diff mbox series

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

Message ID 20221216130355.41667-4-shentey@gmail.com (mailing list archive)
State New, archived
Headers show
Series Clean up dependencies of ACPI controllers | expand

Commit Message

Bernhard Beschow Dec. 16, 2022, 1:03 p.m. UTC
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(-)

Comments

BALATON Zoltan Dec. 16, 2022, 2:44 p.m. UTC | #1
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
>
Bernhard Beschow Dec. 16, 2022, 3:10 p.m. UTC | #2
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
>>
diff mbox series

Patch

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