From patchwork Fri Oct 6 22:15:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 13412066 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 51800E94133 for ; Fri, 6 Oct 2023 22:16:54 +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=+s4K0f14VTlUrRB0VbJqtTtKOqfj+fXpQK364dI1t8M=; b=CmNqCndg+7VN+S EfeS6V6abm4uvsrPykMwByd1hLMJKUF5eeKidSbO1Yiju7WNiHpmbIBWgW3ax/RHOft4wNcBti6D5 5nnS7QIvm17utUGS88YzA9MlIXQ/Oq2ydInlSDQdBh/W9v/H0mno8r8HriJRLgNd9ckeU5tl0/d2z QMKTKaOM/aTBOCDi5qFx+LNvCFSpQthEKd+74LTm/9JhuGdNwYPEhvldHX6Gs9ktwhgA4zwcZJ2h2 m2oUhe6elsM7jKeGjkVHuCj4RHrLMgifxtps9zdbCPqTmEQz7Mc0BebHj8+HgXDQhDw3cQk00PEjB hYpGoBNBA0KINQgYvenA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qot7U-006ZpP-1w; Fri, 06 Oct 2023 22:16:28 +0000 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qot7R-006ZmJ-0k for linux-arm-kernel@lists.infradead.org; Fri, 06 Oct 2023 22:16:26 +0000 Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-54290603887so1881267a12.1 for ; Fri, 06 Oct 2023 15:16:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696630580; x=1697235380; 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=wCChOiC5+OCDlbLLrEgPwNPe/HtuhSm+x2PIj6YN8Og=; b=lUcv8hehRivexKvegHhBauNr9+IFYeNh0qSgcNOztT0kHeQ5+XMWJrQ+VeDMGXyuqD nr045p+7zOMQ8MZ2dUOrdznUuUHterT3robIO6wkZgDkWrI9RvS754o1kVoIAvuDymwl pPPEa3VxwTRILRkP7gsJxjnUdiqnP3VR9xRyc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696630580; x=1697235380; 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=wCChOiC5+OCDlbLLrEgPwNPe/HtuhSm+x2PIj6YN8Og=; b=gll9je1Ydkc98OmyogJmXoyE8/W1f6FsZt+KxtxbM2P/9zGgKmiqgj1wGBLNZH9COc Ai2tOtB9hJSHnFlVCA3fJbxbOiu97nkJIyM0XL0CYsRWunWt1GmCBt/8Fw1Tpv2OQofe LqQBcm8r8crKACAWwpJhsngMfuCV5HwRf+e8YjGDCelV+tzffxAHzONJes5Lwsvp922u 3B9roJDJlc5yJj/S0sGF6p8qoWztQ2k4TydkOpuVuxCSosyvuev2WXaEaQe6hMuVpV9J mNSZtY+/nhMdltL/gfyvZ8gwm5Cg9dKjxSJl+GB2YW9ekW+sX017E69cEoXxjtXhNb5L XggQ== X-Gm-Message-State: AOJu0YwzAWDheEVEp1dR9Uag5AIGtq8WT4lFF26+kY4SVELLKyHd971F 7yFicFo84kgyaXNwN+1Ls9js6w== X-Google-Smtp-Source: AGHT+IHKwJcVCOzr02nXWYBfeXvpup+ZejkzGxyBBUXwkHWHzNfLIWK/MnuToROxrwttI3fLYLoUug== X-Received: by 2002:a17:90b:224d:b0:274:566a:3477 with SMTP id hk13-20020a17090b224d00b00274566a3477mr9047899pjb.39.1696630580472; Fri, 06 Oct 2023 15:16:20 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:9d:2:1f37:5459:32bf:faf9]) by smtp.gmail.com with ESMTPSA id rj6-20020a17090b3e8600b00276e8e4f1fbsm5946523pjb.1.2023.10.06.15.16.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 15:16:19 -0700 (PDT) From: Douglas Anderson To: Marc Zyngier , Mark Rutland , Catalin Marinas , Will Deacon , Chen-Yu Tsai Cc: Douglas Anderson , D Scott Phillips , Josh Poimboeuf , Peter Zijlstra , Stephen Boyd , Thomas Gleixner , Valentin Schneider , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] Revert "arm64: smp: avoid NMI IPIs with broken MediaTek FW" Date: Fri, 6 Oct 2023 15:15:52 -0700 Message-ID: <20231006151547.2.I2c5fa192e767eb3ee233bc28eb60e2f8656c29a6@changeid> X-Mailer: git-send-email 2.42.0.609.gbb76f46606-goog In-Reply-To: <20231006151547.1.Ide945748593cffd8ff0feb9ae22b795935b944d6@changeid> References: <20231006151547.1.Ide945748593cffd8ff0feb9ae22b795935b944d6@changeid> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231006_151625_270101_FA68FF6B X-CRM114-Status: GOOD ( 14.10 ) 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: Disable GiC priorities on Mediatek devices w/ firmware issues"). Signed-off-by: Douglas Anderson Acked-by: Mark Rutland --- 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 16ead57a583d..f36a97a54d2b 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -964,10 +964,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 737da1b9aabf..787ccc880b22 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -106,7 +106,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);