commit fd763ae1b709cc838bf7ff6d9beadd85057c4f46
author Timothy Chen <timothytim@google.com> Wed Jan 20 15:15:45 2021 -0800
committer tjaychen <timothytim@google.com> Mon Feb 01 15:12:49 2021 -0800
tree fc8913b1ac34daed87ec26280babfa9122c86a78
parent 06f7831b28423c25a763a8fece26f79a4e9df8eb

[sw] updates for removed flash interrupt

Signed-off-by: Timothy Chen <timothytim@google.com>

[sw] switch to err code register

Signed-off-by: Timothy Chen <timothytim@google.com>

[sw] update number of interrupts

Signed-off-by: Timothy Chen <timothytim@google.com>

sw/device/lib/flash_ctrl.c

diff --git a/sw/device/lib/flash_ctrl.c b/sw/device/lib/flash_ctrl.c
index 06c9421..34bc154 100644
--- a/sw/device/lib/flash_ctrl.c
+++ b/sw/device/lib/flash_ctrl.c
@@ -42,9 +42,8 @@
 /* Return status error and clear internal status register */
 static int get_clr_err(void) {
   uint32_t err_status =
-      REG32(FLASH_CTRL0_BASE_ADDR + FLASH_CTRL_INTR_STATE_REG_OFFSET) &
-      (0x1 << FLASH_CTRL_INTR_STATE_OP_ERROR_BIT);
-  REG32(FLASH_CTRL0_BASE_ADDR + FLASH_CTRL_INTR_STATE_REG_OFFSET) = err_status;
+      REG32(FLASH_CTRL0_BASE_ADDR + FLASH_CTRL_ERR_CODE_REG_OFFSET);
+  REG32(FLASH_CTRL0_BASE_ADDR + FLASH_CTRL_ERR_CODE_REG_OFFSET) = 0;
   return err_status;
 }
 

sw/device/tests/dif/dif_plic_unittest.cc

diff --git a/sw/device/tests/dif/dif_plic_unittest.cc b/sw/device/tests/dif/dif_plic_unittest.cc
index eed935d..cf63246 100644
--- a/sw/device/tests/dif/dif_plic_unittest.cc
+++ b/sw/device/tests/dif/dif_plic_unittest.cc
@@ -20,7 +20,7 @@
 
 // If either of these static assertions fail, then the unit-tests for related
 // API should be revisited.
-static_assert(RV_PLIC_PARAM_NUMSRC == 123,
+static_assert(RV_PLIC_PARAM_NUMSRC == 122,
               "PLIC instantiation parameters have changed.");
 static_assert(RV_PLIC_PARAM_NUMTARGET == 1,
               "PLIC instantiation parameters have changed.");
@@ -106,21 +106,21 @@
           {RV_PLIC_IE0_0_REG_OFFSET, RV_PLIC_IE0_0_E_31_BIT},
           {RV_PLIC_IE0_1_REG_OFFSET, RV_PLIC_IE0_1_E_63_BIT},
           {RV_PLIC_IE0_2_REG_OFFSET, RV_PLIC_IE0_2_E_95_BIT},
-          {RV_PLIC_IE0_3_REG_OFFSET, RV_PLIC_IE0_3_E_122_BIT},
+          {RV_PLIC_IE0_3_REG_OFFSET, RV_PLIC_IE0_3_E_121_BIT},
       }};
   static constexpr std::array<Register, RV_PLIC_LE_MULTIREG_COUNT>
       kTriggerRegisters{{
           {RV_PLIC_LE_0_REG_OFFSET, RV_PLIC_LE_0_LE_31_BIT},
           {RV_PLIC_LE_1_REG_OFFSET, RV_PLIC_LE_1_LE_63_BIT},
           {RV_PLIC_LE_2_REG_OFFSET, RV_PLIC_LE_2_LE_95_BIT},
-          {RV_PLIC_LE_3_REG_OFFSET, RV_PLIC_LE_3_LE_122_BIT},
+          {RV_PLIC_LE_3_REG_OFFSET, RV_PLIC_LE_3_LE_121_BIT},
       }};
   static constexpr std::array<Register, RV_PLIC_IP_MULTIREG_COUNT>
       kPendingRegisters{{
           {RV_PLIC_IP_0_REG_OFFSET, RV_PLIC_IP_0_P_31_BIT},
           {RV_PLIC_IP_1_REG_OFFSET, RV_PLIC_IP_1_P_63_BIT},
           {RV_PLIC_IP_2_REG_OFFSET, RV_PLIC_IP_2_P_95_BIT},
-          {RV_PLIC_IP_3_REG_OFFSET, RV_PLIC_IP_3_P_122_BIT},
+          {RV_PLIC_IP_3_REG_OFFSET, RV_PLIC_IP_3_P_121_BIT},
       }};
 
   // Set enable/disable multireg expectations, one bit per call.