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.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
Cc: "Krzysztof Wilczyński" <kw@linux.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Fixes: d3e5bab923d3 ("arch: simplify architecture specific page size configuration")
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 drivers/pci/controller/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
index efb5043f106a..fbcf1ff522b8 100644
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@ -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
-- 
2.39.2

On Mon, Apr 1, 2024, at 14:19, Marc Zyngier wrote:
> 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.
>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
> Cc: "Krzysztof Wilczyński" <kw@linux.com>
> Cc: Rob Herring <robh@kernel.org>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Fixes: d3e5bab923d3 ("arch: simplify architecture specific page size 
> configuration")
> Signed-off-by: Marc Zyngier <maz@kernel.org>

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

On Mon, 01 Apr 2024 13:23:27 +0100,
"Arnd Bergmann" <arnd@arndb.de> wrote:
> 
> On Mon, Apr 1, 2024, at 14:19, Marc Zyngier wrote:
> > 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.
> >
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
> > Cc: "Krzysztof Wilczyński" <kw@linux.com>
> > Cc: Rob Herring <robh@kernel.org>
> > Cc: Bjorn Helgaas <bhelgaas@google.com>
> > Fixes: d3e5bab923d3 ("arch: simplify architecture specific page size 
> > configuration")
> > Signed-off-by: Marc Zyngier <maz@kernel.org>
> 
> 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.

You are absolutely right, and I should have checked where this
dependency was coming from.

Apologies for the noise.

	M.

-- 
Without deviation from the norm, progress is not possible.