From patchwork Fri Jun 22 17:01:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 10482735 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 090E5602CB for ; Fri, 22 Jun 2018 17:04:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECEF828F85 for ; Fri, 22 Jun 2018 17:04:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E14E328F87; Fri, 22 Jun 2018 17:04:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9970928F85 for ; Fri, 22 Jun 2018 17:04:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:To:From:References: In-Reply-To:Message-Id:Date:Subject:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mJ5nvsEmkNMygf6H4r3tKWMpLHK4zTMzWnffBv2Jbiw=; b=nTPAFhbpdZhKXr 8Mdg3vX2qM4NP3MyUGG1EK0vmqrfahwYTDaPEZ8TFiLyfq4Eh000bm4vsC7Yi0ocpgVdfMvKP1Fto DtGJx3gceewRY2ln2XxIz7we/XHL+b97pl14+ByV6yjHvxwGl2uSeqUvKYT4yIf74SfX//AhZTvx9 LSEBzOolM5gMHdbSEXwNfZktAL68MXAz7X2AZnX1DmQJ/4Dx5V4fTH+ksdLdOgS2EGbLDFg80f+db P2lWY2WKtiJB0HF2MI3JbPhES7Q1qSyeYsYDweym8VDuU0OTt1LVqYtCBW4MtoSdeTaRVe24ath8X fzY8+0wefjpucTvuMuCQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWPTQ-0004Rx-Kr; Fri, 22 Jun 2018 17:03:48 +0000 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWPRr-0003bQ-Gw for linux-arm-kernel@lists.infradead.org; Fri, 22 Jun 2018 17:02:16 +0000 Received: by mail-pg0-x242.google.com with SMTP id w8-v6so3226467pgp.7 for ; Fri, 22 Jun 2018 10:02:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=subject:date:message-id:in-reply-to:references:cc:from:to; bh=H+Ji6nS9RYHrI9T/GDY2lUIR2+1671gfm3aYh78j4WQ=; b=fNrismZoZZbq5C9dakd4+Ohf5cOQje4ke12QDHxzFFZisEG/3WiZ2Wq8i+mG2arfTc 6hCur/MW754h39i5m4NV7tukZKFh9T+bW6oEHfQZW6u0MTytVzN9e1Y4T/EWMVFXNFrl ac+HmJQcCQnWrCoYlWVq9iiwVwYSM6ZJ9/DcxgwlmRjUqclIv1yCgsjXAQXOWAngnofx Fa/2o0vtDU95pumU3fp8OpHNXQmu834SeAwhpluB5YoPcESmkwA3tj6+lBhny5mq0+9v 04QDNwKlzDM2Y6GDjMA4MqHuhxM+e4T0/z8xhJDH3mbhrC2fBtHae/YOv9qlkZr7gqJs Qzgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :cc:from:to; bh=H+Ji6nS9RYHrI9T/GDY2lUIR2+1671gfm3aYh78j4WQ=; b=Wf1fekoZEVLDgezAWcqNG+7xrdlOoKVx2KvsvzTn3/DPzjUHlzspLpkI1Kg43+O1l2 4q/yyKljcO9fN29otUk+9hHGCmp8k9ZAaOB4wEWXGnTmGXL6KVoctA12lB3WI3aDPJsC BFtNIVXXqrhTZhLpvI1hob4qL6rgQn2OXln5An6gl+vhm/99LV85Ubt+vVQwJNn/5OxU vK3J8HfMOx7Orzf0xD+Sd8D+knzp/O9GoowePn4CwKExzaiB67SCd0Yijh0dpUOJGcvf JTy85C7u9Co5Lz5nHCi8eebuFKj6ACQiJS0jM6KUz7pGhLO5afc+T2v84oNGViiKdvva ZtIQ== X-Gm-Message-State: APt69E1xaf3tUqakiWtT3d1jYO78curtcnNgVXCpXV49s0iJEhxu5xVA +JEvkm9AXunGfPmbKPpjuMsv1Q== X-Google-Smtp-Source: ADUXVKKmblopOQKbY0PPsauJUn7rxPjEgWysswNIfWrGFgzRyvMi+rb6YCe0/GxYfTFsLxoIi338oA== X-Received: by 2002:a65:664a:: with SMTP id z10-v6mr2185372pgv.43.1529686920961; Fri, 22 Jun 2018 10:02:00 -0700 (PDT) Received: from localhost ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id p22-v6sm17795790pfj.166.2018.06.22.10.01.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jun 2018 10:02:00 -0700 (PDT) Subject: [PATCH 3/5] arm64: Use the new GENERIC_IRQ_MULTI_HANDLER Date: Fri, 22 Jun 2018 10:01:24 -0700 Message-Id: <20180622170126.6308-4-palmer@sifive.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180622170126.6308-1-palmer@sifive.com> References: <20180621181756.12493-1-palmer@sifive.com> <20180622170126.6308-1-palmer@sifive.com> From: Palmer Dabbelt To: tglx@linutronix.de X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180622_100211_595453_9FF4340D X-CRM114-Status: GOOD ( 16.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nicolas.pitre@linaro.org, mark.rutland@arm.com, alexandre.belloni@bootlin.com, catalin.marinas@arm.com, Palmer Dabbelt , Will Deacon , yamada.masahiro@socionext.com, keescook@chromium.org, jonas@southpole.se, linux@armlinux.org.uk, jhogan@kernel.org, vladimir.murzin@arm.com, jason@lakedaemon.net, Arnd Bergmann , marc.zyngier@arm.com, stefan.kristiansson@saunalahti.fi, jinb.park7@gmail.com, openrisc@lists.librecores.org, shorne@gmail.com, linux-arm-kernel@lists.infradead.org, ard.biesheuvel@linaro.org, Greg KH , linux-kernel@vger.kernel.org, james.morse@arm.com, pombredanne@nexb.com, kstewart@linuxfoundation.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP It appears arm64 copied arm's GENERIC_IRQ_MULTI_HANDLER code, but made it unconditional. I wanted to make this generic so it could be used by the RISC-V port. This patch converts the arm64 code to use the new generic code, which simply consists of deleting the arm64 code and setting MULTI_IRQ_HANDLER instead. Reviewed-by: Christoph Hellwig Signed-off-by: Palmer Dabbelt --- arch/arm64/Kconfig | 4 +--- arch/arm64/include/asm/irq.h | 2 -- arch/arm64/kernel/irq.c | 10 ---------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 42c090cf0292..3d1011957823 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -74,6 +74,7 @@ config ARM64 select GENERIC_CPU_AUTOPROBE select GENERIC_EARLY_IOREMAP select GENERIC_IDLE_POLL_SETUP + select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW_LEVEL @@ -264,9 +265,6 @@ config ARCH_SUPPORTS_UPROBES config ARCH_PROC_KCORE_TEXT def_bool y -config MULTI_IRQ_HANDLER - def_bool y - source "init/Kconfig" source "kernel/Kconfig.freezer" diff --git a/arch/arm64/include/asm/irq.h b/arch/arm64/include/asm/irq.h index a0fee6985e6a..b2b0c6405eb0 100644 --- a/arch/arm64/include/asm/irq.h +++ b/arch/arm64/include/asm/irq.h @@ -8,8 +8,6 @@ struct pt_regs; -extern void set_handle_irq(void (*handle_irq)(struct pt_regs *)); - static inline int nr_legacy_irqs(void) { return 0; diff --git a/arch/arm64/kernel/irq.c b/arch/arm64/kernel/irq.c index 60e5fc661f74..780a12f59a8f 100644 --- a/arch/arm64/kernel/irq.c +++ b/arch/arm64/kernel/irq.c @@ -42,16 +42,6 @@ int arch_show_interrupts(struct seq_file *p, int prec) return 0; } -void (*handle_arch_irq)(struct pt_regs *) = NULL; - -void __init set_handle_irq(void (*handle_irq)(struct pt_regs *)) -{ - if (handle_arch_irq) - return; - - handle_arch_irq = handle_irq; -} - #ifdef CONFIG_VMAP_STACK static void init_irq_stacks(void) {