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 8BA40C433F5 for ; Fri, 3 Dec 2021 10:12:44 +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=Rke/rTRAVZg165PHlPHdec50nhbW0bJa/8O57spYLvs=; b=TDEAKbLWt40Rxi Ia/R5Xpi4PBPdLcFCiAOqyHErdnIgIdS4TI1oif7zOp/KKBubSM+u9j5QQGvQCozKdndbzARjMHj0 9V8pCxMrvqdmIm9lcbtPq2qdmNePSuP04I0Az/6L6+mf6CrGmqtNhCihGrVABHebRUOhE+dEm8Q7r lKXl5nDWJEV65uI8IulbDmJF7fbpgyrn6WjtxOSHJlLWR4ka3AMb/SACJVW5ErlBWnwQAkPfm1z8v lZ+RBp33lW0ji1ft81ZT70b5xKbjMSJ+mnrxO9V6lxokCkpl3MBJgX6ZqcURUKp/H8Lg/432rMBxg sSfoOw1JCuK3VshWE2WQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mt5WT-00F54y-O5; Fri, 03 Dec 2021 10:10:34 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mt5VS-00F4hs-81 for linux-arm-kernel@lists.infradead.org; Fri, 03 Dec 2021 10:09:31 +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 dfw.source.kernel.org (Postfix) with ESMTPS id D1752629F0; Fri, 3 Dec 2021 10:09:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76311C53FD1; Fri, 3 Dec 2021 10:09:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638526169; bh=kUyrWl6ACos66Ds+2ogKPJ+lwCBC0vB2JwvoyBTBJfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HKcWbHrKoLiNhvUqhblX39BipiU0IqXEn8OUSa9qMte+Jx5+mej0HGvusmS1h9/aa MyckFlAv+rfGxZvSE8I4ypnAMliGAL+Qe0/tr9P0pPzcVsgntqwrEaulGB5wiYW83M hgjw7SiG+1JKvfoy9v7JmE3U+ia44Ix4I4GQNkRArtKH5KDA06SkakQvbwaLU7dePv ub4jg97mgSLrlGcmnOJdZLi20Q2j83QYTH1/Qh1j4+zUiX8Ka0V7SdYI2pdBTqETpy vDFnnsElLNWLTmbRhHdRug7OYmvjv4t3N8UO5fHt8tbfGV2CJkfKeVxERLKVt++Za0 SSuJZ9l0EnPnw== 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 v3 06/14] irqchip: nvic: Use GENERIC_IRQ_MULTI_HANDLER Date: Fri, 3 Dec 2021 11:08:55 +0100 Message-Id: <20211203100903.334206-7-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211203100903.334206-1-ardb@kernel.org> References: <20211203100903.334206-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3579; i=ardb@kernel.org; h=from:subject; bh=c7I04BCVpe0Q8n8eX3W1JOw/U7xDf87LKv3vdgvuA9w=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBhqeys6n0DwEElqurzXd8wMcIvtWP40D83NmFJKZWG zMsDXJCJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYansrAAKCRDDTyI5ktmPJAboDA CeeqTEIhfFtGd/W8IB3zuSu91HbMTbVPE9GU9P8/jhFlUXlT0ss4Ixkj9vu3wKYmgOauvYjNpYNuTS L4UkxFpDVySGbbdYXc9g1NyGkk6UuN5u4z2blY6TDIQhBz0e3oEBfF4HGVkVQBIPYgP8w85qJ/vq5w Af2h5r8daeXhkZN2wO6DKeUPzYXXgC+513fBfoPsGkcXMPQLjZwdfZjTyUm5bzpM9v5D2gjIYzgmzP RD32gzYb9wpGXW01jF2lWjZ0g9wuw5pZGIPG5zhOQDPGnvdHp2WL3fkKsbZCre6hxGpcBU1hZalw67 88Rx4THG+JyEzL1jqh0W0MR0vOb31NQ675+3j5StPaTS1awdzWjCYcdErKAJYoufHikEpiRazYs2bP l6Fkr0Dxqw+R/1NIB4TUpRRr2oppTHoCFqUeP8szgo5dNprt6G8gvbLlv+Sf4sCPPSOSPocYX8mR3Y J+nAgLyZvzgn2hnd76h445s/1pVb1C3Fvq7ugsmmWamfc= 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-20211203_020930_401979_734CF96A X-CRM114-Status: GOOD ( 17.66 ) 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 --- 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