From 375ce9355ee0115619c94284d9bd3f79231f3322 Mon Sep 17 00:00:00 2001 From: sakar arora Date: Mon, 23 Jul 2018 10:14:08 +0530 Subject: [PATCH 1/2] test 58: bug fix: handle BDF return values correctly (#51) BDF value 0 is valid, and should not be discarded. Signed-off-by: Sakar Arora --- test_pool/pcie/test_p008.c | 44 ++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/test_pool/pcie/test_p008.c b/test_pool/pcie/test_p008.c index c85c25dc..58395a94 100644 --- 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, ¤t_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, ¤t_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--; From a62e77db16bfdd4f7a952f5f33083a27e3c6360f Mon Sep 17 00:00:00 2001 From: Sakar Arora Date: Wed, 1 Aug 2018 10:32:05 +0530 Subject: [PATCH 2/2] Update source code version to 1.6 Signed-off-by: Sakar Arora --- README.md | 2 +- linux_app/sbsa-acs-app/include/sbsa_app.h | 2 +- uefi_app/SbsaAvs.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b546feb8..10d10229 100644 --- 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 index dd5a0635..4c572098 100644 --- 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/uefi_app/SbsaAvs.h b/uefi_app/SbsaAvs.h index 1724a917..9c7257d3 100755 --- 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