From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f195.google.com (mail-dy1-f195.google.com [74.125.82.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 007C3313551 for ; Sun, 10 May 2026 05:21:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778390501; cv=none; b=knPx9gDZmjg9AtuWR3hyzfwuX00fWLaxA9U605CvtpCBNRtvM/VzS9Uj8FLa8kwbB4+Izlz2YzgsFOykbfvgZTDTodnWb0i6G9eMuE3hN/MP+Zx/tBxX4MrOrX7GsN8fMHAdzbnbOd7VpLyBiJ77+LsZUpPJ1FH4RuZQqmCC7Xw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778390501; c=relaxed/simple; bh=iyfgSATq+jlurSkwX0XjsG0MidymjoDXh1Dg0XL0i60=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=AGwkXz1buJan7+WfUB8+vy8hXLJAWta440G4y7srjWFAOoz/1gvaw70umrX7cRNoyPYRWSh/TX4H1X/F0m2wBzYUWqlybHlnVyovplR1vFbacR9s77LKZGmWMbp+0yhBwwCh3p2wc9aAnCvNI14AISl4GTHnfOlqbj8y9j53tjY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=G5ByJJtU; arc=none smtp.client-ip=74.125.82.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="G5ByJJtU" Received: by mail-dy1-f195.google.com with SMTP id 5a478bee46e88-2ecf9e398f4so8768758eec.1 for ; Sat, 09 May 2026 22:21:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778390499; x=1778995299; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ByD/C9lLdqNb5sEC4Ll4SpfSx43c4fiEK3gBugZ/0MQ=; b=G5ByJJtU6fzeIpeX1Y3ul3tMQ7eM5e9YXANyFZy1bC91eqckFJD4ECzkulv9uz70/u /YieCODTTVFzDIyi6QRlrOHw1SYAnETGMBlWEcHy4DVOwoX0sQ3OqDPCjoEIliUHRQc/ LwKa2uI8KE+0TFnccN7x9nWPajI/yQUGtS8UKFbYGWq5PAD6NbjC658cwhkUsEZlIv3b 3EQQq+5PMQ3fiAci39RIjrSie+45kkpP9GAes0IdgNKShfmEitN1BmNtueptSJqzHLUi xRLMKMNaZnqn+eexOJq/vWKRwlwgv08xFUFaImRipI7vQyOnb4AZjcm6ztpaITpYOU69 JOmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778390499; x=1778995299; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ByD/C9lLdqNb5sEC4Ll4SpfSx43c4fiEK3gBugZ/0MQ=; b=rzzNRh+39iiiHVw+iBiBHxhjFiVB3fmorjBENsZHDiEpI7MxU278m3tIiC/EN1J77Q QqS7hSrv5eSCl0NIjtejHzxrDLgwSyHvsACxdFnLPQHRC9cGLkgWb9dyS/j3NRO7d4aX /C3kCrso5wsUsJ1v6zNk8pomht5wrf6AkcyjYzCDBX2cmHjpY6h9cQhhitqmlnFJOp2K 1vlJ0pSqlY2r6FX0uZqmrKFH6+JFsuDl6PaR967Gm+l9fteLaP6BkyYE3YjBTumd2oTz qozCd0TigytgqWNAsJUjPh8f8lOwkJPHDQTEO8xKOq/pDvver+/1n88sO7ihyLGCXYUJ w5ZA== X-Forwarded-Encrypted: i=1; AFNElJ/N7GYzdVhTIMVYUCKHyYs+Jf3HYDe4RkjYb2W64lTM8pAJgK26iNIVK+REjL85qUxiJO6Esmm0bcV7ziE=@vger.kernel.org X-Gm-Message-State: AOJu0YxP8omI/bpomNZwLCj7Q/GhWw1n+koTUNtcCZ8Eu0HvGjO0uG4z SlVnTlo3sI34v2AQxgaRaeUr1Jk4jO/iTBqP8Pn2trhR9azuMfqD/QnD X-Gm-Gg: Acq92OFu2EXSwiyshp1MySmRCN81HoHTeXJyd0rXTNqPY4ldMaIJwPH6Bkr4o7a1/M4 PhA9WUI3M6BJ0VkDnSvatJSDQNjXNeohwxkWp6ooJ9Mho4wBJg+I2rlWjISGrl4zVfsFBXXt+IH 2oCRD3fWxplORFDiJbMetycm+7iql+7G9l0sSKGvP+yQeBDZaTn+Yhic9rdswp6195bAFxobvXp bwpPmLzcAaSRt3405+5mjVqjNeLm5xVHIqsq6oN4HOXwg0FbsBhLIi66es58DMrHBDmgdU/hUl0 j3GgDaaQr30abZv4Tb7uiSj7sbyy2zS3H7WHCrkSepsqOP4pmat4NPMbsO2voh6pa8rM+Y3WlbP ZXUtPWgXmAK6xf8yf6i8YbOPnnJNwuBfdfQGH/8Vgw5eLoMJe7Si9TFf8DaalsJDMRosqvt+w+K R1KBz7/WZaeKsUwhcES81xZ4Lu79MkA7iVob22ncRxASth5rbFNDZqZed3vy4XQxV0aBr6Ynvh7 +qouEts5Wgfd+OyhPGQQWxHmzcJmFu4gKA0YoyIgU0GAg8gux6Zf+TfDO/lWqqqrxaAxdqbkwxv CdjTYPYxvL6PHrtPAw== X-Received: by 2002:a05:7301:7c12:b0:2d8:df01:d9f7 with SMTP id 5a478bee46e88-2f54b891fd0mr10659278eec.15.1778390498897; Sat, 09 May 2026 22:21:38 -0700 (PDT) Received: from ethan-latitude5420.. (host-127-24.cafrjco.fresno.ca.us.clients.pavlovmedia.net. [68.180.127.24]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2f888c469b6sm8749587eec.24.2026.05.09.22.21.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2026 22:21:38 -0700 (PDT) From: Ethan Nelson-Moore To: linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, linux-serial@vger.kernel.org Cc: Ethan Nelson-Moore , Russell King , Arnd Bergmann , Greg Kroah-Hartman , Dmitry Torokhov , Jiri Slaby , "Russell King (Oracle)" , Linus Walleij , Kees Cook , Nathan Chancellor , Sebastian Andrzej Siewior , Steven Rostedt , Thomas Weissschuh , Peter Zijlstra Subject: [PATCH] ARM: footbridge: convert to sparse IRQs Date: Sat, 9 May 2026 22:20:49 -0700 Message-ID: <20260510052107.555825-1-enelsonmoore@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To improve future maintainability, change the interrupt handling for mach-footbridge to use sparse IRQs. Since the number of possible interrupts is already fixed and relatively small, just make it use all legacy interrupts preallocated using the .nr_irqs field in the machine descriptor, rather than actually allocating domains on the fly. Many files had to be adjusted to include explicitly because it is no longer implicitly included with sparse IRQs. Description adapted from commit c78a41fc04f0 ("ARM: s3c24xx: convert to sparse-irq"). Signed-off-by: Ethan Nelson-Moore --- This commit depends on my previous submission "ARM: : fix build with sparse IRQs". arch/arm/Kconfig | 2 +- arch/arm/include/asm/irq.h | 4 +++- arch/arm/mach-footbridge/dc21285-timer.c | 2 +- arch/arm/mach-footbridge/dc21285.c | 2 +- arch/arm/mach-footbridge/ebsa285-pci.c | 2 +- arch/arm/mach-footbridge/ebsa285.c | 2 ++ arch/arm/mach-footbridge/include/mach/irqs.h | 4 +--- arch/arm/mach-footbridge/isa-irq.c | 2 +- arch/arm/mach-footbridge/isa-timer.c | 2 +- arch/arm/mach-footbridge/isa.c | 2 +- arch/arm/mach-footbridge/netwinder-hw.c | 2 ++ arch/arm/mach-footbridge/netwinder-pci.c | 2 +- drivers/char/nwbutton.c | 2 +- drivers/input/serio/i8042-io.h | 6 +++--- drivers/tty/serial/21285.c | 2 +- 15 files changed, 21 insertions(+), 17 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 09b2767fee0f..1155c78bb6aa 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -153,7 +153,7 @@ config ARM select PCI_SYSCALL if PCI select PERF_USE_VMALLOC select RTC_LIB - select SPARSE_IRQ if !ARCH_FOOTBRIDGE + select SPARSE_IRQ select SYS_SUPPORTS_APM_EMULATION select THREAD_INFO_IN_TASK select TIMER_OF if OF diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h index 26c1d2ced4ce..08589b88c3b9 100644 --- a/arch/arm/include/asm/irq.h +++ b/arch/arm/include/asm/irq.h @@ -10,7 +10,9 @@ #define NR_IRQS NR_IRQS_LEGACY #endif -#ifndef irq_canonicalize +#ifdef CONFIG_ARCH_FOOTBRIDGE +#define irq_canonicalize(i) (((i) == 2) ? 9 : i) +#else #define irq_canonicalize(i) (i) #endif diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c index 2908c9ef3c9b..7d7ad1c1ef3f 100644 --- a/arch/arm/mach-footbridge/dc21285-timer.c +++ b/arch/arm/mach-footbridge/dc21285-timer.c @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c index e1b336624883..ffdecfadc9e2 100644 --- a/arch/arm/mach-footbridge/dc21285.c +++ b/arch/arm/mach-footbridge/dc21285.c @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-footbridge/ebsa285-pci.c b/arch/arm/mach-footbridge/ebsa285-pci.c index c3f280d08fa7..d2168660dd01 100644 --- a/arch/arm/mach-footbridge/ebsa285-pci.c +++ b/arch/arm/mach-footbridge/ebsa285-pci.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c index 1cb7d674bc81..a820f7467468 100644 --- a/arch/arm/mach-footbridge/ebsa285.c +++ b/arch/arm/mach-footbridge/ebsa285.c @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -117,6 +118,7 @@ MACHINE_START(EBSA285, "EBSA285") .video_end = 0x000bffff, .map_io = footbridge_map_io, .init_early = footbridge_sched_clock, + .nr_irqs = FOOTBRIDGE_NR_IRQS, .init_irq = footbridge_init_irq, .init_time = footbridge_timer_init, .restart = footbridge_restart, diff --git a/arch/arm/mach-footbridge/include/mach/irqs.h b/arch/arm/mach-footbridge/include/mach/irqs.h index a5f41846ab9c..10f1fbc24012 100644 --- a/arch/arm/mach-footbridge/include/mach/irqs.h +++ b/arch/arm/mach-footbridge/include/mach/irqs.h @@ -11,7 +11,7 @@ */ #include -#define NR_IRQS 36 +#define FOOTBRIDGE_NR_IRQS 36 #define NR_DC21285_IRQS 16 #define _ISA_IRQ(x) (0 + (x)) @@ -93,5 +93,3 @@ #define I8042_KBD_IRQ IRQ_ISA_KEYBOARD #define I8042_AUX_IRQ (machine_is_netwinder() ? IRQ_NETWINDER_PS2MOUSE : IRQ_ISA_PS2MOUSE) #define IRQ_FLOPPYDISK IRQ_ISA_FLOPPY - -#define irq_canonicalize(_i) (((_i) == IRQ_ISA_CASCADE) ? IRQ_ISA_2 : _i) diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c index 842ddb4121ef..e4e71bdf1dc7 100644 --- a/arch/arm/mach-footbridge/isa-irq.c +++ b/arch/arm/mach-footbridge/isa-irq.c @@ -21,8 +21,8 @@ #include #include +#include #include -#include #include #include "common.h" diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c index 723e3eae995d..07dee61b0b03 100644 --- a/arch/arm/mach-footbridge/isa-timer.c +++ b/arch/arm/mach-footbridge/isa-timer.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include "common.h" diff --git a/arch/arm/mach-footbridge/isa.c b/arch/arm/mach-footbridge/isa.c index 84caccddce44..1e7b0f5fb111 100644 --- a/arch/arm/mach-footbridge/isa.c +++ b/arch/arm/mach-footbridge/isa.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include "common.h" diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c index c024eefd4978..ab17ba916d47 100644 --- a/arch/arm/mach-footbridge/netwinder-hw.c +++ b/arch/arm/mach-footbridge/netwinder-hw.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include @@ -766,6 +767,7 @@ MACHINE_START(NETWINDER, "Rebel-NetWinder") .reserve_lp2 = 1, .fixup = fixup_netwinder, .map_io = footbridge_map_io, + .nr_irqs = FOOTBRIDGE_NR_IRQS, .init_irq = footbridge_init_irq, .init_time = isa_timer_init, .restart = netwinder_restart, diff --git a/arch/arm/mach-footbridge/netwinder-pci.c b/arch/arm/mach-footbridge/netwinder-pci.c index e8304392074b..bfd5c0606c71 100644 --- a/arch/arm/mach-footbridge/netwinder-pci.c +++ b/arch/arm/mach-footbridge/netwinder-pci.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c index 92cee5717237..99819b184aac 100644 --- a/drivers/char/nwbutton.c +++ b/drivers/char/nwbutton.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #define __NWBUTTON_C /* Tell the header file who we are */ diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h index a8f4b2d70e59..cea72bd888af 100644 --- a/drivers/input/serio/i8042-io.h +++ b/drivers/input/serio/i8042-io.h @@ -15,9 +15,9 @@ * IRQs. */ -#if defined(__arm__) -/* defined in include/asm-arm/arch-xxx/irqs.h */ -#include +#ifdef CONFIG_ARCH_FOOTBRIDGE +/* defined in arch/arm/mach-footbridge/include/mach/irqs.h */ +#include #elif defined(CONFIG_PPC) extern int of_i8042_kbd_irq; extern int of_i8042_aux_irq; diff --git a/drivers/tty/serial/21285.c b/drivers/tty/serial/21285.c index 4de0c975ebdc..f0c63875912e 100644 --- a/drivers/tty/serial/21285.c +++ b/drivers/tty/serial/21285.c @@ -15,11 +15,11 @@ #include #include -#include #include #include #include #include +#include #define BAUD_BASE (mem_fclk_21285/64) -- 2.43.0