Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp7226000imu; Thu, 31 Jan 2019 07:01:49 -0800 (PST) X-Google-Smtp-Source: ALg8bN4d1WdXFpGwt7yRPFHUBClFhmSOtI/f/3YcpWG6s6GTdCC/8d39doQNkJphH/csk6e1oW5L X-Received: by 2002:a63:cf48:: with SMTP id b8mr32315702pgj.17.1548946909536; Thu, 31 Jan 2019 07:01:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548946909; cv=none; d=google.com; s=arc-20160816; b=UaJfFshAkKOIQfYYJ4X7etnIvhLqR+HFfT3k79ieUs2HonDr7igbOssvTFHuAcbSBb 4QJOWmcVwz4OH1/AvpI5I+QoVs0y0eX/zvwzGMTccjE6OmIWr+tubNTwLvLveV8iLg6e ZQvlNwdErXViPafJ4lITP/gE8CnQjNbULZUYJK5gUjJ+BgYqjvlG0oUJ2yPmEkIi6kIr ozTXbs0PwHXZSjNUFZG2hN0y+t8vPq/RXMENAyQ9C2HvZlPRGMXS1UclPUox5ldCVlC6 yX5ywNFHs5WX4fQBonBmrkpyvDogVwe6O/R5HmezWBLq3//pgOlxVJtkCxRBBc4sEIH1 K2uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=HcYxp5sUBPraDC1AbXrsM678frnEXwp5IitV7u8a0Xg=; b=TgBwyWOhDfT+fkltniDczBxz95KfisDcQEIycrqQMTUaplneqgKayi28W1V4lcpQLB fLw+3kOmjFY3+NXd520xWa/7RqBX1WHzR6OhIYUZWPNY8HPnAPpo0MT35YxsB1Od57R2 10tvH8mIRnIFDArpRv5J9GngV+voYv1+ioeA15PE+W2IrgxOFo34mreGkPKM6EBVou0S JFaAHbOKbEaJzJ2f9hVYD17fNriIaFpbqNeO3thPt/Kvx4tZ8Bnnv1HZZag49TFRU/AJ 4MmjP5L7rIHTR+fkZxIyG1Lg+uqfVIYK5vXQnM3Hk2PLCbTU3nEDmrSbTsRwYyJgb+Wa FtWA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q7si4319035pgl.303.2019.01.31.07.01.32; Thu, 31 Jan 2019 07:01:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733301AbfAaPAF (ORCPT + 99 others); Thu, 31 Jan 2019 10:00:05 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:45716 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733186AbfAaPAE (ORCPT ); Thu, 31 Jan 2019 10:00:04 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D17B51684; Thu, 31 Jan 2019 07:00:03 -0800 (PST) Received: from e112298-lin.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 90D223F59C; Thu, 31 Jan 2019 07:00:01 -0800 (PST) From: Julien Thierry To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, daniel.thompson@linaro.org, joel@joelfernandes.org, marc.zyngier@arm.com, christoffer.dall@arm.com, james.morse@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, mark.rutland@arm.com, Julien Thierry , Thomas Gleixner , Jason Cooper Subject: [PATCH v10 20/25] irqchip/gic-v3: Handle pseudo-NMIs Date: Thu, 31 Jan 2019 14:58:58 +0000 Message-Id: <1548946743-38979-21-git-send-email-julien.thierry@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1548946743-38979-1-git-send-email-julien.thierry@arm.com> References: <1548946743-38979-1-git-send-email-julien.thierry@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Provide a higher priority to be used for pseudo-NMIs. When such an interrupt is received, keep interrupts fully disabled at CPU level to prevent receiving other pseudo-NMIs while handling the current one. Signed-off-by: Julien Thierry Acked-by: Marc Zyngier Cc: Thomas Gleixner Cc: Jason Cooper Cc: Marc Zyngier --- drivers/irqchip/irq-gic-v3.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index eb9d948..c2767fb 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -41,6 +41,8 @@ #include "irq-gic-common.h" +#define GICD_INT_NMI_PRI (GICD_INT_DEF_PRI & ~0x80) + #define FLAGS_WORKAROUND_GICR_WAKER_MSM8996 (1ULL << 0) struct redist_region { @@ -381,12 +383,45 @@ static u64 gic_mpidr_to_affinity(unsigned long mpidr) return aff; } +static void gic_deactivate_unhandled(u32 irqnr) +{ + if (static_branch_likely(&supports_deactivate_key)) { + if (irqnr < 8192) + gic_write_dir(irqnr); + } else { + gic_write_eoir(irqnr); + } +} + +static inline void gic_handle_nmi(u32 irqnr, struct pt_regs *regs) +{ + int err; + + if (static_branch_likely(&supports_deactivate_key)) + gic_write_eoir(irqnr); + /* + * Leave the PSR.I bit set to prevent other NMIs to be + * received while handling this one. + * PSR.I will be restored when we ERET to the + * interrupted context. + */ + err = handle_domain_nmi(gic_data.domain, irqnr, regs); + if (err) + gic_deactivate_unhandled(irqnr); +} + static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs) { u32 irqnr; irqnr = gic_read_iar(); + if (gic_supports_nmi() && + unlikely(gic_read_rpr() == GICD_INT_NMI_PRI)) { + gic_handle_nmi(irqnr, regs); + return; + } + if (gic_prio_masking_enabled()) { gic_pmr_mask_irqs(); gic_arch_enable_irqs(); @@ -403,12 +438,7 @@ static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs err = handle_domain_irq(gic_data.domain, irqnr, regs); if (err) { WARN_ONCE(true, "Unexpected interrupt received!\n"); - if (static_branch_likely(&supports_deactivate_key)) { - if (irqnr < 8192) - gic_write_dir(irqnr); - } else { - gic_write_eoir(irqnr); - } + gic_deactivate_unhandled(irqnr); } return; } -- 1.9.1