[PATCH v2 0/7] Clean up dependencies of ACPI controllers

[PATCH v2 0/7] Clean up dependencies of ACPI controllers

[Bernhard Beschow]

This small series establishes consistency between ICH9, PIIX4 and VT82C686 ACPI
controllers to select ACPI, ACPI_SMBUS and APM since they are provided by the
device models.

Due to the PIIX4 PM cleanup PEGASOS2's dependency can be reduced to just ACPI,
eliminating 9 dependencies from the softmmu-ppc build.

v2:
- Turn "depends on ACPI" into "select ACPI" (Phil)
- Remove "select ACPI" from PEGASOS2 (Phil)
- Move already reviewed patches to bottom
- Split some patches into "add missing dependencies" and "remove redundant
  dependencies" for ease of review

Bernhard Beschow (7):
  hw/acpi/Kconfig: Rename ACPI_X86_ICH to ACPI_ICH9
  hw/acpi/Kconfig: Add missing dependencies to ACPI_ICH9
  hw/acpi/Kconfig: Do not needlessly build TYPE_PIIX4_PM in non-PC/Malta
    machines
  hw/acpi/Kconfig: Add missing dependencies to ACPI_PIIX4
  hw/isa/Kconfig: Add missing dependency to VT82C686
  i386, mips: Resolve redundant ACPI and APM dependencies
  hw/ppc/Kconfig: Remove unused dependencies from PEGASOS2

 configs/devices/mips-softmmu/common.mak | 3 ---
 hw/acpi/Kconfig                         | 9 ++++++---
 hw/acpi/meson.build                     | 2 +-
 hw/i2c/meson.build                      | 2 +-
 hw/i386/Kconfig                         | 3 +--
 hw/isa/Kconfig                          | 4 ++--
 hw/ppc/Kconfig                          | 2 --
 7 files changed, 11 insertions(+), 14 deletions(-)

-- 
2.39.0

[PATCH v2 1/7] hw/acpi/Kconfig: Rename ACPI_X86_ICH to ACPI_ICH9

[Bernhard Beschow]

Although the ICH9 ACPI controller may currently be tied to x86 it
doesn't have to. Furthermore, the source files this configuration switch
manages contain a '9', so this name fits more.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/acpi/Kconfig     | 2 +-
 hw/acpi/meson.build | 2 +-
 hw/i2c/meson.build  | 2 +-
 hw/isa/Kconfig      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
index 3703aca212..14694c75b4 100644
--- a/hw/acpi/Kconfig
+++ b/hw/acpi/Kconfig
@@ -13,7 +13,7 @@ config ACPI_X86
     select ACPI_PCIHP
     select ACPI_ERST
 
-config ACPI_X86_ICH
+config ACPI_ICH9
     bool
     select ACPI_X86
 
diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
index f8c820ca94..cfae2f58f6 100644
--- a/hw/acpi/meson.build
+++ b/hw/acpi/meson.build
@@ -22,7 +22,7 @@ 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_VIOT', if_true: files('viot.c'))
-acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_ICH9', if_true: files('ich9.c', 'tco.c'))
 acpi_ss.add(when: 'CONFIG_ACPI_ERST', if_true: files('erst.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'))
diff --git a/hw/i2c/meson.build b/hw/i2c/meson.build
index d3df273251..6e7340aaac 100644
--- a/hw/i2c/meson.build
+++ b/hw/i2c/meson.build
@@ -2,7 +2,7 @@ i2c_ss = ss.source_set()
 i2c_ss.add(when: 'CONFIG_I2C', if_true: files('core.c'))
 i2c_ss.add(when: 'CONFIG_SMBUS', if_true: files('smbus_slave.c', 'smbus_master.c'))
 i2c_ss.add(when: 'CONFIG_ACPI_SMBUS', if_true: files('pm_smbus.c'))
-i2c_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('smbus_ich9.c'))
+i2c_ss.add(when: 'CONFIG_ACPI_ICH9', if_true: files('smbus_ich9.c'))
 i2c_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_i2c.c'))
 i2c_ss.add(when: 'CONFIG_BITBANG_I2C', if_true: files('bitbang_i2c.c'))
 i2c_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_i2c.c'))
diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index 18b5c6bf3f..01f330d941 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -78,4 +78,4 @@ config LPC_ICH9
     select I8257
     select ISA_BUS
     select ACPI_SMBUS
-    select ACPI_X86_ICH
+    select ACPI_ICH9
-- 
2.39.0

[PATCH v2 2/7] hw/acpi/Kconfig: Add missing dependencies to ACPI_ICH9

[Bernhard Beschow]

ich9_lpc_realize() uses apm_init() and ich9_smbus_realize() uses
pm_smbus_init(), so both APM and ACPI_SMBUS are provided by the device
models managed by ACPI_ICH9.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/acpi/Kconfig | 2 ++
 hw/isa/Kconfig  | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
index 14694c75b4..704cbc6236 100644
--- a/hw/acpi/Kconfig
+++ b/hw/acpi/Kconfig
@@ -15,7 +15,9 @@ config ACPI_X86
 
 config ACPI_ICH9
     bool
+    select ACPI_SMBUS
     select ACPI_X86
+    select APM
 
 config ACPI_CPU_HOTPLUG
     bool
diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index 01f330d941..0a6a04947c 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -77,5 +77,4 @@ config LPC_ICH9
     # for ICH9.
     select I8257
     select ISA_BUS
-    select ACPI_SMBUS
     select ACPI_ICH9
-- 
2.39.0

[PATCH v2 3/7] hw/acpi/Kconfig: Do not needlessly build TYPE_PIIX4_PM in non-PC/Malta machines

[Bernhard Beschow]

TYPE_PIIX4_PM is only used in machines where PIIX chipsets are used
which is currently PC and Malta. There is no point building it for the
other ACPI_X86 machines.

Note that this also removes unneeded ACPI_PIIX4 from PEGASOS2.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 hw/acpi/Kconfig | 1 -
 hw/i386/Kconfig | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
index 704cbc6236..b7006e18c8 100644
--- a/hw/acpi/Kconfig
+++ b/hw/acpi/Kconfig
@@ -9,7 +9,6 @@ config ACPI_X86
     select ACPI_CPU_HOTPLUG
     select ACPI_MEMORY_HOTPLUG
     select ACPI_HMAT
-    select ACPI_PIIX4
     select ACPI_PCIHP
     select ACPI_ERST
 
diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index d22ac4a4b9..3a92566701 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -69,6 +69,7 @@ config I440FX
     imply E1000_PCI
     imply VMPORT
     imply VMMOUSE
+    select ACPI_PIIX4
     select PC_PCI
     select PC_ACPI
     select ACPI_SMBUS
-- 
2.39.0

[PATCH v2 4/7] hw/acpi/Kconfig: Add missing dependencies to ACPI_PIIX4

[Bernhard Beschow]

piix4_pm_realize() uses apm_init() and pm_smbus_init(), so both APM and
ACPI_SMBUS are provided by the device model managed by ACPI_PIIX4.

The ACPIREGS are also provided by ACPI_PIIX4, so needs to select ACPI.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 hw/acpi/Kconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
index b7006e18c8..1f7803fdab 100644
--- a/hw/acpi/Kconfig
+++ b/hw/acpi/Kconfig
@@ -31,7 +31,9 @@ config ACPI_NVDIMM
 
 config ACPI_PIIX4
     bool
-    depends on ACPI
+    select ACPI
+    select ACPI_SMBUS
+    select APM
 
 config ACPI_PCIHP
     bool
-- 
2.39.0

[PATCH v2 5/7] hw/isa/Kconfig: Add missing dependency to VT82C686

[Bernhard Beschow]

The ACPIREGS are provided by TYPE_VIA_PM, so needs to select ACPI.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 hw/isa/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index 0a6a04947c..0156a66889 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -52,6 +52,7 @@ config PIIX4
 config VT82C686
     bool
     select ISA_SUPERIO
+    select ACPI
     select ACPI_SMBUS
     select SERIAL_ISA
     select FDC_ISA
-- 
2.39.0

[PATCH v2 6/7] i386, mips: Resolve redundant ACPI and APM dependencies

[Bernhard Beschow]

Now that all ACPI controllers select the ACPI and APM dependencies
themselves, these explicit dependencies became redundant. Remove them.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 configs/devices/mips-softmmu/common.mak | 3 ---
 hw/i386/Kconfig                         | 2 --
 2 files changed, 5 deletions(-)

diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak
index 416161f833..88aff94625 100644
--- a/configs/devices/mips-softmmu/common.mak
+++ b/configs/devices/mips-softmmu/common.mak
@@ -17,9 +17,7 @@ CONFIG_I8254=y
 CONFIG_PCSPK=y
 CONFIG_PCKBD=y
 CONFIG_FDC=y
-CONFIG_ACPI=y
 CONFIG_ACPI_PIIX4=y
-CONFIG_APM=y
 CONFIG_I8257=y
 CONFIG_PIIX4=y
 CONFIG_IDE_ISA=y
@@ -32,6 +30,5 @@ CONFIG_MIPS_ITU=y
 CONFIG_MALTA=y
 CONFIG_PCNET_PCI=y
 CONFIG_MIPSSIM=y
-CONFIG_ACPI_SMBUS=y
 CONFIG_SMBUS_EEPROM=y
 CONFIG_TEST_DEVICES=y
diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index 3a92566701..c4fb5b49bd 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -51,7 +51,6 @@ config PC_PCI
     bool
     select APIC
     select IOAPIC
-    select APM
     select PC
 
 config PC_ACPI
@@ -72,7 +71,6 @@ config I440FX
     select ACPI_PIIX4
     select PC_PCI
     select PC_ACPI
-    select ACPI_SMBUS
     select PCI_I440FX
     select PIIX3
     select IDE_PIIX
-- 
2.39.0

[PATCH v2 7/7] hw/ppc/Kconfig: Remove unused dependencies from PEGASOS2

[Bernhard Beschow]

Removes the following dependencies from ppc-softmmu:
- CONFIG_ACPI_CPU_HOTPLUG
- CONFIG_ACPI_CXL
- CONFIG_ACPI_HMAT
- CONFIG_ACPI_MEMORY_HOTPLUG
- CONFIG_ACPI_NVDIMM
- CONFIG_ACPI_PCIHP
- CONFIG_ACPI_X86
- CONFIG_MEM_DEVICE

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 hw/ppc/Kconfig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index b8d2522f45..0087369f5b 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -76,8 +76,6 @@ config PEGASOS2
     select VT82C686
     select SMBUS_EEPROM
     select VOF
-# This should come with VT82C686
-    select ACPI_X86
 
 config PREP
     bool
-- 
2.39.0

Re: [PATCH v2 3/7] hw/acpi/Kconfig: Do not needlessly build TYPE_PIIX4_PM in non-PC/Malta machines

[BALATON Zoltan]

On Fri, 16 Dec 2022, Bernhard Beschow wrote:
> TYPE_PIIX4_PM is only used in machines where PIIX chipsets are used
> which is currently PC and Malta. There is no point building it for the
> other ACPI_X86 machines.
>
> Note that this also removes unneeded ACPI_PIIX4 from PEGASOS2.
>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>

Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>

Isn't 440fx using PIIX3 whereas Malta uses PIIX4? If so there may be still 
some inconsistency in the naming of this config option (should it be 
ACPI_PIIX maybe?) but it should not be needed for pegasos2 in any case.

Regards,
BALATON Zoltan

> ---
> hw/acpi/Kconfig | 1 -
> hw/i386/Kconfig | 1 +
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
> index 704cbc6236..b7006e18c8 100644
> --- a/hw/acpi/Kconfig
> +++ b/hw/acpi/Kconfig
> @@ -9,7 +9,6 @@ config ACPI_X86
>     select ACPI_CPU_HOTPLUG
>     select ACPI_MEMORY_HOTPLUG
>     select ACPI_HMAT
> -    select ACPI_PIIX4
>     select ACPI_PCIHP
>     select ACPI_ERST
>
> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
> index d22ac4a4b9..3a92566701 100644
> --- a/hw/i386/Kconfig
> +++ b/hw/i386/Kconfig
> @@ -69,6 +69,7 @@ config I440FX
>     imply E1000_PCI
>     imply VMPORT
>     imply VMMOUSE
> +    select ACPI_PIIX4
>     select PC_PCI
>     select PC_ACPI
>     select ACPI_SMBUS
>

Re: [PATCH v2 5/7] hw/isa/Kconfig: Add missing dependency to VT82C686

[BALATON Zoltan]

On Fri, 16 Dec 2022, Bernhard Beschow wrote:
> The ACPIREGS are provided by TYPE_VIA_PM, so needs to select ACPI.
>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>

Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>

> ---
> hw/isa/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
> index 0a6a04947c..0156a66889 100644
> --- a/hw/isa/Kconfig
> +++ b/hw/isa/Kconfig
> @@ -52,6 +52,7 @@ config PIIX4
> config VT82C686
>     bool
>     select ISA_SUPERIO
> +    select ACPI
>     select ACPI_SMBUS
>     select SERIAL_ISA
>     select FDC_ISA
>

Re: [PATCH v2 6/7] i386, mips: Resolve redundant ACPI and APM dependencies

[BALATON Zoltan]

On Fri, 16 Dec 2022, Bernhard Beschow wrote:
> Now that all ACPI controllers select the ACPI and APM dependencies
> themselves, these explicit dependencies became redundant. Remove them.
>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
> configs/devices/mips-softmmu/common.mak | 3 ---
> hw/i386/Kconfig                         | 2 --
> 2 files changed, 5 deletions(-)
>
> diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak
> index 416161f833..88aff94625 100644
> --- a/configs/devices/mips-softmmu/common.mak
> +++ b/configs/devices/mips-softmmu/common.mak
> @@ -17,9 +17,7 @@ CONFIG_I8254=y
> CONFIG_PCSPK=y
> CONFIG_PCKBD=y
> CONFIG_FDC=y
> -CONFIG_ACPI=y
> CONFIG_ACPI_PIIX4=y
> -CONFIG_APM=y
> CONFIG_I8257=y
> CONFIG_PIIX4=y
> CONFIG_IDE_ISA=y
> @@ -32,6 +30,5 @@ CONFIG_MIPS_ITU=y
> CONFIG_MALTA=y
> CONFIG_PCNET_PCI=y
> CONFIG_MIPSSIM=y
> -CONFIG_ACPI_SMBUS=y
> CONFIG_SMBUS_EEPROM=y
> CONFIG_TEST_DEVICES=y
> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
> index 3a92566701..c4fb5b49bd 100644
> --- a/hw/i386/Kconfig
> +++ b/hw/i386/Kconfig
> @@ -51,7 +51,6 @@ config PC_PCI
>     bool
>     select APIC
>     select IOAPIC
> -    select APM
>     select PC
>
> config PC_ACPI
> @@ -72,7 +71,6 @@ config I440FX
>     select ACPI_PIIX4
>     select PC_PCI
>     select PC_ACPI
> -    select ACPI_SMBUS
>     select PCI_I440FX
>     select PIIX3
>     select IDE_PIIX
>

Is select APM now redundant in VT82686 too?

Regards,
BALATON Zoltan

Re: [PATCH v2 7/7] hw/ppc/Kconfig: Remove unused dependencies from PEGASOS2

[BALATON Zoltan]

On Fri, 16 Dec 2022, Bernhard Beschow wrote:
> Removes the following dependencies from ppc-softmmu:
> - CONFIG_ACPI_CPU_HOTPLUG
> - CONFIG_ACPI_CXL
> - CONFIG_ACPI_HMAT
> - CONFIG_ACPI_MEMORY_HOTPLUG
> - CONFIG_ACPI_NVDIMM
> - CONFIG_ACPI_PCIHP
> - CONFIG_ACPI_X86
> - CONFIG_MEM_DEVICE
>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>

Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>

Thanks for sorting this out.

> ---
> hw/ppc/Kconfig | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
> index b8d2522f45..0087369f5b 100644
> --- a/hw/ppc/Kconfig
> +++ b/hw/ppc/Kconfig
> @@ -76,8 +76,6 @@ config PEGASOS2
>     select VT82C686
>     select SMBUS_EEPROM
>     select VOF
> -# This should come with VT82C686
> -    select ACPI_X86
>
> config PREP
>     bool
>

Re: [PATCH v2 3/7] hw/acpi/Kconfig: Do not needlessly build TYPE_PIIX4_PM in non-PC/Malta machines

[Bernhard Beschow]

Am 16. Dezember 2022 14:44:33 UTC schrieb BALATON Zoltan <balaton@eik.bme.hu>:
>On Fri, 16 Dec 2022, Bernhard Beschow wrote:
>> TYPE_PIIX4_PM is only used in machines where PIIX chipsets are used
>> which is currently PC and Malta. There is no point building it for the
>> other ACPI_X86 machines.
>> 
>> Note that this also removes unneeded ACPI_PIIX4 from PEGASOS2.
>> 
>> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
>
>Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
>
>Isn't 440fx using PIIX3 whereas Malta uses PIIX4?

Correct.

> If so there may be still some inconsistency in the naming of this config option (should it be ACPI_PIIX maybe?)

I440fx does indeed use the PIIX4 PM controller, often referred to as a "Frankenstein" device here on the list. That's why I'm currently consolidating the PIIX south bridges -- to make PIIX4 bridge usable in i440fx machine.

Best regards,
Bernhard

> but it should not be needed for pegasos2 in any case.
>
>Regards,
>BALATON Zoltan
>
>> ---
>> hw/acpi/Kconfig | 1 -
>> hw/i386/Kconfig | 1 +
>> 2 files changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
>> index 704cbc6236..b7006e18c8 100644
>> --- a/hw/acpi/Kconfig
>> +++ b/hw/acpi/Kconfig
>> @@ -9,7 +9,6 @@ config ACPI_X86
>>     select ACPI_CPU_HOTPLUG
>>     select ACPI_MEMORY_HOTPLUG
>>     select ACPI_HMAT
>> -    select ACPI_PIIX4
>>     select ACPI_PCIHP
>>     select ACPI_ERST
>> 
>> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
>> index d22ac4a4b9..3a92566701 100644
>> --- a/hw/i386/Kconfig
>> +++ b/hw/i386/Kconfig
>> @@ -69,6 +69,7 @@ config I440FX
>>     imply E1000_PCI
>>     imply VMPORT
>>     imply VMMOUSE
>> +    select ACPI_PIIX4
>>     select PC_PCI
>>     select PC_ACPI
>>     select ACPI_SMBUS
>> 

Re: [PATCH v2 6/7] i386, mips: Resolve redundant ACPI and APM dependencies

[Bernhard Beschow]

Am 16. Dezember 2022 14:48:05 UTC schrieb BALATON Zoltan <balaton@eik.bme.hu>:
>On Fri, 16 Dec 2022, Bernhard Beschow wrote:
>> Now that all ACPI controllers select the ACPI and APM dependencies
>> themselves, these explicit dependencies became redundant. Remove them.
>> 
>> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
>> ---
>> configs/devices/mips-softmmu/common.mak | 3 ---
>> hw/i386/Kconfig                         | 2 --
>> 2 files changed, 5 deletions(-)
>> 
>> diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak
>> index 416161f833..88aff94625 100644
>> --- a/configs/devices/mips-softmmu/common.mak
>> +++ b/configs/devices/mips-softmmu/common.mak
>> @@ -17,9 +17,7 @@ CONFIG_I8254=y
>> CONFIG_PCSPK=y
>> CONFIG_PCKBD=y
>> CONFIG_FDC=y
>> -CONFIG_ACPI=y
>> CONFIG_ACPI_PIIX4=y
>> -CONFIG_APM=y
>> CONFIG_I8257=y
>> CONFIG_PIIX4=y
>> CONFIG_IDE_ISA=y
>> @@ -32,6 +30,5 @@ CONFIG_MIPS_ITU=y
>> CONFIG_MALTA=y
>> CONFIG_PCNET_PCI=y
>> CONFIG_MIPSSIM=y
>> -CONFIG_ACPI_SMBUS=y
>> CONFIG_SMBUS_EEPROM=y
>> CONFIG_TEST_DEVICES=y
>> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
>> index 3a92566701..c4fb5b49bd 100644
>> --- a/hw/i386/Kconfig
>> +++ b/hw/i386/Kconfig
>> @@ -51,7 +51,6 @@ config PC_PCI
>>     bool
>>     select APIC
>>     select IOAPIC
>> -    select APM
>>     select PC
>> 
>> config PC_ACPI
>> @@ -72,7 +71,6 @@ config I440FX
>>     select ACPI_PIIX4
>>     select PC_PCI
>>     select PC_ACPI
>> -    select ACPI_SMBUS
>>     select PCI_I440FX
>>     select PIIX3
>>     select IDE_PIIX
>> 
>
>Is select APM now redundant in VT82686 too?

No it's not, quite the opposite indeed: APM is provided by the VT82686 south bridge, so it needs to select it. See also patches 2 and 4 of this series for futher explanation.

The idea of this patch is to remove the redundant selections from the boards.

Best regards,
Bernhard

>
>Regards,
>BALATON Zoltan

Re: [PATCH v2 0/7] Clean up dependencies of ACPI controllers

[Bernhard Beschow]

Am 16. Dezember 2022 13:03:48 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>This small series establishes consistency between ICH9, PIIX4 and VT82C686 ACPI
>
>controllers to select ACPI, ACPI_SMBUS and APM since they are provided by the
>
>device models.
>
>
>
>Due to the PIIX4 PM cleanup PEGASOS2's dependency can be reduced to just ACPI,
>
>eliminating 9 dependencies from the softmmu-ppc build.
>
>
>
>v2:
>
>- Turn "depends on ACPI" into "select ACPI" (Phil)
>
>- Remove "select ACPI" from PEGASOS2 (Phil)
>

Ping

Patches 4 & 6 still need review.

>- Move already reviewed patches to bottom
>
>- Split some patches into "add missing dependencies" and "remove redundant
>
>  dependencies" for ease of review
>
>
>
>Bernhard Beschow (7):
>
>  hw/acpi/Kconfig: Rename ACPI_X86_ICH to ACPI_ICH9
>
>  hw/acpi/Kconfig: Add missing dependencies to ACPI_ICH9
>
>  hw/acpi/Kconfig: Do not needlessly build TYPE_PIIX4_PM in non-PC/Malta
>
>    machines
>
>  hw/acpi/Kconfig: Add missing dependencies to ACPI_PIIX4
>
>  hw/isa/Kconfig: Add missing dependency to VT82C686
>
>  i386, mips: Resolve redundant ACPI and APM dependencies
>
>  hw/ppc/Kconfig: Remove unused dependencies from PEGASOS2
>
>
>
> configs/devices/mips-softmmu/common.mak | 3 ---
>
> hw/acpi/Kconfig                         | 9 ++++++---
>
> hw/acpi/meson.build                     | 2 +-
>
> hw/i2c/meson.build                      | 2 +-
>
> hw/i386/Kconfig                         | 3 +--
>
> hw/isa/Kconfig                          | 4 ++--
>
> hw/ppc/Kconfig                          | 2 --
>
> 7 files changed, 11 insertions(+), 14 deletions(-)
>
>
>
>-- >
>2.39.0
>
>
>

Re: [PATCH v2 4/7] hw/acpi/Kconfig: Add missing dependencies to ACPI_PIIX4

[Philippe Mathieu-Daudé]

On 16/12/22 14:03, Bernhard Beschow wrote:
> piix4_pm_realize() uses apm_init() and pm_smbus_init(), so both APM and
> ACPI_SMBUS are provided by the device model managed by ACPI_PIIX4.
> 
> The ACPIREGS are also provided by ACPI_PIIX4, so needs to select ACPI.
> 
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/acpi/Kconfig | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH v2 5/7] hw/isa/Kconfig: Add missing dependency to VT82C686

[Philippe Mathieu-Daudé]

On 16/12/22 14:03, Bernhard Beschow wrote:
> The ACPIREGS are provided by TYPE_VIA_PM, so needs to select ACPI.
> 
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/isa/Kconfig | 1 +
>   1 file changed, 1 insertion(+)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH v2 6/7] i386, mips: Resolve redundant ACPI and APM dependencies

[Philippe Mathieu-Daudé]

On 16/12/22 14:03, Bernhard Beschow wrote:
> Now that all ACPI controllers select the ACPI and APM dependencies
> themselves, these explicit dependencies became redundant. Remove them.
> 
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   configs/devices/mips-softmmu/common.mak | 3 ---
>   hw/i386/Kconfig                         | 2 --
>   2 files changed, 5 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH v2 7/7] hw/ppc/Kconfig: Remove unused dependencies from PEGASOS2

[Philippe Mathieu-Daudé]

On 16/12/22 14:03, Bernhard Beschow wrote:
> Removes the following dependencies from ppc-softmmu:
> - CONFIG_ACPI_CPU_HOTPLUG
> - CONFIG_ACPI_CXL
> - CONFIG_ACPI_HMAT
> - CONFIG_ACPI_MEMORY_HOTPLUG
> - CONFIG_ACPI_NVDIMM
> - CONFIG_ACPI_PCIHP
> - CONFIG_ACPI_X86
> - CONFIG_MEM_DEVICE
> 
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/ppc/Kconfig | 2 --
>   1 file changed, 2 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH v2 0/7] Clean up dependencies of ACPI controllers

[Bernhard Beschow]

Am 16. Dezember 2022 13:03:48 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>This small series establishes consistency between ICH9, PIIX4 and VT82C686 ACPI
>
>controllers to select ACPI, ACPI_SMBUS and APM since they are provided by the
>
>device models.
>
>
>
>Due to the PIIX4 PM cleanup PEGASOS2's dependency can be reduced to just ACPI,
>
>eliminating 9 dependencies from the softmmu-ppc build.
>

Ping

Looks like all patches are reviewed, i.e. ready to be queued.

Best regards,
Bernhard

>
>
>v2:
>
>- Turn "depends on ACPI" into "select ACPI" (Phil)
>
>- Remove "select ACPI" from PEGASOS2 (Phil)
>
>- Move already reviewed patches to bottom
>
>- Split some patches into "add missing dependencies" and "remove redundant
>
>  dependencies" for ease of review
>
>
>
>Bernhard Beschow (7):
>
>  hw/acpi/Kconfig: Rename ACPI_X86_ICH to ACPI_ICH9
>
>  hw/acpi/Kconfig: Add missing dependencies to ACPI_ICH9
>
>  hw/acpi/Kconfig: Do not needlessly build TYPE_PIIX4_PM in non-PC/Malta
>
>    machines
>
>  hw/acpi/Kconfig: Add missing dependencies to ACPI_PIIX4
>
>  hw/isa/Kconfig: Add missing dependency to VT82C686
>
>  i386, mips: Resolve redundant ACPI and APM dependencies
>
>  hw/ppc/Kconfig: Remove unused dependencies from PEGASOS2
>
>
>
> configs/devices/mips-softmmu/common.mak | 3 ---
>
> hw/acpi/Kconfig                         | 9 ++++++---
>
> hw/acpi/meson.build                     | 2 +-
>
> hw/i2c/meson.build                      | 2 +-
>
> hw/i386/Kconfig                         | 3 +--
>
> hw/isa/Kconfig                          | 4 ++--
>
> hw/ppc/Kconfig                          | 2 --
>
> 7 files changed, 11 insertions(+), 14 deletions(-)
>
>
>
>-- >
>2.39.0
>
>
>

Re: [PATCH v2 0/7] Clean up dependencies of ACPI controllers

[Michael S. Tsirkin]

On Wed, Dec 21, 2022 at 05:56:56PM +0000, Bernhard Beschow wrote:
> 
> 
> Am 16. Dezember 2022 13:03:48 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
> >This small series establishes consistency between ICH9, PIIX4 and VT82C686 ACPI
> >
> >controllers to select ACPI, ACPI_SMBUS and APM since they are provided by the
> >
> >device models.
> >
> >
> >
> >Due to the PIIX4 PM cleanup PEGASOS2's dependency can be reduced to just ACPI,
> >
> >eliminating 9 dependencies from the softmmu-ppc build.
> >
> 
> Ping
> 
> Looks like all patches are reviewed, i.e. ready to be queued.
> 
> Best regards,
> Bernhard


Sure, next pull.

> >
> >
> >v2:
> >
> >- Turn "depends on ACPI" into "select ACPI" (Phil)
> >
> >- Remove "select ACPI" from PEGASOS2 (Phil)
> >
> >- Move already reviewed patches to bottom
> >
> >- Split some patches into "add missing dependencies" and "remove redundant
> >
> >  dependencies" for ease of review
> >
> >
> >
> >Bernhard Beschow (7):
> >
> >  hw/acpi/Kconfig: Rename ACPI_X86_ICH to ACPI_ICH9
> >
> >  hw/acpi/Kconfig: Add missing dependencies to ACPI_ICH9
> >
> >  hw/acpi/Kconfig: Do not needlessly build TYPE_PIIX4_PM in non-PC/Malta
> >
> >    machines
> >
> >  hw/acpi/Kconfig: Add missing dependencies to ACPI_PIIX4
> >
> >  hw/isa/Kconfig: Add missing dependency to VT82C686
> >
> >  i386, mips: Resolve redundant ACPI and APM dependencies
> >
> >  hw/ppc/Kconfig: Remove unused dependencies from PEGASOS2
> >
> >
> >
> > configs/devices/mips-softmmu/common.mak | 3 ---
> >
> > hw/acpi/Kconfig                         | 9 ++++++---
> >
> > hw/acpi/meson.build                     | 2 +-
> >
> > hw/i2c/meson.build                      | 2 +-
> >
> > hw/i386/Kconfig                         | 3 +--
> >
> > hw/isa/Kconfig                          | 4 ++--
> >
> > hw/ppc/Kconfig                          | 2 --
> >
> > 7 files changed, 11 insertions(+), 14 deletions(-)
> >
> >
> >
> >-- >
> >2.39.0
> >
> >
> >