[PATCH] ARM64/irqchip: Make ACPI_IORT depend on PCI again

[PATCH] ARM64/irqchip: Make ACPI_IORT depend on PCI again

[Sasha Levin]

ACPI_IORT lost it's explicit dependency on PCI in c6bb8f89fa6df
("ARM64/irqchip: Update ACPI_IORT symbol selection logic") where the
author has relied on the general dependency of ACPI on PCI.

However, that dependency was finally removed in 5d32a66541c4 ("PCI/ACPI:
Allow ACPI to be built without CONFIG_PCI set") and now ACPI_IORT breaks
when we try and build it without PCI support.

This patch brings back the explicit dependency of ACPI_IORT on PCI.

Fixes: 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
Cc: stable@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 arch/arm64/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index a36ff61321ce..d6d93027196b 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -4,7 +4,7 @@ config ARM64
 	select ACPI_CCA_REQUIRED if ACPI
 	select ACPI_GENERIC_GSI if ACPI
 	select ACPI_GTDT if ACPI
-	select ACPI_IORT if ACPI
+	select ACPI_IORT if (ACPI && PCI)
 	select ACPI_REDUCED_HARDWARE_ONLY if ACPI
 	select ACPI_MCFG if (ACPI && PCI)
 	select ACPI_SPCR_TABLE if ACPI
-- 
2.20.1

Re: [PATCH] ARM64/irqchip: Make ACPI_IORT depend on PCI again

[Sinan Kaya]

On 7/16/2019 12:04 AM, Sasha Levin wrote:
> ACPI_IORT lost it's explicit dependency on PCI in c6bb8f89fa6df
> ("ARM64/irqchip: Update ACPI_IORT symbol selection logic") where the
> author has relied on the general dependency of ACPI on PCI.
> 
> However, that dependency was finally removed in 5d32a66541c4 ("PCI/ACPI:
> Allow ACPI to be built without CONFIG_PCI set") and now ACPI_IORT breaks
> when we try and build it without PCI support.
> 
> This patch brings back the explicit dependency of ACPI_IORT on PCI.
> 
> Fixes: 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
> Cc: stable@kernel.org
> Signed-off-by: Sasha Levin <sashal@kernel.org>

Do you have more detail on what really is broken without this patch?

It should be possible to build IORT table without PCI.

Re: [PATCH] ARM64/irqchip: Make ACPI_IORT depend on PCI again

[Sasha Levin]

On Tue, Jul 16, 2019 at 12:13:23AM -0400, Sinan Kaya wrote:
>On 7/16/2019 12:04 AM, Sasha Levin wrote:
>> ACPI_IORT lost it's explicit dependency on PCI in c6bb8f89fa6df
>> ("ARM64/irqchip: Update ACPI_IORT symbol selection logic") where the
>> author has relied on the general dependency of ACPI on PCI.
>>
>> However, that dependency was finally removed in 5d32a66541c4 ("PCI/ACPI:
>> Allow ACPI to be built without CONFIG_PCI set") and now ACPI_IORT breaks
>> when we try and build it without PCI support.
>>
>> This patch brings back the explicit dependency of ACPI_IORT on PCI.
>>
>> Fixes: 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
>> Cc: stable@kernel.org
>> Signed-off-by: Sasha Levin <sashal@kernel.org>
>
>Do you have more detail on what really is broken without this patch?
>
>It should be possible to build IORT table without PCI.

For the record, the errors look like this:

	drivers/acpi/arm64/iort.o: In function `acpi_iort_init':
	iort.c:(.init.text+0x47c): undefined reference to `pci_request_acs'

Sinan pointed me to an earlier patch he wrote that would fix it
(https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/acpi/arm64/iort.c?id=43554cebba50e709b9207c55ceca6bc281748586).

Please disregard this patch.

--
Thanks,
Sasha