From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Fri, 8 Apr 2016 22:43:52 +0200 Subject: [PATCH 2/4] irqchip: bcm2836: Drop smp_set_ops on arm64 builds In-Reply-To: <1459827858-3871-3-git-send-email-eric@anholt.net> References: <1459827858-3871-1-git-send-email-eric@anholt.net> <1459827858-3871-3-git-send-email-eric@anholt.net> Message-ID: <201604082243.52300.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tuesday 05 April 2016, Eric Anholt wrote: > For arm64, the bootloader will instead be implementing the spin-table > enable method. > > Signed-off-by: Eric Anholt > --- > drivers/irqchip/irq-bcm2836.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c > index 233ccdd..4ae9f76 100644 > --- a/drivers/irqchip/irq-bcm2836.c > +++ b/drivers/irqchip/irq-bcm2836.c > @@ -223,6 +223,7 @@ static struct notifier_block bcm2836_arm_irqchip_cpu_notifier = { > .priority = 100, > }; > > +#ifdef ARM > int __init bcm2836_smp_boot_secondary(unsigned int cpu, > struct task_struct *idle) > { > @@ -238,7 +239,7 @@ int __init bcm2836_smp_boot_secondary(unsigned int cpu, > static const struct smp_operations bcm2836_smp_ops __initconst = { > .smp_boot_secondary = bcm2836_smp_boot_secondary, > }; > - > +#endif > #endif > > static const struct irq_domain_ops bcm2836_arm_irqchip_intc_ops = { > @@ -256,8 +257,11 @@ bcm2836_arm_irqchip_smp_init(void) > register_cpu_notifier(&bcm2836_arm_irqchip_cpu_notifier); > > set_smp_cross_call(bcm2836_arm_irqchip_send_ipi); > + > +#ifdef ARM > smp_set_ops(&bcm2836_smp_ops); > #endif > +#endif > } I'd suggest instead using CPU_METHOD_OF_DECLARE and moving the SMP code to arch/arm/mach-bcm/platsmp-bcm2835.c. It doesn't really belong in the irqchip code. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758956AbcDHUos (ORCPT ); Fri, 8 Apr 2016 16:44:48 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:54720 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755085AbcDHUoq (ORCPT ); Fri, 8 Apr 2016 16:44:46 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 2/4] irqchip: bcm2836: Drop smp_set_ops on arm64 builds Date: Fri, 8 Apr 2016 22:43:52 +0200 User-Agent: KMail/1.12.2 (Linux/3.19.0-58-generic; KDE/4.3.2; x86_64; ; ) Cc: Eric Anholt , linux-rpi-kernel@lists.infradead.org, Jason Cooper , Stephen Warren , Marc Zyngier , Lee Jones , linux-kernel@vger.kernel.org, Thomas Gleixner References: <1459827858-3871-1-git-send-email-eric@anholt.net> <1459827858-3871-3-git-send-email-eric@anholt.net> In-Reply-To: <1459827858-3871-3-git-send-email-eric@anholt.net> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201604082243.52300.arnd@arndb.de> X-Provags-ID: V03:K0:LEBgefW0x3h2CfYpRNunQh2vxKk2fsGxWG5o7yTEJZhJB86P3hs ocNMbdmlp/qMt03Wt0c2xBi35YHYE9BVZ7xzogguHRq5tHCbv/tVKnHbJLQ6SU3R8OxR1+V Be9ISd23ApQaGk5UrILuwmnlZVpPmkBgfP5+jpEU53q9MySYapwGB9RRCjlHGfMd0FJCvN/ ORlYfXZ+92wyNLJRn+wyA== X-UI-Out-Filterresults: notjunk:1;V01:K0:LaFPSn8fs7Y=:JvxoBTa5ta07jD3DmehWPF WcnkqR945ohueia43m1QiplcDneOXHDqH/85AVy0g5eNspmNR1e6ukfBfbxtv96C1LQCyX9j7 F539D4nGrY2SSt5qWcGhoI/sRutLgwG8n6QDx+y2bheCd0CMH3ix+Xj/w2h4HEy3g6L79AEsL oSMFcGTV9CJOLCpGf+eL63jXGbHoYC2SOMJpYUZLHo4ym5jUt+jx0DSro7Gb4TQ552fwjzDs1 uTdzeCRJjvYZH4juNDgpF3KLx7LKG3QFOt+bHrAI4hdKA9k6OpMqbu+cpBqowJbBXLRH1MCAv BqRSX0xJrUx6bXvuYFNRphCQKi3wy8PhzxRbVtAURuESleFcNv8kuB/QSi0lg+OJNk5HW0Ec7 hbiJ57oR0hYnbPCVmCKmvLN808zVwBCAu3BXAjNQMUjLiPKrx3T24mE/WEhqkR73wWKLTLb08 UFqe+MFGnctAAVr1tlUgT9EnbDT6dCE19ButKvvvFCgZkGji+M9ou/A3Dfa/50uAlv+w2JZSn 1X+dWz0Zd/R5UG4FF8h9q44Ta9uB3U8jdznOhmxr+qK5xoGQT7gr31MMsHfkfZPeayKEKDOQa 0QUu3Odt95hJQx2kIjBjzuGxjkVa1E4LjNA08pOotd0v+L1SxETKwIBQ3ICNGsq3nCEEFRuZr 5OmW4kIo4fGk/+cFX1nHzduQaT5Lubw5JVdGvyA9T81/n+QrJ07hYKQCtPsdGgY0iwKCUrl2D qaHSmg9mdbAjGUNB Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tuesday 05 April 2016, Eric Anholt wrote: > For arm64, the bootloader will instead be implementing the spin-table > enable method. > > Signed-off-by: Eric Anholt > --- > drivers/irqchip/irq-bcm2836.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c > index 233ccdd..4ae9f76 100644 > --- a/drivers/irqchip/irq-bcm2836.c > +++ b/drivers/irqchip/irq-bcm2836.c > @@ -223,6 +223,7 @@ static struct notifier_block bcm2836_arm_irqchip_cpu_notifier = { > .priority = 100, > }; > > +#ifdef ARM > int __init bcm2836_smp_boot_secondary(unsigned int cpu, > struct task_struct *idle) > { > @@ -238,7 +239,7 @@ int __init bcm2836_smp_boot_secondary(unsigned int cpu, > static const struct smp_operations bcm2836_smp_ops __initconst = { > .smp_boot_secondary = bcm2836_smp_boot_secondary, > }; > - > +#endif > #endif > > static const struct irq_domain_ops bcm2836_arm_irqchip_intc_ops = { > @@ -256,8 +257,11 @@ bcm2836_arm_irqchip_smp_init(void) > register_cpu_notifier(&bcm2836_arm_irqchip_cpu_notifier); > > set_smp_cross_call(bcm2836_arm_irqchip_send_ipi); > + > +#ifdef ARM > smp_set_ops(&bcm2836_smp_ops); > #endif > +#endif > } I'd suggest instead using CPU_METHOD_OF_DECLARE and moving the SMP code to arch/arm/mach-bcm/platsmp-bcm2835.c. It doesn't really belong in the irqchip code. Arnd