[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 08/10] i386: acpi: Don't build HPET ACPI entry if HPET is disa
From: |
Isaku Yamahata |
Subject: |
[PATCH v3 08/10] i386: acpi: Don't build HPET ACPI entry if HPET is disabled |
Date: |
Wed, 10 Feb 2021 22:46:44 -0800 |
From: Sean Christopherson <sean.j.christopherson@intel.com>
Omit HPET AML if the HPET is disabled, QEMU is not emulating it and the
guest may get confused by seeing HPET in the ACPI tables without a
"physical" device present.
The change of DSDT when -no-hpet is as follows.
@@ -141,47 +141,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS "
}
}
- Scope (_SB)
- {
- Device (HPET)
- {
- Name (_HID, EisaId ("PNP0103") /* HPET System Timer */) // _HID:
Hardware ID
- Name (_UID, Zero) // _UID: Unique ID
- OperationRegion (HPTM, SystemMemory, 0xFED00000, 0x0400)
- Field (HPTM, DWordAcc, Lock, Preserve)
- {
- VEND, 32,
- PRD, 32
- }
-
- Method (_STA, 0, NotSerialized) // _STA: Status
- {
- Local0 = VEND /* \_SB_.HPET.VEND */
- Local1 = PRD /* \_SB_.HPET.PRD_ */
- Local0 >>= 0x10
- If (((Local0 == Zero) || (Local0 == 0xFFFF)))
- {
- Return (Zero)
- }
-
- If (((Local1 == Zero) || (Local1 > 0x05F5E100)))
- {
- Return (Zero)
- }
-
- Return (0x0F)
- }
-
- Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
- {
- Memory32Fixed (ReadOnly,
- 0xFED00000, // Address Base
- 0x00000400, // Address Length
- )
- })
- }
- }
-
Scope (_SB.PCI0)
{
Device (ISA)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
hw/i386/acpi-build.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index e369908b1a..bfdadd7907 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1280,7 +1280,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(sb_scope, dev);
aml_append(dsdt, sb_scope);
- build_hpet_aml(dsdt);
+ if (misc->has_hpet) {
+ build_hpet_aml(dsdt);
+ }
build_piix4_isa_bridge(dsdt);
build_isa_devices_aml(dsdt);
if (pm->pcihp_bridge_en || pm->pcihp_root_en) {
@@ -1328,7 +1330,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(dsdt, sb_scope);
- build_hpet_aml(dsdt);
+ if (misc->has_hpet) {
+ build_hpet_aml(dsdt);
+ }
build_q35_isa_bridge(dsdt);
build_isa_devices_aml(dsdt);
build_q35_pci0_int(dsdt);
--
2.17.1
- [PATCH v3 01/10] checkpatch: don't emit warning on newly created acpi data files, (continued)
- [PATCH v3 01/10] checkpatch: don't emit warning on newly created acpi data files, Isaku Yamahata, 2021/02/11
- [PATCH v3 02/10] qtest: update tests/qtest/bios-tables-test-allowed-diff.h, Isaku Yamahata, 2021/02/11
- [PATCH v3 03/10] i386: add properoty, x-smm-compat-5, to keep compatibility of SMM, Isaku Yamahata, 2021/02/11
- [PATCH v3 04/10] acpi/core: always set SCI_EN when SMM isn't supported, Isaku Yamahata, 2021/02/11
- [PATCH v3 05/10] acpi: set fadt.smi_cmd to zero when SMM is not supported, Isaku Yamahata, 2021/02/11
- [PATCH v3 06/10] acpi: add test case for smm unsupported -machine smm=off, Isaku Yamahata, 2021/02/11
- [PATCH v3 09/10] acpi: add test case for -no-hpet, Isaku Yamahata, 2021/02/11
- [PATCH v3 08/10] i386: acpi: Don't build HPET ACPI entry if HPET is disabled,
Isaku Yamahata <=
- [PATCH v3 07/10] hw/i386: declare ACPI mother board resource for MMCONFIG region, Isaku Yamahata, 2021/02/11
- Re: [PATCH v3 07/10] hw/i386: declare ACPI mother board resource for MMCONFIG region, Igor Mammedov, 2021/02/12
- Re: [PATCH v3 07/10] hw/i386: declare ACPI mother board resource for MMCONFIG region, Isaku Yamahata, 2021/02/12
- Re: [PATCH v3 07/10] hw/i386: declare ACPI mother board resource for MMCONFIG region, Igor Mammedov, 2021/02/15
- Re: [PATCH v3 07/10] hw/i386: declare ACPI mother board resource for MMCONFIG region, Isaku Yamahata, 2021/02/16
- Re: [PATCH v3 07/10] hw/i386: declare ACPI mother board resource for MMCONFIG region, Michael S. Tsirkin, 2021/02/16
- Re: [PATCH v3 07/10] hw/i386: declare ACPI mother board resource for MMCONFIG region, Isaku Yamahata, 2021/02/16
- Re: [PATCH v3 07/10] hw/i386: declare ACPI mother board resource for MMCONFIG region, Igor Mammedov, 2021/02/16
[PATCH v3 10/10] qtest/acpi/bios-tables-test: update acpi tables, Isaku Yamahata, 2021/02/11