Branch: refs/heads/staging
Home: https://github.com/qemu/qemu
Commit: b01a49014a867dc75fdac610c436810ca62b335c
https://github.com/qemu/qemu/commit/b01a49014a867dc75fdac610c436810ca62b335c
Author: Laurent Vivier <lviv...@redhat.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M hw/pci/pci.c
Log Message:
-----------
pci: cleanup failover sanity check
Commit a1190ab628 has added a "allow_unplug_during_migration = true" at
the end of the main "if" block, so it is not needed to set it anymore
in the previous checking.
Remove it, to have only sub-ifs that check for needed conditions and exit
if one fails.
Fixes: 4f5b6a05a4e7 ("pci: add option for net failover")
Fixes: a1190ab628c0 ("migration: allow unplug during migration for failover
devices")
Cc: jfreim...@redhat.com
Signed-off-by: Laurent Vivier <lviv...@redhat.com>
Message-Id: <20210212135250.2738750-2-lviv...@redhat.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Reviewed-by: Jens Freimann <jfreim...@redhat.com>
Acked-by: Jason Wang <jasow...@redhat.com>
Commit: 00e7b1299599384dfdda2a2a4570a0fb2d69eb6b
https://github.com/qemu/qemu/commit/00e7b1299599384dfdda2a2a4570a0fb2d69eb6b
Author: Laurent Vivier <lviv...@redhat.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M hw/net/virtio-net.c
Log Message:
-----------
virtio-net: add missing object_unref()
failover_add_primary() calls qdev_device_add() and doesn't unref
the device. Because of that, when the device is unplugged a reference
is remaining and prevents the cleanup of the object.
This prevents to be able to plugin back the failover primary device,
with errors like:
(qemu) device_add
vfio-pci,host=0000:41:00.0,id=hostdev0,bus=root.3,failover_pair_id=net0
(qemu) device_del hostdev0
We can check with "info qtree" and "info pci" that the device has been removed,
and then:
(qemu) device_add
vfio-pci,host=0000:41:00.0,id=hostdev1,bus=root.3,failover_pair_id=net0
Error: vfio 0000:41:00.0: device is already attached
(qemu) device_add
vfio-pci,host=0000:41:00.0,id=hostdev0,bus=root.3,failover_pair_id=net0
qemu-kvm: Duplicate ID 'hostdev0' for device
Fixes: 21e8709b29cd ("failover: Remove primary_dev member")
Cc: quint...@redhat.com
Signed-off-by: Laurent Vivier <lviv...@redhat.com>
Message-Id: <20210212135250.2738750-3-lviv...@redhat.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Reviewed-by: Jens Freimann <jfreim...@redhat.com>
Commit: 97ca9c5920362d5b7a9f96d4fa758e9f2ccb3301
https://github.com/qemu/qemu/commit/97ca9c5920362d5b7a9f96d4fa758e9f2ccb3301
Author: Laurent Vivier <lviv...@redhat.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M hw/net/virtio-net.c
Log Message:
-----------
failover: really display a warning when the primary device is not found
In failover_add_primary(), we search the id of the failover device by
scanning the list of the devices in the opts list to find a device with
a failover_pair_id equals to the id of the virtio-net device.
If the failover_pair_id is not found, QEMU ignores the primary
device silently (which also means it will not be hidden and
it will be enabled directly at boot).
After that, we search the id in the opts list to do a qdev_device_add()
with it. The device will be always found as otherwise we had exited
before, and thus the warning is never displayed.
Fix that by moving the error report to the first exit condition.
Also add a g_assert() to be sure the compiler will not complain
about a possibly NULL pointer.
Signed-off-by: Laurent Vivier <lviv...@redhat.com>
Message-Id: <20210212135250.2738750-4-lviv...@redhat.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Commit: df72184ec15829053b3bb5a0d5801773b6d9ec25
https://github.com/qemu/qemu/commit/df72184ec15829053b3bb5a0d5801773b6d9ec25
Author: Laurent Vivier <lviv...@redhat.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M hw/pci/pcie.c
Log Message:
-----------
pcie: don't set link state active if the slot is empty
When the pcie slot is initialized, by default PCI_EXP_LNKSTA_DLLLA
(Data Link Layer Link Active) is set in PCI_EXP_LNKSTA
(Link Status) without checking if the slot is empty or not.
This is confusing for the kernel because as it sees the link is up
it tries to read the vendor ID and fails:
(From https://bugzilla.kernel.org/show_bug.cgi?id=211691)
[ 1.661105] pcieport 0000:00:02.2: pciehp: Slot Capabilities :
0x0002007b
[ 1.661115] pcieport 0000:00:02.2: pciehp: Slot Status : 0x0010
[ 1.661123] pcieport 0000:00:02.2: pciehp: Slot Control : 0x07c0
[ 1.661138] pcieport 0000:00:02.2: pciehp: Slot #0 AttnBtn+ PwrCtrl+ MRL-
AttnInd+ PwrInd+ HotPlug+ Surprise+ Interlock+ NoCompl- IbPresDis- LLActRep+
[ 1.662581] pcieport 0000:00:02.2: pciehp: pciehp_get_power_status: SLOTCTRL
6c value read 7c0
[ 1.662597] pcieport 0000:00:02.2: pciehp: pciehp_check_link_active:
lnk_status = 2204
[ 1.662703] pcieport 0000:00:02.2: pciehp: pending interrupts 0x0010 from
Slot Status
[ 1.662706] pcieport 0000:00:02.2: pciehp: pcie_enable_notification:
SLOTCTRL 6c write cmd 1031
[ 1.662730] pcieport 0000:00:02.2: pciehp: pciehp_check_link_active:
lnk_status = 2204
[ 1.662748] pcieport 0000:00:02.2: pciehp: pciehp_check_link_active:
lnk_status = 2204
[ 1.662750] pcieport 0000:00:02.2: pciehp: Slot(0-2): Link Up
[ 2.896132] pcieport 0000:00:02.2: pciehp: pciehp_check_link_status:
lnk_status = 2204
[ 2.896135] pcieport 0000:00:02.2: pciehp: Slot(0-2): No device found
[ 2.896900] pcieport 0000:00:02.2: pciehp: pending interrupts 0x0010 from
Slot Status
[ 2.896903] pcieport 0000:00:02.2: pciehp: pciehp_power_off_slot: SLOTCTRL
6c write cmd 400
[ 3.656901] pcieport 0000:00:02.2: pciehp: pending interrupts 0x0009 from
Slot Status
This is really a problem with virtio-net failover that hotplugs a VFIO
card during the boot process. The kernel can shutdown the slot while
QEMU is hotplugging it, and this likely ends by an automatic unplug of
the card. At the end of the boot sequence the card has disappeared.
To fix that, don't set the "Link Active" state in the init function, but
rely on the plug function to do it, as the mechanism has already been
introduced by 2f2b18f60bf1.
Fixes: 2f2b18f60bf1 ("pcie: set link state inactive/active after hot
unplug/plug")
Cc: zhengxia...@huawei.com
Fixes: 3d67447fe7c2 ("pcie: Fill PCIESlot link fields to support higher speeds
and widths")
Cc: alex.william...@redhat.com
Fixes: b2101eae63ea ("pcie: Set the "link active" in the link status register")
Cc: b...@kernel.crashing.org
Signed-off-by: Laurent Vivier <lviv...@redhat.com>
Message-Id: <20210212135250.2738750-5-lviv...@redhat.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Commit: 451730cfe455a00c6d36fc110ef9b7ab6d646a82
https://github.com/qemu/qemu/commit/451730cfe455a00c6d36fc110ef9b7ab6d646a82
Author: Xingang Wang <wangxinga...@huawei.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M tests/qtest/bios-tables-test-allowed-diff.h
Log Message:
-----------
acpi: Allow pxb DSDT acpi table changes
Signed-off-by: Jiahui Cen <cenjia...@huawei.com>
Signed-off-by: Xingang Wang <wangxinga...@huawei.com>
Message-Id: <1612490205-48788-2-git-send-email-wangxinga...@huawei.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
Commit: b48088d60e8466eea2cc517dedb7ee0d97b7feab
https://github.com/qemu/qemu/commit/b48088d60e8466eea2cc517dedb7ee0d97b7feab
Author: Xingang Wang <wangxinga...@huawei.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M hw/pci-host/gpex-acpi.c
Log Message:
-----------
acpi/gpex: Fix cca attribute check for pxb device
When check DMA support for device attached to pxb,
the cache coherency attribute need to be set.
This add _CCA attribute for pxb DSDT.
Fixes: 6f9765fbad ("acpi/gpex: Build tables for pxb")
Signed-off-by: Jiahui Cen <cenjia...@huawei.com>
Signed-off-by: Xingang Wang <wangxinga...@huawei.com>
Message-Id: <1612490205-48788-3-git-send-email-wangxinga...@huawei.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
Commit: 2182e4058c5ac6a6fa24353c110131333c864648
https://github.com/qemu/qemu/commit/2182e4058c5ac6a6fa24353c110131333c864648
Author: Xingang Wang <wangxinga...@huawei.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M tests/data/acpi/virt/DSDT.pxb
M tests/qtest/bios-tables-test-allowed-diff.h
Log Message:
-----------
tests/data/acpi/virt/DSDT.pxb: update with _CCA
Update expected DSDT files accordingly, and re-enable their testing.
diff of disassembly of changed expected files:
diff -ru -IDisassembly old/tests/data/acpi/virt/DSDT.pxb.dsl
new/tests/data/acpi/virt/DSDT.pxb.dsl
--- old/tests/data/acpi/virt/DSDT.pxb.dsl 2021-02-23
09:54:18.566781350 -0500
+++ new/tests/data/acpi/virt/DSDT.pxb.dsl 2021-02-23
09:57:51.952816428 -0500
Name (_BBN, 0x80) // _BBN: BIOS Bus Number
Name (_UID, 0x80) // _UID: Unique ID
Name (_STR, Unicode ("pxb Device")) // _STR: Description
String
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
Name (_PRT, Package (0x80) // _PRT: PCI Routing Table
{
Package (0x04)
Signed-off-by: Jiahui Cen <cenjia...@huawei.com>
Signed-off-by: Xingang Wang <wangxinga...@huawei.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Commit: d2f1af0e41205269bd87e56e133a4353dc8de664
https://github.com/qemu/qemu/commit/d2f1af0e41205269bd87e56e133a4353dc8de664
Author: Isaku Yamahata <isaku.yamah...@intel.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M scripts/checkpatch.pl
Log Message:
-----------
checkpatch: don't emit warning on newly created acpi data files
Newly created acpi data files(tests/data/acpi/) cause false positive
warning.
If file names are acpi expected file, don't emit warning.
Fixes: e625ba2a41 ("checkpatch: fix acpi check with multiple file name")
Signed-off-by: Isaku Yamahata <isaku.yamah...@intel.com>
Message-Id:
<6899f9ad54cab8e7deca94ff0eeab641680e2b5e.1613615732.git.isaku.yamah...@intel.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Commit: 7995d9a399ecb7f509e2862b96bc2dcb249a8d44
https://github.com/qemu/qemu/commit/7995d9a399ecb7f509e2862b96bc2dcb249a8d44
Author: Isaku Yamahata <isaku.yamah...@intel.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
A tests/data/acpi/pc/DSDT.nohpet
A tests/data/acpi/pc/FACP.nosmm
A tests/data/acpi/q35/DSDT.nohpet
A tests/data/acpi/q35/FACP.nosmm
M tests/qtest/bios-tables-test-allowed-diff.h
Log Message:
-----------
qtest: update tests/qtest/bios-tables-test-allowed-diff.h
The following tests will modify acpi tables.
prepare qtests to allow acpi table change.
add new tables for new tests.
- tests/data/acpi/pc/DSDT.nohpet
- tests/data/acpi/pc/FACP.nosmm
- tests/data/acpi/q35/DSDT.nohpet
- tests/data/acpi/q35/FACP.nosmm
Acked-by: Igor Mammedov <imamm...@redhat.com>
Signed-off-by: Isaku Yamahata <isaku.yamah...@intel.com>
Message-Id:
<c8285f54deab362ed839d31f0fb5bb590ab71fdd.1613615732.git.isaku.yamah...@intel.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Commit: 24cd04fce06b0d54e5ca2c12f20f714894a78b95
https://github.com/qemu/qemu/commit/24cd04fce06b0d54e5ca2c12f20f714894a78b95
Author: Isaku Yamahata <isaku.yamah...@intel.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M hw/acpi/piix4.c
M hw/isa/lpc_ich9.c
M include/hw/acpi/ich9.h
Log Message:
-----------
ich9, piix4: add property, smm-compat, to keep compatibility of SMM
The following patch will introduce incompatible behavior of SMM.
Introduce a property to keep the old behavior for compatibility.
To enable smm compat, use "-global ICH9-LPC.smm-compat=on" or
"-global PIIX4_PM.smm-compat=on"
Suggested-by: Igor Mammedov <imamm...@redhat.com>
Signed-off-by: Isaku Yamahata <isaku.yamah...@intel.com>
Message-Id:
<47254ae0b8c6cc6945422978b6b2af2d213ef891.1613615732.git.isaku.yamah...@intel.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
Commit: 6be8cf56bc8bda2ed9a070bdb04446191f31acc9
https://github.com/qemu/qemu/commit/6be8cf56bc8bda2ed9a070bdb04446191f31acc9
Author: Isaku Yamahata <isaku.yamah...@intel.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M hw/acpi/core.c
M hw/acpi/ich9.c
M hw/acpi/piix4.c
M hw/core/machine.c
M hw/isa/vt82c686.c
M include/hw/acpi/acpi.h
Log Message:
-----------
acpi/core: always set SCI_EN when SMM isn't supported
If SMM is not supported, ACPI fixed hardware doesn't support
legacy-mode. ACPI-only platform. Where SCI_EN in PM1_CNT register is
always set.
The bit tells OS legacy mode(SCI_EN cleared) or ACPI mode(SCI_EN set).
With the next patch (setting fadt.smi_cmd = 0 when smm isn't enabled),
guest Linux tries to switch to ACPI mode, finds smi_cmd = 0, and then
fails to initialize acpi subsystem. This patch proactively fixes it.
This patch changes guest ABI. To keep compatibility, use
"smm-compat" introduced by earlier patch. If the property is true,
disable new behavior.
ACPI spec 4.8.10.1 PM1 Event Grouping
PM1 Eanble Registers
> For ACPI-only platforms (where SCI_EN is always set)
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
Signed-off-by: Isaku Yamahata <isaku.yamah...@intel.com>
Message-Id:
<500f62081626997e46f96377393d3662211763a8.1613615732.git.isaku.yamah...@intel.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Commit: 33b44fdaba54a99e94b604dafb0d5fcaa8a35261
https://github.com/qemu/qemu/commit/33b44fdaba54a99e94b604dafb0d5fcaa8a35261
Author: Isaku Yamahata <isaku.yamah...@intel.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M hw/i386/acpi-build.c
Log Message:
-----------
acpi: set fadt.smi_cmd to zero when SMM is not supported
>From table 5.9 SMI_CMD of ACPI spec
> This field is reserved and must be zero on system
> that does not support System Management mode.
When smm is not enabled, set it to zero to comform to the spec.
When -machine smm=off is passed, the change to FACP is as follows.
@@ -1,46 +1,46 @@
/*
* Intel ACPI Component Architecture
* AML/ASL+ Disassembler version 20180105 (64-bit version)
* Copyright (c) 2000 - 2018 Intel Corporation
*
- * Disassembly of tests/data/acpi/q35/FACP, Fri Feb 5 16:57:04 2021
+ * Disassembly of /tmp/aml-1OQYX0, Fri Feb 5 16:57:04 2021
*
* ACPI Data Table [FACP]
*
* Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue
*/
[000h 0000 4] Signature : "FACP" [Fixed ACPI
Description Table (FADT)]
[004h 0004 4] Table Length : 000000F4
[008h 0008 1] Revision : 03
-[009h 0009 1] Checksum : 1F
+[009h 0009 1] Checksum : D6
[00Ah 0010 6] Oem ID : "BOCHS "
[010h 0016 8] Oem Table ID : "BXPCFACP"
[018h 0024 4] Oem Revision : 00000001
[01Ch 0028 4] Asl Compiler ID : "BXPC"
[020h 0032 4] Asl Compiler Revision : 00000001
[024h 0036 4] FACS Address : 00000000
[028h 0040 4] DSDT Address : 00000000
[02Ch 0044 1] Model : 01
[02Dh 0045 1] PM Profile : 00 [Unspecified]
[02Eh 0046 2] SCI Interrupt : 0009
-[030h 0048 4] SMI Command Port : 000000B2
-[034h 0052 1] ACPI Enable Value : 02
-[035h 0053 1] ACPI Disable Value : 03
+[030h 0048 4] SMI Command Port : 00000000
+[034h 0052 1] ACPI Enable Value : 00
+[035h 0053 1] ACPI Disable Value : 00
[036h 0054 1] S4BIOS Command : 00
[037h 0055 1] P-State Control : 00
[038h 0056 4] PM1A Event Block Address : 00000600
[03Ch 0060 4] PM1B Event Block Address : 00000000
[040h 0064 4] PM1A Control Block Address : 00000604
[044h 0068 4] PM1B Control Block Address : 00000000
[048h 0072 4] PM2 Control Block Address : 00000000
[04Ch 0076 4] PM Timer Block Address : 00000608
[050h 0080 4] GPE0 Block Address : 00000620
[054h 0084 4] GPE1 Block Address : 00000000
[058h 0088 1] PM1 Event Block Length : 04
[059h 0089 1] PM1 Control Block Length : 02
[05Ah 0090 1] PM2 Control Block Length : 00
[05Bh 0091 1] PM Timer Block Length : 04
[05Ch 0092 1] GPE0 Block Length : 10
[05Dh 0093 1] GPE1 Block Length : 00
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
Signed-off-by: Isaku Yamahata <isaku.yamah...@intel.com>
Message-Id:
<09ed791ef77fda2b194100669cbc690865c9eb52.1613615732.git.isaku.yamah...@intel.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Commit: 0dabb2e802437c2e578dc72bd0bdf3380a25ec96
https://github.com/qemu/qemu/commit/0dabb2e802437c2e578dc72bd0bdf3380a25ec96
Author: Isaku Yamahata <isaku.yamah...@intel.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M tests/qtest/bios-tables-test.c
Log Message:
-----------
acpi: add test case for smm unsupported -machine smm=off
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
Signed-off-by: Isaku Yamahata <isaku.yamah...@intel.com>
Message-Id:
<22f774a51255af1608b07b00b257af426adcf4ab.1613615732.git.isaku.yamah...@intel.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Commit: e3fb55f06501b7cffd1df2223eeadaa60e25565d
https://github.com/qemu/qemu/commit/e3fb55f06501b7cffd1df2223eeadaa60e25565d
Author: Isaku Yamahata <isaku.yamah...@intel.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M hw/i386/acpi-build.c
Log Message:
-----------
hw/i386: declare ACPI mother board resource for MMCONFIG region
Declare PNP0C01 device to reserve MMCONFIG region to conform to the
spec better and play nice with guest BIOSes/OSes.
According to PCI Firmware Specification[0], MMCONFIG region must be
reserved by declaring a motherboard resource. It's optional to reserve
the region in memory map by Int 15 E820h or EFIGetMemoryMap.
Guest Linux checks if the MMCFG region is reserved by bios memory map
or ACPI resource. If it's not reserved, Linux falls back to legacy PCI
configuration access.
TDVF [1] [2] doesn't reserve MMCONFIG the region in memory map.
On the other hand OVMF reserves it in memory map without declaring a
motherboard resource. With memory map reservation, linux guest uses
MMCONFIG region. However it doesn't comply to PCI Firmware
specification.
[0] PCI Firmware specification Revision 3.2
4.1.2 MCFG Table Description table 4-2 NOTE 2
If the operating system does not natively comprehend reserving the
MMCFG region, The MMCFG region must e reserved by firmware. ...
For most systems, the mortheroard resource would appear at the root
of the ACPI namespace (under \_SB)...
The resource can optionally be returned in Int15 E820h or
EFIGetMemoryMap as reserved memory but must always be reported
through ACPI as a motherboard resource
[1] TDX: Intel Trust Domain Extension
https://software.intel.com/content/www/us/en/develop/articles/intel-trust-domain-extensions.html
[2] TDX Virtual Firmware
https://github.com/tianocore/edk2-staging/tree/TDVF
The change to DSDT is as follows.
@@ -68,32 +68,47 @@
If ((CDW3 != Local0))
{
CDW1 |= 0x10
}
CDW3 = Local0
}
Else
{
CDW1 |= 0x04
}
Return (Arg3)
}
}
+
+ Device (DRAC)
+ {
+ Name (_HID, "PNP0C01" /* System Board */) // _HID: Hardware ID
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
NonCacheable, ReadWrite,
+ 0x00000000, // Granularity
+ 0xB0000000, // Range Minimum
+ 0xBFFFFFFF, // Range Maximum
+ 0x00000000, // Translation Offset
+ 0x10000000, // Length
+ ,, , AddressRangeMemory, TypeStatic)
+ })
+ }
}
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
Signed-off-by: Isaku Yamahata <isaku.yamah...@intel.com>
Message-Id:
<6f686b45ce7bc43048c56dbb46e72e1fe51927e6.1613615732.git.isaku.yamah...@intel.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
Commit: 51124bbfd2ea31ab4d9f9dd5134b67d308518781
https://github.com/qemu/qemu/commit/51124bbfd2ea31ab4d9f9dd5134b67d308518781
Author: Sean Christopherson <sean.j.christopher...@intel.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M hw/i386/acpi-build.c
Log Message:
-----------
i386: acpi: Don't build HPET ACPI entry if HPET is disabled
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é <phi...@redhat.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
Signed-off-by: Sean Christopherson <sean.j.christopher...@intel.com>
Message-Id:
<66114dead09232d04891b9e5f5a4081e85cc2c4d.1613615732.git.isaku.yamah...@intel.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Commit: 9a70e043593d913d2c8d5f398b43cabc2f5db382
https://github.com/qemu/qemu/commit/9a70e043593d913d2c8d5f398b43cabc2f5db382
Author: Isaku Yamahata <isaku.yamah...@intel.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M tests/qtest/bios-tables-test.c
Log Message:
-----------
acpi: add test case for -no-hpet
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
Signed-off-by: Isaku Yamahata <isaku.yamah...@intel.com>
Message-Id:
<5ef9a81e49793afb42ffd19bbf1f44e269c65e93.1613615732.git.isaku.yamah...@intel.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Commit: 7b630d937a6c73fb145746fb31e0fb4b08f0cf0e
https://github.com/qemu/qemu/commit/7b630d937a6c73fb145746fb31e0fb4b08f0cf0e
Author: Isaku Yamahata <isaku.yamah...@intel.com>
Date: 2021-02-23 (Tue, 23 Feb 2021)
Changed paths:
M tests/data/acpi/pc/DSDT.nohpet
M tests/data/acpi/pc/FACP.nosmm
M tests/data/acpi/q35/DSDT
M tests/data/acpi/q35/DSDT.acpihmat
M tests/data/acpi/q35/DSDT.bridge
M tests/data/acpi/q35/DSDT.cphp
M tests/data/acpi/q35/DSDT.dimmpxm
M tests/data/acpi/q35/DSDT.ipmibt
M tests/data/acpi/q35/DSDT.memhp
M tests/data/acpi/q35/DSDT.mmio64
M tests/data/acpi/q35/DSDT.nohpet
M tests/data/acpi/q35/DSDT.numamem
M tests/data/acpi/q35/DSDT.tis
M tests/data/acpi/q35/FACP.nosmm
M tests/qtest/bios-tables-test-allowed-diff.h
Log Message:
-----------
qtest/acpi/bios-tables-test: update acpi tables
update golden master acpi tables and empty
bios-tables-test-allowed-diff.h.
Signed-off-by: Isaku Yamahata <isaku.yamah...@intel.com>
Message-Id:
<de5a7f88563d39ed0cec34ff1d4cd6a1bdc927f0.1613615732.git.isaku.yamah...@intel.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Commit: 51db2d7cf26d05a961ec0ee0eb773594b32cc4a1
https://github.com/qemu/qemu/commit/51db2d7cf26d05a961ec0ee0eb773594b32cc4a1
Author: Peter Maydell <peter.mayd...@linaro.org>
Date: 2021-02-25 (Thu, 25 Feb 2021)
Changed paths:
M hw/acpi/core.c
M hw/acpi/ich9.c
M hw/acpi/piix4.c
M hw/core/machine.c
M hw/i386/acpi-build.c
M hw/isa/lpc_ich9.c
M hw/isa/vt82c686.c
M hw/net/virtio-net.c
M hw/pci-host/gpex-acpi.c
M hw/pci/pci.c
M hw/pci/pcie.c
M include/hw/acpi/acpi.h
M include/hw/acpi/ich9.h
M scripts/checkpatch.pl
A tests/data/acpi/pc/DSDT.nohpet
A tests/data/acpi/pc/FACP.nosmm
M tests/data/acpi/q35/DSDT
M tests/data/acpi/q35/DSDT.acpihmat
M tests/data/acpi/q35/DSDT.bridge
M tests/data/acpi/q35/DSDT.cphp
M tests/data/acpi/q35/DSDT.dimmpxm
M tests/data/acpi/q35/DSDT.ipmibt
M tests/data/acpi/q35/DSDT.memhp
M tests/data/acpi/q35/DSDT.mmio64
A tests/data/acpi/q35/DSDT.nohpet
M tests/data/acpi/q35/DSDT.numamem
M tests/data/acpi/q35/DSDT.tis
A tests/data/acpi/q35/FACP.nosmm
M tests/data/acpi/virt/DSDT.pxb
M tests/qtest/bios-tables-test.c
Log Message:
-----------
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc,virtio,pci: fixes, tests
Fixes all over the place, a new test.
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
# gpg: Signature made Tue 23 Feb 2021 16:00:29 GMT
# gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg: issuer "m...@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <m...@kernel.org>" [full]
# gpg: aka "Michael S. Tsirkin <m...@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
qtest/acpi/bios-tables-test: update acpi tables
acpi: add test case for -no-hpet
i386: acpi: Don't build HPET ACPI entry if HPET is disabled
hw/i386: declare ACPI mother board resource for MMCONFIG region
acpi: add test case for smm unsupported -machine smm=off
acpi: set fadt.smi_cmd to zero when SMM is not supported
acpi/core: always set SCI_EN when SMM isn't supported
ich9, piix4: add property, smm-compat, to keep compatibility of SMM
qtest: update tests/qtest/bios-tables-test-allowed-diff.h
checkpatch: don't emit warning on newly created acpi data files
tests/data/acpi/virt/DSDT.pxb: update with _CCA
acpi/gpex: Fix cca attribute check for pxb device
acpi: Allow pxb DSDT acpi table changes
pcie: don't set link state active if the slot is empty
failover: really display a warning when the primary device is not found
virtio-net: add missing object_unref()
pci: cleanup failover sanity check
Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
Compare: https://github.com/qemu/qemu/compare/7ef8134565dc...51db2d7cf26d
