ARM-software · chetan-rathore · Sep 1, 2026 · Aug 24, 2026
diff --git a/docs/pc_bsa/README.md b/docs/pc_bsa/README.md
@@ -102,13 +102,13 @@ below to claim complete coverage.
 
 **Example**
 
-`Shell> PC_bsa.efi -v 1 -skip P_L1PE_01,P_L1GI_01 -f pcbsa_uefi.log`
+`Shell> PC_bsa.efi -v 1 -skip P_L1PE_02,P_L1GI_01 -f pcbsa_uefi.log`
 
-Runs PCBSA ACS with verbosity INFO, skips rules `P_L1PE_01`/`P_L1GI_01`and stores the UART output in `pcbsa_uefi.log`.
+Runs PCBSA ACS with verbosity INFO, skips rules `P_L1PE_02`/`P_L1GI_01`and stores the UART output in `pcbsa_uefi.log`.
 
 > Use PC BSA rule IDs that follow the `P_L<level><module>_<nn>` pattern defined in
   [PC BSA checklist](arm_pc-bsa_testcase_checklist.md)
-  (for example, `P_L1PE_01`, `P_L1GI_01`) when filtering, and record any resulting
+  (for example, `P_L1PE_02`, `P_L1GI_01`) when filtering, and record any resulting
   coverage gap.
 
 #### Emulation environment with secondary storage

diff --git a/docs/pc_bsa/arm_pc-bsa_testcase_checklist.md b/docs/pc_bsa/arm_pc-bsa_testcase_checklist.md
@@ -35,26 +35,6 @@ The checklist provides information about:
       <td>Yes</td>
       <td>No</td>
     </tr>
-    <tr>
-      <td>4</td>
-      <td>Check PE 4KB Granule Support</td>
-      <td>1</td>
-      <td>P_L1PE_01</td>
-      <td>Yes</td>
-      <td>Yes</td>
-      <td>Yes</td>
-      <td>No</td>
-    </tr>
-    <tr>
-      <td>18</td>
-      <td>Check PE Stage 2 4KB Granule Support</td>
-      <td>1</td>
-      <td>P_L1PE_01</td>
-      <td>Yes</td>
-      <td>Yes</td>
-      <td>Yes</td>
-      <td>No</td>
-    </tr>
     <tr>
       <td>24</td>
       <td>Check for 16-bit ASID support</td>

diff --git a/pal/baremetal/target/RDN2/src/platform_cfg_fvp.c b/pal/baremetal/target/RDN2/src/platform_cfg_fvp.c
@@ -51,12 +51,12 @@ const uint32_t g_module_array_len = sizeof(g_module_array) / sizeof(g_module_arr
    Partner fill-in guide :
    - platform_rule_list_arr: Explicit list of rule IDs (RULE_ID_e) to execute. Leave empty for
        the default rule checklist.
-       Example entries: B_PE_01, S_L3PE_02, P_L1PE_01, B_GIC_03, ...
+       Example entries : B_PE_01, S_L3PE_02, P_L1PE_02, B_GIC_03, ...
        Refer sysarch-acs/val/include/rule_based_execution_enum.h for valid enums.
 
    - platform_skip_rule_list_arr: Rules (RULE_ID_e) to skip.
        These take precedence over selections via platform_rule_list_arr or module filters.
-       Example entries: B_PE_01, S_L3PE_02, P_L1PE_01, B_GIC_03, ...
+       Example entries : B_PE_01, S_L3PE_02, P_L1PE_02, B_GIC_03, ...
        Refer sysarch-acs/val/include/rule_based_execution_enum.h for valid enums.
 
    - platform_execute_modules_arr: Modules to include (values from MODULE_NAME_e: PE, GIC, SMMU,

diff --git a/pal/baremetal/target/RDV3/src/platform_cfg_fvp.c b/pal/baremetal/target/RDV3/src/platform_cfg_fvp.c
@@ -51,12 +51,12 @@ const uint32_t g_module_array_len = sizeof(g_module_array) / sizeof(g_module_arr
    Partner fill-in guide :
    - platform_rule_list_arr: Explicit list of rule IDs (RULE_ID_e) to execute. Leave empty for
        the default rule checklist.
-       Example entries: B_PE_01, S_L3PE_02, P_L1PE_01, B_GIC_03, ...
+       Example entries : B_PE_01, S_L3PE_02, P_L1PE_02, B_GIC_03, ...
        Refer sysarch-acs/val/include/rule_based_execution_enum.h for valid enums.
 
    - platform_skip_rule_list_arr: Rules (RULE_ID_e) to skip.
        These take precedence over selections via platform_rule_list_arr or module filters.
-       Example entries: B_PE_01, S_L3PE_02, P_L1PE_01, B_GIC_03, ...
+       Example entries : B_PE_01, S_L3PE_02, P_L1PE_02, B_GIC_03, ...
        Refer sysarch-acs/val/include/rule_based_execution_enum.h for valid enums.
 
    - platform_execute_modules_arr: Modules to include (values from MODULE_NAME_e: PE, GIC, SMMU,

diff --git a/pal/baremetal/target/RDV3CFG1/src/platform_cfg_fvp.c b/pal/baremetal/target/RDV3CFG1/src/platform_cfg_fvp.c
@@ -51,12 +51,12 @@ const uint32_t g_module_array_len = sizeof(g_module_array) / sizeof(g_module_arr
    Partner fill-in guide :
    - platform_rule_list_arr: Explicit list of rule IDs (RULE_ID_e) to execute. Leave empty for
        the default rule checklist.
-       Example entries: B_PE_01, S_L3PE_02, P_L1PE_01, B_GIC_03, ...
+       Example entries : B_PE_01, S_L3PE_02, P_L1PE_02, B_GIC_03, ...
        Refer sysarch-acs/val/include/rule_based_execution_enum.h for valid enums.
 
    - platform_skip_rule_list_arr: Rules (RULE_ID_e) to skip.
        These take precedence over selections via platform_rule_list_arr or module filters.
-       Example entries: B_PE_01, S_L3PE_02, P_L1PE_01, B_GIC_03, ...
+       Example entries : B_PE_01, S_L3PE_02, P_L1PE_02, B_GIC_03, ...
        Refer sysarch-acs/val/include/rule_based_execution_enum.h for valid enums.
 
    - platform_execute_modules_arr: Modules to include (values from MODULE_NAME_e: PE, GIC, SMMU,

diff --git a/test_pool/pe/pe004.c b/test_pool/pe/pe004.c
@@ -20,11 +20,7 @@
 
 
 #define TEST_NUM   (ACS_PE_TEST_NUM_BASE  +  4)
-#ifdef PC_BSA
-#define TEST_RULE  "P_L1PE_01"
-#else
 #define TEST_RULE  "B_PE_04"
-#endif
 #define TEST_DESC  "Check PE 4KB Granule Support          "
 
 static

diff --git a/test_pool/pe/pe018.c b/test_pool/pe/pe018.c
@@ -20,11 +20,7 @@
 
 
 #define TEST_NUM   (ACS_PE_TEST_NUM_BASE  +  18)
-#ifdef PC_BSA
-#define TEST_RULE  "P_L1PE_01"
-#else
 #define TEST_RULE  "B_PE_19"
-#endif
 #define TEST_DESC  "Check Stage 2 4KB Granule Support     "
 
 static

diff --git a/val/include/rule_based_execution_enum.h b/val/include/rule_based_execution_enum.h
@@ -100,7 +100,6 @@ typedef enum {
     S_L8SHD_1,
 
     /* PE PCBSA rules */
-    P_L1PE_01,
     P_L1PE_02,
     P_L1PE_03,
     P_L1PE_04,
@@ -785,7 +784,6 @@ typedef enum {
     U006_ENTRY,
     B_WAK_03_07_ENTRY,
     V_L1WK_02_05_ENTRY,
-    P_L1PE_01_ENTRY,
     P021_ENTRY,
     P093_ENTRY,
     P089_ENTRY,

diff --git a/val/include/test_wrappers.h b/val/include/test_wrappers.h
@@ -28,7 +28,6 @@ uint32_t b_ppi_02_entry(uint32_t num_pe);
 uint32_t b_wak_03_07_entry(uint32_t num_pe);
 uint32_t s_l7mp_03_entry(uint32_t num_pe);
 uint32_t appendix_i_6_entry(uint32_t num_pe);
-uint32_t p_l1pe_01_entry(uint32_t num_pe);
 uint32_t ie_reg_1_entry(uint32_t num_pe);
 uint32_t pci_ic_11_entry(uint32_t num_pe);
 uint32_t pci_in_04_entry(uint32_t num_pe);

diff --git a/val/src/rule_enum_string_map.c b/val/src/rule_enum_string_map.c
@@ -476,7 +476,6 @@ char *rule_id_string[RULE_ID_SENTINEL] = {
 
     /* PC-BSA identifiers */
     [P_L1_01]     = "P_L1_01",
-    [P_L1PE_01]   = "P_L1PE_01",
     [P_L1PE_02]   = "P_L1PE_02",
     [P_L1PE_03]   = "P_L1PE_03",
     [P_L1PE_04]   = "P_L1PE_04",

diff --git a/val/src/rule_lookup.c b/val/src/rule_lookup.c
@@ -25,7 +25,6 @@ const pcbsa_rule_entry_t pcbsa_rule_list[] = {
     { P_L1_01,     PCBSA_LEVEL_1 },
 
     /* PE */
-    { P_L1PE_01,   PCBSA_LEVEL_1 },
     { P_L1PE_02,   PCBSA_LEVEL_1 },
     { P_L1PE_03,   PCBSA_LEVEL_1 },
     { P_L1PE_04,   PCBSA_LEVEL_1 },

diff --git a/val/src/rule_metadata.c b/val/src/rule_metadata.c
@@ -2475,13 +2475,6 @@ rule_test_map_t rule_test_map[RULE_ID_SENTINEL] = {
             .platform_bitmask = PLATFORM_BAREMETAL | PLATFORM_UEFI,
             .flag             = ALIAS_RULE,
         },
-        [P_L1PE_01] = {
-            .test_entry_id    = P_L1PE_01_ENTRY,
-            .module_id        = PE,
-            .rule_desc        = "Check PE 4KB Granule Support",
-            .platform_bitmask = PLATFORM_BAREMETAL | PLATFORM_UEFI,
-            .flag             = BASE_RULE,
-        },
         [P_L1PE_02] = {
             .test_entry_id    = PE024_ENTRY,
             .module_id        = PE,
@@ -3584,7 +3577,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = {
     [G010_ENTRY] = g010_entry, // used in wrapper.
     [G011_ENTRY] = g011_entry, // used in wrapper.
     [G012_ENTRY] = g012_entry,
-    [P_L1PE_01_ENTRY]  = p_l1pe_01_entry,
     [B_PPI_00_ENTRY]   = b_ppi_00_entry,
     [B_PPI_01_ENTRY]   = b_ppi_01_entry,
     [B_PPI_02_ENTRY]   = b_ppi_02_entry,
@@ -3958,7 +3950,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = {
     [PE029_ENTRY] = pe029_entry,
     [PE030_ENTRY] = pe030_entry,
     [PE063_ENTRY] = pe063_entry,
-    [P_L1PE_01_ENTRY] = p_l1pe_01_entry,
     [G001_ENTRY] = g001_entry,
     [G002_ENTRY] = g002_entry,
     [G003_ENTRY] = g003_entry,
@@ -4295,7 +4286,6 @@ test_entry_fn_t test_entry_func_table[TEST_ENTRY_SENTINEL] = {
     [G001_ENTRY] = g001_entry,
     [G004_ENTRY] = g004_entry,
     [V2M002_ENTRY] = v2m002_entry,
-    [P_L1PE_01_ENTRY]  = p_l1pe_01_entry,
     [B_PPI_00_ENTRY]   = b_ppi_00_entry,
     [B_PPI_01_ENTRY]   = b_ppi_01_entry,
     [B_PPI_02_ENTRY]   = b_ppi_02_entry,

diff --git a/val/src/test_wrappers.c b/val/src/test_wrappers.c
@@ -183,15 +183,6 @@ appendix_i_6_entry(uint32_t num_pe)
     return run_test_entries(tst_entry_list, num_pe);
 }
 
-/* P_L1PE_01 */
-uint32_t
-p_l1pe_01_entry(uint32_t num_pe)
-{
-    TEST_ENTRY_ID_e tst_entry_list[] = {PE004_ENTRY, PE018_ENTRY, TEST_ENTRY_SENTINEL};
-
-    return run_test_entries(tst_entry_list, num_pe);
-}
-
 /* IE_REG_1 */
 uint32_t
 ie_reg_1_entry(uint32_t num_pe)