tests: acpi: update expected blobs after HPET move
HPET AML moved after PCI host bridge description (no functional change) diff example for PC machine: @@ -54,47 +54,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001) } } - 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) @@ -529,6 +488,47 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001) } } + 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) { Device (\_SB.PCI0.PRES) Signed-off-by: Igor Mammedov <imammedo@redhat.com> Message-Id: <20220701133515.137890-4-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
e05acc360e
commit
4609296d06
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,33 +1 @@
|
|||
/* List of comma-separated changed AML files to ignore */
|
||||
"tests/data/acpi/pc/DSDT",
|
||||
"tests/data/acpi/pc/DSDT.acpierst",
|
||||
"tests/data/acpi/pc/DSDT.acpihmat",
|
||||
"tests/data/acpi/pc/DSDT.bridge",
|
||||
"tests/data/acpi/pc/DSDT.cphp",
|
||||
"tests/data/acpi/pc/DSDT.dimmpxm",
|
||||
"tests/data/acpi/pc/DSDT.hpbridge",
|
||||
"tests/data/acpi/pc/DSDT.hpbrroot",
|
||||
"tests/data/acpi/pc/DSDT.ipmikcs",
|
||||
"tests/data/acpi/pc/DSDT.memhp",
|
||||
"tests/data/acpi/pc/DSDT.numamem",
|
||||
"tests/data/acpi/pc/DSDT.roothp",
|
||||
"tests/data/acpi/q35/DSDT",
|
||||
"tests/data/acpi/q35/DSDT.acpierst",
|
||||
"tests/data/acpi/q35/DSDT.acpihmat",
|
||||
"tests/data/acpi/q35/DSDT.applesmc",
|
||||
"tests/data/acpi/q35/DSDT.bridge",
|
||||
"tests/data/acpi/q35/DSDT.cphp",
|
||||
"tests/data/acpi/q35/DSDT.cxl",
|
||||
"tests/data/acpi/q35/DSDT.dimmpxm",
|
||||
"tests/data/acpi/q35/DSDT.ipmibt",
|
||||
"tests/data/acpi/q35/DSDT.ipmismbus",
|
||||
"tests/data/acpi/q35/DSDT.ivrs",
|
||||
"tests/data/acpi/q35/DSDT.memhp",
|
||||
"tests/data/acpi/q35/DSDT.mmio64",
|
||||
"tests/data/acpi/q35/DSDT.multi-bridge",
|
||||
"tests/data/acpi/q35/DSDT.numamem",
|
||||
"tests/data/acpi/q35/DSDT.pvpanic-isa",
|
||||
"tests/data/acpi/q35/DSDT.tis.tpm12",
|
||||
"tests/data/acpi/q35/DSDT.tis.tpm2",
|
||||
"tests/data/acpi/q35/DSDT.viot",
|
||||
"tests/data/acpi/q35/DSDT.xapic",
|
||||
|
|
Loading…
Reference in New Issue