[cheriot,sw] SW adaptations for CHERIoT

Signed-off-by: Thomas Benz <tbenz@lowrisc.org>

Author: thommythomaso

hw/top_earlgrey/data/otp/otp_ctrl_img_owner_sw_cfg.hjson

@@ -112,6 +112,7 @@
                         "0x94949494",
                         "0x94949494",
                         "0x94949494",
+                        "0x94949494",
                     ],
                 },
                 {
@@ -162,19 +163,19 @@
                 },
                 {
                     name: "OWNER_SW_CFG_ROM_ALERT_DIGEST_DEV",
-                    value: "0x6db5ced",
+                    value: "0x18cbd487",
                 },
                 {
                     name: "OWNER_SW_CFG_ROM_ALERT_DIGEST_PROD",
-                    value: "0x68737b02",
+                    value: "0x7663f368",
                 },
                 {
                     name: "OWNER_SW_CFG_ROM_ALERT_DIGEST_PROD_END",
-                    value: "0x9c389f87",
+                    value: "0x822817ed",
                 },
                 {
                     name: "OWNER_SW_CFG_ROM_ALERT_DIGEST_RMA",
-                    value: "0xc20dd3a6",
+                    value: "0xdc1d5bcc",
                 },
                 {
                     name: "OWNER_SW_CFG_ROM_SENSOR_CTRL_ALERT_CFG",

sw/device/lib/dif/dif_alert_handler_unittest.cc

@@ -30,7 +30,7 @@ using ::testing::Return;
 // so if the number of alerts change, the digest will be changed
 // as well.  This process is not yet automated, so the user
 // must be aware on how to update the value.
-static_assert(ALERT_HANDLER_PARAM_N_ALERTS == 63,
+static_assert(ALERT_HANDLER_PARAM_N_ALERTS == 64,
               "The number of alerts have changed.");
 
 constexpr int kAlerts = ALERT_HANDLER_PARAM_N_ALERTS;

sw/device/silicon_creator/rom/rom_epmp.c

@@ -17,9 +17,9 @@ extern char _text_end[];     // End of executable code.
 
 // Note: Hardcoding these values since the way we generate this range is not
 // very robust at the moment. See #14345 and #14336.
-static_assert(TOP_EARLGREY_MMIO_BASE_ADDR == 0x40000000,
+static_assert(TOP_EARLGREY_MMIO_BASE_ADDR == 0x11000000,
               "MMIO region changed, update ePMP configuration if needed");
-static_assert(TOP_EARLGREY_MMIO_SIZE_BYTES == 0x10000000,
+static_assert(TOP_EARLGREY_MMIO_SIZE_BYTES == 0x3F000000,
               "MMIO region changed, update ePMP configuration if needed");
 
 static_assert(TOP_EARLGREY_SRAM_CTRL_RET_AON_RAM_BASE_ADDR >=

sw/device/tests/penetrationtests/json/pentest_lib_commands.h

@@ -14,7 +14,7 @@ extern "C" {
 
 #define MODULE_ID MAKE_MODULE_ID('j', 'p', 'c')
 
-#define ALERT_HANDLER_PARAM_N_ALERTS 63
+#define ALERT_HANDLER_PARAM_N_ALERTS 64
 #define ALERT_HANDLER_PARAM_N_CLASSES 4
 #define SENSOR_CTRL_PARAM_NUM_ALERT_EVENTS 11
 #define ALERT_HANDLER_PARAM_N_PHASES 4