PCI: apple: Fix dependency on 16kB pages
Subsystems (2)
PATCH 1/1 PCI: apple: Fix dependency on 16kB pages
While d3e5bab923d3 consolidated the various definitions for page sizes, it ended up breaking the Apple PCIe driver, which still depends on ARM64_PAGE_SHIFT. Switch over to HAVE_PAGE_SIZE_16KB to make the driver selectable again.
--- drivers/pci/controller/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/Kconfig +1 -1
@@ -39,7 +39,7 @@ config PCIE_APPLE depends on ARCH_APPLE || COMPILE_TEST depends on OF depends on PCI_MSI - depends on ARM64_PAGE_SHIFT = 14 || COMPILE_TEST + depends on HAVE_PAGE_SIZE_16KB || COMPILE_TEST select PCI_HOST_COMMON help Say Y here if you want to enable PCIe controller support on Apple
Signature · 1 line
2.39.2
Quoted 5 lines · Marc Zyngier
While
d3e5bab923d3consolidated the various definitions for page sizes, it ended up breaking the Apple PCIe driver, which still depends onARM64_PAGE_SHIFT. Switch over toHAVE_PAGE_SIZE_16KBto make the driver selectable again.
Quoted 8 lines
Cc Arnd Bergmann <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc "Krzysztof Wilczyński" <[email protected]>Cc Rob Herring <[email protected]>Cc Bjorn Helgaas <[email protected]>Fixes d3e5bab923d3 ("arch: simplify architecture specific page sizeconfiguration")
Signed-off-by Marc Zyngier <[email protected]>
The dependency only exists in the asahi kernel with commit db5709e83c11 ("PCI: apple: Add depends on ARM64_PAGE_SHIFT = 14") and is not present upstream.
Arnd
Quoted 16 lines · Arnd Bergmann
Quoted 5 lines · Marc Zyngier
While
d3e5bab923d3consolidated the various definitions for page sizes, it ended up breaking the Apple PCIe driver, which still depends onARM64_PAGE_SHIFT. Switch over toHAVE_PAGE_SIZE_16KBto make the driver selectable again.Quoted 8 lines
Cc Arnd Bergmann <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc "Krzysztof Wilczyński" <[email protected]>Cc Rob Herring <[email protected]>Cc Bjorn Helgaas <[email protected]>Fixes d3e5bab923d3 ("arch: simplify architecture specific page sizeconfiguration")
Signed-off-by Marc Zyngier <[email protected]>
Quoted 3 lines
The dependency only exists in the asahi kernel with commit
db5709e83c11("PCI: apple: Add depends onARM64_PAGE_SHIFT= 14") and is not present upstream.
You are absolutely right, and I should have checked where this dependency was coming from.
Apologies for the noise.
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.