From: Marc Zyngier <maz@kernel.org>
To: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: "Arnd Bergmann" <arnd@arndb.de>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Rob Herring" <robh@kernel.org>,
"Bjorn Helgaas" <bhelgaas@google.com>
Subject: [PATCH] PCI: apple: Fix dependency on 16kB pages
Date: Mon, 1 Apr 2024 13:19:33 +0100 [thread overview]
Message-ID: <20240401121933.600977-1-maz@kernel.org> (raw)
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
next reply other threads:[~2024-04-01 12:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-01 12:19 Marc Zyngier [this message]
2024-04-01 12:23 ` [PATCH] PCI: apple: Fix dependency on 16kB pages Arnd Bergmann
2024-04-01 12:29 ` Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240401121933.600977-1-maz@kernel.org \
--to=maz@kernel.org \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=kw@linux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox