From ef4013dada32e252e6742342ba8f5087e3563ec7 Mon Sep 17 00:00:00 2001 From: Sujana M Date: Mon, 11 Nov 2024 14:55:19 +0530 Subject: [PATCH] Fixes https://github.com/ARM-software/sbsa-acs/issues/512 - PCIe tests to not run if no ECAM - For UEFI PCIe tests 840 and 601 , presence of ECAM is mandatory for this rule from compliance perspective Signed-off-by: Sujana M --- val/sbsa/src/sbsa_execute_test.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/val/sbsa/src/sbsa_execute_test.c b/val/sbsa/src/sbsa_execute_test.c index 6d6695a..6047e4e 100644 --- a/val/sbsa/src/sbsa_execute_test.c +++ b/val/sbsa/src/sbsa_execute_test.c @@ -278,6 +278,14 @@ val_sbsa_pcie_execute_tests(uint32_t level, uint32_t num_pe) status |= p009_entry(num_pe); /* This covers GIC rule */ #endif + ecam_status = p001_entry(num_pe); + if (ecam_status == ACS_STATUS_FAIL) { + val_print(ACS_PRINT_WARN, "\n *** Skipping remaining PCIE tests ***\n", 0); + return status; + } + + status |= ecam_status; + #ifndef TARGET_LINUX if (((level > 2) && (g_sbsa_only_level == 0)) || (g_sbsa_only_level == 3)) status |= p040_entry(num_pe); @@ -289,13 +297,6 @@ val_sbsa_pcie_execute_tests(uint32_t level, uint32_t num_pe) #endif if (((level > 5) && (g_sbsa_only_level == 0)) || (g_sbsa_only_level == 6)) { - ecam_status = p001_entry(num_pe); - if (ecam_status == ACS_STATUS_FAIL) { - val_print(ACS_PRINT_WARN, "\n *** Skipping remaining PCIE tests ***\n", 0); - return status; - } - - status |= ecam_status; #if defined(TARGET_LINUX) || defined(TARGET_EMULATION) status |= p005_entry(num_pe); #endif