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: 162640 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp310321vqo; Tue, 7 Nov 2023 07:28:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IHy4vtsd3lex2obKZHIO7GTfDl+QWvu75gxeZ/9nbQvsGnPOXAKXfNSvP9VxqmSpLA+mgBd X-Received: by 2002:a05:6a21:3e02:b0:180:e3f1:4f60 with SMTP id bk2-20020a056a213e0200b00180e3f14f60mr18812675pzc.45.1699370893913; Tue, 07 Nov 2023 07:28:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699370893; cv=none; d=google.com; s=arc-20160816; b=H2n7WrCh8vHcSGsWtSdJGTauZ8787mF9XzsX8HZQMsIdD59wXZcQUv+qPyFcOTu3mJ tnY93zNrzvgcvVlKG6y8gL5o9A+tdCIlfz3DmNYHmZnsxPna8Gr+gOEMNn6UE752t0j1 QWSqZZA72GFRwwdUxIHLlVwi7NInv8VpKg/lclk/dSwHEaigfn+rgwP4A+ZDqcIUVET4 fS/5jP6JQ94FaPDUmB8tZ8zB5083ULlmNpTTenFNQBexq3CT79xMNc8Qi5xfAbTheu6E xgxyVkehtDGTPNpSRWTBDn3JvU+AO/lAD7ZV1YK+52wrLply7uOYk2YOsNTdaZZ9bNI3 XfMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=U2SccpyfV2fl1KuQVt090nerznp46yA/P71X1kRc3n4=; fh=+kQqjh0bEhafAhfSk+f9BRTkY6zLDMI3dWtC3ZGNASU=; b=PSwmiGglkx9trhLAQ5h9GGFevo0gzSulVzCITaNwLQv4hkWtPdi8jNK7ONdHQCX7is NHreUIT7liaQU6WoecrsGWEi9KxdEMdTes10OA0Ur67M16nnYCbFhUxK95HoQCxJT8to 1jqHNf3z2nKR8zFjbZ4seDbltzmI0k78VtoVYuL27RR81hgwSAlbhRb1s9bbybXvwTVf nAOqxbvuaIx9MFCw0S5KpvGZibOnctseErljrKkNzq5lnaY3RK3ruRSj5iXkp62/ECek Z3/VlbR4NAkcLtbV1peSb/HOpcA9KNP+8mRxDIFhvTWDTmFFEaBrIdNC3OXmijcIrDpm R75A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=VRoCrDSG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id c5-20020a6566c5000000b005b32ca3f714si2126064pgw.718.2023.11.07.07.28.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 07:28:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=VRoCrDSG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id D7842801BF53; Tue, 7 Nov 2023 07:28:11 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343851AbjKGP1d (ORCPT + 32 others); Tue, 7 Nov 2023 10:27:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235210AbjKGP13 (ORCPT ); Tue, 7 Nov 2023 10:27:29 -0500 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 842D110F1 for ; Tue, 7 Nov 2023 07:27:26 -0800 (PST) Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-5bda105206fso1189922a12.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=vger.kernel.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=VRoCrDSGcH1n31Rl2p8av09ehrKMMN0ItOpSsjozprt8YYIzHfuh2rqCRUL+M0ujbV 6E8RcDNCAXeB9sk1gtfoLJCtR9P982jVnIIRPNs+zvBZGNR1nTwc19xW54VLBuRrHntU OKd8JHJvrzHOlcgo6Z2XsFIMxvj3s0t36dK2I= 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=XQqEgtj15p9+FZHt1O/pWQyDm0ypXxvBsUrS6nGPI13hInvpuN1fM9fCvMrXwCxTzM ZsuAByWAvkRm/ESeyM3Kw3JfjCQTU3mooK68XLWw5E4+Z4l2GbcDrjwsaFr/JVBzmRTr Athqxa2xhPMu862p/1pQDp5bXgna6VhjH60ZjHgT61aFXJV9NgFvlQQrqgUYJsMw/x09 dGvaAmm07LtXqV4ULANjPArO6rJqIDvJFie/mdPx5DuYtaSvPplFYdp6mZOwQKB0/aiV ytUTycBvTn4CjKbPWe5kufFWZjq3EARw/GDaxWw/rHIiGUspeD9nfSuwDmmBW0xmjQ5q OldA== X-Gm-Message-State: AOJu0YwrQnzLZRNUQG1H74GbZ1pLTmhN5P57d0AVQGRyKz9C0iPxaH72 5AwT/NGrDcTOP/Etej6UzsMZ2w== 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 07 Nov 2023 07:28:11 -0800 (PST) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781919534402701911 X-GMAIL-MSGID: 1781919534402701911 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);