From fd389cb15c8a345c046f19fab4c31a184202befc Mon Sep 17 00:00:00 2001 From: Jian Jun Chen Date: Fri, 1 Mar 2019 11:05:08 +0800 Subject: [PATCH] dm: disable ACPI PM timer ACPI PM timer is disabled in FADT since there is no pm timer emulation in device model now. Tracked-On: #2962 Signed-off-by: Jian Jun Chen Acked-by: Yin Fengwei --- devicemodel/hw/platform/acpi/acpi.c | 2 +- devicemodel/include/acpi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devicemodel/hw/platform/acpi/acpi.c b/devicemodel/hw/platform/acpi/acpi.c index 150f84c16..72cb90346 100644 --- a/devicemodel/hw/platform/acpi/acpi.c +++ b/devicemodel/hw/platform/acpi/acpi.c @@ -374,7 +374,7 @@ basl_fwrite_fadt(FILE *fp, struct vmctx *ctx) EFPRINTF(fp, "[0001]\t\tPM1 Event Block Length : 04\n"); EFPRINTF(fp, "[0001]\t\tPM1 Control Block Length : 02\n"); EFPRINTF(fp, "[0001]\t\tPM2 Control Block Length : 00\n"); - EFPRINTF(fp, "[0001]\t\tPM Timer Block Length : 04\n"); + EFPRINTF(fp, "[0001]\t\tPM Timer Block Length : 00\n"); EFPRINTF(fp, "[0001]\t\tGPE0 Block Length : 00\n"); EFPRINTF(fp, "[0001]\t\tGPE1 Block Length : 00\n"); EFPRINTF(fp, "[0001]\t\tGPE1 Base Offset : 00\n"); diff --git a/devicemodel/include/acpi.h b/devicemodel/include/acpi.h index 6097a3a50..43856583f 100644 --- a/devicemodel/include/acpi.h +++ b/devicemodel/include/acpi.h @@ -37,7 +37,7 @@ #define PM1A_EVT_ADDR 0x400 -#define IO_PMTMR 0x408 /* 4-byte i/o port for the timer */ +#define IO_PMTMR 0x0 /* PM Timer is disabled in ACPI */ /* All dynamic table entry no. */ #define NHLT_ENTRY_NO 8