[sival/flash_ctrl] Modify flash_ctrl test scripts for checking read/write

This commit updates the flash_ctrl test files for read/write access before
flash operations.

Signed-off-by: Ramesh Prakash <[email protected]>

Author: rprakas-gsc

sw/device/tests/flash_ctrl_idle_low_power_test.c

@@ -22,7 +22,6 @@
 #include "sw/device/lib/testing/autogen/isr_testutils.h"
 
 OTTF_DEFINE_TEST_CONFIG();
-
 static dif_rv_plic_t plic;
 static dif_aon_timer_t aon;
 static dif_rv_core_ibex_t rv_core_ibex;
@@ -43,7 +42,7 @@ static top_earlgrey_plic_peripheral_t peripheral_serviced;
 static dif_aon_timer_irq_t irq_serviced;
 
 enum {
-  kFlashDataRegion = 2,  // The ROM_EXT protects itself using regions 0-1.
+  kFlashCtrlParamNumRegions = 8,
   kRegionBasePageIndex =
       256 + 32,  // First non-ROM_EXT page in bank 1 (avoids program code.)
   kPartitionId = 0,
@@ -102,6 +101,8 @@ bool test_main(void) {
   dif_pwrmgr_t pwrmgr;
   dif_rstmgr_t rstmgr;
 
+  uint32_t flash_region_index = 0;
+
   CHECK_DIF_OK(dif_rv_plic_init(
       mmio_region_from_addr(TOP_EARLGREY_RV_PLIC_BASE_ADDR), &plic));
   CHECK_DIF_OK(dif_flash_ctrl_init_state(
@@ -126,8 +127,24 @@ bool test_main(void) {
   rstmgr_reset_info = rstmgr_testutils_reason_get();
 
   uint32_t address = 0;
+  // Find the first unlocked flash region and use that for testing
+  for (uint32_t region = 0; region < kFlashCtrlParamNumRegions; region++) {
+    bool locked;
+    LOG_INFO("Testing  REGION 0x%x", region);
+    CHECK_DIF_OK(dif_flash_ctrl_data_region_is_locked(&flash, region, &locked));
+    if (!locked) {
+      // We can use this region
+      flash_region_index = region;
+      LOG_INFO("Region %u is unlocked");
+      break;
+    }
+  }
+
+  //  CHECK_STATUS_OK(flash_ctrl_testutils_data_region_setup(
+  //    &flash, kRegionBasePageIndex, kFlashDataRegion, kRegionSize, &address));
+
   CHECK_STATUS_OK(flash_ctrl_testutils_data_region_setup(
-      &flash, kRegionBasePageIndex, kFlashDataRegion, kRegionSize, &address));
+      &flash, kRegionBasePageIndex, flash_region_index, kRegionSize, &address));
 
   if (rstmgr_reset_info == kDifRstmgrResetInfoPor) {
     // Create data. Random data will be different than

sw/device/tests/flash_ctrl_ops_test.c

@@ -68,6 +68,7 @@ enum {
   kInfoSize = 16,
   kDataSize = 32,
   kPageSize = 2048,
+  FLASH_CTRL_PARAM_NUM_REGIONS = 8,
 };
 
 const uint32_t kRandomData1[kInfoSize] = {
@@ -309,13 +310,35 @@ static void do_bank1_data_partition_test(void) {
     uint32_t page_index =
         (i == 0) ? flash_bank_1_page_index : flash_bank_1_page_index_scr;
     const uint32_t *test_data = (i == 0) ? kRandomData4 : kRandomData5;
-
+    // Find the first unlocked flash region and use that for testing
+    for (uint32_t region = 0; region < FLASH_CTRL_PARAM_NUM_REGIONS; region++) {
+      bool locked;
+      CHECK_DIF_OK(
+          dif_flash_ctrl_data_region_is_locked(&flash_state, region, &locked));
+      if (!locked) {
+        flash_bank_1_data_region = region;
+        LOG_INFO("Region %u is unlocked");
+        break;
+      }
+    }
     if (i == 0) {
       // Set region1 for non-scrambled ecc enabled.
       CHECK_STATUS_OK(flash_ctrl_testutils_data_region_setup(
           &flash_state, page_index, flash_bank_1_data_region, kRegionSize,
           &address));
     } else {
+      for (uint32_t region = flash_bank_1_data_region + 1;
+           region < FLASH_CTRL_PARAM_NUM_REGIONS; region++) {
+        bool locked;
+        CHECK_DIF_OK(dif_flash_ctrl_data_region_is_locked(&flash_state, region,
+                                                          &locked));
+        if (!locked) {
+          flash_bank_1_data_region_scr = region;
+          LOG_INFO("Region %u is unlocked");
+          break;
+        }
+      }
+
       // Set region2 for scrambled ecc enabled.
       CHECK_STATUS_OK(flash_ctrl_testutils_data_region_scrambled_setup(
           &flash_state, page_index, flash_bank_1_data_region_scr, kRegionSize,
@@ -423,22 +446,12 @@ static void do_bank1_data_partition_test(void) {
 bool test_main(void) {
   flash_info = dif_flash_ctrl_get_device_info();
 
-  // Determine the region index and page index to use for tests.
-  // Test data page used for flash bank 1 should be the lowest and highest
-  // usable page.
-  if (kBootStage != kBootStageOwner) {
-    flash_bank_0_data_region = 0;
-    flash_bank_1_page_index = flash_info.data_pages;
-  } else {
-    // If we boot up in owner stage, the first 2 regions will be used by
-    // ROM_EXT.
-    flash_bank_0_data_region = 2;
-    // First 0x20 pages are configured by ROM_EXT. To avoid conflicts, skip over
-    // these pages.
-    flash_bank_1_page_index = flash_info.data_pages + 0x20;
-  }
+  flash_bank_0_data_region = 3;
+  // First 0x20 pages are configured by ROM_EXT. To avoid conflicts, skip over
+  // these pages.
+  flash_bank_1_page_index = flash_info.data_pages + 0x20;
   flash_bank_1_data_region = flash_bank_0_data_region + 1;
-  flash_bank_1_data_region_scr = flash_bank_0_data_region + 2;
+  // flash_bank_1_data_region_scr is defined later
   flash_bank_1_page_index_scr = flash_info.data_pages * 2 - 1;
 
   CHECK_DIF_OK(dif_rv_plic_init(

sw/device/tests/flash_ctrl_write_clear_test.c

@@ -22,6 +22,8 @@
 
 OTTF_DEFINE_TEST_CONFIG();
 
+static uint32_t flash_region_index;
+
 enum {
   // Some dif_flash_ctrl functions don't require the partition parameter when
   // interacting with data partitions. This constant is added to improve
@@ -39,9 +41,6 @@ enum {
   // partition in bank 1, otherwise known as owner partition B.
   kBank1StartPageNum = 256 + kRomExtPageCount,
 
-  // The ROM_EXT protects itself using regions 0-1.
-  kFlashRegionNum = 2,
-
 };
 
 // The `flash_word_verify()` function will need to be updated if this assertion
@@ -93,7 +92,6 @@ static void flash_ctrl_write_clear_test(
   const uint64_t kExpectedValues[] = {
       UINT64_MAX, UINT64_MAX - 1, 0, 0xa5a5a5a594949494, 0xaaaaaaaaaaaaaaaa,
   };
-
   for (size_t i = 0; i < ARRAYSIZE(kExpectedValues); ++i) {
     flash_word_write_verify(start_addr + sizeof(uint64_t) * i,
                             kExpectedValues[i]);
@@ -105,6 +103,19 @@ bool test_main(void) {
   CHECK_DIF_OK(dif_flash_ctrl_init_state(
       &flash, mmio_region_from_addr(TOP_EARLGREY_FLASH_CTRL_CORE_BASE_ADDR)));
 
+  flash_region_index = 0;
+  // Find the first unlocked flash region and use that for testing
+  for (uint32_t region = 0; region < FLASH_CTRL_PARAM_NUM_REGIONS; region++) {
+    bool locked;
+    LOG_INFO("Testing  REGION 0x%x", region);
+    CHECK_DIF_OK(dif_flash_ctrl_data_region_is_locked(&flash, region, &locked));
+    if (!locked) {
+      flash_region_index = region;
+      LOG_INFO("Region %u is unlocked");
+      break;
+    }
+  }
+
   // The ROM_EXT configures the default region access. We can't modify the
   // values after configured.
   if (kBootStage != kBootStageOwner) {
@@ -114,7 +125,7 @@ bool test_main(void) {
   }
 
   LOG_INFO("ECC enabled with high endurance disabled.");
-  flash_ctrl_write_clear_test(/*mp_region_index=*/kFlashRegionNum,
+  flash_ctrl_write_clear_test(/*mp_region_index=*/flash_region_index,
                               (dif_flash_ctrl_data_region_properties_t){
                                   .base = kBank1StartPageNum,
                                   .size = 1,
@@ -128,7 +139,7 @@ bool test_main(void) {
                                   }});
 
   LOG_INFO("ECC enabled with high endurance enabled.");
-  flash_ctrl_write_clear_test(/*mp_region_index=*/kFlashRegionNum,
+  flash_ctrl_write_clear_test(/*mp_region_index=*/flash_region_index,
                               (dif_flash_ctrl_data_region_properties_t){
                                   .base = kBank1StartPageNum + 1,
                                   .size = 1,

sw/device/tests/rv_core_ibex_mem_test.c

@@ -61,8 +61,8 @@ enum {
   kFlashTestLoc = TOP_EARLGREY_FLASH_CTRL_MEM_BASE_ADDR +
                   kBank1StartPageNum * kFlashBytesPerPage,
   // The ROM_EXT protects itself using regions 0-1.
-  kFlashRegionNum = 2,
 };
+static uint32_t flash_region_index;
 
 // The flash test location is set to the encoding of `jalr x0, 0(x1)`
 // so execution can be tested.
@@ -162,12 +162,25 @@ static void setup_flash(void) {
       .ecc_en = kMultiBitBool4False,
       .high_endurance_en = kMultiBitBool4False};
   dif_flash_ctrl_data_region_properties_t data_region = {
-      .base = kBank1StartPageNum, .size = 0x1, .properties = region_properties};
+      .base = kBank1StartPageNum, .size = 0x2, .properties = region_properties};
+
+  // Find the first unlocked flash region and use that for testing
+  for (uint32_t region = 0; region < FLASH_CTRL_PARAM_NUM_REGIONS; region++) {
+    bool locked;
+    LOG_INFO("Testing  REGION 0x%x", region);
+    CHECK_DIF_OK(
+        dif_flash_ctrl_data_region_is_locked(&flash_ctrl, region, &locked));
+    if (!locked) {
+      flash_region_index = region;
+      LOG_INFO("Region %u is unlocked");
+      break;
+    }
+  }
 
   CHECK_DIF_OK(dif_flash_ctrl_set_data_region_properties(
-      &flash_ctrl, kFlashRegionNum, data_region));
+      &flash_ctrl, flash_region_index, data_region));
   CHECK_DIF_OK(dif_flash_ctrl_set_data_region_enablement(
-      &flash_ctrl, kFlashRegionNum, kDifToggleEnabled));
+      &flash_ctrl, flash_region_index, kDifToggleEnabled));
 
   // Make flash executable
   CHECK_DIF_OK(