From patchwork Wed Mar 7 23:57:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 10265665 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 47BB160247 for ; Thu, 8 Mar 2018 00:00:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35BF428ADD for ; Thu, 8 Mar 2018 00:00:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2894328D7D; Thu, 8 Mar 2018 00:00:20 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID 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 965C628ADD for ; Thu, 8 Mar 2018 00:00:19 +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=7ZN7gZXJTDAXmIjNcv2rr1KIAiSwZe4eYUWZvnILtr0=; b=Ptl7k9f1SuiXGx wg7oVFchDgTIpREAqXhoZ+WIkN8rGuqsD1ErD2OmZKzQLAIR5aN97tRWhcC9wvcJdmWWh6UsPXihm R0EhJyWAD/1aO975hZIBMDLKLwDJipRteaFNK1xEhzysI2ZbgXvTjg0XbphDPCIR2tsrOma+Z+m7k U+uub/KoMlNgMnwkIIMG5wrrG9ikq5F8TWuPofvdEiMeuHpcHoIkLZ1Edf6nuqcsvlkPmFRWcyMfN lpq4rJTpQLejoWhCgh6T3L1rXAGzKsyYFPWs6rvw8xzaUV+hZczmZ70LRWuEFqLkoR/atD31awdvQ IqXwY3h88W/BZvlQi5Rw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1etiyi-0000qS-Oq; Thu, 08 Mar 2018 00:00:12 +0000 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1etiwV-0007eW-37 for linux-arm-kernel@lists.infradead.org; Wed, 07 Mar 2018 23:58:05 +0000 Received: by mail-pl0-x244.google.com with SMTP id 93-v6so2305015plc.9 for ; Wed, 07 Mar 2018 15:57:45 -0800 (PST) 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=0DZiJ9MiS15OC1zwoxPQKEw+uzbJYu9AjeNCZJgMIk4=; b=LKaO0hxIQ/eQE5PAjNp1lefdrQx4zJHahZrVdD4WBVM13rRfaTqBcrNAgXzSDgHxtD h68L7vi+W/lXmxo1I/Dlkc7KhhLlQm6Yx/CEbDSt3i98O/RVJec7t9QkdZF0zIjzpfsO FjuQJGypE+WRIPYdVIpW7EiXO5qDsD2nzSPjiw4ilDAIW78oOiyBmCOkGLXS8sfqx20E D/TLYPBJEbMm1t7NfwmIRTIOGfe7GfBkYE+zI6YvsFnD2u/76w/uOxc//+ai0bHfqbI1 yeQUknV/9TEAGgedoHtCCrxUhVknR9/MC8NOhb7khdLfV3f5aiFV9YIvmketpXcuj5sv eNcA== 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=0DZiJ9MiS15OC1zwoxPQKEw+uzbJYu9AjeNCZJgMIk4=; b=Ait2OczT0poNYl66xYKBsB1jZy5kPOh8LQ8ZHgaa2+wOL9Z6JCI3HqodtJkELL6TdW evcfoUoQps4olIy3HeZXZJTqnwBcEnW+inB1bxtzJlfB1MN7nViHj1uWX/eB0fOfRRqc 8u2yk3Wz78JuAOaPhrAi60AJuNKcLL/gU4rzjLzqL/iUEMK8iwdvOlBolSFxrHJw3mif on2kpoh9JnMC/c5XBKjPS/IGdcH0uw8f2Si0G7At314IOaVrIxq8OSvzkqRblu+fufXJ LzKg7+lAYrKE6MnowozB2JSM2jcmPm2Yg5k/6rERqUNpxrTQG4juTOYg8ccv/fPhmOWy P0uw== X-Gm-Message-State: APf1xPDWuVKEgUQ6D4+VNzJmHFDIEoJzc+NosTmc2vY54d8qnAxhUQMQ DJtjLelJvxtJo/guyWOtqBHesQ== X-Google-Smtp-Source: AG47ELvRXRdhjz0Ixiey699xkHVzVjMzFANh76vnWx75/0DvO/N5BpjY9or4x5F8LuVJZajjuC1ldw== X-Received: by 2002:a17:902:3103:: with SMTP id w3-v6mr21063670plb.99.1520467064543; Wed, 07 Mar 2018 15:57:44 -0800 (PST) Received: from localhost ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id 73sm34946611pfz.165.2018.03.07.15.57.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Mar 2018 15:57:43 -0800 (PST) Subject: [PATCH v3 4/5] arm64: Use the new GENERIC_IRQ_MULTI_HANDLER Date: Wed, 7 Mar 2018 15:57:30 -0800 Message-Id: <20180307235731.22627-5-palmer@sifive.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180307235731.22627-1-palmer@sifive.com> References: <20180307235731.22627-1-palmer@sifive.com> From: Palmer Dabbelt To: linux@armlinux.org.uk, catalin.marinas@arm.com, Will Deacon , jonas@southpole.se, stefan.kristiansson@saunalahti.fi, shorne@gmail.com, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, openrisc@lists.librecores.org, linux-riscv@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180307_155755_784235_467D7F73 X-CRM114-Status: GOOD ( 18.84 ) 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: Palmer Dabbelt 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 | 1 + arch/arm64/include/asm/irq.h | 2 -- arch/arm64/kernel/irq.c | 10 ---------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 7381eeb7ef8e..cb03e93f03cf 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -132,6 +132,7 @@ config ARM64 select IRQ_DOMAIN select IRQ_FORCED_THREADING select MODULES_USE_ELF_RELA + select GENERIC_IRQ_MULTI_HANDLER select NO_BOOTMEM select OF select OF_EARLY_FLATTREE 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) {