From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] irqchip: bcm2836: Drop smp_set_ops on arm64 builds
Date: Fri, 8 Apr 2016 22:43:52 +0200 [thread overview]
Message-ID: <201604082243.52300.arnd@arndb.de> (raw)
In-Reply-To: <1459827858-3871-3-git-send-email-eric@anholt.net>
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 <eric@anholt.net>
> ---
> 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
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: Eric Anholt <eric@anholt.net>,
linux-rpi-kernel@lists.infradead.org,
Jason Cooper <jason@lakedaemon.net>,
Stephen Warren <swarren@wwwdotorg.org>,
Marc Zyngier <marc.zyngier@arm.com>, Lee Jones <lee@kernel.org>,
linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [PATCH 2/4] irqchip: bcm2836: Drop smp_set_ops on arm64 builds
Date: Fri, 8 Apr 2016 22:43:52 +0200 [thread overview]
Message-ID: <201604082243.52300.arnd@arndb.de> (raw)
In-Reply-To: <1459827858-3871-3-git-send-email-eric@anholt.net>
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 <eric@anholt.net>
> ---
> 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
next prev parent reply other threads:[~2016-04-08 20:43 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-05 3:44 [PATCH 0/4] irqchip: bcm2835: arm64 port Eric Anholt
2016-04-05 3:44 ` Eric Anholt
2016-04-05 3:44 ` [PATCH 1/4] irqchip: bcm2835: Avoid arch/arm-specific handle_IRQ Eric Anholt
2016-04-05 3:44 ` Eric Anholt
2016-04-05 3:44 ` [PATCH 2/4] irqchip: bcm2836: Drop smp_set_ops on arm64 builds Eric Anholt
2016-04-05 3:44 ` Eric Anholt
2016-04-05 13:44 ` Marc Zyngier
2016-04-05 13:44 ` Marc Zyngier
2016-04-08 20:43 ` Arnd Bergmann [this message]
2016-04-08 20:43 ` Arnd Bergmann
2016-04-13 19:49 ` Eric Anholt
2016-04-13 19:49 ` Eric Anholt
2016-04-05 3:44 ` [PATCH 3/4] irqchip: bcm2836: Fix compiler warning on 64-bit build Eric Anholt
2016-04-05 3:44 ` Eric Anholt
2016-04-05 3:44 ` [PATCH 4/4] irqchip: bcm2836: Use a more generic memory barrier call Eric Anholt
2016-04-05 3:44 ` Eric Anholt
2016-04-06 4:59 ` Stephen Warren
2016-04-06 4:59 ` Stephen Warren
2016-04-08 18:20 ` Eric Anholt
2016-04-08 18:20 ` Eric Anholt
2016-04-09 5:26 ` Stephen Warren
2016-04-09 5:26 ` Stephen Warren
2016-04-10 18:32 ` Eric Anholt
2016-04-10 18:32 ` Eric Anholt
2016-04-11 15:52 ` Stephen Warren
2016-04-11 15:52 ` Stephen Warren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201604082243.52300.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.