| Message ID | 20190919213924.31852-3-minyard@acm.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/15] ipmi: Fix watchdog NMI handling | expand |
On 19/09/2019 23:39, minyard@acm.org wrote: > From: Corey Minyard <cminyard@mvista.com> > > It wasn't returning the set timeout like it should have been. Looking at 27.7 Get Watchdog Timer Command This looks correct. Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > > Signed-off-by: Corey Minyard <cminyard@mvista.com> > --- > hw/ipmi/ipmi_bmc_sim.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c > index 8f63bb7181..afb99e33d7 100644 > --- a/hw/ipmi/ipmi_bmc_sim.c > +++ b/hw/ipmi/ipmi_bmc_sim.c > @@ -1228,6 +1228,8 @@ static void get_watchdog_timer(IPMIBmcSim *ibs, > rsp_buffer_push(rsp, ibs->watchdog_action); > rsp_buffer_push(rsp, ibs->watchdog_pretimeout); > rsp_buffer_push(rsp, ibs->watchdog_expired); > + rsp_buffer_push(rsp, ibs->watchdog_timeout & 0xff); > + rsp_buffer_push(rsp, (ibs->watchdog_timeout >> 8) & 0xff); > if (ibs->watchdog_running) { > long timeout; > timeout = ((ibs->watchdog_expiry - ipmi_getmonotime() + 50000000) >
diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 8f63bb7181..afb99e33d7 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -1228,6 +1228,8 @@ static void get_watchdog_timer(IPMIBmcSim *ibs, rsp_buffer_push(rsp, ibs->watchdog_action); rsp_buffer_push(rsp, ibs->watchdog_pretimeout); rsp_buffer_push(rsp, ibs->watchdog_expired); + rsp_buffer_push(rsp, ibs->watchdog_timeout & 0xff); + rsp_buffer_push(rsp, (ibs->watchdog_timeout >> 8) & 0xff); if (ibs->watchdog_running) { long timeout; timeout = ((ibs->watchdog_expiry - ipmi_getmonotime() + 50000000)