Skip to content

Commit baf1f02

Browse files
committed
[ot] 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 <alex.jones@lowrisc.org>
1 parent ff6b5c8 commit baf1f02

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
@@ -485,6 +485,9 @@ static uint64_t ot_hmac_regs_read(void *opaque, hwaddr addr, unsigned size)
485485
val32 |= R_STATUS_FIFO_FULL_MASK;
486486
}
487487
}
488+
if (!(s->regs->cmd)) {
489+
val32 |= R_STATUS_HMAC_IDLE_MASK;
490+
}
488491
} break;
489492
case R_ERR_CODE:
490493
val32 = s->regs->err_code;
@@ -609,8 +612,10 @@ static void ot_hmac_regs_write(void *opaque, hwaddr addr, uint64_t value,
609612
}
610613

611614
s->regs->cfg =
612-
val32 & (R_CFG_HMAC_EN_MASK | R_CFG_SHA_EN_MASK |
613-
R_CFG_ENDIAN_SWAP_MASK | R_CFG_DIGEST_SWAP_MASK);
615+
val32 &
616+
(R_CFG_HMAC_EN_MASK | R_CFG_SHA_EN_MASK | R_CFG_ENDIAN_SWAP_MASK |
617+
R_CFG_DIGEST_SWAP_MASK | R_CFG_KEY_SWAP_MASK |
618+
R_CFG_DIGEST_SIZE_MASK | R_CFG_KEY_LENGTH_MASK);
614619

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

0 commit comments

Comments
 (0)