diff --git a/apps/uefi/Bsa.inf b/apps/uefi/Bsa.inf index 6ca5838a..cca95bfd 100644 --- a/apps/uefi/Bsa.inf +++ b/apps/uefi/Bsa.inf @@ -140,14 +140,12 @@ ../../test_pool/pcie/p042.c ../../test_pool/pcie/p045.c ../../test_pool/pcie/p094.c - ../../test_pool/pcie/p096.c ../../test_pool/pcie/p100.c ../../test_pool/pcie/p101.c ../../test_pool/exerciser/e001.c ../../test_pool/exerciser/e002.c ../../test_pool/exerciser/e003.c ../../test_pool/exerciser/e004.c - ../../test_pool/exerciser/e006.c ../../test_pool/exerciser/e007.c ../../test_pool/exerciser/e010.c ../../test_pool/exerciser/e011.c diff --git a/apps/uefi/Mem.inf b/apps/uefi/Mem.inf index 019c4997..ee7d68f4 100644 --- a/apps/uefi/Mem.inf +++ b/apps/uefi/Mem.inf @@ -138,7 +138,6 @@ ../../test_pool/exerciser/e002.c ../../test_pool/exerciser/e003.c ../../test_pool/exerciser/e004.c - ../../test_pool/exerciser/e006.c ../../test_pool/exerciser/e007.c ../../test_pool/exerciser/e010.c ../../test_pool/exerciser/e011.c diff --git a/apps/uefi/Sbsa.inf b/apps/uefi/Sbsa.inf index dee1321d..92a0847c 100644 --- a/apps/uefi/Sbsa.inf +++ b/apps/uefi/Sbsa.inf @@ -148,7 +148,6 @@ ../../test_pool/exerciser/e002.c ../../test_pool/exerciser/e003.c ../../test_pool/exerciser/e004.c - ../../test_pool/exerciser/e006.c ../../test_pool/exerciser/e007.c ../../test_pool/exerciser/e010.c ../../test_pool/exerciser/e011.c @@ -267,7 +266,6 @@ ../../test_pool/pcie/p090.c ../../test_pool/pcie/p092.c ../../test_pool/pcie/p093.c - ../../test_pool/pcie/p096.c ../../test_pool/exerciser/e003.c ../../test_pool/exerciser/e007.c ../../test_pool/exerciser/e008.c diff --git a/apps/uefi/Vbsa.inf b/apps/uefi/Vbsa.inf index e12a8f11..bf83bd92 100644 --- a/apps/uefi/Vbsa.inf +++ b/apps/uefi/Vbsa.inf @@ -141,14 +141,12 @@ ../../test_pool/pcie/p042.c ../../test_pool/pcie/p045.c ../../test_pool/pcie/p094.c - ../../test_pool/pcie/p096.c ../../test_pool/pcie/p100.c ../../test_pool/pcie/p101.c ../../test_pool/exerciser/e001.c ../../test_pool/exerciser/e002.c ../../test_pool/exerciser/e003.c ../../test_pool/exerciser/e004.c - ../../test_pool/exerciser/e006.c ../../test_pool/exerciser/e007.c ../../test_pool/exerciser/e010.c ../../test_pool/exerciser/e011.c diff --git a/apps/uefi/pc_bsa.inf b/apps/uefi/pc_bsa.inf index 83b5980e..60da1dec 100644 --- a/apps/uefi/pc_bsa.inf +++ b/apps/uefi/pc_bsa.inf @@ -141,14 +141,12 @@ ../../test_pool/pcie/p038.c ../../test_pool/pcie/p039.c ../../test_pool/pcie/p042.c - ../../test_pool/pcie/p096.c ../../test_pool/pcie/p100.c ../../test_pool/pcie/p101.c ../../test_pool/exerciser/e001.c ../../test_pool/exerciser/e002.c ../../test_pool/exerciser/e003.c ../../test_pool/exerciser/e004.c - ../../test_pool/exerciser/e006.c ../../test_pool/exerciser/e007.c ../../test_pool/exerciser/e010.c ../../test_pool/exerciser/e011.c diff --git a/apps/uefi/xbsa_acpi.inf b/apps/uefi/xbsa_acpi.inf index f6d97732..7bab10ae 100644 --- a/apps/uefi/xbsa_acpi.inf +++ b/apps/uefi/xbsa_acpi.inf @@ -136,13 +136,11 @@ ../../test_pool/pcie/p038.c ../../test_pool/pcie/p039.c ../../test_pool/pcie/p042.c - ../../test_pool/pcie/p096.c ../../test_pool/pcie/p100.c ../../test_pool/pcie/p101.c ../../test_pool/exerciser/e001.c ../../test_pool/exerciser/e002.c ../../test_pool/exerciser/e004.c - ../../test_pool/exerciser/e006.c ../../test_pool/exerciser/e010.c ../../test_pool/exerciser/e011.c ../../test_pool/exerciser/e012.c diff --git a/docs/bsa/arm_bsa_testcase_checklist.md b/docs/bsa/arm_bsa_testcase_checklist.md index 272355c1..69a9f6a9 100644 --- a/docs/bsa/arm_bsa_testcase_checklist.md +++ b/docs/bsa/arm_bsa_testcase_checklist.md @@ -1560,16 +1560,6 @@ The checklist provides information about: - - PCI_LI_02 - 896 - PCI legacy intr SPI ID unique - Yes - Yes - Yes - - - 1506 Generate PCIe legacy interrupt @@ -2765,16 +2755,6 @@ The checklist provides information about: - - PCI_LI_02 - 896 - PCI legacy intr SPI ID unique - Yes - Yes - Yes - - - PCI_LI_03 823 @@ -3783,16 +3763,6 @@ The checklist provides information about: - - PCI_LI_02 - 896 - PCI legacy intr SPI ID unique - Yes - Yes - Yes - - - PCI_LI_03 823 diff --git a/docs/sbsa/arm_sbsa_testcase_checklist.md b/docs/sbsa/arm_sbsa_testcase_checklist.md index a047c3af..250b96d6 100644 --- a/docs/sbsa/arm_sbsa_testcase_checklist.md +++ b/docs/sbsa/arm_sbsa_testcase_checklist.md @@ -1282,16 +1282,6 @@ The checklist provides information about: RCiEP, RCEC - - PCI_LI_02 - - PCI legacy intr SPI ID unique - No - Yes - Yes - - - PCI_LI_03 @@ -2300,16 +2290,6 @@ The checklist provides information about: RCiEP, RCEC - - PCI_LI_02 - - PCI legacy intr SPI ID unique - No - Yes - Yes - - - PCI_LI_03 diff --git a/docs/vbsa/arm_vbsa_architecture_compliance_test_scenario.md b/docs/vbsa/arm_vbsa_architecture_compliance_test_scenario.md index dbff1e5e..dd7bd461 100644 --- a/docs/vbsa/arm_vbsa_architecture_compliance_test_scenario.md +++ b/docs/vbsa/arm_vbsa_architecture_compliance_test_scenario.md @@ -324,7 +324,6 @@ Purpose: capture ACS scenario outlines for each VBSA rule. Each section: - E.6 - Legacy Interrupts - PCI_LI_01 - - PCI_LI_02 - PCI_LI_03 - PCI_LI_04 diff --git a/docs/vbsa/arm_vbsa_testcase_checklist.md b/docs/vbsa/arm_vbsa_testcase_checklist.md index 199e496b..eb4ee429 100644 --- a/docs/vbsa/arm_vbsa_testcase_checklist.md +++ b/docs/vbsa/arm_vbsa_testcase_checklist.md @@ -960,14 +960,6 @@ The checklist provides information about: ❌ - - PCI_LI_02 - 896 - PCI legacy intr SPI ID unique - ❌ - ✅ - - 1506 diff --git a/tools/cmake/infra/bsa_test.txt b/tools/cmake/infra/bsa_test.txt index 1c3140a3..d90215af 100644 --- a/tools/cmake/infra/bsa_test.txt +++ b/tools/cmake/infra/bsa_test.txt @@ -147,7 +147,6 @@ p088.c p092.c p094.c p095.c -p096.c p097.c p100.c p101.c @@ -155,7 +154,6 @@ e001.c e002.c e003.c e004.c -e006.c e007.c e008.c e010.c diff --git a/tools/cmake/infra/pc_bsa_test.txt b/tools/cmake/infra/pc_bsa_test.txt index ae9986c4..c1075fe4 100644 --- a/tools/cmake/infra/pc_bsa_test.txt +++ b/tools/cmake/infra/pc_bsa_test.txt @@ -97,7 +97,6 @@ p072.c p078.c p094.c p095.c -p096.c p097.c p101.c p087.c @@ -112,7 +111,6 @@ tpm002.c e001.c e002.c e003.c -e006.c e007.c e010.c e014.c diff --git a/val/include/rule_based_execution_enum.h b/val/include/rule_based_execution_enum.h index 675fadf2..e885f174 100644 --- a/val/include/rule_based_execution_enum.h +++ b/val/include/rule_based_execution_enum.h @@ -428,7 +428,6 @@ typedef enum { PCI_IN_19, PCI_IN_20, PCI_LI_01, - PCI_LI_02, PCI_LI_03, PCI_LI_04, PCI_MM_01, @@ -865,7 +864,6 @@ typedef enum { PCI_IN_19_ENTRY, P009_ENTRY, PCI_LI_01_ENTRY, - PCI_LI_02_ENTRY, PCI_LI_03_ENTRY, PCI_MM_01_ENTRY, PCI_MM_02_ENTRY, @@ -955,7 +953,6 @@ typedef enum { P103_ENTRY, P106_ENTRY, P107_ENTRY, - E006_ENTRY, E019_ENTRY, E020_ENTRY, E033_ENTRY, @@ -969,7 +966,6 @@ typedef enum { E047_ENTRY, E048_ENTRY, P094_ENTRY, - P096_ENTRY, P097_ENTRY, P100_ENTRY, P101_ENTRY, diff --git a/val/src/bsa_execute_test.c b/val/src/bsa_execute_test.c index e7039c0d..a1d43086 100644 --- a/val/src/bsa_execute_test.c +++ b/val/src/bsa_execute_test.c @@ -508,7 +508,6 @@ val_bsa_pcie_execute_tests(uint32_t num_pe, uint32_t *g_sw_view) status |= p045_entry(num_pe); status |= p094_entry(num_pe); status |= p095_entry(num_pe); - status |= p096_entry(num_pe); status |= p097_entry(num_pe); #endif #if defined(TARGET_LINUX) @@ -895,7 +894,6 @@ val_bsa_exerciser_execute_tests(uint32_t num_pe, uint32_t *g_sw_view) status |= e001_entry(num_pe); status |= e002_entry(num_pe); status |= e004_entry(num_pe); - status |= e006_entry(num_pe); status |= e010_entry(num_pe); if (!pal_target_is_dt()) { diff --git a/val/src/rule_enum_string_map.c b/val/src/rule_enum_string_map.c index 6ed6692c..6758bb92 100644 --- a/val/src/rule_enum_string_map.c +++ b/val/src/rule_enum_string_map.c @@ -383,7 +383,6 @@ char *rule_id_string[RULE_ID_SENTINEL] = { [PCI_IN_19] = "PCI_IN_19", [PCI_IN_20] = "PCI_IN_20", [PCI_LI_01] = "PCI_LI_01", - [PCI_LI_02] = "PCI_LI_02", [PCI_LI_03] = "PCI_LI_03", [PCI_LI_04] = "PCI_LI_04", [PCI_MM_01] = "PCI_MM_01", diff --git a/val/src/rule_metadata.c b/val/src/rule_metadata.c index 4d3e112e..d671d904 100644 --- a/val/src/rule_metadata.c +++ b/val/src/rule_metadata.c @@ -1997,13 +1997,6 @@ rule_test_map_t rule_test_map[RULE_ID_SENTINEL] = { .platform_bitmask = PLATFORM_BAREMETAL | PLATFORM_UEFI, .flag = BASE_RULE, }, - [PCI_LI_02] = { - .test_entry_id = PCI_LI_02_ENTRY, - .module_id = PCIE, - .rule_desc = "PCI legacy intr SPI ID unique", - .platform_bitmask = PLATFORM_BAREMETAL | PLATFORM_UEFI | PLATFORM_LINUX, - .flag = BASE_RULE, - }, [PCI_LI_03] = { .test_entry_id = PCI_LI_03_ENTRY, .module_id = PCIE, @@ -3532,7 +3525,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = { [P104_ENTRY] = p104_entry, // used in wrapper. [P107_ENTRY] = p107_entry, // used in wrapper. [P105_ENTRY] = p105_entry, - [PCI_LI_02_ENTRY] = pci_li_02_entry, [PCI_MM_01_ENTRY] = pci_mm_01_entry, [PCI_MM_02_ENTRY] = pci_mm_02_entry, [PCI_MM_03_ENTRY] = pci_mm_03_entry, @@ -3542,7 +3534,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = { [D004_ENTRY] = d004_entry, [D007_ENTRY] = d007_entry, [M004_ENTRY] = m004_entry, - [P096_ENTRY] = p096_entry, // used in wrapper. [P097_ENTRY] = p097_entry, // used in wrapper. [M006_ENTRY] = m006_entry, [P095_ENTRY] = p095_entry, @@ -3569,7 +3560,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = { [E002_ENTRY] = e002_entry, // used in wrapper. [E003_ENTRY] = e003_entry, [E004_ENTRY] = e004_entry, - [E006_ENTRY] = e006_entry, // used in wrapper. [E007_ENTRY] = e007_entry, // used in wrapper. [E008_ENTRY] = e008_entry, [E010_ENTRY] = e010_entry, @@ -3646,7 +3636,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = { [PCI_IN_17_ENTRY] = pci_in_17_entry, [PCI_IN_19_ENTRY] = pci_in_19_entry, [PCI_LI_01_ENTRY] = pci_li_01_entry, - [PCI_LI_02_ENTRY] = pci_li_02_entry, [PCI_LI_03_ENTRY] = pci_li_03_entry, [PCI_MM_01_ENTRY] = pci_mm_01_entry, [PCI_MM_02_ENTRY] = pci_mm_02_entry, @@ -3797,7 +3786,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = { [P092_ENTRY] = p092_entry, [P093_ENTRY] = p093_entry, [P094_ENTRY] = p094_entry, - [P096_ENTRY] = p096_entry, [P098_ENTRY] = p098_entry, // used in wrapper. [P099_ENTRY] = p099_entry, // used in wrapper. [P100_ENTRY] = p100_entry, @@ -4088,7 +4076,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = { [P072_ENTRY] = p072_entry, // used in wrapper. [P078_ENTRY] = p078_entry, // used in wrapper. [P095_ENTRY] = p095_entry, - [P096_ENTRY] = p096_entry, // used in wrapper. [P097_ENTRY] = p097_entry, // used in wrapper. [P101_ENTRY] = p101_entry, [P087_ENTRY] = p087_entry, @@ -4104,7 +4091,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = { [PCI_IN_17_ENTRY] = pci_in_17_entry, [PCI_IN_19_ENTRY] = pci_in_19_entry, [PCI_LI_01_ENTRY] = pci_li_01_entry, - [PCI_LI_02_ENTRY] = pci_li_02_entry, [PCI_LI_03_ENTRY] = pci_li_03_entry, [PCI_MM_01_ENTRY] = pci_mm_01_entry, [PCI_MM_02_ENTRY] = pci_mm_02_entry, @@ -4115,7 +4101,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = { [E001_ENTRY] = e001_entry, [E002_ENTRY] = e002_entry, [E003_ENTRY] = e003_entry, - [E006_ENTRY] = e006_entry, [E007_ENTRY] = e007_entry, [E010_ENTRY] = e010_entry, [E014_ENTRY] = e014_entry, @@ -4360,7 +4345,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = { [PCI_IN_17_ENTRY] = pci_in_17_entry, [PCI_IN_19_ENTRY] = pci_in_19_entry, [PCI_LI_01_ENTRY] = pci_li_01_entry, - [PCI_LI_02_ENTRY] = pci_li_02_entry, [PCI_LI_03_ENTRY] = pci_li_03_entry, [PCI_MM_01_ENTRY] = pci_mm_01_entry, [PCI_MM_02_ENTRY] = pci_mm_02_entry, @@ -4440,7 +4424,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = { [E016_ENTRY] = e016_entry, // used in wrapper. [E004_ENTRY] = e004_entry, [E033_ENTRY] = e033_entry, // used in wrapper. - [E006_ENTRY] = e006_entry, // used in wrapper. [E046_ENTRY] = e046_entry, [E047_ENTRY] = e047_entry, [E048_ENTRY] = e048_entry, @@ -4486,7 +4469,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = { [P017_ENTRY] = p017_entry, // used in wrapper. [P005_ENTRY] = p005_entry, // used in wrapper. [P023_ENTRY] = p023_entry, // used in wrapper. - [P096_ENTRY] = p096_entry, // used in wrapper. [P037_ENTRY] = p037_entry, [P002_ENTRY] = p002_entry, [P018_ENTRY] = p018_entry, // used in wrapper. @@ -4583,7 +4565,7 @@ const RULE_ID_e jkzmt_rule_list[] = { /* E.4 - Message Signaled Interrupts */ PCI_MSI_1, PCI_MSI_2, /* E.6 - Legacy Interrupts */ - PCI_LI_01, PCI_LI_02, PCI_LI_03, PCI_LI_04, + PCI_LI_01, PCI_LI_03, PCI_LI_04, /* E.7 - System MMU and Device Assignment */ PCI_SM_01, PCI_SM_02, /* E.8 - I/O Coherency */ @@ -4650,7 +4632,7 @@ const RULE_ID_e hvzjy_rule_list[] = { /* E.4 - Message Signaled Interrupts */ PCI_MSI_1, PCI_MSI_2, /* E.6 - Legacy Interrupts */ - PCI_LI_01, PCI_LI_02, PCI_LI_03, PCI_LI_04, + PCI_LI_01, PCI_LI_03, PCI_LI_04, /* E.7 - System MMU and Device Assignment */ PCI_SM_01, PCI_SM_02, /* E.8 - I/O Coherency */ @@ -4720,7 +4702,7 @@ const RULE_ID_e b_per_08_rule_list[] = { /* E.4 - Message Signaled Interrupts */ PCI_MSI_1, PCI_MSI_2, /* E.6 - Legacy Interrupts */ - PCI_LI_01, PCI_LI_02, PCI_LI_03, PCI_LI_04, + PCI_LI_01, PCI_LI_03, PCI_LI_04, /* E.7 - System MMU and Device Assignment */ PCI_SM_01, PCI_SM_02, /* E.8 - I/O Coherency */ @@ -4881,7 +4863,7 @@ const RULE_ID_e v_l1pr_02_rule_list[] = { /* E.4 - Message Signaled Interrupts */ PCI_MSI_1, PCI_MSI_2, /* E.6 - Legacy Interrupts */ - PCI_LI_01, PCI_LI_02, PCI_LI_03, PCI_LI_04, + PCI_LI_01, PCI_LI_03, PCI_LI_04, /* E.7 - System MMU and Device Assignment */ PCI_SM_01, PCI_SM_02, /* E.8 - I/O Coherency */ diff --git a/val/src/test_wrappers.c b/val/src/test_wrappers.c index 4345670b..ed431cf0 100644 --- a/val/src/test_wrappers.c +++ b/val/src/test_wrappers.c @@ -215,16 +215,6 @@ pci_in_04_entry(uint32_t num_pe) return run_test_entries(tst_entry_list, num_pe); } -/* PCI_LI_02 */ -uint32_t -pci_li_02_entry(uint32_t num_pe) -{ - TEST_ENTRY_ID_e p_list[] = { P096_ENTRY, TEST_ENTRY_SENTINEL }; - TEST_ENTRY_ID_e e_list[] = { E006_ENTRY, TEST_ENTRY_SENTINEL }; - - return run_pcie_static_and_exerciser(p_list, e_list, num_pe); -} - /* PCI_LI_03 */ uint32_t pci_li_03_entry(uint32_t num_pe)