Merge remote-tracking branch 'origin/master' into release

ARM-software · Aug 1, 2018 · 83eaffc · 83eaffc
2 parents 4a415ff + a62e77d
commit 83eaffc
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ A few tests are executed by running the SBSA ACS Linux application which in turn
 
 
 ## Release details
- - Code Quality: REL v1.5
+ - Code Quality: REL v1.6
  - The tests are written for version 3.0 of the SBSA specification.
  - The compliance suite is not a substitute for design verification.
  - To review the SBSA ACS logs, ARM licensees can contact ARM directly through their partner managers.

diff --git a/linux_app/sbsa-acs-app/include/sbsa_app.h b/linux_app/sbsa-acs-app/include/sbsa_app.h
@@ -20,7 +20,7 @@
 
 
 #define SBSA_APP_VERSION_MAJOR  1
-#define SBSA_APP_VERSION_MINOR  5
+#define SBSA_APP_VERSION_MINOR  6
 
 #include "sbsa_drv_intf.h"
 

diff --git a/test_pool/pcie/test_p008.c b/test_pool/pcie/test_p008.c
@@ -141,36 +141,28 @@ payload (void)
     if (check_msi_status (count - 1)) {
       /* Get BDF of a device */
       current_dev_bdf = val_peripheral_get_info (ANY_BDF, count - 1);
-      if (current_dev_bdf) {
-        val_print (AVS_PRINT_INFO, "       Checking PCI device with BDF %4X\n", current_dev_bdf);
-        /* Read MSI(X) vectors */
-        if (val_get_msi_vectors (current_dev_bdf, &current_dev_mvec)) {
-
-          /* Pull other PCI devices left in the devices list */
-          while (count_next > 0 && !status) {
-            if (check_msi_status (count_next - 1)) {
-              /* Get BDF of a device */
-              next_dev_bdf = val_peripheral_get_info (ANY_BDF, count_next - 1);
-              /* Read MSI(X) vectors */
-              if (val_get_msi_vectors (next_dev_bdf, &next_dev_mvec)) {
-                /* Compare two lists of MSI(X) vectors */
-                if(check_list_duplicates (current_dev_mvec, next_dev_mvec)) {
-                  val_print (AVS_STATUS_ERR, "\n       Allocated MSIs are not unique", 0);
-                  val_set_status (index, RESULT_FAIL (g_sbsa_level, TEST_NUM, 02));
-                  status = 1;
-                }
-                clean_msi_list (next_dev_mvec);
+      val_print (AVS_PRINT_INFO, "       Checking PCI device with BDF %4X\n", current_dev_bdf);
+      /* Read MSI(X) vectors */
+      if (val_get_msi_vectors (current_dev_bdf, &current_dev_mvec)) {
+        /* Pull other PCI devices left in the devices list */
+        while (count_next > 0 && !status) {
+          if (check_msi_status (count_next - 1)) {
+            /* Get BDF of a device */
+            next_dev_bdf = val_peripheral_get_info (ANY_BDF, count_next - 1);
+            /* Read MSI(X) vectors */
+            if (val_get_msi_vectors (next_dev_bdf, &next_dev_mvec)) {
+              /* Compare two lists of MSI(X) vectors */
+              if (check_list_duplicates (current_dev_mvec, next_dev_mvec)) {
+                val_print (AVS_STATUS_ERR, "\n       Allocated MSIs are not unique", 0);
+                val_set_status (index, RESULT_FAIL (g_sbsa_level, TEST_NUM, 02));
+                status = 1;
               }
+              clean_msi_list (next_dev_mvec);
             }
-            count_next--;
           }
-
-          clean_msi_list (current_dev_mvec);
+          count_next--;
         }
-      } else {
-        val_print (AVS_STATUS_ERR, "\n       Failed to get address of PCI device", 0);
-        val_set_status (index, RESULT_FAIL (g_sbsa_level, TEST_NUM, 01));
-        status = 1;
+        clean_msi_list (current_dev_mvec);
       }
     }
     count--;

diff --git a/uefi_app/SbsaAvs.h b/uefi_app/SbsaAvs.h
@@ -20,7 +20,7 @@
 
 
   #define SBSA_ACS_MAJOR_VER  1
-  #define SBSA_ACS_MINOR_VER  5
+  #define SBSA_ACS_MINOR_VER  6
 
   #define G_SBSA_LEVEL  3
   #define G_PRINT_LEVEL AVS_PRINT_TEST