From patchwork Tue Nov 7 15:26:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 13449061 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 33BE3C0018C for ; Tue, 7 Nov 2023 15:28:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=X6X5Gus73mToicITU4IlUr6Cpl9ZPoHlK5+IUD0QgQY=; b=huL67IGj0H3Ok8 PLp4u87inkH4VMLZWDj5II+ZXotcRvcbtxFjBWtWlBhoQCE8P+IzAxm3WXpRuG1uq6m0OVJPvd3tF Hs/mDbbhVuyN1pe5LdELfhhVFxx0hojBWlOAdol/6uDpCvQPq+fyEbjukeqaiDPaBiM5769kondhy HWOIhzlzT7SdQcxYmGR9uhDIGddHXOTulhBpsFcGKRUQLnj16slYr5zd9SLCHVG2DvBCZhrjxbBsX 3QKj4Q+2h68JuSeoAFQ8nwi21ljMNsKnpA/dumE6BcOROPBHxNOO3r0nTLu9Q0S5RrXIHm7HAf1my hDVgGVp2cWnmdRLoAVwQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r0NzH-001rKH-3D; Tue, 07 Nov 2023 15:27:32 +0000 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r0NzE-001rHB-2s for linux-arm-kernel@lists.infradead.org; Tue, 07 Nov 2023 15:27:30 +0000 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1cc0e78ec92so38702955ad.3 for ; Tue, 07 Nov 2023 07:27:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699370846; x=1699975646; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U2SccpyfV2fl1KuQVt090nerznp46yA/P71X1kRc3n4=; b=AFwITIk2NQBZj0nxJyxVXHf2bLtzD3Gkgp3QxTCYVzG6dKFHzzA1xM0ld4q22SBrlI TtpA5qNacmJbmHB0NtAsUXpC0bdQtS/KWrdtYRRMxTS6ygerJatNfSqkDxmT0mzrAn98 2T1cfaFybjNVe4aJhDuWoviiDMjwIvUhgcJeQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699370846; x=1699975646; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U2SccpyfV2fl1KuQVt090nerznp46yA/P71X1kRc3n4=; b=wrga08TjHpwCBb+x1ZSfEDG2kHpmRL1AebKrTvj4kjEF1ya2nCxg0rt0B2/KniHwoz mBFLgptExWD75iJ6rjzbF4E16bzg7kFttVFoVDfnVs4Y3GZRc2+KjpKxKCSTpzbiIBME zwWDBCigEk+agUX49cFA/ZXo3liNR/ivJ5auCAFUQtDxG+w0Wfb7oFZ2Not13kGNG3hM IOfNW8rtnbMzYLsb7MfxKkajC35Ky8pHwyhNiOA87IlnLJQRW0Ur2yLIlV3mkjN3rqOw Le34PaRTACs8MZm1cQolAU5IIaHG4a9QKNj5ujIjeYKe3Qx6nuV1ke2Ujhes/9MWe4xJ TmhA== X-Gm-Message-State: AOJu0YwdRcWSx1+e0OdW36YgkSw78WUeRR7oK5vuXGla+4WT+Rpg0Q2N Q2PPx1AYGZgGyrfVKS98NyIVCw== X-Google-Smtp-Source: AGHT+IFcVuXr5lafjKMACmRmx/5rgib+c25BB9nXqxYoKEEpiMb9Ejom7vRw0FX77iFcLePPMQDMkQ== X-Received: by 2002:a17:90a:7547:b0:280:2609:6d47 with SMTP id q65-20020a17090a754700b0028026096d47mr21545310pjk.19.1699370845953; Tue, 07 Nov 2023 07:27:25 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:9d:2:16a7:2c01:9126:36a4]) by smtp.gmail.com with ESMTPSA id l7-20020a17090a49c700b002808c9e3095sm7066259pjm.26.2023.11.07.07.27.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 07:27:25 -0800 (PST) From: Douglas Anderson To: Marc Zyngier , Mark Rutland , Catalin Marinas , Will Deacon , Chen-Yu Tsai Cc: Douglas Anderson , 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: [PATCH v2 2/2] Revert "arm64: smp: avoid NMI IPIs with broken MediaTek FW" Date: Tue, 7 Nov 2023 07:26:57 -0800 Message-ID: <20231107072651.v2.2.I2c5fa192e767eb3ee233bc28eb60e2f8656c29a6@changeid> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107072651.v2.1.Ide945748593cffd8ff0feb9ae22b795935b944d6@changeid> References: <20231107072651.v2.1.Ide945748593cffd8ff0feb9ae22b795935b944d6@changeid> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231107_072728_926482_9A5F2FE6 X-CRM114-Status: GOOD ( 14.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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: Marc Zyngier Acked-by: Mark Rutland --- 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);