mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-21 10:24:33 +00:00
0e84fd3b98
(I practice [1] hasn't broke anything since on hardware side we unset
hotplug_handler on such intermediate port => hotplug behind it has
never worked)
When deciding if bridge should be described, the original
condition was
cold_plugged_bridge && pcihp_bridge_en
which was replaced [1] by
bridge has ACPI_PCIHP_PROP_BSEL
the later however is not the same thing as the original
and flips to false if intermediate bridge has hotplug
turned off (root-port with 'hotplug=off' option).
Since we already in build_pci_bridge_aml(), the question
if it's bridge is answered. Use DeviceState::hotplugged
to make decision if bridge should describe its slots.
What's left out is pcihp_bridge_en, which tells us if
ACPI bridge hotplug is enabled.
With hotplug and non hotplug part now being mostly
separated, omitting this check will only lead to
colplugged bridges describe occupied slots in case
when ACPI bridge hotplug is disabled.
Which makes behavior consistent with occupied slots
on hostbridge.
Ex (pc/DSDT.hpbrroot diff):
...
Device (S20)
{
Name (_ADR, 0x00040000) // _ADR: Address
+ Device (S08)
+ {
+ Name (_ADR, 0x00010000) // _ADR: Address
+ }
+
+ Device (S10)
+ {
+ Name (_ADR, 0x00020000) // _ADR: Address
+ }
}
...
PS:
testing shows that above doesn't affect adversely guest OS
behavior: i.e. if ACPI bridge hotplug is enabled it's
expected behaviour, and with ACPI bridge hotplug is disabled
(a.k. native hotplug), it doesn't break slot enumeration
nor native hotplug. (tested with RHEL9.0 and WS2022).
1)
Fixes:
|
||
|---|---|---|
| .. | ||
| acpi-cpu-hotplug-stub.c | ||
| acpi-mem-hotplug-stub.c | ||
| acpi-nvdimm-stub.c | ||
| acpi-pci-hotplug-stub.c | ||
| acpi-qmp-cmds.c | ||
| acpi-stub.c | ||
| acpi-x86-stub.c | ||
| acpi_interface.c | ||
| aml-build-stub.c | ||
| aml-build.c | ||
| bios-linker-loader.c | ||
| core.c | ||
| cpu.c | ||
| cpu_hotplug.c | ||
| cxl-stub.c | ||
| cxl.c | ||
| erst.c | ||
| generic_event_device.c | ||
| ghes-stub.c | ||
| ghes.c | ||
| hmat.c | ||
| hmat.h | ||
| ich9.c | ||
| ich9_tco.c | ||
| ipmi-stub.c | ||
| ipmi.c | ||
| Kconfig | ||
| memory_hotplug.c | ||
| meson.build | ||
| nvdimm.c | ||
| pci-bridge-stub.c | ||
| pci-bridge.c | ||
| pci.c | ||
| pcihp.c | ||
| piix4.c | ||
| tpm.c | ||
| trace-events | ||
| trace.h | ||
| utils.c | ||
| viot.c | ||
| viot.h | ||
| vmgenid.c | ||