Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Douglas Anderson and committed by
Catalin Marinas
4bb49009 1d816ba1

+2 -5
+1 -4
arch/arm64/kernel/smp.c
··· 965 965 966 966 static bool ipi_should_be_nmi(enum ipi_msg_type ipi) 967 967 { 968 - DECLARE_STATIC_KEY_FALSE(supports_pseudo_nmis); 969 - 970 - if (!system_uses_irq_prio_masking() || 971 - !static_branch_likely(&supports_pseudo_nmis)) 968 + if (!system_uses_irq_prio_masking()) 972 969 return false; 973 970 974 971 switch (ipi) {
+1 -1
drivers/irqchip/irq-gic-v3.c
··· 105 105 * - Figure 4-7 Secure read of the priority field for a Non-secure Group 1 106 106 * interrupt. 107 107 */ 108 - DEFINE_STATIC_KEY_FALSE(supports_pseudo_nmis); 108 + static DEFINE_STATIC_KEY_FALSE(supports_pseudo_nmis); 109 109 110 110 DEFINE_STATIC_KEY_FALSE(gic_nonsecure_priorities); 111 111 EXPORT_SYMBOL(gic_nonsecure_priorities);