From e0f33d8beaef28dd50c90c14d11fd04929353966 Mon Sep 17 00:00:00 2001 From: Douglas Reis Date: Thu, 30 Oct 2025 10:45:00 +0000 Subject: [PATCH] [ot] hw/opentitan: ot_spi_device: Fix regression on the spi_flash The bug was caused by the TPM using the flash register bank for tpm. Signed-off-by: Douglas Reis --- hw/opentitan/ot_spi_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/opentitan/ot_spi_device.c b/hw/opentitan/ot_spi_device.c index 182637ab34e5b..866e405dac2a8 100644 --- a/hw/opentitan/ot_spi_device.c +++ b/hw/opentitan/ot_spi_device.c @@ -800,7 +800,7 @@ static void ot_spi_device_update_alerts(OtSPIDeviceState *s) static bool ot_spi_device_is_tpm_enabled(const OtSPIDeviceState *s) { - return (bool)FIELD_EX32(s->spi_regs[R_TPM_CFG], TPM_CFG, EN); + return (bool)FIELD_EX32(s->tpm_regs[R_TPM_CFG], TPM_CFG, EN); } /* @@ -810,7 +810,7 @@ static bool ot_spi_device_is_tpm_enabled(const OtSPIDeviceState *s) */ static bool ot_spi_device_is_tpm_mode_crb(const OtSPIDeviceState *s) { - return (bool)FIELD_EX32(s->spi_regs[R_TPM_CFG], TPM_CFG, TPM_MODE); + return (bool)FIELD_EX32(s->tpm_regs[R_TPM_CFG], TPM_CFG, TPM_MODE); } /* @@ -820,7 +820,7 @@ static bool ot_spi_device_is_tpm_mode_crb(const OtSPIDeviceState *s) */ static bool ot_spi_device_tpm_disable_hw_regs(const OtSPIDeviceState *s) { - return (bool)FIELD_EX32(s->spi_regs[R_TPM_CFG], TPM_CFG, HW_REG_DIS); + return (bool)FIELD_EX32(s->tpm_regs[R_TPM_CFG], TPM_CFG, HW_REG_DIS); } static OtSpiDeviceMode ot_spi_device_get_mode(const OtSPIDeviceState *s)