fix(pcie): drop PCI_MM_04 test implementation

Sujana-M · Sujana-M · commit bc1a72c0d2a3 · 2026-06-09T13:26:32.000Z
- Move PCI_MM_04 to not-implemented metadata while keeping it in alias rule lists for reporting. - Remove p047 source, direct execution call, entry mappings, prototype, and build source-list references. - fixes ARM-software#386 Signed-off-by: Sujana M <sujana.murali@arm.com> Change-Id: I726f4bfbcff78aa7ff079eb16537cab0fe605de7
diff --git a/apps/uefi/Bsa.inf b/apps/uefi/Bsa.inf
@@ -220,7 +220,6 @@
   ../../test_pool/pcie/p007.c
   ../../test_pool/pcie/p010.c
   ../../test_pool/pcie/p046.c
-  ../../test_pool/pcie/p047.c
   ../../test_pool/pcie/p048.c
   ../../test_pool/pcie/p049.c
   ../../test_pool/pcie/p050.c
diff --git a/apps/uefi/Sbsa.inf b/apps/uefi/Sbsa.inf
@@ -221,7 +221,6 @@
   ../../test_pool/pcie/p007.c
   ../../test_pool/pcie/p010.c
   ../../test_pool/pcie/p046.c
-  ../../test_pool/pcie/p047.c
   ../../test_pool/pcie/p048.c
   ../../test_pool/pcie/p049.c
   ../../test_pool/pcie/p050.c
diff --git a/apps/uefi/SbsaNist.inf b/apps/uefi/SbsaNist.inf
@@ -110,7 +110,6 @@
   ../../test_pool/pcie/p037.c
   ../../test_pool/pcie/p038.c
   ../../test_pool/pcie/p046.c
-  ../../test_pool/pcie/p047.c
   ../../test_pool/pcie/p048.c
   ../../test_pool/pcie/p049.c
   ../../test_pool/pcie/p050.c
diff --git a/apps/uefi/Vbsa.inf b/apps/uefi/Vbsa.inf
@@ -223,7 +223,6 @@
   ../../test_pool/pcie/p007.c
   ../../test_pool/pcie/p010.c
   ../../test_pool/pcie/p046.c
-  ../../test_pool/pcie/p047.c
   ../../test_pool/pcie/p048.c
   ../../test_pool/pcie/p049.c
   ../../test_pool/pcie/p050.c
diff --git a/apps/uefi/pc_bsa.inf b/apps/uefi/pc_bsa.inf
@@ -223,7 +223,6 @@
   ../../test_pool/pcie/p007.c
   ../../test_pool/pcie/p010.c
   ../../test_pool/pcie/p046.c
-  ../../test_pool/pcie/p047.c
   ../../test_pool/pcie/p048.c
   ../../test_pool/pcie/p049.c
   ../../test_pool/pcie/p050.c
diff --git a/apps/uefi/xbsa_acpi.inf b/apps/uefi/xbsa_acpi.inf
@@ -219,7 +219,6 @@
   ../../test_pool/pcie/p007.c
   ../../test_pool/pcie/p010.c
   ../../test_pool/pcie/p046.c
-  ../../test_pool/pcie/p047.c
   ../../test_pool/pcie/p048.c
   ../../test_pool/pcie/p049.c
   ../../test_pool/pcie/p050.c
diff --git a/docs/bsa/arm_bsa_testcase_checklist.md b/docs/bsa/arm_bsa_testcase_checklist.md
@@ -1330,11 +1330,11 @@ The checklist provides information about:
     </tr>
     <tr>
       <td>PCI_MM_04</td>
-      <td>847</td>
-      <td>NP type-1 pcie only support 32-bit</td>
-      <td>Yes</td>
-      <td>Yes</td>
-      <td>No</td>
+      <td>Not Covered</td>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td></td>
       <td></td>
     </tr>
     <tr>
@@ -2411,11 +2411,11 @@ The checklist provides information about:
     </tr>
     <tr>
       <td>PCI_MM_04</td>
-      <td>847</td>
-      <td>NP type-1 pcie only support 32-bit</td>
-      <td>Yes</td>
-      <td>Yes</td>
-      <td>No</td>
+      <td>Not Covered</td>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td></td>
       <td></td>
     </tr>
     <tr>
@@ -3295,11 +3295,11 @@ The checklist provides information about:
     </tr>
     <tr>
       <td>PCI_MM_04</td>
-      <td>847</td>
-      <td>NP type-1 pcie only support 32-bit</td>
-      <td>Yes</td>
-      <td>Yes</td>
-      <td>No</td>
+      <td>Not Covered</td>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td></td>
       <td></td>
     </tr>
     <tr>
diff --git a/docs/sbsa/arm_sbsa_testcase_checklist.md b/docs/sbsa/arm_sbsa_testcase_checklist.md
@@ -1078,12 +1078,12 @@ The checklist provides information about:
     </tr>
     <tr>
       <td>PCI_MM_04</td>
-      <td>847</td>
-      <td>NP type-1 pcie only support 32-bit</td>
-      <td>Yes</td>
-      <td>Yes</td>
-      <td>No</td>
-      <td>RCiEP, RCEC, iEP RP, iEP EP</td>
+      <td>Not Covered</td>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td></td>
     </tr>
     <tr>
       <td>PCI_MM_05</td>
@@ -1962,12 +1962,12 @@ The checklist provides information about:
     </tr>
     <tr>
       <td>PCI_MM_04</td>
-      <td>847</td>
-      <td>NP type-1 pcie only support 32-bit</td>
-      <td>Yes</td>
-      <td>Yes</td>
-      <td>No</td>
-      <td>RCiEP, RCEC, iEP RP, iEP EP,</td>
+      <td>Not Covered</td>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td></td>
     </tr>
     <tr>
       <td>PCI_MM_05</td>
diff --git a/docs/vbsa/arm_vbsa_testcase_checklist.md b/docs/vbsa/arm_vbsa_testcase_checklist.md
@@ -898,10 +898,10 @@ The checklist provides information about:
     </tr>
     <tr>
       <td>PCI_MM_04</td>
-      <td>847</td>
-      <td>NP type-1 pcie only support 32-bit</td>
-      <td>✅</td>
-      <td>❌</td>
+      <td>Not Covered</td>
+      <td></td>
+      <td></td>
+      <td></td>
       <td></td>
     </tr>
     <tr>
diff --git a/test_pool/pcie/p047.c b/test_pool/pcie/p047.c
diff --git a/tools/cmake/infra/bsa_test.txt b/tools/cmake/infra/bsa_test.txt
@@ -171,4 +171,3 @@ e033.c
 e035.c
 e036.c
 e039.c
-p047.c
diff --git a/tools/cmake/infra/pc_bsa_test.txt b/tools/cmake/infra/pc_bsa_test.txt
@@ -83,7 +83,6 @@ p039.c
 p042.c
 p045.c
 p046.c
-p047.c
 p064.c
 p068.c
 p071.c
diff --git a/tools/cmake/infra/sbsa_test.txt b/tools/cmake/infra/sbsa_test.txt
@@ -73,7 +73,6 @@ p037.c
 p038.c
 p045.c
 p046.c
-p047.c
 p048.c
 p049.c
 p050.c
diff --git a/val/include/acs_pcie.h b/val/include/acs_pcie.h
@@ -243,7 +243,6 @@ uint32_t p039_entry(uint32_t num_pe);
 uint32_t p042_entry(uint32_t num_pe);
 uint32_t p045_entry(uint32_t num_pe); /* Linux test */
 uint32_t p046_entry(uint32_t num_pe); /* Linux test */
-uint32_t p047_entry(uint32_t num_pe);
 uint32_t p048_entry(uint32_t num_pe);
 uint32_t p049_entry(uint32_t num_pe);
 uint32_t p050_entry(uint32_t num_pe);
diff --git a/val/include/rule_based_execution_enum.h b/val/include/rule_based_execution_enum.h
@@ -857,7 +857,6 @@ typedef enum {
     PCI_LI_03_ENTRY,
     PCI_MM_01_ENTRY,
     PCI_MM_03_ENTRY,
-    P047_ENTRY,
     P049_ENTRY,
     P095_ENTRY,
     P105_ENTRY,
diff --git a/val/src/rule_metadata.c b/val/src/rule_metadata.c
@@ -1950,14 +1950,6 @@ rule_test_map_t rule_test_map[RULE_ID_SENTINEL] = {
             .platform_bitmask = PLATFORM_BAREMETAL | PLATFORM_UEFI | PLATFORM_LINUX,
             .flag             = BASE_RULE,
         },
-        [PCI_MM_04] = {
-            .test_entry_id    = P047_ENTRY,
-            .module_id        = PCIE,
-            .rule_desc        = "NP type-1 pcie only support 32-bit",
-            .platform_bitmask = PLATFORM_BAREMETAL | PLATFORM_UEFI,
-            .flag             = BASE_RULE,
-            .test_num         = ACS_PCIE_TEST_NUM_BASE + 47,
-        },
         [PCI_MM_05] = {
             .test_entry_id    = P095_ENTRY,
             .module_id        = PCIE,
@@ -3288,6 +3280,9 @@ rule_test_map_t rule_test_map[RULE_ID_SENTINEL] = {
         [PCI_MM_02] = {
             .module_id        = PCIE,
         },
+        [PCI_MM_04] = {
+            .module_id        = PCIE,
+        },
         [PCI_MM_06] = {
             .module_id        = PCIE,
         },
@@ -3649,7 +3644,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = {
     [P038_ENTRY] = p038_entry,
     [P039_ENTRY] = p039_entry,
     [P042_ENTRY] = p042_entry,
-    [P047_ENTRY] = p047_entry,
     [P048_ENTRY] = p048_entry, // used in wrapper.
     [P049_ENTRY] = p049_entry, // used in wrapper.
     [P050_ENTRY] = p050_entry, // used in wrapper.
@@ -3960,7 +3954,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = {
     [P042_ENTRY] = p042_entry,
     [P045_ENTRY] = p045_entry, // used in wrapper.
     [P046_ENTRY] = p046_entry,
-    [P047_ENTRY] = p047_entry,
     [P064_ENTRY] = p064_entry, // used in wrapper.
     [P068_ENTRY] = p068_entry, // used in wrapper.
     [P071_ENTRY] = p071_entry, // used in wrapper.
@@ -4171,7 +4164,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = {
     [P015_ENTRY] = p015_entry,
     [P016_ENTRY] = p016_entry,
     [P027_ENTRY] = p027_entry, // used in wrapper.
-    [P047_ENTRY] = p047_entry,
     [P048_ENTRY] = p048_entry, // used in wrapper.
     [P049_ENTRY] = p049_entry, // used in wrapper.
     [P050_ENTRY] = p050_entry, // used in wrapper.
diff --git a/val/src/sbsa_execute_test.c b/val/src/sbsa_execute_test.c
@@ -391,7 +391,6 @@ val_sbsa_pcie_execute_tests(uint32_t level, uint32_t num_pe)
       status |= p027_entry(num_pe);
       status |= p037_entry(num_pe);
       status |= p038_entry(num_pe);
-      status |= p047_entry(num_pe);
       status |= p048_entry(num_pe);
       status |= p049_entry(num_pe);
       status |= p050_entry(num_pe); /* iEP/RP only */
