0e780da76a
Changecaf108bc58("hw/i386/acpi-build: Add ACPI PCI hot-plug methods to Q35") selects an IO address range for acpi based PCI hotplug for q35 arbitrarily. It starts at address 0x0cc4 and ends at 0x0cdb. At the time when the patch was written but the final version of the patch was not yet pushed upstream, this address range was free and did not conflict with any other IO address ranges. However, with the following change, this address range was no longer conflict free as in this change, the IO address range (value of ACPI_PCIHP_SIZE) was incremented by four bytes:b32bd763a1("pci: introduce acpi-index property for PCI device") This can be seen from the output of QMP command 'info mtree' : 0000000000000600-0000000000000603 (prio 0, i/o): acpi-evt 0000000000000604-0000000000000605 (prio 0, i/o): acpi-cnt 0000000000000608-000000000000060b (prio 0, i/o): acpi-tmr 0000000000000620-000000000000062f (prio 0, i/o): acpi-gpe0 0000000000000630-0000000000000637 (prio 0, i/o): acpi-smi 0000000000000cc4-0000000000000cdb (prio 0, i/o): acpi-pci-hotplug 0000000000000cd8-0000000000000ce3 (prio 0, i/o): acpi-cpu-hotplug It shows that there is a region of conflict between IO regions of acpi pci hotplug and acpi cpu hotplug. Unfortunately, the changecaf108bc58did not update the IO address range appropriately before it was pushed upstream to accommodate the increased length of the IO address space introduced in changeb32bd763a1. Due to this bug, windows guests complain 'This device cannot find enough free resources it can use' in the device manager panel for extended IO buses. This issue also breaks the correct functioning of pci hotplug as the following shows that the IO space for pci hotplug has been truncated: (qemu) info mtree -f FlatView #0 AS "I/O", root: io Root memory region: io 0000000000000cc4-0000000000000cd7 (prio 0, i/o): acpi-pci-hotplug 0000000000000cd8-0000000000000cf7 (prio 0, i/o): acpi-cpu-hotplug Therefore, in this fix, we adjust the IO address range for the acpi pci hotplug so that it does not conflict with cpu hotplug and there is no truncation of IO spaces. The starting IO address of PCI hotplug region has been decremented by four bytes in order to accommodate four byte increment in the IO address space introduced by changeb32bd763a1("pci: introduce acpi-index property for PCI device") After fixing, the following are the corrected IO ranges: 0000000000000600-0000000000000603 (prio 0, i/o): acpi-evt 0000000000000604-0000000000000605 (prio 0, i/o): acpi-cnt 0000000000000608-000000000000060b (prio 0, i/o): acpi-tmr 0000000000000620-000000000000062f (prio 0, i/o): acpi-gpe0 0000000000000630-0000000000000637 (prio 0, i/o): acpi-smi 0000000000000cc0-0000000000000cd7 (prio 0, i/o): acpi-pci-hotplug 0000000000000cd8-0000000000000ce3 (prio 0, i/o): acpi-cpu-hotplug This change has been tested using a Windows Server 2019 guest VM. Windows no longer complains after this change. Fixes:caf108bc58("hw/i386/acpi-build: Add ACPI PCI hot-plug methods to Q35") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/561 Signed-off-by: Ani Sinha <ani@anisinha.ca> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Julia Suvorova <jusual@redhat.com> Message-Id: <20210916132838.3469580-3-ani@anisinha.ca> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
94 lines
2.9 KiB
C
94 lines
2.9 KiB
C
/*
|
|
* QEMU GMCH/ICH9 LPC PM Emulation
|
|
*
|
|
* Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp>
|
|
* VA Linux Systems Japan K.K.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>
|
|
*/
|
|
|
|
#ifndef HW_ACPI_ICH9_H
|
|
#define HW_ACPI_ICH9_H
|
|
|
|
#include "hw/acpi/acpi.h"
|
|
#include "hw/acpi/cpu_hotplug.h"
|
|
#include "hw/acpi/cpu.h"
|
|
#include "hw/acpi/pcihp.h"
|
|
#include "hw/acpi/memory_hotplug.h"
|
|
#include "hw/acpi/acpi_dev_interface.h"
|
|
#include "hw/acpi/tco.h"
|
|
|
|
#define ACPI_PCIHP_ADDR_ICH9 0x0cc0
|
|
|
|
typedef struct ICH9LPCPMRegs {
|
|
/*
|
|
* In ich9 spec says that pm1_cnt register is 32bit width and
|
|
* that the upper 16bits are reserved and unused.
|
|
* PM1a_CNT_BLK = 2 in FADT so it is defined as uint16_t.
|
|
*/
|
|
ACPIREGS acpi_regs;
|
|
|
|
MemoryRegion io;
|
|
MemoryRegion io_gpe;
|
|
MemoryRegion io_smi;
|
|
|
|
uint32_t smi_en;
|
|
uint32_t smi_en_wmask;
|
|
uint32_t smi_sts;
|
|
|
|
qemu_irq irq; /* SCI */
|
|
|
|
uint32_t pm_io_base;
|
|
Notifier powerdown_notifier;
|
|
|
|
bool cpu_hotplug_legacy;
|
|
AcpiCpuHotplug gpe_cpu;
|
|
CPUHotplugState cpuhp_state;
|
|
|
|
bool use_acpi_hotplug_bridge;
|
|
AcpiPciHpState acpi_pci_hotplug;
|
|
MemHotplugState acpi_memory_hotplug;
|
|
|
|
uint8_t disable_s3;
|
|
uint8_t disable_s4;
|
|
uint8_t s4_val;
|
|
uint8_t smm_enabled;
|
|
bool smm_compat;
|
|
bool enable_tco;
|
|
TCOIORegs tco_regs;
|
|
} ICH9LPCPMRegs;
|
|
|
|
#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
|
|
|
|
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
|
|
bool smm_enabled,
|
|
qemu_irq sci_irq);
|
|
|
|
void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base);
|
|
extern const VMStateDescription vmstate_ich9_pm;
|
|
|
|
void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm);
|
|
|
|
void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
Error **errp);
|
|
void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
Error **errp);
|
|
void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev,
|
|
DeviceState *dev, Error **errp);
|
|
void ich9_pm_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
Error **errp);
|
|
|
|
void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list);
|
|
#endif /* HW_ACPI_ICH9_H */
|