From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753038AbbL2Kqd (ORCPT ); Tue, 29 Dec 2015 05:46:33 -0500 Received: from terminus.zytor.com ([198.137.202.10]:57039 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752877AbbL2KqR (ORCPT ); Tue, 29 Dec 2015 05:46:17 -0500 Date: Tue, 29 Dec 2015 02:46:02 -0800 From: tip-bot for Andrea Merello Message-ID: Cc: andrea.merello@gmail.com, linux-kernel@vger.kernel.org, lee@kernel.org, eric@anholt.net, hpa@zytor.com, mingo@kernel.org, marc.zyngier@arm.com, f.fainelli@gmail.com, swarren@wwwdotorg.org, jason@lakedaemon.net, tglx@linutronix.de Reply-To: tglx@linutronix.de, f.fainelli@gmail.com, jason@lakedaemon.net, swarren@wwwdotorg.org, mingo@kernel.org, marc.zyngier@arm.com, hpa@zytor.com, eric@anholt.net, lee@kernel.org, linux-kernel@vger.kernel.org, andrea.merello@gmail.com In-Reply-To: <1451166444-11044-3-git-send-email-eric@anholt.net> References: <1451166444-11044-3-git-send-email-eric@anholt.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqchip/bcm2836: Add SMP support for the 2836 Git-Commit-ID: 41f4988cc287e5f836d3f6620c9f900bc9b560e9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 41f4988cc287e5f836d3f6620c9f900bc9b560e9 Gitweb: http://git.kernel.org/tip/41f4988cc287e5f836d3f6620c9f900bc9b560e9 Author: Andrea Merello AuthorDate: Sat, 26 Dec 2015 13:47:22 -0800 Committer: Thomas Gleixner CommitDate: Tue, 29 Dec 2015 11:40:45 +0100 irqchip/bcm2836: Add SMP support for the 2836 The firmware sets the secondaries spinning waiting for a non-NULL value to show up in the last IPI mailbox. The original SMP port from the downstream tree was done by Andrea, and Eric cleaned it up/rewrote it a few times from there. Signed-off-by: Andrea Merello Signed-off-by: Eric Anholt Cc: linux-arm-kernel@lists.infradead.org Cc: Stephen Warren Cc: Lee Jones Cc: Florian Fainelli Cc: Jason Cooper Cc: Marc Zyngier Cc: linux-rpi-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/1451166444-11044-3-git-send-email-eric@anholt.net Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-bcm2836.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c index 6ec125e..59ac40c 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c @@ -53,14 +53,16 @@ /* Same status bits as above, but for FIQ. */ #define LOCAL_FIQ_PENDING0 0x070 /* - * Mailbox0 write-to-set bits. There are 16 mailboxes, 4 per CPU, and + * Mailbox write-to-set bits. There are 16 mailboxes, 4 per CPU, and * these bits are organized by mailbox number and then CPU number. We * use mailbox 0 for IPIs. The mailbox's interrupt is raised while * any bit is set. */ #define LOCAL_MAILBOX0_SET0 0x080 -/* Mailbox0 write-to-clear bits. */ +#define LOCAL_MAILBOX3_SET0 0x08c +/* Mailbox write-to-clear bits. */ #define LOCAL_MAILBOX0_CLR0 0x0c0 +#define LOCAL_MAILBOX3_CLR0 0x0cc #define LOCAL_IRQ_CNTPSIRQ 0 #define LOCAL_IRQ_CNTPNSIRQ 1 @@ -220,6 +222,24 @@ static struct notifier_block bcm2836_arm_irqchip_cpu_notifier = { .notifier_call = bcm2836_arm_irqchip_cpu_notify, .priority = 100, }; + +int __init bcm2836_smp_boot_secondary(unsigned int cpu, + struct task_struct *idle) +{ + unsigned long secondary_startup_phys = + (unsigned long)virt_to_phys((void *)secondary_startup); + + dsb(); + writel(secondary_startup_phys, + intc.base + LOCAL_MAILBOX3_SET0 + 16 * cpu); + + return 0; +} + +static const struct smp_operations bcm2836_smp_ops __initconst = { + .smp_boot_secondary = bcm2836_smp_boot_secondary, +}; + #endif static const struct irq_domain_ops bcm2836_arm_irqchip_intc_ops = { @@ -237,6 +257,7 @@ bcm2836_arm_irqchip_smp_init(void) register_cpu_notifier(&bcm2836_arm_irqchip_cpu_notifier); set_smp_cross_call(bcm2836_arm_irqchip_send_ipi); + smp_set_ops(&bcm2836_smp_ops); #endif }