Skip to content

[ot] hw/opentitan: ot_clkmgr, ot_spi_host: Earlgrey 1.0.0 backwards compatability #148

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
Feb 26, 2025
Merged

[ot] hw/opentitan: ot_clkmgr, ot_spi_host: Earlgrey 1.0.0 backwards compatability #148

Show file tree
Hide file tree
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
14 changes: 13 additions & 1 deletion hw/opentitan/ot_clkmgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
#define PARAM_NUM_HINTABLE_CLOCKS 4u
#define PARAM_NUM_ALERTS 2u

/* undef to build for `master`, not for Earlgrey 1.0 */
#define OT_IS_EARLGREY_V1_0_0

/* clang-format off */
REG32(ALERT_TEST, 0x0u)
FIELD(ALERT_TEST, RECOV_FAULT, 0u, 1u)
Expand Down Expand Up @@ -341,13 +344,22 @@ static void ot_clkmgr_write(void *opaque, hwaddr addr, uint64_t val64,
s->regs[reg] &= val32;
break;
case R_JITTER_ENABLE:
if (s->regs[R_JITTER_REGWEN]) {
#ifdef OT_IS_EARLGREY_V1_0_0
/*
* There is a known bug in Earlgrey 1.0.0, where the Clkmgr Jitter Enable
* REGWEN was not properly connected, meaning it is unused here.
*/
val32 &= R_JITTER_ENABLE_VAL_MASK;
s->regs[reg] = val32;
#else
if (s->regs[R_JITTER_REGWEN]) {
val32 &= R_JITTER_ENABLE_VAL_MASK;
s->regs[reg] = val32;
} else {
qemu_log_mask(LOG_GUEST_ERROR,
"%s: JITTER_ENABLE protected w/ REGWEN\n", __func__);
}
#endif
break;
case R_CLK_ENABLES:
val32 &= CLK_ENABLES_MASK;
Expand Down
10 changes: 10 additions & 0 deletions hw/opentitan/ot_spi_host.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@
#define RXFIFO_LEN 256U /* bytes */
#define CMDFIFO_LEN 4U /* slots */

/* undef to build for `master`, not for Earlgrey 1.0 */
#define OT_IS_EARLGREY_V1_0_0

/* ------------------------------------------------------------------------ */
/* Register definitions */
/* ------------------------------------------------------------------------ */
Expand Down Expand Up @@ -110,10 +113,17 @@ REG32(CONFIGOPTS, 0x18u)
REG32(CSID, 0x1cu)
FIELD(CSID, CSID, 0u, 32u)
REG32(COMMAND, 0x20u)
#ifdef OT_IS_EARLGREY_V1_0_0
FIELD(COMMAND, LEN, 0u, 9u)
FIELD(COMMAND, CSAAT, 9u, 1u)
FIELD(COMMAND, SPEED, 10u, 2u)
FIELD(COMMAND, DIRECTION, 12u, 2u)
#else
FIELD(COMMAND, CSAAT, 0u, 1u)
FIELD(COMMAND, SPEED, 1u, 2u)
FIELD(COMMAND, DIRECTION, 3u, 2u)
FIELD(COMMAND, LEN, 5u, 20u)
#endif
REG32(RXDATA, 0x24u)
REG32(TXDATA, 0x28u)
REG32(ERROR_ENABLE, 0x2cu)
Expand Down