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 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 DCFC3C433F5 for ; Mon, 6 Dec 2021 16:53:38 +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=PN86wU4ksTRTyFim+UXsBH0z0dFqesDqaFxOcZVXyKU=; b=P85rOet0Qpbhs9 1e6acbIRgHETbJqdRDLEbNTO1WiztabLAp1AMwYInSYqYveguzOkwvesjLVUrgurUY7n1eVXrMuP0 oo1qo19BuQE8+FBQh7ZWkGbgkjr3JPajrWsM31AeXQFGDk4wnWAxV2lQ+KGjxbQBIWlQCrAK/GO9M ru1JPMH07XIqKfBCHICpRntxAjQwlvdZGMBLHzJt4K3QxgN9Tj11P8eYE6B4eQkUUUzUTlgGKEn/e wFukcQkJXz/yE79e+uKg74Ai0Uz2/11ZslwScEfZVrNeE9nVHpSzVsOykevNluyR0ltk40YjIbs4h Mk0Q/H8nELrXh6c/Wxew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1muHDd-004sgL-T5; Mon, 06 Dec 2021 16:52:03 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1muH9T-004qi5-Sb for linux-arm-kernel@lists.infradead.org; Mon, 06 Dec 2021 16:47:45 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id F2046CE16E0; Mon, 6 Dec 2021 16:47:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 548EBC341C7; Mon, 6 Dec 2021 16:47:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638809260; bh=ZYCwGk8JMCf38QPc4BJiVqt93N0KFCEMJkQyHc13FoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DVRvWF6/TCYNqR3CSDZP/Y5IzvpCCexfWvCwbf41sFNZXJq/jtLkwnSQLs464d4O8 MhdKkbCDFJQIgDzYWtdNsHeFFk0eLkv6GpdvfLtG/6OMQmY0VmEzs//5GLxyOlPSr2 F2IAfyVgwM61cjT0ehFPb/SMFN6hFIqqNa6M/Hg139nTPgE1c4Io4c7ml/kTdy9RjN xxrU+9qiqr/oUPMjSH25EjMmG9j1NI6hi9K+WtovfIaQWttTi5mM1MYU8zyakrNjEx RXYuAMoKn+9HBgVtmj5DzC/y1TWarVH18r34/hLv0EoGF4XiH827V3pPKf5+rP5z4q 2tQZVquuhG07g== From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk Cc: Ard Biesheuvel , Nicolas Pitre , Arnd Bergmann , Kees Cook , Keith Packard , Linus Walleij , Nick Desaulniers , Tony Lindgren , Marc Zyngier , Vladimir Murzin , Jesse Taube , Mark Rutland Subject: [PATCH v4 07/15] irqchip: nvic: Use GENERIC_IRQ_MULTI_HANDLER Date: Mon, 6 Dec 2021 17:46:51 +0100 Message-Id: <20211206164659.1495084-8-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206164659.1495084-1-ardb@kernel.org> References: <20211206164659.1495084-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3684; i=ardb@kernel.org; h=from:subject; bh=5MVgWW7YtEVUvJFFhcGP+QHjR64EBHbCh72Vmwxw3Xs=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBhrj5xR9U+19Pb7b8KLh1V2koJ9YTKy2wReot9i0yW Chc0o7yJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYa4+cQAKCRDDTyI5ktmPJChYC/ 9qPUHyMjjIscN6DAzueq5dKudtwDyyL1sSeNMhudBgadPLZQLd/rePotDPW8gU9EalzdcY7dTx1LsR oRDlivsn3InppLydvn763m/szs9IkLtvfz5pW8kFZZwPKQG9jDzdV1PKUkIf/HSP7s9WrQlcIyZyRD 0p7r1XrzAdyc8RRYZrSdLaWfu8NMqPWxjFk1RiQdNxtF4qQiV6bdo1HjRPFjHoD/kSC39p5vWoMCTX hUiaSkJUO2r0iYa0mJAp2e2COzacHmuUYnKv6vON296m79SAoA7zFcKctItz8X7nqkoxuBDFeFiVxs xSl0wv5l/DJrC82JIVaIS4666e/jUw1eq6mh2Ehui1mV6+p3c3+/OlrujM0mzGvNjvfNIRhbcnRJB1 53vat1mAWbiV08SMGkr0BQsFhaOTf9jkNaWy6n5GkJIlW1SLjXoHM04GLh+K8//DV2TYY7bt7oLHqg X8BkgiSncNDkKmDYeLVvBS6V+KQdvb2fgzmjAvQVgM5cg= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211206_084744_331086_91A127F5 X-CRM114-Status: GOOD ( 16.88 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Vladimir Murzin Rather then restructuring the ARMv7M entrly logic per TODO, just move NVIC to GENERIC_IRQ_MULTI_HANDLER. Signed-off-by: Vladimir Murzin Acked-by: Mark Rutland Acked-by: Arnd Bergmann Acked-by: Marc Zyngier Signed-off-by: Ard Biesheuvel Tested-by: Marc Zyngier Tested-by: Vladimir Murzin # ARMv7M --- arch/arm/include/asm/v7m.h | 3 ++- arch/arm/kernel/entry-v7m.S | 10 +++------ drivers/irqchip/Kconfig | 1 + drivers/irqchip/irq-nvic.c | 22 +++++--------------- 4 files changed, 11 insertions(+), 25 deletions(-) diff --git a/arch/arm/include/asm/v7m.h b/arch/arm/include/asm/v7m.h index 2cb00d15831b..4512f7e1918f 100644 --- a/arch/arm/include/asm/v7m.h +++ b/arch/arm/include/asm/v7m.h @@ -13,6 +13,7 @@ #define V7M_SCB_ICSR_PENDSVSET (1 << 28) #define V7M_SCB_ICSR_PENDSVCLR (1 << 27) #define V7M_SCB_ICSR_RETTOBASE (1 << 11) +#define V7M_SCB_ICSR_VECTACTIVE 0x000001ff #define V7M_SCB_VTOR 0x08 @@ -38,7 +39,7 @@ #define V7M_SCB_SHCSR_MEMFAULTENA (1 << 16) #define V7M_xPSR_FRAMEPTRALIGN 0x00000200 -#define V7M_xPSR_EXCEPTIONNO 0x000001ff +#define V7M_xPSR_EXCEPTIONNO V7M_SCB_ICSR_VECTACTIVE /* * When branching to an address that has bits [31:28] == 0xf an exception return diff --git a/arch/arm/kernel/entry-v7m.S b/arch/arm/kernel/entry-v7m.S index 7bde93c10962..520dd43e7e08 100644 --- a/arch/arm/kernel/entry-v7m.S +++ b/arch/arm/kernel/entry-v7m.S @@ -39,14 +39,10 @@ __irq_entry: @ @ Invoke the IRQ handler @ - mrs r0, ipsr - ldr r1, =V7M_xPSR_EXCEPTIONNO - and r0, r1 - sub r0, #16 - mov r1, sp + mov r0, sp stmdb sp!, {lr} - @ routine called with r0 = irq number, r1 = struct pt_regs * - bl nvic_handle_irq + @ routine called with r0 = struct pt_regs * + bl generic_handle_arch_irq pop {lr} @ diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 7038957f4a77..488eaa14d3a7 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -58,6 +58,7 @@ config ARM_NVIC bool select IRQ_DOMAIN_HIERARCHY select GENERIC_IRQ_CHIP + select GENERIC_IRQ_MULTI_HANDLER config ARM_VIC bool diff --git a/drivers/irqchip/irq-nvic.c b/drivers/irqchip/irq-nvic.c index 63bac3f78863..c0de696b3823 100644 --- a/drivers/irqchip/irq-nvic.c +++ b/drivers/irqchip/irq-nvic.c @@ -37,25 +37,12 @@ static struct irq_domain *nvic_irq_domain; -static void __nvic_handle_irq(irq_hw_number_t hwirq) +static void __irq_entry nvic_handle_irq(struct pt_regs *regs) { - generic_handle_domain_irq(nvic_irq_domain, hwirq); -} + unsigned long icsr = readl_relaxed(BASEADDR_V7M_SCB + V7M_SCB_ICSR); + irq_hw_number_t hwirq = (icsr & V7M_SCB_ICSR_VECTACTIVE) - 16; -/* - * TODO: restructure the ARMv7M entry logic so that this entry logic can live - * in arch code. - */ -asmlinkage void __exception_irq_entry -nvic_handle_irq(irq_hw_number_t hwirq, struct pt_regs *regs) -{ - struct pt_regs *old_regs; - - irq_enter(); - old_regs = set_irq_regs(regs); - __nvic_handle_irq(hwirq); - set_irq_regs(old_regs); - irq_exit(); + generic_handle_domain_irq(nvic_irq_domain, hwirq); } static int nvic_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, @@ -141,6 +128,7 @@ static int __init nvic_of_init(struct device_node *node, for (i = 0; i < irqs; i += 4) writel_relaxed(0, nvic_base + NVIC_IPR + i); + set_handle_irq(nvic_handle_irq); return 0; } IRQCHIP_DECLARE(armv7m_nvic, "arm,armv7m-nvic", nvic_of_init); -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel