Re: [PATCH 3/3] bios-tables-test: Update ACPI DSDT table golden blobs for q35
On Tue, 14 Sep 2021 10:24:10 +0530
Ani Sinha wrote:
> We have modified the IO address range for ACPI pci hotplug in q35. See change:
>
> 36f98d0d4f ("hw/i386/acpi: fix conflicting IO address range for acpi pci
> hotplug in q35")
>
> The ACPI DSDT table golden blobs must be regenrated in order to make the unit
> tests
> pass. This change updates the golden ACPI DSDT table blobs.
>
> Following is the ASL diff between the blobs:
>
> @@ -1,30 +1,30 @@
> /*
> * Intel ACPI Component Architecture
> * AML/ASL+ Disassembler version 20190509 (64-bit version)
> * Copyright (c) 2000 - 2019 Intel Corporation
> *
> * Disassembling to symbolic ASL+ operators
> *
> - * Disassembly of tests/data/acpi/q35/DSDT, Tue Sep 14 09:04:06 2021
> + * Disassembly of /tmp/aml-52DP90, Tue Sep 14 09:04:06 2021
> *
> * Original Table Header:
> * Signature"DSDT"
> * Length 0x2061 (8289)
> * Revision 0x01 32-bit table (V1), no 64-bit math support
> - * Checksum 0xE5
> + * Checksum 0xF9
> * OEM ID "BOCHS "
> * OEM Table ID "BXPC"
> * OEM Revision 0x0001 (1)
> * Compiler ID "BXPC"
> * Compiler Version 0x0001 (1)
> */
> DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC", 0x0001)
> {
> Scope (\)
> {
> OperationRegion (DBG, SystemIO, 0x0402, One)
> Field (DBG, ByteAcc, NoLock, Preserve)
> {
> DBGB, 8
> }
>
> @@ -226,46 +226,46 @@
> Name (_CRS, ResourceTemplate () // _CRS: Current Resource
> Settings
> {
> IO (Decode16,
> 0x0070, // Range Minimum
> 0x0070, // Range Maximum
> 0x01, // Alignment
> 0x08, // Length
> )
> IRQNoFlags ()
> {8}
> })
> }
> }
>
> Scope (_SB.PCI0)
> {
> -OperationRegion (PCST, SystemIO, 0x0CC4, 0x08)
> +OperationRegion (PCST, SystemIO, 0x0CC0, 0x08)
> Field (PCST, DWordAcc, NoLock, WriteAsZeros)
> {
> PCIU, 32,
> PCID, 32
> }
>
> -OperationRegion (SEJ, SystemIO, 0x0CCC, 0x04)
> +OperationRegion (SEJ, SystemIO, 0x0CC8, 0x04)
> Field (SEJ, DWordAcc, NoLock, WriteAsZeros)
> {
> B0EJ, 32
> }
>
> -OperationRegion (BNMR, SystemIO, 0x0CD4, 0x08)
> +OperationRegion (BNMR, SystemIO, 0x0CD0, 0x08)
> Field (BNMR, DWordAcc, NoLock, WriteAsZeros)
> {
> BNUM, 32,
> PIDX, 32
> }
>
> Mutex (BLCK, 0x00)
> Method (PCEJ, 2, NotSerialized)
> {
> Acquire (BLCK, 0x)
> BNUM = Arg0
> B0EJ = (One << Arg1)
> Release (BLCK)
> Return (Zero)
> }
>
> @@ -3185,34 +3185,34 @@
> 0x0620, // Range Minimum
> 0x0620, // Range Maximum
> 0x01, // Alignment
> 0x10, // Length
> )
> })
> }
>
> Device (PHPR)
> {
> Name (_HID, "PNP0A06" /* Generic Container Device */) // _HID:
> Hardware ID
> Name (_UID, "PCI Hotplug resources") // _UID: Unique ID
> Name (_STA, 0x0B) // _STA: Status
> Name (_CRS, ResourceTemplate () // _CRS: Current Resource
> Settings
> {
> IO (Decode16,
> -0x0CC4, // Range Minimum
> -0x0CC4, // Range Maximum
> +0x0CC0, // Range Minimum
> +0x0CC0, // Range Maximum
> 0x01, // Alignment
> 0x18, // Length
> )
> })
> }
> }
>
> Scope (\)
> {
> Name (_S3, Package (0x04) // _S3_: S3 System State
> {
> One,
> One,
> Zero,
> Zero
> })
>
> Signed-off-by: Ani Sinha
Acked-by: Igor Mammedov
> ---
> tests/data/acpi/q35/DSDT| Bin 8289 -> 8289 bytes
> tests/data/acpi/q35/DSDT.acpihmat | Bin 9614 -> 9614 bytes
> tests/data/acpi/q35/DSDT.bridge | Bin 11003 -> 11003 bytes
> tests/data/acpi/q35/DSDT.cphp | Bin 8753 -> 8753 bytes
> tests/data/acpi/q35/DSDT.dimmpxm| Bin 9943 -> 9943 bytes
> tests/data/acpi/q35/DSDT.ipmibt | Bin 8364 -> 8364 bytes
> tests/data/acpi/q35/DSDT.memhp | Bin 9648 -> 9648 bytes
> tests/data/acpi/q35/DSDT.mmio64
[PATCH 3/3] bios-tables-test: Update ACPI DSDT table golden blobs for q35
We have modified the IO address range for ACPI pci hotplug in q35. See change:
36f98d0d4f ("hw/i386/acpi: fix conflicting IO address range for acpi pci
hotplug in q35")
The ACPI DSDT table golden blobs must be regenrated in order to make the unit
tests
pass. This change updates the golden ACPI DSDT table blobs.
Following is the ASL diff between the blobs:
@@ -1,30 +1,30 @@
/*
* Intel ACPI Component Architecture
* AML/ASL+ Disassembler version 20190509 (64-bit version)
* Copyright (c) 2000 - 2019 Intel Corporation
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/q35/DSDT, Tue Sep 14 09:04:06 2021
+ * Disassembly of /tmp/aml-52DP90, Tue Sep 14 09:04:06 2021
*
* Original Table Header:
* Signature"DSDT"
* Length 0x2061 (8289)
* Revision 0x01 32-bit table (V1), no 64-bit math support
- * Checksum 0xE5
+ * Checksum 0xF9
* OEM ID "BOCHS "
* OEM Table ID "BXPC"
* OEM Revision 0x0001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x0001 (1)
*/
DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC", 0x0001)
{
Scope (\)
{
OperationRegion (DBG, SystemIO, 0x0402, One)
Field (DBG, ByteAcc, NoLock, Preserve)
{
DBGB, 8
}
@@ -226,46 +226,46 @@
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
IO (Decode16,
0x0070, // Range Minimum
0x0070, // Range Maximum
0x01, // Alignment
0x08, // Length
)
IRQNoFlags ()
{8}
})
}
}
Scope (_SB.PCI0)
{
-OperationRegion (PCST, SystemIO, 0x0CC4, 0x08)
+OperationRegion (PCST, SystemIO, 0x0CC0, 0x08)
Field (PCST, DWordAcc, NoLock, WriteAsZeros)
{
PCIU, 32,
PCID, 32
}
-OperationRegion (SEJ, SystemIO, 0x0CCC, 0x04)
+OperationRegion (SEJ, SystemIO, 0x0CC8, 0x04)
Field (SEJ, DWordAcc, NoLock, WriteAsZeros)
{
B0EJ, 32
}
-OperationRegion (BNMR, SystemIO, 0x0CD4, 0x08)
+OperationRegion (BNMR, SystemIO, 0x0CD0, 0x08)
Field (BNMR, DWordAcc, NoLock, WriteAsZeros)
{
BNUM, 32,
PIDX, 32
}
Mutex (BLCK, 0x00)
Method (PCEJ, 2, NotSerialized)
{
Acquire (BLCK, 0x)
BNUM = Arg0
B0EJ = (One << Arg1)
Release (BLCK)
Return (Zero)
}
@@ -3185,34 +3185,34 @@
0x0620, // Range Minimum
0x0620, // Range Maximum
0x01, // Alignment
0x10, // Length
)
})
}
Device (PHPR)
{
Name (_HID, "PNP0A06" /* Generic Container Device */) // _HID:
Hardware ID
Name (_UID, "PCI Hotplug resources") // _UID: Unique ID
Name (_STA, 0x0B) // _STA: Status
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
IO (Decode16,
-0x0CC4, // Range Minimum
-0x0CC4, // Range Maximum
+0x0CC0, // Range Minimum
+0x0CC0, // Range Maximum
0x01, // Alignment
0x18, // Length
)
})
}
}
Scope (\)
{
Name (_S3, Package (0x04) // _S3_: S3 System State
{
One,
One,
Zero,
Zero
})
Signed-off-by: Ani Sinha
---
tests/data/acpi/q35/DSDT| Bin 8289 -> 8289 bytes
tests/data/acpi/q35/DSDT.acpihmat | Bin 9614 -> 9614 bytes
tests/data/acpi/q35/DSDT.bridge | Bin 11003 -> 11003 bytes
tests/data/acpi/q35/DSDT.cphp | Bin 8753 -> 8753 bytes
tests/data/acpi/q35/DSDT.dimmpxm| Bin 9943 -> 9943 bytes
tests/data/acpi/q35/DSDT.ipmibt | Bin 8364 -> 8364 bytes
tests/data/acpi/q35/DSDT.memhp | Bin 9648 -> 9648 bytes
tests/data/acpi/q35/DSDT.mmio64 | Bin 9419 -> 9419 bytes
tests/data/acpi/q35/DSDT.nohpet | Bin 8147 -> 8147 bytes
tests/data/acpi/q35/DSDT.numamem| Bin 8295 -> 8295 bytes
tests/data/acpi/q35/DSDT.tis| Bin 8894 -> 8894 bytes
tests/qtest/bios-tables-test-allowed-diff.h | 11 ---
12 files changed, 11 deletions(-)
diff --git
