OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

DM: add vm_stop/reset_watchdog 

When guest enter/exit S3, we need to do
1. stop watchdog timer when guest enter S3 to avoid watchdog
   timer reset guest when guest is in S3 state.
2. reset watchdog timer when guest exit from S3.

Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yin Fengwei 2018-07-24 18:07:37 +08:00 committed by lijinxia
parent a2241d983d
commit 8ee4c0b1dd
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
devicemodel/hw/pci/wdt_i6300esb.c
View File

@ -49,6 +49,7 @@
#define WDT_TIMER_SIG 0x55AA #define WDT_TIMER_SIG 0x55AA
#define DEFAULT_MAX_TIMER_VAL 0x000FFFFF #define DEFAULT_MAX_TIMER_VAL 0x000FFFFF
#define DEFAULT_RESET_TIMER_VAL 60
/* for debug */ /* for debug */
/* #define WDT_DEBUG */ /* #define WDT_DEBUG */
@ -365,6 +366,31 @@ pci_wdt_deinit(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
memset(&wdt_state, 0, sizeof(wdt_state)); memset(&wdt_state, 0, sizeof(wdt_state));
} }
/* stop/reset watchdog will be invoked during guest enter/exit S3.
* We stop watchdog timer when guest enter S3 to avoid watchdog trigger
* guest reset when guest is in S3 state.
*
* We reset watchdog with a long peroid (2 * 60s) during guest exit
* from S3 to handle system hang before watchdog in guest kernel start to
* work.
*/
void
vm_stop_watchdog(struct vmctx *ctx)
{
stop_wdt_timer();
}
void
vm_reset_watchdog(struct vmctx *ctx)
{
wdt_state.stage = 1;
wdt_state.timer1_val = DEFAULT_RESET_TIMER_VAL;
wdt_state.timer2_val = DEFAULT_RESET_TIMER_VAL;
wdt_state.unlock_state = 0;
start_wdt_timer();
}
struct pci_vdev_ops pci_ops_wdt = { struct pci_vdev_ops pci_ops_wdt = {
.class_name = "wdt-i6300esb", .class_name = "wdt-i6300esb",
.vdev_init = pci_wdt_init, .vdev_init = pci_wdt_init,

2
devicemodel/include/vmmapi.h
View File

@ -148,4 +148,6 @@ int vm_reset_ptdev_intx_info(struct vmctx *ctx, int virt_pin, bool pic_pin);
int vm_create_vcpu(struct vmctx *ctx, uint16_t vcpu_id); int vm_create_vcpu(struct vmctx *ctx, uint16_t vcpu_id);
int vm_get_cpu_state(struct vmctx *ctx, void *state_buf); int vm_get_cpu_state(struct vmctx *ctx, void *state_buf);
void vm_stop_watchdog(struct vmctx *ctx);
void vm_reset_watchdog(struct vmctx *ctx);
#endif /* _VMMAPI_H_ */ #endif /* _VMMAPI_H_ */