From patchwork Tue Mar 27 16:19:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 10310629 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 6D74D6037D for ; Tue, 27 Mar 2018 16:23:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C6B829A1C for ; Tue, 27 Mar 2018 16:23:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5052F29B03; Tue, 27 Mar 2018 16:23:06 +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=unavailable 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 D82C029A1C for ; Tue, 27 Mar 2018 16:23:05 +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=t/W0BdQiabcf2ZQV4MEetsw62iHbbVTKVFfLt/uSMCg=; b=Yab0+3+1eYV/r7 qNhhGcLYHM+G0q/gIphUHqQixkAopQfu+3vNIwrnHvV+Wy6ALUqwNeddb98x57qbn0DPzih4+8UG6 OFCwMCGA5LhjR5jIBKTCyfLJqC6e5fYPlPaTMiKRGh8raE/cYCOgQbTeBNf8aVRuor4lwcxYAuXQz iFyUqiK1sumT93JeGYZq63MjuI4YSlwgcdydQ/ssWXl6NxEScbZl/3JP9qNdWKEkXbXPbBEA7TKq4 JRxzZXAzbfUzuVBWOPEfhN84CZnaVP5RCuBdeS4ErouWtn1GdGSmrfwSNq0tPPofuLRJPXY18QMHC LDfs3muHZxl2pjUtDPGA==; 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 1f0rN9-0002ab-Vz; Tue, 27 Mar 2018 16:22:55 +0000 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f0rK4-00074q-U7 for linux-arm-kernel@lists.infradead.org; Tue, 27 Mar 2018 16:19:48 +0000 Received: by mail-pf0-x242.google.com with SMTP id m68so9043463pfm.11 for ; Tue, 27 Mar 2018 09:19:34 -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=WSzf0FAhlRqFzHOh7TIhVWaODL6J13psFt6GlQpKick=; b=K8QQDWI00S5NnKd06nqjwsGvghHdFl2z9UFxzoQW9sr6ahiK3Sz2kEv24iiFCOqbps MUs0YLNmGNfAsGPFu3dMYALsNwXHQq3Qz5OB5UDPVNKGOaK5dvdOozXtgH40nijtd4Q4 CCECD4g+ys9LNCy0Yae+pMDXvXXDRqLMavaPffDMyodRqURLP7zdGMz8Fy2TnVL46W5H k41OJWxsV65bLtmxBYs8sg/fFtfSikfW1fbNfVoI4n6UXYgues73NnJJiOLzwOaQxl5C 5+K2ttt+QcAxumRymaaOKrNDulA5vN522NUnZNdcgSnEiaWtjovBT0V9P35qysm7auIQ EPyg== 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=WSzf0FAhlRqFzHOh7TIhVWaODL6J13psFt6GlQpKick=; b=aDpjTBm96UApUA0WU36/Tt2qHqtmFMJVyNjGFU9zV3HMzlp7dAqzP7MYmw+5XZlbfY zPRTJ7km9NJBtIBE0KZAgi4wgpW6sdYL+Q7j/IVsSYnDznpvZvHyjJ4H/KFkNfvJuOha ohoAxMgTwrDhhauxeavfzwcCXSRiH04KkSHr3+iGJYyWayetNT+eLV/J8Jtfik/gkX4H yMVjXRMoo53Znyeq5qJiTgFJQvJUraBwG9Heoqka22py7QYMxxApUNi6OD548HGUcRzM 1+R6beGcnXwYXt/ByQForbBfWJKaYDuP9beRVaE0NXvl2VLwTI4GKCcvBYNUG74mQhlP +gqA== X-Gm-Message-State: AElRT7GAzSgp030tY0eSu+xM4EuUkGgkYEclh3NBUIHGOjx/Tdq3p4AR J7a8EZ4ug5C7PeIp82DN5OJQLg== X-Google-Smtp-Source: AIpwx4+9YrO+0aj/XOb31SzBY500XbhFP9kby/T/r8492NyYBd/d54rJmqBJv4LgujwoCqK0JhRMsg== X-Received: by 10.99.109.139 with SMTP id i133mr1019pgc.194.1522167574202; Tue, 27 Mar 2018 09:19:34 -0700 (PDT) Received: from localhost ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id a3sm3248960pgv.14.2018.03.27.09.19.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Mar 2018 09:19:33 -0700 (PDT) Subject: [PATCH v4 7/8] openrisc: Use the new GENERIC_IRQ_MULTI_HANDLER Date: Tue, 27 Mar 2018 09:19:10 -0700 Message-Id: <20180327161911.14086-8-palmer@sifive.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180327161911.14086-1-palmer@sifive.com> References: <20180327161911.14086-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-20180327_091944_997520_92D31F82 X-CRM114-Status: GOOD ( 14.17 ) 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 , Arnd Bergmann 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 that openrisc copied arm64's GENERIC_IRQ_MULTI_HANDLER code (which came from arm). I wanted to make this generic so I could use it in the RISC-V port. This patch converts the openrisc code to use the generic version. Acked-by: Stafford Horne Signed-off-by: Palmer Dabbelt --- arch/openrisc/Kconfig | 5 +---- arch/openrisc/include/asm/irq.h | 2 -- arch/openrisc/kernel/irq.c | 7 ------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index 9ecad05bfc73..dfb6a79ba7ff 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@ -27,7 +27,6 @@ config OPENRISC select GENERIC_STRNLEN_USER select GENERIC_SMP_IDLE_THREAD select MODULES_USE_ELF_RELA - select MULTI_IRQ_HANDLER select HAVE_DEBUG_STACKOVERFLOW select OR1K_PIC select CPU_NO_EFFICIENT_FFS if !OPENRISC_HAVE_INST_FF1 @@ -36,6 +35,7 @@ config OPENRISC select ARCH_USE_QUEUED_RWLOCKS select OMPIC if SMP select ARCH_WANT_FRAME_POINTERS + select GENERIC_IRQ_MULTI_HANDLER config CPU_BIG_ENDIAN def_bool y @@ -69,9 +69,6 @@ config STACKTRACE_SUPPORT config LOCKDEP_SUPPORT def_bool y -config MULTI_IRQ_HANDLER - def_bool y - source "init/Kconfig" source "kernel/Kconfig.freezer" diff --git a/arch/openrisc/include/asm/irq.h b/arch/openrisc/include/asm/irq.h index d9eee0a2b7b4..eb612b1865d2 100644 --- a/arch/openrisc/include/asm/irq.h +++ b/arch/openrisc/include/asm/irq.h @@ -24,6 +24,4 @@ #define NO_IRQ (-1) -extern void set_handle_irq(void (*handle_irq)(struct pt_regs *)); - #endif /* __ASM_OPENRISC_IRQ_H__ */ diff --git a/arch/openrisc/kernel/irq.c b/arch/openrisc/kernel/irq.c index 35e478a93116..5f9445effaf8 100644 --- a/arch/openrisc/kernel/irq.c +++ b/arch/openrisc/kernel/irq.c @@ -41,13 +41,6 @@ void __init init_IRQ(void) irqchip_init(); } -static void (*handle_arch_irq)(struct pt_regs *); - -void __init set_handle_irq(void (*handle_irq)(struct pt_regs *)) -{ - handle_arch_irq = handle_irq; -} - void __irq_entry do_IRQ(struct pt_regs *regs) { handle_arch_irq(regs);