mirror of https://gitee.com/openkylin/qemu.git
a8339e07f9
We added a new unit test for testing acpi hotplug on multifunction bridges in
q35 machines. Here, we update the DSDT table gloden master blob for this unit
test.
The test adds the following devices to qemu and then checks the changes
introduced in the DSDT table due to the addition of the following devices:
(a) a multifunction bridge device
(b) a bridge device with function 1
(c) a non-bridge device with function 2
In the DSDT table, we should see AML hotplug descriptions for (a) and (b).
For (a) we should find a hotplug AML description for function 0.
Following is the ASL diff between the original DSDT table and the modified DSDT
table due to the unit test. We see that multifunction bridge on bus 2 and single
function bridge on bus 3 function 1 are described, not the non-bridge balloon
device on bus 4, function 2.
@@ -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, Thu Oct 7 18:29:19 2021
+ * Disassembly of /tmp/aml-C7JCA1, Thu Oct 7 18:29:19 2021
*
* Original Table Header:
* Signature "DSDT"
- * Length 0x00002061 (8289)
+ * Length 0x00002187 (8583)
* Revision 0x01 **** 32-bit table (V1), no 64-bit math support
- * Checksum 0xF9
+ * Checksum 0x8D
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\)
{
OperationRegion (DBG, SystemIO, 0x0402, One)
Field (DBG, ByteAcc, NoLock, Preserve)
{
DBGB, 8
}
@@ -3265,23 +3265,95 @@
Method (_S1D, 0, NotSerialized) // _S1D: S1 Device State
{
Return (Zero)
}
Method (_S2D, 0, NotSerialized) // _S2D: S2 Device State
{
Return (Zero)
}
Method (_S3D, 0, NotSerialized) // _S3D: S3 Device State
{
Return (Zero)
}
}
+ Device (S10)
+ {
+ Name (_ADR, 0x00020000) // _ADR: Address
+ Name (BSEL, One)
+ Device (S00)
+ {
+ Name (_SUN, Zero) // _SUN: Slot User Number
+ Name (_ADR, Zero) // _ADR: Address
+ Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9
+ {
+ PCEJ (BSEL, _SUN)
+ }
+
+ Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method
+ {
+ Return (PDSM (Arg0, Arg1, Arg2, Arg3, BSEL, _SUN))
+ }
+ }
+
+ Method (DVNT, 2, NotSerialized)
+ {
+ If ((Arg0 & One))
+ {
+ Notify (S00, Arg1)
+ }
+ }
+
+ Method (PCNT, 0, NotSerialized)
+ {
+ BNUM = One
+ DVNT (PCIU, One)
+ DVNT (PCID, 0x03)
+ }
+ }
+
+ Device (S19)
+ {
+ Name (_ADR, 0x00030001) // _ADR: Address
+ Name (BSEL, Zero)
+ Device (S00)
+ {
+ Name (_SUN, Zero) // _SUN: Slot User Number
+ Name (_ADR, Zero) // _ADR: Address
+ Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9
+ {
+ PCEJ (BSEL, _SUN)
+ }
+
+ Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method
+ {
+ Return (PDSM (Arg0, Arg1, Arg2, Arg3, BSEL, _SUN))
+ }
+ }
+
+ Method (DVNT, 2, NotSerialized)
+ {
+ If ((Arg0 & One))
+ {
+ Notify (S00, Arg1)
+ }
+ }
+
+ Method (PCNT, 0, NotSerialized)
+ {
+ BNUM = Zero
+ DVNT (PCIU, One)
+ DVNT (PCID, 0x03)
+ }
+ }
+
Method (PCNT, 0, NotSerialized)
{
+ ^S19.PCNT ()
+ ^S10.PCNT ()
}
}
}
}
Signed-off-by: Ani Sinha <ani@anisinha.ca>
Message-Id: <20211007135750.1277213-4-ani@anisinha.ca>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
|
||
|---|---|---|
| .. | ||
| fuzz | ||
| libqos | ||
| ac97-test.c | ||
| acpi-utils.c | ||
| acpi-utils.h | ||
| adm1272-test.c | ||
| ahci-test.c | ||
| am53c974-test.c | ||
| arm-cpu-features.c | ||
| aspeed_hace-test.c | ||
| aspeed_smc-test.c | ||
| bios-tables-test-allowed-diff.h | ||
| bios-tables-test.c | ||
| boot-order-test.c | ||
| boot-sector.c | ||
| boot-sector.h | ||
| boot-serial-test.c | ||
| cdrom-test.c | ||
| cmsdk-apb-dualtimer-test.c | ||
| cmsdk-apb-timer-test.c | ||
| cmsdk-apb-watchdog-test.c | ||
| cpu-plug-test.c | ||
| dbus-vmstate-test.c | ||
| dbus-vmstate1.xml | ||
| device-introspect-test.c | ||
| device-plug-test.c | ||
| display-vga-test.c | ||
| drive_del-test.c | ||
| ds1338-test.c | ||
| e1000-test.c | ||
| e1000e-test.c | ||
| eepro100-test.c | ||
| emc141x-test.c | ||
| endianness-test.c | ||
| es1370-test.c | ||
| fdc-test.c | ||
| fuzz-e1000e-test.c | ||
| fuzz-megasas-test.c | ||
| fuzz-sb16-test.c | ||
| fuzz-sdcard-test.c | ||
| fuzz-virtio-scsi-test.c | ||
| fuzz-xlnx-dp-test.c | ||
| fw_cfg-test.c | ||
| hd-geo-test.c | ||
| hexloader-test.c | ||
| i440fx-test.c | ||
| i82801b11-test.c | ||
| ide-test.c | ||
| intel-hda-test.c | ||
| ioh3420-test.c | ||
| ipmi-bt-test.c | ||
| ipmi-kcs-test.c | ||
| ipoctal232-test.c | ||
| ivshmem-test.c | ||
| libqtest-single.h | ||
| libqtest.c | ||
| lpc-ich9-test.c | ||
| m48t59-test.c | ||
| machine-none-test.c | ||
| max34451-test.c | ||
| megasas-test.c | ||
| meson.build | ||
| microbit-test.c | ||
| migration-helpers.c | ||
| migration-helpers.h | ||
| migration-test.c | ||
| modules-test.c | ||
| ne2000-test.c | ||
| npcm7xx_adc-test.c | ||
| npcm7xx_emc-test.c | ||
| npcm7xx_gpio-test.c | ||
| npcm7xx_pwm-test.c | ||
| npcm7xx_rng-test.c | ||
| npcm7xx_smbus-test.c | ||
| npcm7xx_timer-test.c | ||
| npcm7xx_watchdog_timer-test.c | ||
| numa-test.c | ||
| nvme-test.c | ||
| pca9552-test.c | ||
| pci-test.c | ||
| pcnet-test.c | ||
| pflash-cfi02-test.c | ||
| pnv-xscom-test.c | ||
| prom-env-test.c | ||
| pvpanic-pci-test.c | ||
| pvpanic-test.c | ||
| pxe-test.c | ||
| q35-test.c | ||
| qmp-cmd-test.c | ||
| qmp-test.c | ||
| qom-test.c | ||
| qos-test.c | ||
| rtas-test.c | ||
| rtc-test.c | ||
| rtl8139-test.c | ||
| sdhci-test.c | ||
| spapr-phb-test.c | ||
| sse-timer-test.c | ||
| tco-test.c | ||
| test-arm-mptimer.c | ||
| test-filter-mirror.c | ||
| test-filter-redirector.c | ||
| test-hmp.c | ||
| test-netfilter.c | ||
| test-x86-cpuid-compat.c | ||
| tmp105-test.c | ||
| tpm-crb-swtpm-test.c | ||
| tpm-crb-test.c | ||
| tpm-emu.c | ||
| tpm-emu.h | ||
| tpm-tests.c | ||
| tpm-tests.h | ||
| tpm-tis-device-swtpm-test.c | ||
| tpm-tis-device-test.c | ||
| tpm-tis-swtpm-test.c | ||
| tpm-tis-test.c | ||
| tpm-tis-util.c | ||
| tpm-tis-util.h | ||
| tpm-util.c | ||
| tpm-util.h | ||
| tulip-test.c | ||
| usb-hcd-ehci-test.c | ||
| usb-hcd-ohci-test.c | ||
| usb-hcd-uhci-test.c | ||
| usb-hcd-xhci-test.c | ||
| vhost-user-blk-test.c | ||
| vhost-user-test.c | ||
| virtio-9p-test.c | ||
| virtio-blk-test.c | ||
| virtio-ccw-test.c | ||
| virtio-net-test.c | ||
| virtio-rng-test.c | ||
| virtio-scsi-test.c | ||
| virtio-serial-test.c | ||
| virtio-test.c | ||
| vmgenid-test.c | ||
| vmxnet3-test.c | ||
| wdt_ib700-test.c | ||
| xlnx-can-test.c | ||