aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0080-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2021-08-21 10:54:34 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2021-08-21 19:07:07 +0200
commit8299d1f057439f94c6a4412e2e5c5082b82a30c9 (patch)
tree1bf678d61f11f7394493be464c7876e496f7faed /target/linux/bcm27xx/patches-5.10/950-0080-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch
parent33b6885975ce376ff075362b7f0890326043111b (diff)
downloadupstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.tar.gz
upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.tar.bz2
upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.zip
bcm27xx: add kernel 5.10 support
Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted patches, wireless patches and defconfig patches. bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 4B v1.1 4G bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0080-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0080-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch66
1 files changed, 66 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0080-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch b/target/linux/bcm27xx/patches-5.10/950-0080-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch
new file mode 100644
index 0000000000..c02f5f699b
--- /dev/null
+++ b/target/linux/bcm27xx/patches-5.10/950-0080-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch
@@ -0,0 +1,66 @@
+From 35a38d723d9cd61be4c39defad4e44b1a6acc4b8 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.org>
+Date: Thu, 14 Jun 2018 11:21:04 +0100
+Subject: [PATCH] irqchip: irq-bcm2835: Calc. FIQ_START at boot-time
+
+ad83c7cb2f37 ("irqchip/irq-bcm2836: Add support for DT interrupt polarity")
+changed the way that the BCM2836/7 local interrupts are mapped; instead
+of being pre-mapped they are now mapped on-demand. A side effect of this
+change is that the call to irq_of_parse_and_map from armctrl_of_init
+creates a new mapping, forming a gap between the IRQs and the FIQs. This
+ gap breaks the FIQ<->IRQ mapping which up to now has been done by assuming:
+
+1) that the value of FIQ_START is the same as the number of normal IRQs
+that will be mapped (still true), and
+
+2) that this value is also the offset between an IRQ and its equivalent
+FIQ (which is no longer the case).
+
+Remove both assumptions by measuring the interval between the last IRQ
+and the last FIQ, passing it as the parameter to init_FIQ().
+
+Fixes: https://github.com/raspberrypi/linux/issues/2432
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.org>
+---
+ drivers/irqchip/irq-bcm2835.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/irqchip/irq-bcm2835.c
++++ b/drivers/irqchip/irq-bcm2835.c
+@@ -74,8 +74,6 @@
+ #define NR_BANKS 3
+ #define IRQS_PER_BANK 32
+ #define NUMBER_IRQS MAKE_HWIRQ(NR_BANKS, 0)
+-#undef FIQ_START
+-#define FIQ_START (NR_IRQS_BANK0 + MAKE_HWIRQ(NR_BANKS - 1, 0))
+
+ static const int reg_pending[] __initconst = { 0x00, 0x04, 0x08 };
+ static const int reg_enable[] __initconst = { 0x18, 0x10, 0x14 };
+@@ -203,7 +201,7 @@ static int __init armctrl_of_init(struct
+ bool is_2836)
+ {
+ void __iomem *base;
+- int irq, b, i;
++ int irq = 0, last_irq, b, i;
+ u32 reg;
+
+ base = of_iomap(node, 0);
+@@ -243,6 +241,8 @@ static int __init armctrl_of_init(struct
+ pr_err(FW_BUG "Bootloader left fiq enabled\n");
+ }
+
++ last_irq = irq;
++
+ if (is_2836) {
+ int parent_irq = irq_of_parse_and_map(node, 0);
+
+@@ -273,7 +273,7 @@ static int __init armctrl_of_init(struct
+ }
+ }
+ #ifndef CONFIG_ARM64
+- init_FIQ(FIQ_START);
++ init_FIQ(irq - last_irq);
+ #endif
+
+ return 0;