@@ -1334,8 +1334,6 @@ static void ot_entropy_src_regs_write(void *opaque, hwaddr addr, uint64_t val64,
1334
1334
s -> regs [reg ] = val32 ;
1335
1335
CHECK_MULTIBOOT (s , MODULE_ENABLE , MODULE_ENABLE );
1336
1336
if (ot_entropy_src_is_module_disabled (s )) {
1337
- /* change state in disable mode can discard an error state */
1338
- ot_entropy_src_change_state (s , ENTROPY_SRC_IDLE );
1339
1337
/* reset takes care of cancelling the scheduler timer */
1340
1338
ot_entropy_src_reset (DEVICE (s ));
1341
1339
break ;
@@ -1576,7 +1574,7 @@ static void ot_entropy_src_reset(DeviceState *dev)
1576
1574
s -> regs [R_REGWEN ] = 0x1u ;
1577
1575
s -> regs [R_REV ] = 0x10303u ;
1578
1576
s -> regs [R_MODULE_ENABLE ] = 0x9u ;
1579
- s -> regs [R_CONF ] = 0x909099u ;
1577
+ s -> regs [R_CONF ] = 0x2649999u ;
1580
1578
s -> regs [R_ENTROPY_CONTROL ] = 0x99u ;
1581
1579
s -> regs [R_HEALTH_TEST_WINDOWS ] = 0x600200u ;
1582
1580
s -> regs [R_REPCNT_THRESHOLDS ] = 0xffffffffu ;
@@ -1591,7 +1589,7 @@ static void ot_entropy_src_reset(DeviceState *dev)
1591
1589
s -> regs [R_ALERT_THRESHOLD ] = 0xfffd0002u ;
1592
1590
s -> regs [R_FW_OV_CONTROL ] = 0x99u ;
1593
1591
s -> regs [R_FW_OV_SHA3_START ] = 0x9u ;
1594
- s -> regs [R_OBSERVE_FIFO_THRESH ] = 0x20u ;
1592
+ s -> regs [R_OBSERVE_FIFO_THRESH ] = 0x10u ;
1595
1593
s -> regs [R_DEBUG_STATUS ] = 0x10000u ;
1596
1594
1597
1595
ot_fifo32_reset (& s -> input_fifo );
@@ -1604,6 +1602,7 @@ static void ot_entropy_src_reset(DeviceState *dev)
1604
1602
s -> cond_word = 0u ;
1605
1603
s -> noise_count = 0u ;
1606
1604
s -> packet_count = 0u ;
1605
+ s -> obs_fifo_en = false;
1607
1606
1608
1607
ot_entropy_src_update_irqs (s );
1609
1608
for (unsigned ix = 0 ; ix < PARAM_NUM_ALERTS ; ix ++ ) {
@@ -1615,8 +1614,6 @@ static void ot_entropy_src_reset(DeviceState *dev)
1615
1614
const OtOTPEntropyCfg * entropy_cfg = oc -> get_entropy_cfg (s -> otp_ctrl );
1616
1615
g_assert (entropy_cfg );
1617
1616
1618
- s -> obs_fifo_en = false;
1619
-
1620
1617
ot_entropy_src_change_state (s , ENTROPY_SRC_IDLE );
1621
1618
}
1622
1619
0 commit comments