Skip to contentSkip to conversation

arm64: Set ARCH_NR_GPIO to 2048 for ARCH_APPLE

PATCH Applied Hector Martin 3 participants 3 messages May 2, 2022 – May 4, 2022 arm64

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: Set ARCH_NR_GPIO to 2048 for ARCH_APPLE

We're already running into the 512 GPIO limit on t600[01] depending on how many SMC GPIOs we allocate, and a 2-die version could double that. Let's make it 2K to be safe for now.

---
 arch/arm64/Kconfig | 12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/arm64/Kconfig +12 -0
index 20ea89d9ac2f..b0da0a28aa2d 100644
@@ -2050,6 +2050,18 @@ config STACKPROTECTOR_PER_TASK
 	def_bool y
 	depends on STACKPROTECTOR && CC_HAVE_STACKPROTECTOR_SYSREG
 
+# The GPIO number here must be sorted by descending number. In case of
+# a multiplatform kernel, we just want the highest value required by the
+# selected platforms.
+config ARCH_NR_GPIO
+        int
+        default 2048 if ARCH_APPLE
+        default 0
+        help
+          Maximum number of GPIOs in the system.
+
+          If unsure, leave the default value.
+
 endmenu
 
 menu "Boot options"
Signature · 1 line
2.35.1
Acked-by on v1 1/1
#1 lore raw
Quoted 23 lines · Hector Martin

We're already running into the 512 GPIO limit on t600[01] depending on how many SMC GPIOs we allocate, and a 2-die version could double that. Let's make it 2K to be safe for now.

---
 arch/arm64/Kconfig | 12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/arm64/Kconfig +5 -0
index 20ea89d9ac2f..b0da0a28aa2d 100644
@@ -2050,6 +2050,18 @@ config STACKPROTECTOR_PER_TASK
 	def_bool y
 	depends on STACKPROTECTOR && CC_HAVE_STACKPROTECTOR_SYSREG
 
+# The GPIO number here must be sorted by descending number. In case of
+# a multiplatform kernel, we just want the highest value required by the
+# selected platforms.
+config ARCH_NR_GPIO
+        int

arch/arm64/Kconfig config STACKPROTECTOR_PER_TASK · line 2067

Quoted 10 lines
arch/arm64/Kconfig +7 -0
+        default 2048 if ARCH_APPLE
+        default 0
+        help
+          Maximum number of GPIOs in the system.
+
+          If unsure, leave the default value.
+
 endmenu
 
 menu "Boot options"

It may be worth pointing out that this doesn't seem to result in any extra memory allocation, as this only controls the GPIO numbering.

My only worry is that since the allocation is done top-down, the new limit is going to have a userspace visible impacts (i.e. anything in /sys/class/gpiochip* will get renumbered). I don't think anyone should rely on this anyway (they should use the canonical bus path), but this is worth pointing out as a potential side effect.

Otherwise,

	M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
maintainer Applied
#2 lore raw
In reply to Hector Martin
Quoted 5 lines · Hector Martin

We're already running into the 512 GPIO limit on t600[01] depending on how many SMC GPIOs we allocate, and a 2-die version could double that. Let's make it 2K to be safe for now.

Applied to arm64 (for-next/misc), thanks!

[1/1] arm64: Set ARCH_NR_GPIO to 2048 for ARCH_APPLE

      https://git.kernel.org/arm64/c/5028fbad2d57
Signature · 1 line
Catalin