Skip to content

Commit 4bb4900

Browse files
diandersctmarinas
authored andcommitted
Revert "arm64: smp: avoid NMI IPIs with broken MediaTek FW"
This reverts commit a07a594. 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>
1 parent 1d816ba commit 4bb4900

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

arch/arm64/kernel/smp.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -965,10 +965,7 @@ static void smp_cross_call(const struct cpumask *target, unsigned int ipinr)
965965

966966
static bool ipi_should_be_nmi(enum ipi_msg_type ipi)
967967
{
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())
972969
return false;
973970

974971
switch (ipi) {

drivers/irqchip/irq-gic-v3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static DEFINE_STATIC_KEY_TRUE(supports_deactivate_key);
105105
* - Figure 4-7 Secure read of the priority field for a Non-secure Group 1
106106
* interrupt.
107107
*/
108-
DEFINE_STATIC_KEY_FALSE(supports_pseudo_nmis);
108+
static DEFINE_STATIC_KEY_FALSE(supports_pseudo_nmis);
109109

110110
DEFINE_STATIC_KEY_FALSE(gic_nonsecure_priorities);
111111
EXPORT_SYMBOL(gic_nonsecure_priorities);

0 commit comments

Comments
 (0)