Ping ... On Thu, 12 Aug 2021, Ani Sinha wrote:
> Currently various acpi hotplug modules like cpu hotplug, memory hotplug, pci > hotplug, nvdimm hotplug are all pulled in when CONFIG_ACPI_X86 is turned on. > This brings in support for whole lot of subsystems that some targets like > mips does not need. They are added just to satisfy symbol dependencies. This > is ugly and should be avoided. Targets should be able to pull in just what > they > need and no more. For example, mips only needs support for PIIX4 and does not > need acpi pci hotplug support or cpu hotplug support or memory hotplug support > etc. This change is an effort to clean this up. > In this change, new config variables are added for various acpi hotplug > subsystems. Targets like mips can only enable PIIX4 support and not the rest > of all the other modules which were being previously pulled in as a part of > CONFIG_ACPI_X86. Function stubs make sure that symbols which piix4 needs but > are not required by mips (for example, symbols specific to pci hotplug etc) > are available to satisfy the dependencies. > > Currently, this change only addresses issues with mips malta targets. In > future > we might be able to clean up other targets which are similarly pulling in lot > of unnecessary hotplug modules by enabling ACPI_X86. > > This change should also address issues such as the following: > https://gitlab.com/qemu-project/qemu/-/issues/221 > https://gitlab.com/qemu-project/qemu/-/issues/193 > > Signed-off-by: Ani Sinha <a...@anisinha.ca> > --- > configs/devices/mips-softmmu/common.mak | 5 +-- > hw/acpi/Kconfig | 10 +++++ > hw/acpi/acpi-cpu-hotplug-stub.c | 50 +++++++++++++++++++++++++ > hw/acpi/acpi-mem-hotplug-stub.c | 35 +++++++++++++++++ > hw/acpi/acpi-nvdimm-stub.c | 8 ++++ > hw/acpi/acpi-pci-hotplug-stub.c | 47 +++++++++++++++++++++++ > hw/acpi/meson.build | 14 +++++-- > 7 files changed, 161 insertions(+), 8 deletions(-) > create mode 100644 hw/acpi/acpi-cpu-hotplug-stub.c > create mode 100644 hw/acpi/acpi-mem-hotplug-stub.c > create mode 100644 hw/acpi/acpi-nvdimm-stub.c > create mode 100644 hw/acpi/acpi-pci-hotplug-stub.c > > diff --git a/configs/devices/mips-softmmu/common.mak > b/configs/devices/mips-softmmu/common.mak > index ea78fe7275..752b62b1e6 100644 > --- a/configs/devices/mips-softmmu/common.mak > +++ b/configs/devices/mips-softmmu/common.mak > @@ -18,10 +18,7 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > -CONFIG_ACPI_X86=y > -CONFIG_ACPI_MEMORY_HOTPLUG=y > -CONFIG_ACPI_NVDIMM=y > -CONFIG_ACPI_CPU_HOTPLUG=y > +CONFIG_ACPI_PIIX4=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_PIIX4=y > diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig > index cfc4ede8d9..3b5e118c54 100644 > --- a/hw/acpi/Kconfig > +++ b/hw/acpi/Kconfig > @@ -8,6 +8,8 @@ config ACPI_X86 > select ACPI_CPU_HOTPLUG > select ACPI_MEMORY_HOTPLUG > select ACPI_HMAT > + select ACPI_PIIX4 > + select ACPI_PCIHP > > config ACPI_X86_ICH > bool > @@ -24,6 +26,14 @@ config ACPI_NVDIMM > bool > depends on ACPI > > +config ACPI_PIIX4 > + bool > + depends on ACPI > + > +config ACPI_PCIHP > + bool > + depends on ACPI > + > config ACPI_HMAT > bool > depends on ACPI > diff --git a/hw/acpi/acpi-cpu-hotplug-stub.c b/hw/acpi/acpi-cpu-hotplug-stub.c > new file mode 100644 > index 0000000000..3fc4b14c26 > --- /dev/null > +++ b/hw/acpi/acpi-cpu-hotplug-stub.c > @@ -0,0 +1,50 @@ > +#include "qemu/osdep.h" > +#include "hw/acpi/cpu_hotplug.h" > +#include "migration/vmstate.h" > + > + > +/* Following stubs are all related to ACPI cpu hotplug */ > +const VMStateDescription vmstate_cpu_hotplug; > + > +void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe_cpu, > + CPUHotplugState *cpuhp_state, > + uint16_t io_port) > +{ > + return; > +} > + > +void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner, > + AcpiCpuHotplug *gpe_cpu, uint16_t base) > +{ > + return; > +} > + > +void acpi_cpu_ospm_status(CPUHotplugState *cpu_st, ACPIOSTInfoList ***list) > +{ > + return; > +} > + > +void acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, > + CPUHotplugState *cpu_st, DeviceState *dev, Error > **errp) > +{ > + return; > +} > + > +void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, > + AcpiCpuHotplug *g, DeviceState *dev, Error > **errp) > +{ > + return; > +} > + > +void acpi_cpu_unplug_cb(CPUHotplugState *cpu_st, > + DeviceState *dev, Error **errp) > +{ > + return; > +} > + > +void acpi_cpu_unplug_request_cb(HotplugHandler *hotplug_dev, > + CPUHotplugState *cpu_st, > + DeviceState *dev, Error **errp) > +{ > + return; > +} > diff --git a/hw/acpi/acpi-mem-hotplug-stub.c b/hw/acpi/acpi-mem-hotplug-stub.c > new file mode 100644 > index 0000000000..73a076a265 > --- /dev/null > +++ b/hw/acpi/acpi-mem-hotplug-stub.c > @@ -0,0 +1,35 @@ > +#include "qemu/osdep.h" > +#include "hw/acpi/memory_hotplug.h" > +#include "migration/vmstate.h" > + > +const VMStateDescription vmstate_memory_hotplug; > + > +void acpi_memory_hotplug_init(MemoryRegion *as, Object *owner, > + MemHotplugState *state, hwaddr io_base) > +{ > + return; > +} > + > +void acpi_memory_ospm_status(MemHotplugState *mem_st, ACPIOSTInfoList > ***list) > +{ > + return; > +} > + > +void acpi_memory_plug_cb(HotplugHandler *hotplug_dev, MemHotplugState > *mem_st, > + DeviceState *dev, Error **errp) > +{ > + return; > +} > + > +void acpi_memory_unplug_cb(MemHotplugState *mem_st, > + DeviceState *dev, Error **errp) > +{ > + return; > +} > + > +void acpi_memory_unplug_request_cb(HotplugHandler *hotplug_dev, > + MemHotplugState *mem_st, > + DeviceState *dev, Error **errp) > +{ > + return; > +} > diff --git a/hw/acpi/acpi-nvdimm-stub.c b/hw/acpi/acpi-nvdimm-stub.c > new file mode 100644 > index 0000000000..8baff9be6f > --- /dev/null > +++ b/hw/acpi/acpi-nvdimm-stub.c > @@ -0,0 +1,8 @@ > +#include "qemu/osdep.h" > +#include "hw/mem/nvdimm.h" > +#include "hw/hotplug.h" > + > +void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev) > +{ > + return; > +} > diff --git a/hw/acpi/acpi-pci-hotplug-stub.c b/hw/acpi/acpi-pci-hotplug-stub.c > new file mode 100644 > index 0000000000..734e4c5986 > --- /dev/null > +++ b/hw/acpi/acpi-pci-hotplug-stub.c > @@ -0,0 +1,47 @@ > +#include "qemu/osdep.h" > +#include "hw/acpi/pcihp.h" > +#include "migration/vmstate.h" > + > +const VMStateDescription vmstate_acpi_pcihp_pci_status; > + > +void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, > + MemoryRegion *address_space_io, bool bridges_enabled, > + uint16_t io_base) > +{ > + return; > +} > + > +void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState > *s, > + DeviceState *dev, Error **errp) > +{ > + return; > +} > + > +void acpi_pcihp_device_pre_plug_cb(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp) > +{ > + return; > +} > + > +void acpi_pcihp_device_unplug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState > *s, > + DeviceState *dev, Error **errp) > +{ > + return; > +} > + > +void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev, > + AcpiPciHpState *s, DeviceState *dev, > + Error **errp) > +{ > + return; > +} > + > +void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off) > +{ > + return; > +} > + > +bool vmstate_acpi_pcihp_use_acpi_index(void *opaque, int version_id) > +{ > + return false; > +} > diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build > index 29f804d13e..7d8c0eb43e 100644 > --- a/hw/acpi/meson.build > +++ b/hw/acpi/meson.build > @@ -6,16 +6,20 @@ acpi_ss.add(files( > 'core.c', > 'utils.c', > )) > -acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu.c')) > -acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu_hotplug.c')) > +acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu.c', > 'cpu_hotplug.c')) > +acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_false: > files('acpi-cpu-hotplug-stub.c')) > acpi_ss.add(when: 'CONFIG_ACPI_MEMORY_HOTPLUG', if_true: > files('memory_hotplug.c')) > +acpi_ss.add(when: 'CONFIG_ACPI_MEMORY_HOTPLUG', if_false: > files('acpi-mem-hotplug-stub.c')) > acpi_ss.add(when: 'CONFIG_ACPI_NVDIMM', if_true: files('nvdimm.c')) > +acpi_ss.add(when: 'CONFIG_ACPI_NVDIMM', if_false: > files('acpi-nvdimm-stub.c')) > acpi_ss.add(when: 'CONFIG_ACPI_PCI', if_true: files('pci.c')) > acpi_ss.add(when: 'CONFIG_ACPI_VMGENID', if_true: files('vmgenid.c')) > acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: > files('generic_event_device.c')) > acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c')) > acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'), if_false: > files('ghes-stub.c')) > -acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('piix4.c', 'pcihp.c')) > +acpi_ss.add(when: 'CONFIG_ACPI_PIIX4', if_true: files('piix4.c')) > +acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_true: files('pcihp.c')) > +acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_false: > files('acpi-pci-hotplug-stub.c')) > acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c')) > acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: > files('ipmi-stub.c')) > acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c')) > @@ -23,4 +27,6 @@ acpi_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c')) > softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', > 'aml-build-stub.c', 'ghes-stub.c')) > softmmu_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss) > softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', > 'aml-build-stub.c', > - 'acpi-x86-stub.c', > 'ipmi-stub.c', 'ghes-stub.c')) > + 'acpi-x86-stub.c', > 'ipmi-stub.c', 'ghes-stub.c', > + 'acpi-mem-hotplug-stub.c', > 'acpi-cpu-hotplug-stub.c', > + 'acpi-pci-hotplug-stub.c', > 'acpi-nvdimm-stub.c')) > -- > 2.25.1 > >
