From: "irqchip-bot for Florian Fainelli" <tip-bot2@linutronix.de>
To: linux-kernel@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Marc Zyngier <maz@kernel.org>,
tglx@linutronix.de
Subject: [irqchip: irq/irqchip-next] irqchip/irq-bcm7038-l1: Gate use of CPU logical map to MIPS
Date: Wed, 20 Oct 2021 21:12:15 -0000 [thread overview]
Message-ID: <163476433522.25758.3857226141259616241.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20211020184859.2705451-5-f.fainelli@gmail.com>
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 35eb2ef5df42d3c3d2186ae6dab5622a31e6ceee
Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/35eb2ef5df42d3c3d2186ae6dab5622a31e6ceee
Author: Florian Fainelli <f.fainelli@gmail.com>
AuthorDate: Wed, 20 Oct 2021 11:48:50 -07:00
Committer: Marc Zyngier <maz@kernel.org>
CommitterDate: Wed, 20 Oct 2021 20:06:33 +01:00
irqchip/irq-bcm7038-l1: Gate use of CPU logical map to MIPS
The use of the cpu_logical_map[] array is only relevant for MIPS based
platform where this driver is used as a first level interrupt controller
and contains multiple register groups to map with an associated CPU.
On ARM/ARM64 based systems this interrupt controller is present and used
as a second level interrupt controller hanging off the ARM GIC. That
copy of the interrupt controller contains a single group, resulting in
the intc->cpus[] array to be of size 1.
Things happened to work in that case because we install that interrupt
controller as a chained handler which does not allow it to be affine to
any CPU but the boot CPU which happens to be 0, therefore we never
de-reference past intc->cpus[] but with the current code in place, we do
leave a chance of de-referencing the array past its bounds.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20211020184859.2705451-5-f.fainelli@gmail.com
---
drivers/irqchip/irq-bcm7038-l1.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c
index 14caf32..3c4e348 100644
--- a/drivers/irqchip/irq-bcm7038-l1.c
+++ b/drivers/irqchip/irq-bcm7038-l1.c
@@ -28,9 +28,6 @@
#include <linux/irqchip.h>
#include <linux/irqchip/chained_irq.h>
#include <linux/syscore_ops.h>
-#ifdef CONFIG_ARM
-#include <asm/smp_plat.h>
-#endif
#define IRQS_PER_WORD 32
#define REG_BYTES_PER_IRQ_WORD (sizeof(u32) * 4)
@@ -127,7 +124,7 @@ static void bcm7038_l1_irq_handle(struct irq_desc *desc)
struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned int idx;
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && defined(CONFIG_MIPS)
cpu = intc->cpus[cpu_logical_map(smp_processor_id())];
#else
cpu = intc->cpus[0];
@@ -301,7 +298,7 @@ static int bcm7038_l1_suspend(void)
u32 val;
/* Wakeup interrupt should only come from the boot cpu */
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && defined(CONFIG_MIPS)
boot_cpu = cpu_logical_map(0);
#else
boot_cpu = 0;
@@ -325,7 +322,7 @@ static void bcm7038_l1_resume(void)
struct bcm7038_l1_chip *intc;
int boot_cpu, word;
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && defined(CONFIG_MIPS)
boot_cpu = cpu_logical_map(0);
#else
boot_cpu = 0;
next prev parent reply other threads:[~2021-10-20 21:12 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-20 18:48 [PATCH v6 00/13] Modular Broadcom irqchip drivers Florian Fainelli
2021-10-20 18:48 ` [PATCH v6 01/13] MIPS: BMIPS: Remove use of irq_cpu_offline Florian Fainelli
2021-10-20 21:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Florian Fainelli
2021-10-20 18:48 ` [PATCH v6 02/13] irqchip/irq-bcm7038-l1: Remove .irq_cpu_offline() Florian Fainelli
2021-10-20 21:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Florian Fainelli
2021-10-20 18:48 ` [PATCH v6 03/13] irqchip/irq-bcm7038-l1: Use irq_get_irq_data() Florian Fainelli
2021-10-20 21:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Florian Fainelli
2021-10-20 18:48 ` [PATCH v6 04/13] irqchip/irq-bcm7038-l1: Gate use of CPU logical map to MIPS Florian Fainelli
2021-10-20 21:12 ` irqchip-bot for Florian Fainelli [this message]
2021-10-20 18:48 ` [PATCH v6 05/13] irqchip/irq-bcm7038-l1: Restrict affinity setting " Florian Fainelli
2021-10-20 21:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Florian Fainelli
2021-10-20 18:48 ` [PATCH v6 06/13] irqchip/irq-bcm7038-l1: Switch to IRQCHIP_PLATFORM_DRIVER Florian Fainelli
2021-10-20 21:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Florian Fainelli
2021-10-20 18:48 ` [PATCH v6 07/13] genirq: Export irq_gc_{unmask_enable,mask_disable}_reg Florian Fainelli
2021-10-20 21:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Florian Fainelli
2021-10-20 18:48 ` [PATCH v6 08/13] irqchip/irq-brcmstb-l2: Switch to IRQCHIP_PLATFORM_DRIVER Florian Fainelli
2021-10-20 21:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Florian Fainelli
2021-10-20 18:48 ` [PATCH v6 09/13] genirq: Export irq_gc_noop() Florian Fainelli
2021-10-20 21:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Florian Fainelli
2021-10-20 18:48 ` [PATCH v6 10/13] irqchip/irq-bcm7120-l2: Switch to IRQCHIP_PLATFORM_DRIVER Florian Fainelli
2021-10-20 21:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Florian Fainelli
2021-10-20 18:48 ` [PATCH v6 11/13] arm64: broadcom: Removed forced select of interrupt controllers Florian Fainelli
2021-10-20 21:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Florian Fainelli
2021-10-20 18:48 ` [PATCH v6 12/13] ARM: bcm: " Florian Fainelli
2021-10-20 21:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Florian Fainelli
2021-10-20 18:48 ` [PATCH v6 13/13] irqchip: Fix kernel-doc parameter typo for IRQCHIP_DECLARE Florian Fainelli
2021-10-20 21:12 ` [irqchip: irq/irqchip-next] " irqchip-bot for Florian Fainelli
2021-10-20 21:13 ` [PATCH v6 00/13] Modular Broadcom irqchip drivers 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=163476433522.25758.3857226141259616241.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=f.fainelli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=tglx@linutronix.de \
/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
all inboxes | Powered by JetHome®