[ot] hw/opentitan: ot_otp: make multibool bit type more visible

Signed-off-by: Emmanuel Blot <[email protected]>

Author: rivos-eblot

hw/opentitan/ot_csrng.c

@@ -1826,7 +1826,7 @@ static void ot_csrng_regs_write(void *opaque, hwaddr addr, uint64_t val64,
                 OBJECT_GET_CLASS(OtOTPClass, s->otp_ctrl, TYPE_OT_OTP);
             const OtOTPHWCfg *hw_cfg = oc->get_hw_cfg(s->otp_ctrl);
             g_assert(hw_cfg);
-            if (hw_cfg->en_csrng_sw_app_read == OT_MULTIBITBOOL8_TRUE) {
+            if (hw_cfg->en_csrng_sw_app_read_mb8 == OT_MULTIBITBOOL8_TRUE) {
                 uint32_t sw_app_en = FIELD_EX32(val32, CTRL, SW_APP_ENABLE);
                 s->sw_app_granted = sw_app_en == OT_MULTIBITBOOL4_TRUE;
                 uint32_t read_int = FIELD_EX32(val32, CTRL, READ_INT_STATE);

hw/opentitan/ot_otp_dj.c

@@ -3540,11 +3540,11 @@ static void ot_otp_dj_pwr_load_hw_cfg(OtOTPDjState *s)
     memcpy(hw_cfg->soc_dbg_state, &otp->data[R_HW_CFG1_SOC_DBG_STATE],
            sizeof(hw_cfg->soc_dbg_state));
     /* do not prevent execution from SRAM if no OTP configuration is loaded */
-    hw_cfg->en_sram_ifetch =
+    hw_cfg->en_sram_ifetch_mb8 =
         s->blk ? (uint8_t)otp->data[R_HW_CFG1_EN_SRAM_IFETCH] :
                  OT_MULTIBITBOOL8_TRUE;
     /* do not prevent CSRNG app reads if no OTP configuration is loaded */
-    hw_cfg->en_csrng_sw_app_read =
+    hw_cfg->en_csrng_sw_app_read_mb8 =
         s->blk ? (uint8_t)otp->data[R_HW_CFG1_EN_CSRNG_SW_APP_READ] :
                  OT_MULTIBITBOOL8_TRUE;
 }

hw/opentitan/ot_otp_eg.c

@@ -3423,11 +3423,11 @@ static void ot_otp_eg_pwr_load_hw_cfg(OtOTPEgState *s)
     memcpy(hw_cfg->manuf_state, &otp->data[R_HW_CFG0_MANUF_STATE],
            sizeof(hw_cfg->manuf_state));
     /* do not prevent execution from SRAM if no OTP configuration is loaded */
-    hw_cfg->en_sram_ifetch =
+    hw_cfg->en_sram_ifetch_mb8 =
         s->blk ? (uint8_t)otp->data[R_HW_CFG1_EN_SRAM_IFETCH] :
                  OT_MULTIBITBOOL8_TRUE;
     /* do not prevent CSRNG app reads if no OTP configuration is loaded */
-    hw_cfg->en_csrng_sw_app_read =
+    hw_cfg->en_csrng_sw_app_read_mb8 =
         s->blk ? (uint8_t)otp->data[R_HW_CFG1_EN_CSRNG_SW_APP_READ] :
                  OT_MULTIBITBOOL8_TRUE;
 }

hw/opentitan/ot_sram_ctrl.c

@@ -356,7 +356,7 @@ static void ot_sram_ctrl_update_exec(OtSramCtrlState *s)
      */
     if (s->otp_ctrl) {
         OtOTPClass *oc = OBJECT_GET_CLASS(OtOTPClass, s->otp_ctrl, TYPE_OT_OTP);
-        s->otp_ifetch = oc->get_hw_cfg(s->otp_ctrl)->en_sram_ifetch ==
+        s->otp_ifetch = oc->get_hw_cfg(s->otp_ctrl)->en_sram_ifetch_mb8 ==
                         OT_MULTIBITBOOL8_TRUE;
     }
 

include/hw/opentitan/ot_otp.h

@@ -30,6 +30,7 @@
 #define HW_OPENTITAN_OT_OTP_H
 
 #include "qom/object.h"
+#include "hw/opentitan/ot_common.h"
 #include "hw/sysbus.h"
 
 #define TYPE_OT_OTP "ot-otp"
@@ -57,16 +58,20 @@ typedef enum {
 #define OT_OTP_HWCFG_SOC_DBG_STATE_BYTES 4u
 
 /*
- * Hardware configuration (for HW_CFG partitions)
+ * Hardware configuration (for HW_CFG partitions).
+ *
+ * Digests are not added to this structure since real HW does not use them
+ *
+ * Note that some fields may be meaningless / not initialized depending on the
+ * actual OpenTitan top.
  */
 typedef struct {
     uint8_t device_id[OT_OTP_HWCFG_DEVICE_ID_BYTES];
     uint8_t manuf_state[OT_OTP_HWCFG_MANUF_STATE_BYTES];
-    /* soc_dbg_state may be meaningless, dep. on the platform */
     uint8_t soc_dbg_state[OT_OTP_HWCFG_SOC_DBG_STATE_BYTES];
-    /* the following value is stored as OT_MULTIBITBOOL8 */
-    uint8_t en_sram_ifetch;
-    uint8_t en_csrng_sw_app_read;
+    ot_mb8_t en_sram_ifetch_mb8;
+    ot_mb8_t en_csrng_sw_app_read_mb8;
+    ot_mb_lc4_t valid_lc4; /* seems generated but no used on real HW */
 } OtOTPHWCfg;
 
 typedef enum {