Re: [Qemu-devel] [PATCH 4/8] hw/isa/southbridge: Rename ACPI_X86_ICH to ACPI_ICH9

[Philippe Mathieu-Daudé]

On 3/19/19 3:28 PM, Igor Mammedov wrote:
> On Sun, 17 Mar 2019 01:22:55 +0100
> Philippe Mathieu-Daudé <address@hidden> wrote:
> 
>> The ICH9 chipset is a generic southbridge and can be used by
>> non-X86 hardware. Rename it to make this more obvious.
> Is it actually used by anything else in QEMU beside Q35 board?

Yes, the MIPS Boston board (hw/mips/boston.c:520):

    ahci =
pci_create_simple_multifunction(&PCI_BRIDGE(&pcie2->root)->sec_bus,
                                           PCI_DEVFN(0, 0),
                                           true, TYPE_ICH9_AHCI);

See:

commit df1d8a1f29f567567b9d20be685a4241282e7005
Author: Paul Burton <address@hidden>
Date:   Thu Sep 8 15:51:58 2016 +0100

 hw/mips: MIPS Boston board support

 Introduce support for emulating the MIPS Boston development board. The
 Boston board is built around an FPGA & 3 PCIe controllers, one of which
 is connected to an Intel EG20T Platform Controller Hub. It is used
 during the development & debug of new CPUs and the software intended to
 run on them, and is essentially the successor to the older MIPS Malta
 board.

 This patch does not implement the EG20T, instead connecting an already
 supported ICH-9 AHCI controller. Whilst this isn't accurate it's enough
 for typical stock Boston software (eg. Linux kernels) to work with hard
 disks given that both the ICH-9 & EG20T implement the AHCI
 specification.


>>
>> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
>> ---
>>  hw/acpi/Kconfig       | 2 +-
>>  hw/acpi/Makefile.objs | 2 +-
>>  hw/i2c/Makefile.objs  | 2 +-
>>  hw/isa/Kconfig        | 2 +-
>>  4 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
>> index eca3beed75..e24c895772 100644
>> --- a/hw/acpi/Kconfig
>> +++ b/hw/acpi/Kconfig
>> @@ -8,7 +8,7 @@ config ACPI_X86
>>      select ACPI_CPU_HOTPLUG
>>      select ACPI_MEMORY_HOTPLUG
>>  
>> -config ACPI_X86_ICH
>> +config ACPI_ICH9
>>      bool
>>      select ACPI_X86
>>  
>> diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
>> index c86edfbed9..dff94d35e7 100644
>> --- a/hw/acpi/Makefile.objs
>> +++ b/hw/acpi/Makefile.objs
>> @@ -1,5 +1,5 @@
>>  common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o
>> -common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o tco.o
>> +common-obj-$(CONFIG_ACPI_ICH9) += ich9.o tco.o
>>  common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o
>>  common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
>>  common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o
>> diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs
>> index a98c786918..b632461513 100644
>> --- a/hw/i2c/Makefile.objs
>> +++ b/hw/i2c/Makefile.objs
>> @@ -3,7 +3,7 @@ common-obj-$(CONFIG_SMBUS) += smbus_slave.o smbus_master.o
>>  common-obj-$(CONFIG_SMBUS_EEPROM) += smbus_eeprom.o
>>  common-obj-$(CONFIG_DDC) += i2c-ddc.o
>>  common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o
>> -common-obj-$(CONFIG_ACPI_X86_ICH) += smbus_ich9.o
>> +common-obj-$(CONFIG_ACPI_ICH9) += smbus_ich9.o
>>  common-obj-$(CONFIG_ACPI_SMBUS) += pm_smbus.o
>>  common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o
>>  common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o
>> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
>> index 57e09a0cb8..19101d349f 100644
>> --- a/hw/isa/Kconfig
>> +++ b/hw/isa/Kconfig
>> @@ -50,4 +50,4 @@ config LPC_ICH9
>>      # for ICH9.
>>      select ISA_BUS
>>      select ACPI_SMBUS
>> -    select ACPI_X86_ICH
>> +    select ACPI_ICH9
>