From patchwork Mon Oct 24 12:46:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuriy Kolerov X-Patchwork-Id: 685812 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t2bf74Gm4z9t0P for ; Mon, 24 Oct 2016 23:47:27 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1byeez-00007j-LM; Mon, 24 Oct 2016 12:47:25 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1byeew-00005s-6q for linux-snps-arc@bombadil.infradead.org; Mon, 24 Oct 2016 12:47:22 +0000 Received: from smtprelay2.synopsys.com ([198.182.60.111] helo=smtprelay.synopsys.com) by merlin.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1byeet-00053q-7a for linux-snps-arc@lists.infradead.org; Mon, 24 Oct 2016 12:47:21 +0000 Received: from dc8secmta2.synopsys.com (dc8secmta2.synopsys.com [10.13.218.202]) by smtprelay.synopsys.com (Postfix) with ESMTP id 0D3A710C1006; Mon, 24 Oct 2016 05:46:56 -0700 (PDT) Received: from dc8secmta2.internal.synopsys.com (dc8secmta2.internal.synopsys.com [127.0.0.1]) by dc8secmta2.internal.synopsys.com (Service) with ESMTP id F3CB4A4112; Mon, 24 Oct 2016 05:46:55 -0700 (PDT) Received: from mailhost.synopsys.com (mailhost1.synopsys.com [10.12.238.239]) by dc8secmta2.internal.synopsys.com (Service) with ESMTP id C7593A4102; Mon, 24 Oct 2016 05:46:55 -0700 (PDT) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id B303AA7D; Mon, 24 Oct 2016 05:46:55 -0700 (PDT) Received: from ykolerov-vm.internal.synopsys.com (unknown [10.225.2.234]) by mailhost.synopsys.com (Postfix) with ESMTP id C8E6FA77; Mon, 24 Oct 2016 05:46:53 -0700 (PDT) From: Yuriy Kolerov To: linux-snps-arc@lists.infradead.org Subject: [PATCH v2 2/5] ARC: SMP: Pass virq to smp_ipi_irq_setup instead of hwirq Date: Mon, 24 Oct 2016 15:46:31 +0300 Message-Id: <1477313194-2310-2-git-send-email-yuriy.kolerov@synopsys.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477313194-2310-1-git-send-email-yuriy.kolerov@synopsys.com> References: <1477313194-2310-1-git-send-email-yuriy.kolerov@synopsys.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161024_084719_333542_955C7E3B X-CRM114-Status: UNSURE ( 9.31 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -3.3 (---) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (-3.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [198.182.60.111 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [198.182.60.111 listed in list.dnswl.org] -1.3 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-snps-arc@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on Synopsys ARC Processors List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marc.zyngier@arm.com, Vineet.Gupta1@synopsys.com, Alexey.Brodkin@synopsys.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, Yuriy Kolerov MIME-Version: 1.0 Sender: "linux-snps-arc" Errors-To: linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This function takes a cpu number and a virq number and registers an appropriate handler per cpu. However smp_ipi_irq_setup is incorrectly used in several places of ARC platform code - hwirq is passed instead of virq. There is a code with an example of inccorect usage of smp_ipi_irq_setup: smp_ipi_irq_setup(cpu, IPI_IRQ); smp_ipi_irq_setup(cpu, SOFTIRQ_IRQ); where IPI_IRQ and SOFTIRQ_IRQ are hwirq numbers for per cpu interrupts. Since smp_ipi_irq_setup must be taken a virq number insdead of a hwirq number then it is necessary to fix usage of this function this way: smp_ipi_irq_setup(cpu, irq_find_mapping(NULL, IPI_IRQ)); smp_ipi_irq_setup(cpu, irq_find_mapping(NULL, SOFTIRQ_IRQ)); The idea is to find an appropriate mapping of to virq by using irq_find_mapping function. NULL value is used as a domain argument (a default domain) since smp_ipi_irq_setup is used for registering an IRQ handler for a root interrupt controller (a default IRQ domain must be used). Signed-off-by: Yuriy Kolerov --- arch/arc/kernel/mcip.c | 5 +++-- arch/arc/plat-eznps/smp.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arc/kernel/mcip.c b/arch/arc/kernel/mcip.c index 72f9179..28ff766 100644 --- a/arch/arc/kernel/mcip.c +++ b/arch/arc/kernel/mcip.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -22,8 +23,8 @@ static DEFINE_RAW_SPINLOCK(mcip_lock); static void mcip_setup_per_cpu(int cpu) { - smp_ipi_irq_setup(cpu, IPI_IRQ); - smp_ipi_irq_setup(cpu, SOFTIRQ_IRQ); + smp_ipi_irq_setup(cpu, irq_find_mapping(NULL, IPI_IRQ)); + smp_ipi_irq_setup(cpu, irq_find_mapping(NULL, SOFTIRQ_IRQ)); } static void mcip_ipi_send(int cpu) diff --git a/arch/arc/plat-eznps/smp.c b/arch/arc/plat-eznps/smp.c index 5e901f8..dd996e0 100644 --- a/arch/arc/plat-eznps/smp.c +++ b/arch/arc/plat-eznps/smp.c @@ -134,7 +134,7 @@ static void eznps_ipi_send(int cpu) static void eznps_init_per_cpu(int cpu) { - smp_ipi_irq_setup(cpu, NPS_IPI_IRQ); + smp_ipi_irq_setup(cpu, irq_find_mapping(NULL, NPS_IPI_IRQ)); eznps_init_core(cpu); mtm_enable_core(cpu);