From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAA4EC4332F for ; Wed, 8 Nov 2023 11:29:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344518AbjKHL34 (ORCPT ); Wed, 8 Nov 2023 06:29:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344193AbjKHL3y (ORCPT ); Wed, 8 Nov 2023 06:29:54 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 15F49186 for ; Wed, 8 Nov 2023 03:29:52 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3C3B11477; Wed, 8 Nov 2023 03:30:36 -0800 (PST) Received: from FVFF77S0Q05N (unknown [10.57.37.113]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 710473F703; Wed, 8 Nov 2023 03:29:49 -0800 (PST) Date: Wed, 8 Nov 2023 11:29:46 +0000 From: Mark Rutland To: Douglas Anderson Cc: Marc Zyngier , Catalin Marinas , Will Deacon , Chen-Yu Tsai , D Scott Phillips , Frederic Weisbecker , Josh Poimboeuf , Peter Zijlstra , Stephen Boyd , Thomas Gleixner , Valentin Schneider , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 2/2] Revert "arm64: smp: avoid NMI IPIs with broken MediaTek FW" Message-ID: References: <20231107072651.v2.1.Ide945748593cffd8ff0feb9ae22b795935b944d6@changeid> <20231107072651.v2.2.I2c5fa192e767eb3ee233bc28eb60e2f8656c29a6@changeid> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231107072651.v2.2.I2c5fa192e767eb3ee233bc28eb60e2f8656c29a6@changeid> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 07, 2023 at 07:26:57AM -0800, Douglas Anderson wrote: > 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 Acked-by: Mark Rutland Mark. > --- > > Changes in v2: > - Fixed typo in subject: s/GiC/GIC. > > arch/arm64/kernel/smp.c | 5 +---- > drivers/irqchip/irq-gic-v3.c | 2 +- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c > index be95b523c101..defbab84e9e5 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) { > diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c > index 1ba674367ee3..98b0329b7154 100644 > --- a/drivers/irqchip/irq-gic-v3.c > +++ b/drivers/irqchip/irq-gic-v3.c > @@ -105,7 +105,7 @@ static DEFINE_STATIC_KEY_TRUE(supports_deactivate_key); > * - Figure 4-7 Secure read of the priority field for a Non-secure Group 1 > * interrupt. > */ > -DEFINE_STATIC_KEY_FALSE(supports_pseudo_nmis); > +static DEFINE_STATIC_KEY_FALSE(supports_pseudo_nmis); > > DEFINE_STATIC_KEY_FALSE(gic_nonsecure_priorities); > EXPORT_SYMBOL(gic_nonsecure_priorities); > -- > 2.42.0.869.gea05f2083d-goog >