summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDouglas Anderson <dianders@chromium.org>2023-11-07 07:26:57 -0800
committerCatalin Marinas <catalin.marinas@arm.com>2023-11-08 15:38:47 +0000
commit4bb49009e07175266e8c5ffbd5d4c4b241c97f19 (patch)
tree200b97f5d69137c0b1b4760748e99486f6fbae74 /arch
parent1d816ba168ea1999afe8cd2ccbe66b0e762bf455 (diff)
downloadlwn-4bb49009e07175266e8c5ffbd5d4c4b241c97f19.tar.gz
lwn-4bb49009e07175266e8c5ffbd5d4c4b241c97f19.zip
Revert "arm64: smp: avoid NMI IPIs with broken MediaTek FW"
This reverts commit a07a594152173a3dd3bdd12fc7d73dbba54cdbca. This is no longer needed after the patch ("arm64: Move MediaTek GIC quirk handling from irqchip to core). Signed-off-by: Douglas Anderson <dianders@chromium.org> Acked-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Marc Zyngier <maz@kernel.org> Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20231107072651.v2.2.I2c5fa192e767eb3ee233bc28eb60e2f8656c29a6@changeid Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kernel/smp.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 13fa576dd2c6..03204e841172 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -965,10 +965,7 @@ static void smp_cross_call(const struct cpumask *target, unsigned int ipinr)
static bool ipi_should_be_nmi(enum ipi_msg_type ipi)
{
- DECLARE_STATIC_KEY_FALSE(supports_pseudo_nmis);
-
- if (!system_uses_irq_prio_masking() ||
- !static_branch_likely(&supports_pseudo_nmis))
+ if (!system_uses_irq_prio_masking())
return false;
switch (ipi) {