Skip to content

ot_spi_device: Fix regression on the spi_flash #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 30, 2025
Merged

ot_spi_device: Fix regression on the spi_flash #267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hw/opentitan/ot_spi_device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand All @@ -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);
}

/*
Expand All @@ -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)
Expand Down
Loading