From 6b8bfcb957857f3ce6bd8e49debbc01e4257ae61 Mon Sep 17 00:00:00 2001 From: Shuang Zheng Date: Wed, 9 Sep 2020 16:05:02 +0800 Subject: [PATCH] acrn-config: increase the length of DSDT table increase the length of DSDT table to avoid memory overwrited by subsequent ACPI tables. Tracked-On: #5266 Signed-off-by: Shuang Zheng Acked-by: Victor Sun --- .../scenarios/hybrid/ehl-crb-b/VM0/xsdt.asl | 4 +- .../scenarios/hybrid/nuc7i7dnb/VM0/xsdt.asl | 4 +- .../scenarios/hybrid/whl-ipc-i5/VM0/xsdt.asl | 4 +- .../scenarios/hybrid/whl-ipc-i7/VM0/xsdt.asl | 4 +- .../hybrid_rt/ehl-crb-b/VM0/dsdt.asl | 45 +++++++++++++++++++ .../hybrid_rt/ehl-crb-b/VM0/xsdt.asl | 6 +-- .../hybrid_rt/whl-ipc-i5/VM0/xsdt.asl | 6 +-- .../hybrid_rt/whl-ipc-i7/VM0/xsdt.asl | 6 +-- .../logical_partition/ehl-crb-b/VM0/xsdt.asl | 4 +- .../logical_partition/ehl-crb-b/VM1/xsdt.asl | 4 +- .../logical_partition/nuc7i7dnb/VM0/xsdt.asl | 4 +- .../logical_partition/nuc7i7dnb/VM1/xsdt.asl | 4 +- .../logical_partition/whl-ipc-i5/VM0/xsdt.asl | 4 +- .../logical_partition/whl-ipc-i5/VM1/xsdt.asl | 4 +- .../logical_partition/whl-ipc-i7/VM0/xsdt.asl | 4 +- .../logical_partition/whl-ipc-i7/VM1/xsdt.asl | 4 +- 16 files changed, 78 insertions(+), 33 deletions(-) diff --git a/misc/vm_configs/scenarios/hybrid/ehl-crb-b/VM0/xsdt.asl b/misc/vm_configs/scenarios/hybrid/ehl-crb-b/VM0/xsdt.asl index 8b9a0b7ac..c480b9937 100644 --- a/misc/vm_configs/scenarios/hybrid/ehl-crb-b/VM0/xsdt.asl +++ b/misc/vm_configs/scenarios/hybrid/ehl-crb-b/VM0/xsdt.asl @@ -19,5 +19,5 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 diff --git a/misc/vm_configs/scenarios/hybrid/nuc7i7dnb/VM0/xsdt.asl b/misc/vm_configs/scenarios/hybrid/nuc7i7dnb/VM0/xsdt.asl index 8b9a0b7ac..c480b9937 100644 --- a/misc/vm_configs/scenarios/hybrid/nuc7i7dnb/VM0/xsdt.asl +++ b/misc/vm_configs/scenarios/hybrid/nuc7i7dnb/VM0/xsdt.asl @@ -19,5 +19,5 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 diff --git a/misc/vm_configs/scenarios/hybrid/whl-ipc-i5/VM0/xsdt.asl b/misc/vm_configs/scenarios/hybrid/whl-ipc-i5/VM0/xsdt.asl index 8b9a0b7ac..c480b9937 100644 --- a/misc/vm_configs/scenarios/hybrid/whl-ipc-i5/VM0/xsdt.asl +++ b/misc/vm_configs/scenarios/hybrid/whl-ipc-i5/VM0/xsdt.asl @@ -19,5 +19,5 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 diff --git a/misc/vm_configs/scenarios/hybrid/whl-ipc-i7/VM0/xsdt.asl b/misc/vm_configs/scenarios/hybrid/whl-ipc-i7/VM0/xsdt.asl index 8b9a0b7ac..c480b9937 100644 --- a/misc/vm_configs/scenarios/hybrid/whl-ipc-i7/VM0/xsdt.asl +++ b/misc/vm_configs/scenarios/hybrid/whl-ipc-i7/VM0/xsdt.asl @@ -19,5 +19,5 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 diff --git a/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/VM0/dsdt.asl b/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/VM0/dsdt.asl index 73bf2a93d..6f0575fb3 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/VM0/dsdt.asl +++ b/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/VM0/dsdt.asl @@ -16,6 +16,51 @@ */ DefinitionBlock ("", "DSDT", 3, "ACRN ", "ACRNDSDT", 0x00000001) { + Scope (_SB) + { + Device (OTN1) + { + Name (_ADR, 0x00020000) // _ADR: Address + OperationRegion (TSRT, PCI_Config, Zero, 0x0100) + Field (TSRT, AnyAcc, NoLock, Preserve) + { + DVID, 16, + Offset (0x10), + TADL, 32, + TADH, 32 + } + } + + Device (PCS2) + { + Name (_HID, "INTC1033") // _HID: Hardware ID + Name (_UID, Zero) // _UID: Unique ID + Method (_STA, 0, NotSerialized) // _STA: Status + { + Return (0x0F) + } + + Method (_CRS, 0, Serialized) // _CRS: Current Resource Settings + { + Name (PCSR, ResourceTemplate () + { + Memory32Fixed (ReadWrite, + 0x00000000, // Address Base + 0x00000004, // Address Length + _Y00) + Memory32Fixed (ReadWrite, + 0x00000000, // Address Base + 0x00000004, // Address Length + _Y01) + }) + CreateDWordField (PCSR, \_SB.PCS2._CRS._Y00._BAS, MAL0) // _BAS: Base Address + MAL0 = ((^^OTN1.TADL & 0xFFFFF000) + 0x0200) + CreateDWordField (PCSR, \_SB.PCS2._CRS._Y01._BAS, MDL0) // _BAS: Base Address + MDL0 = ((^^OTN1.TADL & 0xFFFFF000) + 0x0204) + Return (PCSR) /* \_SB_.PCS2._CRS.PCSR */ + } + } + } Device (TPM) { Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */) // _HID: Hardware ID diff --git a/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/VM0/xsdt.asl b/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/VM0/xsdt.asl index 992cff37c..65e79728e 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/VM0/xsdt.asl +++ b/misc/vm_configs/scenarios/hybrid_rt/ehl-crb-b/VM0/xsdt.asl @@ -19,6 +19,6 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 -[0008] ACPI Table Address 3 : 000000007FF01000 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 +[0008] ACPI Table Address 3 : 000000007FF01100 diff --git a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/VM0/xsdt.asl b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/VM0/xsdt.asl index 992cff37c..65e79728e 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/VM0/xsdt.asl +++ b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i5/VM0/xsdt.asl @@ -19,6 +19,6 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 -[0008] ACPI Table Address 3 : 000000007FF01000 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 +[0008] ACPI Table Address 3 : 000000007FF01100 diff --git a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/VM0/xsdt.asl b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/VM0/xsdt.asl index 992cff37c..65e79728e 100644 --- a/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/VM0/xsdt.asl +++ b/misc/vm_configs/scenarios/hybrid_rt/whl-ipc-i7/VM0/xsdt.asl @@ -19,6 +19,6 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 -[0008] ACPI Table Address 3 : 000000007FF01000 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 +[0008] ACPI Table Address 3 : 000000007FF01100 diff --git a/misc/vm_configs/scenarios/logical_partition/ehl-crb-b/VM0/xsdt.asl b/misc/vm_configs/scenarios/logical_partition/ehl-crb-b/VM0/xsdt.asl index 8b9a0b7ac..c480b9937 100644 --- a/misc/vm_configs/scenarios/logical_partition/ehl-crb-b/VM0/xsdt.asl +++ b/misc/vm_configs/scenarios/logical_partition/ehl-crb-b/VM0/xsdt.asl @@ -19,5 +19,5 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 diff --git a/misc/vm_configs/scenarios/logical_partition/ehl-crb-b/VM1/xsdt.asl b/misc/vm_configs/scenarios/logical_partition/ehl-crb-b/VM1/xsdt.asl index 8b9a0b7ac..c480b9937 100644 --- a/misc/vm_configs/scenarios/logical_partition/ehl-crb-b/VM1/xsdt.asl +++ b/misc/vm_configs/scenarios/logical_partition/ehl-crb-b/VM1/xsdt.asl @@ -19,5 +19,5 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 diff --git a/misc/vm_configs/scenarios/logical_partition/nuc7i7dnb/VM0/xsdt.asl b/misc/vm_configs/scenarios/logical_partition/nuc7i7dnb/VM0/xsdt.asl index 8b9a0b7ac..c480b9937 100644 --- a/misc/vm_configs/scenarios/logical_partition/nuc7i7dnb/VM0/xsdt.asl +++ b/misc/vm_configs/scenarios/logical_partition/nuc7i7dnb/VM0/xsdt.asl @@ -19,5 +19,5 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 diff --git a/misc/vm_configs/scenarios/logical_partition/nuc7i7dnb/VM1/xsdt.asl b/misc/vm_configs/scenarios/logical_partition/nuc7i7dnb/VM1/xsdt.asl index 8b9a0b7ac..c480b9937 100644 --- a/misc/vm_configs/scenarios/logical_partition/nuc7i7dnb/VM1/xsdt.asl +++ b/misc/vm_configs/scenarios/logical_partition/nuc7i7dnb/VM1/xsdt.asl @@ -19,5 +19,5 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 diff --git a/misc/vm_configs/scenarios/logical_partition/whl-ipc-i5/VM0/xsdt.asl b/misc/vm_configs/scenarios/logical_partition/whl-ipc-i5/VM0/xsdt.asl index 8b9a0b7ac..c480b9937 100644 --- a/misc/vm_configs/scenarios/logical_partition/whl-ipc-i5/VM0/xsdt.asl +++ b/misc/vm_configs/scenarios/logical_partition/whl-ipc-i5/VM0/xsdt.asl @@ -19,5 +19,5 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 diff --git a/misc/vm_configs/scenarios/logical_partition/whl-ipc-i5/VM1/xsdt.asl b/misc/vm_configs/scenarios/logical_partition/whl-ipc-i5/VM1/xsdt.asl index 8b9a0b7ac..c480b9937 100644 --- a/misc/vm_configs/scenarios/logical_partition/whl-ipc-i5/VM1/xsdt.asl +++ b/misc/vm_configs/scenarios/logical_partition/whl-ipc-i5/VM1/xsdt.asl @@ -19,5 +19,5 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 diff --git a/misc/vm_configs/scenarios/logical_partition/whl-ipc-i7/VM0/xsdt.asl b/misc/vm_configs/scenarios/logical_partition/whl-ipc-i7/VM0/xsdt.asl index 8b9a0b7ac..c480b9937 100644 --- a/misc/vm_configs/scenarios/logical_partition/whl-ipc-i7/VM0/xsdt.asl +++ b/misc/vm_configs/scenarios/logical_partition/whl-ipc-i7/VM0/xsdt.asl @@ -19,5 +19,5 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440 diff --git a/misc/vm_configs/scenarios/logical_partition/whl-ipc-i7/VM1/xsdt.asl b/misc/vm_configs/scenarios/logical_partition/whl-ipc-i7/VM1/xsdt.asl index 8b9a0b7ac..c480b9937 100644 --- a/misc/vm_configs/scenarios/logical_partition/whl-ipc-i7/VM1/xsdt.asl +++ b/misc/vm_configs/scenarios/logical_partition/whl-ipc-i7/VM1/xsdt.asl @@ -19,5 +19,5 @@ [0004] Asl Compiler Revision : 20190703 [0008] ACPI Table Address 0 : 000000007FF00100 -[0008] ACPI Table Address 1 : 000000007FF00300 -[0008] ACPI Table Address 2 : 000000007FF00340 +[0008] ACPI Table Address 1 : 000000007FF00400 +[0008] ACPI Table Address 2 : 000000007FF00440