Skip to content

Commit 5ecfe46

Browse files
committed
[ot] hw/opentitan: Small HMAC updates
Reports `IDLE` in the status register if no command is currently being processed (i.e. no START/CONTINUE/PROCESS/STOP in progress). Allows the new KEY_SWAP, DIGEST_SIZE and KEY_LENGTH fields of the config registers to be written to by stopping them from being masked out. Signed-off-by: Alex Jones <[email protected]>
1 parent b85040a commit 5ecfe46

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

hw/opentitan/ot_hmac.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,9 @@ static uint64_t ot_hmac_regs_read(void *opaque, hwaddr addr, unsigned size)
487487
val32 |= R_STATUS_FIFO_FULL_MASK;
488488
}
489489
}
490+
if (!(s->regs->cmd)) {
491+
val32 |= R_STATUS_HMAC_IDLE_MASK;
492+
}
490493
} break;
491494
case R_ERR_CODE:
492495
val32 = s->regs->err_code;
@@ -611,8 +614,10 @@ static void ot_hmac_regs_write(void *opaque, hwaddr addr, uint64_t value,
611614
}
612615

613616
s->regs->cfg =
614-
val32 & (R_CFG_HMAC_EN_MASK | R_CFG_SHA_EN_MASK |
615-
R_CFG_ENDIAN_SWAP_MASK | R_CFG_DIGEST_SWAP_MASK);
617+
val32 &
618+
(R_CFG_HMAC_EN_MASK | R_CFG_SHA_EN_MASK | R_CFG_ENDIAN_SWAP_MASK |
619+
R_CFG_DIGEST_SWAP_MASK | R_CFG_KEY_SWAP_MASK |
620+
R_CFG_DIGEST_SIZE_MASK | R_CFG_KEY_LENGTH_MASK);
616621

617622
/* clear digest when SHA is disabled */
618623
if (!(s->regs->cfg & R_CFG_SHA_EN_MASK)) {

0 commit comments

Comments
 (0)