| Message ID | 20230213173033.98762-13-shentey@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | ICH9 cleanup | expand |
On 13/2/23 18:30, Bernhard Beschow wrote: > ICH9 is a south bridge which doesn't necessarily depend on x86, so move > it into the southbridge folder, analoguous to PIIX. > > Signed-off-by: Bernhard Beschow <shentey@gmail.com> > --- > MAINTAINERS | 1 + > include/hw/{i386 => southbridge}/ich9.h | 6 +++--- > hw/acpi/ich9.c | 2 +- > hw/acpi/ich9_tco.c | 2 +- > hw/i2c/smbus_ich9.c | 2 +- > hw/i386/acpi-build.c | 2 +- > hw/i386/pc_q35.c | 2 +- > hw/isa/lpc_ich9.c | 2 +- > hw/pci-bridge/i82801b11.c | 2 +- > tests/qtest/tco-test.c | 2 +- > 10 files changed, 12 insertions(+), 11 deletions(-) > rename include/hw/{i386 => southbridge}/ich9.h (99%) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 13/2/23 18:30, Bernhard Beschow wrote: > ICH9 is a south bridge which doesn't necessarily depend on x86, so move > it into the southbridge folder, analoguous to PIIX. However it is still tied to it due to: hw/isa/lpc_ich9.c:315: cpu_interrupt(first_cpu, CPU_INTERRUPT_SMI); hw/isa/lpc_ich9.c:462: cpu_interrupt(cs, CPU_INTERRUPT_SMI); hw/isa/lpc_ich9.c:465: cpu_interrupt(current_cpu, CPU_INTERRUPT_SMI); target/i386/cpu.h:1145:#define CPU_INTERRUPT_SMI CPU_INTERRUPT_TGT_EXT_2 > Signed-off-by: Bernhard Beschow <shentey@gmail.com> > --- > MAINTAINERS | 1 + > include/hw/{i386 => southbridge}/ich9.h | 6 +++--- > hw/acpi/ich9.c | 2 +- > hw/acpi/ich9_tco.c | 2 +- > hw/i2c/smbus_ich9.c | 2 +- > hw/i386/acpi-build.c | 2 +- > hw/i386/pc_q35.c | 2 +- > hw/isa/lpc_ich9.c | 2 +- > hw/pci-bridge/i82801b11.c | 2 +- > tests/qtest/tco-test.c | 2 +- > 10 files changed, 12 insertions(+), 11 deletions(-) > rename include/hw/{i386 => southbridge}/ich9.h (99%)
On Mon, Feb 27, 2023 at 01:22:37PM +0100, Philippe Mathieu-Daudé wrote: > On 13/2/23 18:30, Bernhard Beschow wrote: > > ICH9 is a south bridge which doesn't necessarily depend on x86, so move > > it into the southbridge folder, analoguous to PIIX. > > However it is still tied to it due to: > > hw/isa/lpc_ich9.c:315: cpu_interrupt(first_cpu, CPU_INTERRUPT_SMI); > hw/isa/lpc_ich9.c:462: cpu_interrupt(cs, CPU_INTERRUPT_SMI); > hw/isa/lpc_ich9.c:465: cpu_interrupt(current_cpu, > CPU_INTERRUPT_SMI); > target/i386/cpu.h:1145:#define CPU_INTERRUPT_SMI CPU_INTERRUPT_TGT_EXT_2 I guess at least the commit log should be changed then. > > Signed-off-by: Bernhard Beschow <shentey@gmail.com> > > --- > > MAINTAINERS | 1 + > > include/hw/{i386 => southbridge}/ich9.h | 6 +++--- > > hw/acpi/ich9.c | 2 +- > > hw/acpi/ich9_tco.c | 2 +- > > hw/i2c/smbus_ich9.c | 2 +- > > hw/i386/acpi-build.c | 2 +- > > hw/i386/pc_q35.c | 2 +- > > hw/isa/lpc_ich9.c | 2 +- > > hw/pci-bridge/i82801b11.c | 2 +- > > tests/qtest/tco-test.c | 2 +- > > 10 files changed, 12 insertions(+), 11 deletions(-) > > rename include/hw/{i386 => southbridge}/ich9.h (99%)
diff --git a/MAINTAINERS b/MAINTAINERS index 20460ce254..eb9ee6178a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1675,6 +1675,7 @@ F: hw/i2c/smbus_ich9.c F: hw/acpi/piix4.c F: hw/acpi/ich9*.c F: include/hw/acpi/ich9*.h +F: include/hw/southbridge/ich9.h F: include/hw/southbridge/piix.h F: hw/misc/sga.c F: hw/isa/apm.c diff --git a/include/hw/i386/ich9.h b/include/hw/southbridge/ich9.h similarity index 99% rename from include/hw/i386/ich9.h rename to include/hw/southbridge/ich9.h index 3125863049..7004eecbf9 100644 --- a/include/hw/i386/ich9.h +++ b/include/hw/southbridge/ich9.h @@ -1,5 +1,5 @@ -#ifndef HW_ICH9_H -#define HW_ICH9_H +#ifndef HW_SOUTHBRIDGE_ICH9_H +#define HW_SOUTHBRIDGE_ICH9_H #include "hw/isa/apm.h" #include "hw/acpi/ich9.h" @@ -242,4 +242,4 @@ struct ICH9LPCState { #define ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT 1 #define ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT 2 -#endif /* HW_ICH9_H */ +#endif /* HW_SOUTHBRIDGE_ICH9_H */ diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 54bb3d83b3..d23bfcaa6b 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -36,7 +36,7 @@ #include "hw/acpi/acpi.h" #include "hw/acpi/ich9_tco.h" -#include "hw/i386/ich9.h" +#include "hw/southbridge/ich9.h" #include "hw/mem/pc-dimm.h" #include "hw/mem/nvdimm.h" diff --git a/hw/acpi/ich9_tco.c b/hw/acpi/ich9_tco.c index fbf97f81f4..1540f4fd46 100644 --- a/hw/acpi/ich9_tco.c +++ b/hw/acpi/ich9_tco.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "sysemu/watchdog.h" -#include "hw/i386/ich9.h" +#include "hw/southbridge/ich9.h" #include "migration/vmstate.h" #include "hw/acpi/ich9_tco.h" diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c index f0dd3cb147..18d40e93c1 100644 --- a/hw/i2c/smbus_ich9.c +++ b/hw/i2c/smbus_ich9.c @@ -27,7 +27,7 @@ #include "migration/vmstate.h" #include "qemu/module.h" -#include "hw/i386/ich9.h" +#include "hw/southbridge/ich9.h" #include "qom/object.h" #include "hw/acpi/acpi_aml_interface.h" diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 1bb73c3e9a..d27921fd8f 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -55,10 +55,10 @@ #include "hw/hyperv/vmbus-bridge.h" /* Supported chipsets: */ +#include "hw/southbridge/ich9.h" #include "hw/southbridge/piix.h" #include "hw/acpi/pcihp.h" #include "hw/i386/fw_cfg.h" -#include "hw/i386/ich9.h" #include "hw/i386/pc.h" #include "hw/pci/pci_bus.h" #include "hw/pci-host/i440fx.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index da2fa11b6f..93b34027a3 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -40,7 +40,6 @@ #include "hw/qdev-properties.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" -#include "hw/i386/ich9.h" #include "hw/i386/amd_iommu.h" #include "hw/i386/intel_iommu.h" #include "hw/display/ramfb.h" @@ -48,6 +47,7 @@ #include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/intc/ioapic.h" +#include "hw/southbridge/ich9.h" #include "hw/usb.h" #include "hw/usb/hcd-uhci.h" #include "qapi/error.h" diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index ce946760bb..96fd500502 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -40,7 +40,7 @@ #include "hw/irq.h" #include "hw/isa/apm.h" #include "hw/pci/pci.h" -#include "hw/i386/ich9.h" +#include "hw/southbridge/ich9.h" #include "hw/i386/pc.h" #include "hw/acpi/acpi.h" #include "hw/acpi/ich9.h" diff --git a/hw/pci-bridge/i82801b11.c b/hw/pci-bridge/i82801b11.c index f3b4a14611..0e83cd11b2 100644 --- a/hw/pci-bridge/i82801b11.c +++ b/hw/pci-bridge/i82801b11.c @@ -45,7 +45,7 @@ #include "hw/pci/pci_bridge.h" #include "migration/vmstate.h" #include "qemu/module.h" -#include "hw/i386/ich9.h" +#include "hw/southbridge/ich9.h" /*****************************************************************************/ /* ICH9 DMI-to-PCI bridge */ diff --git a/tests/qtest/tco-test.c b/tests/qtest/tco-test.c index d865e95dfc..0547d41173 100644 --- a/tests/qtest/tco-test.c +++ b/tests/qtest/tco-test.c @@ -14,7 +14,7 @@ #include "libqos/pci-pc.h" #include "qapi/qmp/qdict.h" #include "hw/pci/pci_regs.h" -#include "hw/i386/ich9.h" +#include "hw/southbridge/ich9.h" #include "hw/acpi/ich9.h" #include "hw/acpi/ich9_tco.h"
ICH9 is a south bridge which doesn't necessarily depend on x86, so move it into the southbridge folder, analoguous to PIIX. Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- MAINTAINERS | 1 + include/hw/{i386 => southbridge}/ich9.h | 6 +++--- hw/acpi/ich9.c | 2 +- hw/acpi/ich9_tco.c | 2 +- hw/i2c/smbus_ich9.c | 2 +- hw/i386/acpi-build.c | 2 +- hw/i386/pc_q35.c | 2 +- hw/isa/lpc_ich9.c | 2 +- hw/pci-bridge/i82801b11.c | 2 +- tests/qtest/tco-test.c | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) rename include/hw/{i386 => southbridge}/ich9.h (99%)