github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-29 16:58:10 +00:00
Code Issues Projects Releases Wiki Activity

DM: Keep consistency between HV and DM about PM1A_CNT_ADDR

Browse Source 
To keep consistency between HV and DM about PM1A_CNT_ADDR,
it is better to replace the PM1A_CNT related MACROs used in DM
with VIRTUAL_PM1A_CNT related MACROs in acrn_common.h.

Tracked-On: #2865
Signed-off-by: Kaige Fu <kaige.fu@intel.com>
Acked-by: Eddie Dong <Eddie.dong@intel.com>
This commit is contained in:
Kaige Fu 2019-04-04 10:29:45 +00:00 committed by Eddie Dong
parent ede5987c11
commit c4ec7ac358
4 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
devicemodel/arch/x86/pm.c
View File

@ -149,11 +149,6 @@ static uint16_t pm1_enable, pm1_status;
*/ */
static uint16_t pm1_control; static uint16_t pm1_control;
#define PM1_SCI_EN 0x0001
#define PM1_SLP_TYP 0x1c00
#define PM1_SLP_EN 0x2000
#define PM1_ALWAYS_ZERO 0xc003
static void static void
sci_update(struct vmctx *ctx) sci_update(struct vmctx *ctx)
{ {
@ -163,7 +158,7 @@ sci_update(struct vmctx *ctx)
* Followed ACPI spec, should trigger SMI if SCI_EN is zero. * Followed ACPI spec, should trigger SMI if SCI_EN is zero.
* Return directly due to ACRN do not support SMI so far. * Return directly due to ACRN do not support SMI so far.
*/ */
if (!(pm1_control & PM1_SCI_EN)) if (!(pm1_control & VIRTUAL_PM1A_SCI_EN))
return; return;
/* See if the SCI should be active or not. */ /* See if the SCI should be active or not. */
@ -296,20 +291,20 @@ pm1_control_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
* to zero in pm1_control. Always preserve SCI_EN as OSPM * to zero in pm1_control. Always preserve SCI_EN as OSPM
* can never change it. * can never change it.
*/ */
pm1_control = (pm1_control & PM1_SCI_EN) | pm1_control = (pm1_control & VIRTUAL_PM1A_SCI_EN) |
(*eax & ~(PM1_SLP_EN | PM1_ALWAYS_ZERO)); (*eax & ~(VIRTUAL_PM1A_SLP_EN | VIRTUAL_PM1A_ALWAYS_ZERO));
/* /*
* If SLP_EN is set, check for S5. ACRN-DM's _S5_ method * If SLP_EN is set, check for S5. ACRN-DM's _S5_ method
* says that '5' should be stored in SLP_TYP for S5. * says that '5' should be stored in SLP_TYP for S5.
*/ */
if (*eax & PM1_SLP_EN) { if (*eax & VIRTUAL_PM1A_SLP_EN) {
if ((pm1_control & PM1_SLP_TYP) >> 10 == 5) { if ((pm1_control & VIRTUAL_PM1A_SLP_TYP) >> 10 == 5) {
error = vm_suspend(ctx, VM_SUSPEND_POWEROFF); error = vm_suspend(ctx, VM_SUSPEND_POWEROFF);
assert(error == 0 || errno == EALREADY); assert(error == 0 || errno == EALREADY);
} }
if ((pm1_control & PM1_SLP_TYP) >> 10 == 3) { if ((pm1_control & VIRTUAL_PM1A_SLP_TYP) >> 10 == 3) {
error = vm_suspend(ctx, VM_SUSPEND_SUSPEND); error = vm_suspend(ctx, VM_SUSPEND_SUSPEND);
assert(error == 0 || errno == EALREADY); assert(error == 0 || errno == EALREADY);
} }
@ -317,7 +312,7 @@ pm1_control_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
} }
return 0; return 0;
} }
INOUT_PORT(pm1_control, PM1A_CNT_ADDR, IOPORT_F_INOUT, pm1_control_handler); INOUT_PORT(pm1_control, VIRTUAL_PM1A_CNT_ADDR, IOPORT_F_INOUT, pm1_control_handler);
SYSRES_IO(PM1A_EVT_ADDR, 8); SYSRES_IO(PM1A_EVT_ADDR, 8);
static int static int
@ -464,7 +459,7 @@ smi_cmd_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
pthread_mutex_lock(&pm_lock); pthread_mutex_lock(&pm_lock);
switch (*eax) { switch (*eax) {
case ACPI_ENABLE: case ACPI_ENABLE:
pm1_control |= PM1_SCI_EN; pm1_control |= VIRTUAL_PM1A_SCI_EN;
/* /*
* FIXME: ACPI_ENABLE/ACPI_DISABLE only impacts SCI_EN via SMI * FIXME: ACPI_ENABLE/ACPI_DISABLE only impacts SCI_EN via SMI
* command register, not impact power button emulation. so need * command register, not impact power button emulation. so need
@ -507,7 +502,7 @@ smi_cmd_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
} }
break; break;
case ACPI_DISABLE: case ACPI_DISABLE:
pm1_control &= ~PM1_SCI_EN; pm1_control &= ~VIRTUAL_PM1A_SCI_EN;
if (power_button != NULL) { if (power_button != NULL) {
mevent_delete(power_button); mevent_delete(power_button);
power_button = NULL; power_button = NULL;

4
devicemodel/hw/platform/acpi/acpi.c
View File

@ -364,7 +364,7 @@ basl_fwrite_fadt(FILE *fp, struct vmctx *ctx)
PM1A_EVT_ADDR); PM1A_EVT_ADDR);
EFPRINTF(fp, "[0004]\t\tPM1B Event Block Address : 00000000\n"); EFPRINTF(fp, "[0004]\t\tPM1B Event Block Address : 00000000\n");
EFPRINTF(fp, "[0004]\t\tPM1A Control Block Address : %08X\n", EFPRINTF(fp, "[0004]\t\tPM1A Control Block Address : %08X\n",
PM1A_CNT_ADDR); VIRTUAL_PM1A_CNT_ADDR);
EFPRINTF(fp, "[0004]\t\tPM1B Control Block Address : 00000000\n"); EFPRINTF(fp, "[0004]\t\tPM1B Control Block Address : 00000000\n");
EFPRINTF(fp, "[0004]\t\tPM2 Control Block Address : 00000000\n"); EFPRINTF(fp, "[0004]\t\tPM2 Control Block Address : 00000000\n");
EFPRINTF(fp, "[0004]\t\tPM Timer Block Address : %08X\n", EFPRINTF(fp, "[0004]\t\tPM Timer Block Address : %08X\n",
@ -466,7 +466,7 @@ basl_fwrite_fadt(FILE *fp, struct vmctx *ctx)
EFPRINTF(fp, "[0001]\t\tBit Offset : 00\n"); EFPRINTF(fp, "[0001]\t\tBit Offset : 00\n");
EFPRINTF(fp, "[0001]\t\tEncoded Access Width : 02 [Word Access:16]\n"); EFPRINTF(fp, "[0001]\t\tEncoded Access Width : 02 [Word Access:16]\n");
EFPRINTF(fp, "[0008]\t\tAddress : 00000000%08X\n", EFPRINTF(fp, "[0008]\t\tAddress : 00000000%08X\n",
PM1A_CNT_ADDR); VIRTUAL_PM1A_CNT_ADDR);
EFPRINTF(fp, "\n"); EFPRINTF(fp, "\n");
EFPRINTF(fp, EFPRINTF(fp,

1
devicemodel/include/acpi.h
View File

@ -36,7 +36,6 @@
#define ACPI_DISABLE 0xa1 #define ACPI_DISABLE 0xa1
#define PM1A_EVT_ADDR 0x400 #define PM1A_EVT_ADDR 0x400
#define PM1A_CNT_ADDR 0x404
#define IO_PMTMR 0x408 /* 4-byte i/o port for the timer */ #define IO_PMTMR 0x408 /* 4-byte i/o port for the timer */

2
hypervisor/include/public/acrn_common.h
View File

@ -56,8 +56,10 @@
/* TODO: We may need to get this addr from guest ACPI instead of hardcode here */ /* TODO: We may need to get this addr from guest ACPI instead of hardcode here */
#define VIRTUAL_PM1A_CNT_ADDR 0x404U #define VIRTUAL_PM1A_CNT_ADDR 0x404U
#define VIRTUAL_PM1A_SCI_EN 0x0001
#define VIRTUAL_PM1A_SLP_TYP 0x1c00U #define VIRTUAL_PM1A_SLP_TYP 0x1c00U
#define VIRTUAL_PM1A_SLP_EN 0x2000U #define VIRTUAL_PM1A_SLP_EN 0x2000U
#define VIRTUAL_PM1A_ALWAYS_ZERO 0xc003
/** /**
* @brief Hypercall * @brief Hypercall