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

Tools: Acrnd fix reporting unnecessary error on NUC and UP2 

The boards without IOC don't need to call get_sos_wakeup_reason function.
The HW IOC can be detected in runtime,via checking "/dev/cbc-early-signals" node.

Tracked-On:#1996
Signed-off-by: liuyonggang <yonggangx.liu@intel.com>
Acked-by: Yan, Like <like.yan@intel.com>
Reviewed-by: Yuan Liu <yuan1.liu@intel.com>
This commit is contained in:
liuygzhuli 2019-03-11 17:32:46 +08:00 committed by wenlingz
parent ff41c008ce
commit 0fb21cfa4a
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/acrn-manager/acrnd.c
View File

@ -40,6 +40,7 @@ static pthread_mutex_t work_mutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t acrnd_stop_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t acrnd_stop_mutex = PTHREAD_MUTEX_INITIALIZER;
static unsigned int acrnd_stop_timeout; static unsigned int acrnd_stop_timeout;
static unsigned char platform_has_hw_ioc;
static int sigterm = 0; /* Exit acrnd when recevied SIGTERM and stop all vms */ static int sigterm = 0; /* Exit acrnd when recevied SIGTERM and stop all vms */
#define VMS_STOP_TIMEOUT 20 /* Wait VMS_STOP_TIMEOUT sec to stop all vms */ #define VMS_STOP_TIMEOUT 20 /* Wait VMS_STOP_TIMEOUT sec to stop all vms */
@ -246,7 +247,7 @@ static int active_all_vms(void)
struct vmmngr_struct *vm; struct vmmngr_struct *vm;
int ret = 0; int ret = 0;
pid_t pid; pid_t pid;
unsigned reason; unsigned reason = 0;
vmmngr_update(); vmmngr_update();
@ -258,7 +259,9 @@ static int active_all_vms(void)
acrnd_run_vm(vm->name); acrnd_run_vm(vm->name);
break; break;
case VM_SUSPENDED: case VM_SUSPENDED:
if (platform_has_hw_ioc) {
reason = get_sos_wakeup_reason(); reason = get_sos_wakeup_reason();
}
ret += resume_vm(vm->name, reason); ret += resume_vm(vm->name, reason);
break; break;
default: default:
@ -304,6 +307,8 @@ static int wakeup_suspended_vms(unsigned wakeup_reason)
#define SOS_LCS_SOCK "sos-lcs" #define SOS_LCS_SOCK "sos-lcs"
#define DEFAULT_TIMEOUT 2U #define DEFAULT_TIMEOUT 2U
#define ACRND_NAME "acrnd" #define ACRND_NAME "acrnd"
#define HW_IOC_PATH "/dev/cbc-early-signals"
static int acrnd_fd = -1; static int acrnd_fd = -1;
unsigned get_sos_wakeup_reason(void) unsigned get_sos_wakeup_reason(void)
@ -579,14 +584,16 @@ void handle_acrnd_resume(struct mngr_msg *msg, int client_fd, void *param)
{ {
struct mngr_msg ack; struct mngr_msg ack;
struct stat st; struct stat st;
int wakeup_reason; int wakeup_reason = 0;
ack.msgid = msg->msgid; ack.msgid = msg->msgid;
ack.timestamp = msg->timestamp; ack.timestamp = msg->timestamp;
ack.data.err = -1; ack.data.err = -1;
/* acrnd get wakeup_reason from sos lcs */ /* acrnd get wakeup_reason from sos lcs */
if (platform_has_hw_ioc) {
wakeup_reason = get_sos_wakeup_reason(); wakeup_reason = get_sos_wakeup_reason();
}
if (wakeup_reason & CBC_WK_RSN_RTC) { if (wakeup_reason & CBC_WK_RSN_RTC) {
printf("Resumed UOS, by RTC timer, reason(%x)!\n", wakeup_reason); printf("Resumed UOS, by RTC timer, reason(%x)!\n", wakeup_reason);
@ -629,11 +636,13 @@ static void handle_on_exit(void)
int init_vm(void) int init_vm(void)
{ {
unsigned int wakeup_reason; unsigned int wakeup_reason = 0;
int ret; int ret;
/* init all UOSs, according wakeup_reason */ /* init all UOSs, according wakeup_reason */
if (platform_has_hw_ioc) {
wakeup_reason = get_sos_wakeup_reason(); wakeup_reason = get_sos_wakeup_reason();
}
if (wakeup_reason & CBC_WK_RSN_RTC) { if (wakeup_reason & CBC_WK_RSN_RTC) {
printf("Loading timer list to set vms wakeup time\n"); printf("Loading timer list to set vms wakeup time\n");
@ -673,6 +682,12 @@ int main(int argc, char *argv[])
} }
} }
if (!access(HW_IOC_PATH, F_OK)) {
platform_has_hw_ioc = 1;
} else {
platform_has_hw_ioc = 0;
}
/* create listening thread */ /* create listening thread */
acrnd_fd = mngr_open_un(ACRND_NAME, MNGR_SERVER); acrnd_fd = mngr_open_un(ACRND_NAME, MNGR_SERVER);
if (acrnd_fd < 0) { if (acrnd_fd < 0) {