[PATCH 0/5] Clean up dependencies of ACPI controllers

[PATCH 0/5] Clean up dependencies of ACPI controllers

[Bernhard Beschow]

This small series establishes consistency between ICH9, PIIX4 and VT82C686 ACPI
controllers to 1/ depend on ACPI and 2/ to select ACPI_SMBUS and APM since the
latter are provided by the device models.

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

Bernhard Beschow (5):
  hw/acpi/Kconfig: Add missing dependencies to ACPI_PIIX4
  hw/acpi/Kconfig: Rename ACPI_X86_ICH to ACPI_ICH9
  hw/acpi/Kconfig: Add missing dependencies to ACPI_ICH9
  hw/isa/Kconfig: Add missing dependency to VT82C686
  hw/ppc/Kconfig: Remove unused dependencies from PEGASOS2

 configs/devices/mips-softmmu/common.mak | 2 --
 hw/acpi/Kconfig                         | 6 +++++-
 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, 10 insertions(+), 11 deletions(-)

-- 
2.38.1

[PATCH 1/5] 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.

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

diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak
index 416161f833..3011304443 100644
--- a/configs/devices/mips-softmmu/common.mak
+++ b/configs/devices/mips-softmmu/common.mak
@@ -19,7 +19,6 @@ 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 +31,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/acpi/Kconfig b/hw/acpi/Kconfig
index 3703aca212..9504cbad2f 100644
--- a/hw/acpi/Kconfig
+++ b/hw/acpi/Kconfig
@@ -30,6 +30,8 @@ config ACPI_NVDIMM
 
 config ACPI_PIIX4
     bool
+    select ACPI_SMBUS
+    select APM
     depends on ACPI
 
 config ACPI_PCIHP
diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index d22ac4a4b9..2fdefd7458 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -62,7 +62,6 @@ config PC_ACPI
     select ACPI_VIOT
     select SMBUS_EEPROM
     select PFLASH_CFI01
-    depends on ACPI_SMBUS
 
 config I440FX
     bool
@@ -71,7 +70,6 @@ config I440FX
     imply VMMOUSE
     select PC_PCI
     select PC_ACPI
-    select ACPI_SMBUS
     select PCI_I440FX
     select PIIX3
     select IDE_PIIX
-- 
2.38.1

[PATCH 2/5] 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>
---
 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 9504cbad2f..ec16dd20e6 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.38.1

[PATCH 3/5] 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>
---
 hw/acpi/Kconfig | 2 ++
 hw/i386/Kconfig | 1 -
 hw/isa/Kconfig  | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
index ec16dd20e6..5a678b07c7 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/i386/Kconfig b/hw/i386/Kconfig
index 2fdefd7458..4b4b5265bb 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
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.38.1

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

[Bernhard Beschow]

Both ACPI_PIIX4 (directly) and ACPI_ICH9 (indirectly) require ACPI to be
selected. Require it for VT82C686's ACPI controller too for consistency.

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..bc2e3ecf02 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -63,6 +63,7 @@ config VT82C686
     select IDE_VIA
     select MC146818RTC
     select PARALLEL
+    depends on ACPI
 
 config SMC37C669
     bool
-- 
2.38.1

[PATCH 5/5] 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_PIIX4
- CONFIG_ACPI_X86
- CONFIG_MEM_DEVICE

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

diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index b8d2522f45..0ab77177a8 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -77,7 +77,7 @@ config PEGASOS2
     select SMBUS_EEPROM
     select VOF
 # This should come with VT82C686
-    select ACPI_X86
+    select ACPI
 
 config PREP
     bool
-- 
2.38.1

Re: [PATCH 2/5] hw/acpi/Kconfig: Rename ACPI_X86_ICH to ACPI_ICH9

[Philippe Mathieu-Daudé]

On 8/12/22 00:12, Bernhard Beschow wrote:
> 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>
> ---
>   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(-)

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

Re: [PATCH 3/5] hw/acpi/Kconfig: Add missing dependencies to ACPI_ICH9

[Philippe Mathieu-Daudé]

On 8/12/22 00:12, Bernhard Beschow wrote:
> 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>
> ---
>   hw/acpi/Kconfig | 2 ++
>   hw/i386/Kconfig | 1 -
>   hw/isa/Kconfig  | 1 -
>   3 files changed, 2 insertions(+), 2 deletions(-)

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

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

[Philippe Mathieu-Daudé]

On 8/12/22 00:12, Bernhard Beschow wrote:
> Both ACPI_PIIX4 (directly) and ACPI_ICH9 (indirectly) require ACPI to be
> selected. Require it for VT82C686's ACPI controller too for consistency.
> 
> 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..bc2e3ecf02 100644
> --- a/hw/isa/Kconfig
> +++ b/hw/isa/Kconfig
> @@ -63,6 +63,7 @@ config VT82C686
>       select IDE_VIA
>       select MC146818RTC
>       select PARALLEL
> +    depends on ACPI

The VT82C686 *provides* the ACPI interface, so here we want to "select"
ACPI (if we need a VT82C686, then ACPI will be available).

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

[Philippe Mathieu-Daudé]

On 8/12/22 00:12, 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_PIIX4
> - CONFIG_ACPI_X86
> - CONFIG_MEM_DEVICE
> 
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/ppc/Kconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
> index b8d2522f45..0ab77177a8 100644
> --- a/hw/ppc/Kconfig
> +++ b/hw/ppc/Kconfig
> @@ -77,7 +77,7 @@ config PEGASOS2
>       select SMBUS_EEPROM
>       select VOF
>   # This should come with VT82C686
> -    select ACPI_X86
> +    select ACPI

With the previous patch (fixed) you can remove both the comment and
the "select" line.

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

[Bernhard Beschow]

Am 12. Dezember 2022 10:37:12 UTC schrieb "Philippe Mathieu-Daudé" <philmd@linaro.org>:
>On 8/12/22 00:12, Bernhard Beschow wrote:
>> Both ACPI_PIIX4 (directly) and ACPI_ICH9 (indirectly) require ACPI to be
>> selected. Require it for VT82C686's ACPI controller too for consistency.
>> 
>> 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..bc2e3ecf02 100644
>> --- a/hw/isa/Kconfig
>> +++ b/hw/isa/Kconfig
>> @@ -63,6 +63,7 @@ config VT82C686
>>       select IDE_VIA
>>       select MC146818RTC
>>       select PARALLEL
>> +    depends on ACPI
>
>The VT82C686 *provides* the ACPI interface, so here we want to "select"
>ACPI (if we need a VT82C686, then ACPI will be available).

I agree. I'd then also adapt PIIX4 and LPC.

Best regards,
Bernhard