* [PATCH 1/3] irqchip: Move ARM GIC to drivers/irqchip
2012-10-30 14:54 [PATCH 0/7] Move GIC and VIC to drivers/irqchip Rob Herring
@ 2012-10-30 14:54 ` Rob Herring
2012-10-30 15:01 ` Thomas Petazzoni
2012-10-30 14:54 ` [PATCH 2/3] irqchip: Move ARM VIC " Rob Herring
2012-10-30 14:54 ` [PATCH 3/3] ARM: highbank: use common irqchip_init Rob Herring
2 siblings, 1 reply; 15+ messages in thread
From: Rob Herring @ 2012-10-30 14:54 UTC (permalink / raw)
To: linux-arm-kernel
From: Rob Herring <rob.herring@calxeda.com>
Now that we have drivers/irqchip, move GIC irqchip to drivers/irqchip. This
is necessary to share the GIC with arm and arm64.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
---
arch/arm/common/Kconfig | 8 --------
arch/arm/common/Makefile | 1 -
drivers/irqchip/Kconfig | 8 ++++++++
drivers/irqchip/Makefile | 1 +
arch/arm/common/gic.c => drivers/irqchip/irq-gic.c | 0
drivers/irqchip/irqchip.c | 10 ++++++++++
drivers/irqchip/irqchip.h | 1 +
7 files changed, 20 insertions(+), 9 deletions(-)
rename arch/arm/common/gic.c => drivers/irqchip/irq-gic.c (100%)
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 45ceeb0..7bf52b2 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -1,11 +1,3 @@
-config ARM_GIC
- bool
- select IRQ_DOMAIN
- select MULTI_IRQ_HANDLER
-
-config GIC_NON_BANKED
- bool
-
config ARM_VIC
bool
select IRQ_DOMAIN
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index e8a4e58..4104b82 100644
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@ -2,7 +2,6 @@
# Makefile for the linux kernel.
#
-obj-$(CONFIG_ARM_GIC) += gic.o
obj-$(CONFIG_ARM_VIC) += vic.o
obj-$(CONFIG_ICST) += icst.o
obj-$(CONFIG_SA1111) += sa1111.o
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 88b0929..2d7f350 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -1,3 +1,11 @@
config IRQCHIP
def_bool y
depends on OF_IRQ
+
+config ARM_GIC
+ bool
+ select IRQ_DOMAIN
+ select MULTI_IRQ_HANDLER
+
+config GIC_NON_BANKED
+ bool
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index 5148ffd..94118db 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -1,3 +1,4 @@
obj-$(CONFIG_IRQCHIP) += irqchip.o
obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o
obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o
+obj-$(CONFIG_ARM_GIC) += irq-gic.o
diff --git a/arch/arm/common/gic.c b/drivers/irqchip/irq-gic.c
similarity index 100%
rename from arch/arm/common/gic.c
rename to drivers/irqchip/irq-gic.c
diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c
index f36d423..3f37397 100644
--- a/drivers/irqchip/irqchip.c
+++ b/drivers/irqchip/irqchip.c
@@ -14,6 +14,16 @@
#include "irqchip.h"
static const struct of_device_id irqchip_of_match[] __initconst = {
+#ifdef CONFIG_ARM_GIC
+ {
+ .compatible = "arm,cortex-a15-gic",
+ .data = gic_of_init,
+ },
+ {
+ .compatible = "arm,cortex-a9-gic",
+ .data = gic_of_init,
+ },
+#endif
#ifdef CONFIG_ARCH_BCM2835
{
.compatible = "brcm,bcm2835-armctrl-ic",
diff --git a/drivers/irqchip/irqchip.h b/drivers/irqchip/irqchip.h
index 0a0d7af..62773ab3 100644
--- a/drivers/irqchip/irqchip.h
+++ b/drivers/irqchip/irqchip.h
@@ -14,5 +14,6 @@
int bcm2835_irqchip_init(struct device_node *node, struct device_node *parent);
int armada_370_xp_mpic_of_init(struct device_node *node,
struct device_node *parent);
+int gic_of_init(struct device_node *node, struct device_node *parent);
#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 1/3] irqchip: Move ARM GIC to drivers/irqchip
2012-10-30 14:54 ` [PATCH 1/3] irqchip: Move ARM GIC " Rob Herring
@ 2012-10-30 15:01 ` Thomas Petazzoni
2012-10-30 16:05 ` Rob Herring
0 siblings, 1 reply; 15+ messages in thread
From: Thomas Petazzoni @ 2012-10-30 15:01 UTC (permalink / raw)
To: linux-arm-kernel
Rob,
On Tue, 30 Oct 2012 09:54:18 -0500, Rob Herring wrote:
> From: Rob Herring <rob.herring@calxeda.com>
>
> Now that we have drivers/irqchip, move GIC irqchip to drivers/irqchip. This
> is necessary to share the GIC with arm and arm64.
>
> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> ---
> arch/arm/common/Kconfig | 8 --------
> arch/arm/common/Makefile | 1 -
> drivers/irqchip/Kconfig | 8 ++++++++
> drivers/irqchip/Makefile | 1 +
> arch/arm/common/gic.c => drivers/irqchip/irq-gic.c | 0
> drivers/irqchip/irqchip.c | 10 ++++++++++
> drivers/irqchip/irqchip.h | 1 +
> 7 files changed, 20 insertions(+), 9 deletions(-)
What about arch/arm/include/asm/hardware/gic.h ?
Contrary to the current version of the bcm2835 IRQ controller driver
and the armada-370-xp IRQ controller driver, the GIC and VIC drivers
not only expose a <foo>_of_init() function, but also other functions
that are directly used by several non-DT capable ARM sub-architectures.
Of course, it works by leaving gic.h where it is now, but it sounds
strange to have the driver in drivers/irqchip/ and the header file in
arch/arm/include/asm/hardware/, especially if the goal is to be able to
use those drivers in arm64.
Best regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/3] irqchip: Move ARM GIC to drivers/irqchip
2012-10-30 15:01 ` Thomas Petazzoni
@ 2012-10-30 16:05 ` Rob Herring
2012-10-30 17:21 ` Rob Herring
0 siblings, 1 reply; 15+ messages in thread
From: Rob Herring @ 2012-10-30 16:05 UTC (permalink / raw)
To: linux-arm-kernel
On 10/30/2012 10:01 AM, Thomas Petazzoni wrote:
> Rob,
>
> On Tue, 30 Oct 2012 09:54:18 -0500, Rob Herring wrote:
>> From: Rob Herring <rob.herring@calxeda.com>
>>
>> Now that we have drivers/irqchip, move GIC irqchip to drivers/irqchip. This
>> is necessary to share the GIC with arm and arm64.
>>
>> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
>> Cc: Russell King <linux@arm.linux.org.uk>
>> Cc: Thomas Gleixner <tglx@linutronix.de>
>> ---
>> arch/arm/common/Kconfig | 8 --------
>> arch/arm/common/Makefile | 1 -
>> drivers/irqchip/Kconfig | 8 ++++++++
>> drivers/irqchip/Makefile | 1 +
>> arch/arm/common/gic.c => drivers/irqchip/irq-gic.c | 0
>> drivers/irqchip/irqchip.c | 10 ++++++++++
>> drivers/irqchip/irqchip.h | 1 +
>> 7 files changed, 20 insertions(+), 9 deletions(-)
>
> What about arch/arm/include/asm/hardware/gic.h ?
>
> Contrary to the current version of the bcm2835 IRQ controller driver
> and the armada-370-xp IRQ controller driver, the GIC and VIC drivers
> not only expose a <foo>_of_init() function, but also other functions
> that are directly used by several non-DT capable ARM sub-architectures.
>
> Of course, it works by leaving gic.h where it is now, but it sounds
> strange to have the driver in drivers/irqchip/ and the header file in
> arch/arm/include/asm/hardware/, especially if the goal is to be able to
> use those drivers in arm64.
Right. I'll have to move it. I wasn't really thinking about arm64 until
this morning.
Rob
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/3] irqchip: Move ARM GIC to drivers/irqchip
2012-10-30 16:05 ` Rob Herring
@ 2012-10-30 17:21 ` Rob Herring
2012-10-30 22:30 ` Thomas Petazzoni
2012-10-30 22:47 ` Russell King - ARM Linux
0 siblings, 2 replies; 15+ messages in thread
From: Rob Herring @ 2012-10-30 17:21 UTC (permalink / raw)
To: linux-arm-kernel
On 10/30/2012 11:05 AM, Rob Herring wrote:
> On 10/30/2012 10:01 AM, Thomas Petazzoni wrote:
>> Rob,
>>
>> On Tue, 30 Oct 2012 09:54:18 -0500, Rob Herring wrote:
>>> From: Rob Herring <rob.herring@calxeda.com>
>>>
>>> Now that we have drivers/irqchip, move GIC irqchip to drivers/irqchip. This
>>> is necessary to share the GIC with arm and arm64.
>>>
>>> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
>>> Cc: Russell King <linux@arm.linux.org.uk>
>>> Cc: Thomas Gleixner <tglx@linutronix.de>
>>> ---
>>> arch/arm/common/Kconfig | 8 --------
>>> arch/arm/common/Makefile | 1 -
>>> drivers/irqchip/Kconfig | 8 ++++++++
>>> drivers/irqchip/Makefile | 1 +
>>> arch/arm/common/gic.c => drivers/irqchip/irq-gic.c | 0
>>> drivers/irqchip/irqchip.c | 10 ++++++++++
>>> drivers/irqchip/irqchip.h | 1 +
>>> 7 files changed, 20 insertions(+), 9 deletions(-)
>>
>> What about arch/arm/include/asm/hardware/gic.h ?
>>
>> Contrary to the current version of the bcm2835 IRQ controller driver
>> and the armada-370-xp IRQ controller driver, the GIC and VIC drivers
>> not only expose a <foo>_of_init() function, but also other functions
>> that are directly used by several non-DT capable ARM sub-architectures.
>>
>> Of course, it works by leaving gic.h where it is now, but it sounds
>> strange to have the driver in drivers/irqchip/ and the header file in
>> arch/arm/include/asm/hardware/, especially if the goal is to be able to
>> use those drivers in arm64.
>
> Right. I'll have to move it. I wasn't really thinking about arm64 until
> this morning.
Looking at this some more, arm64 doesn't need most of what's in gic.h.
The register defines should be moved into the .c file. The remaining
function declarations either are not needed (i.e. gic_init) or should
should be done like the handle_irq function pointer init. We don't want
to have platform code calling gic_cascade_irq or gic_raise_softirq
directly. Perhaps we need to support this generically in irqchip code.
So I'll leave them in the current header and arm64 can add the necessary
support it needs.
Rob
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/3] irqchip: Move ARM GIC to drivers/irqchip
2012-10-30 17:21 ` Rob Herring
@ 2012-10-30 22:30 ` Thomas Petazzoni
2012-10-30 22:47 ` Russell King - ARM Linux
1 sibling, 0 replies; 15+ messages in thread
From: Thomas Petazzoni @ 2012-10-30 22:30 UTC (permalink / raw)
To: linux-arm-kernel
Rob,
On Tue, 30 Oct 2012 12:21:20 -0500, Rob Herring wrote:
> > Right. I'll have to move it. I wasn't really thinking about arm64 until
> > this morning.
>
> Looking at this some more, arm64 doesn't need most of what's in gic.h.
> The register defines should be moved into the .c file. The remaining
> function declarations either are not needed (i.e. gic_init) or should
> should be done like the handle_irq function pointer init. We don't want
> to have platform code calling gic_cascade_irq or gic_raise_softirq
> directly. Perhaps we need to support this generically in irqchip code.
> So I'll leave them in the current header and arm64 can add the necessary
> support it needs.
The thing is that we have the same problem for the armada-370-xp
IRQ controller driver. In its current form, it doesn't need to expose
any symbol to the mach-mvebu code except the initialization function.
However, with the SMP support, we need to expose a bunch of symbols,
which kind of violates the whole idea of the drivers/irqchip
infrastructure, which was aiming at limiting the number of header files
added in <linux/irqchip/...> for each and every IRQ controller driver.
As you say, we maybe need to support thing like yyy_raise_softirq()
generically in the irqchip code.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/3] irqchip: Move ARM GIC to drivers/irqchip
2012-10-30 17:21 ` Rob Herring
2012-10-30 22:30 ` Thomas Petazzoni
@ 2012-10-30 22:47 ` Russell King - ARM Linux
2012-10-31 0:04 ` Rob Herring
1 sibling, 1 reply; 15+ messages in thread
From: Russell King - ARM Linux @ 2012-10-30 22:47 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Oct 30, 2012 at 12:21:20PM -0500, Rob Herring wrote:
> Looking at this some more, arm64 doesn't need most of what's in gic.h.
> The register defines should be moved into the .c file. The remaining
> function declarations either are not needed (i.e. gic_init) or should
> should be done like the handle_irq function pointer init. We don't want
> to have platform code calling gic_cascade_irq or gic_raise_softirq
> directly.
Softirqs are about the SPIs which are used for SMP IPIs and platform
specific wakeup of CPUs. And platform code _needs_ to specify the
way IPIs are delivered on the platform. irqchip can't do that because
irqchip knows nothing about SPIs (neither does genirq.)
The thing about gic_cascade_irq() is that it's to do with handling the
(rare) case of having a system with two GICs cascaded together. There's
only one set of platforms I know of which has that kind of madness and
it's the ARM development platforms, where the baseboard has a GIC, and
the SMP tile has its own GIC as part of the SMP implementation.
Apart from that, gic_cascade_irq() should not be used - it should
probably be ifdef'd out when not on one of the ARM dev platforms which
suffer this weirdness.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/3] irqchip: Move ARM GIC to drivers/irqchip
2012-10-30 22:47 ` Russell King - ARM Linux
@ 2012-10-31 0:04 ` Rob Herring
2012-10-31 9:05 ` Russell King - ARM Linux
2012-10-31 11:56 ` Catalin Marinas
0 siblings, 2 replies; 15+ messages in thread
From: Rob Herring @ 2012-10-31 0:04 UTC (permalink / raw)
To: linux-arm-kernel
On 10/30/2012 05:47 PM, Russell King - ARM Linux wrote:
> On Tue, Oct 30, 2012 at 12:21:20PM -0500, Rob Herring wrote:
>> Looking at this some more, arm64 doesn't need most of what's in gic.h.
>> The register defines should be moved into the .c file. The remaining
>> function declarations either are not needed (i.e. gic_init) or should
>> should be done like the handle_irq function pointer init. We don't want
>> to have platform code calling gic_cascade_irq or gic_raise_softirq
>> directly.
>
> Softirqs are about the SPIs which are used for SMP IPIs and platform
> specific wakeup of CPUs. And platform code _needs_ to specify the
> way IPIs are delivered on the platform. irqchip can't do that because
> irqchip knows nothing about SPIs (neither does genirq.)
Right. v7 is unchanged, so the question is really only about how v8 will
do this. Hopefully, ARM is standardizing this for v8. We probably want
the gic (or other irqchip) to setup a raise_softirq function ptr on init
rather than having a direct call to gic_raise_softirq.
Rob
> The thing about gic_cascade_irq() is that it's to do with handling the
> (rare) case of having a system with two GICs cascaded together. There's
> only one set of platforms I know of which has that kind of madness and
> it's the ARM development platforms, where the baseboard has a GIC, and
> the SMP tile has its own GIC as part of the SMP implementation.
>
> Apart from that, gic_cascade_irq() should not be used - it should
> probably be ifdef'd out when not on one of the ARM dev platforms which
> suffer this weirdness.
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/3] irqchip: Move ARM GIC to drivers/irqchip
2012-10-31 0:04 ` Rob Herring
@ 2012-10-31 9:05 ` Russell King - ARM Linux
2012-10-31 11:56 ` Catalin Marinas
1 sibling, 0 replies; 15+ messages in thread
From: Russell King - ARM Linux @ 2012-10-31 9:05 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Oct 30, 2012 at 07:04:38PM -0500, Rob Herring wrote:
> On 10/30/2012 05:47 PM, Russell King - ARM Linux wrote:
> > On Tue, Oct 30, 2012 at 12:21:20PM -0500, Rob Herring wrote:
> >> Looking at this some more, arm64 doesn't need most of what's in gic.h.
> >> The register defines should be moved into the .c file. The remaining
> >> function declarations either are not needed (i.e. gic_init) or should
> >> should be done like the handle_irq function pointer init. We don't want
> >> to have platform code calling gic_cascade_irq or gic_raise_softirq
> >> directly.
> >
> > Softirqs are about the SPIs which are used for SMP IPIs and platform
> > specific wakeup of CPUs. And platform code _needs_ to specify the
> > way IPIs are delivered on the platform. irqchip can't do that because
> > irqchip knows nothing about SPIs (neither does genirq.)
>
> Right. v7 is unchanged, so the question is really only about how v8 will
> do this. Hopefully, ARM is standardizing this for v8. We probably want
> the gic (or other irqchip) to setup a raise_softirq function ptr on init
> rather than having a direct call to gic_raise_softirq.
We already have that, except it's up to platforms to setup that pointer
via a function call into the SMP code - it's called set_smp_cross_call().
We could move that into the GIC code, as we don't have anyone with a GIC
which doesn't use gic_raise_softirq.
The only thing to remember is that there's non-SMP platforms with GICs.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/3] irqchip: Move ARM GIC to drivers/irqchip
2012-10-31 0:04 ` Rob Herring
2012-10-31 9:05 ` Russell King - ARM Linux
@ 2012-10-31 11:56 ` Catalin Marinas
2012-10-31 14:29 ` Rob Herring
1 sibling, 1 reply; 15+ messages in thread
From: Catalin Marinas @ 2012-10-31 11:56 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 31, 2012 at 12:04:38AM +0000, Rob Herring wrote:
> On 10/30/2012 05:47 PM, Russell King - ARM Linux wrote:
> > On Tue, Oct 30, 2012 at 12:21:20PM -0500, Rob Herring wrote:
> >> Looking at this some more, arm64 doesn't need most of what's in gic.h.
> >> The register defines should be moved into the .c file. The remaining
> >> function declarations either are not needed (i.e. gic_init) or should
> >> should be done like the handle_irq function pointer init. We don't want
> >> to have platform code calling gic_cascade_irq or gic_raise_softirq
> >> directly.
> >
> > Softirqs are about the SPIs which are used for SMP IPIs and platform
> > specific wakeup of CPUs. And platform code _needs_ to specify the
> > way IPIs are delivered on the platform. irqchip can't do that because
> > irqchip knows nothing about SPIs (neither does genirq.)
>
> Right. v7 is unchanged, so the question is really only about how v8 will
> do this. Hopefully, ARM is standardizing this for v8. We probably want
> the gic (or other irqchip) to setup a raise_softirq function ptr on init
> rather than having a direct call to gic_raise_softirq.
In my sample ARMv8 model code I have an older version of gic.c moved to
drivers/irqchip and modified just for the arm64 needs. The gic_of_init()
function calls set_smp_cross_call(git_raise_softirq).
http://git.kernel.org/?p=linux/kernel/git/cmarinas/linux-aarch64.git;a=commitdiff;h=5cd20480f4d7b56160b3312df14fba3b2bda6798
The gic_secondary_init() is done from a CPU notifier as I wanted to
separate this from the SoC code (even on arch/arm, all the calls to
gic_secondary_init() are the same, so it could be factored out to a
notifier or some function pointer set by gic.c).
And let's assume there is no need for gic_cascade_irq().
--
Catalin
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/3] irqchip: Move ARM GIC to drivers/irqchip
2012-10-31 11:56 ` Catalin Marinas
@ 2012-10-31 14:29 ` Rob Herring
2012-10-31 15:07 ` Russell King - ARM Linux
0 siblings, 1 reply; 15+ messages in thread
From: Rob Herring @ 2012-10-31 14:29 UTC (permalink / raw)
To: linux-arm-kernel
On 10/31/2012 06:56 AM, Catalin Marinas wrote:
> On Wed, Oct 31, 2012 at 12:04:38AM +0000, Rob Herring wrote:
>> On 10/30/2012 05:47 PM, Russell King - ARM Linux wrote:
>>> On Tue, Oct 30, 2012 at 12:21:20PM -0500, Rob Herring wrote:
>>>> Looking at this some more, arm64 doesn't need most of what's in gic.h.
>>>> The register defines should be moved into the .c file. The remaining
>>>> function declarations either are not needed (i.e. gic_init) or should
>>>> should be done like the handle_irq function pointer init. We don't want
>>>> to have platform code calling gic_cascade_irq or gic_raise_softirq
>>>> directly.
>>>
>>> Softirqs are about the SPIs which are used for SMP IPIs and platform
>>> specific wakeup of CPUs. And platform code _needs_ to specify the
>>> way IPIs are delivered on the platform. irqchip can't do that because
>>> irqchip knows nothing about SPIs (neither does genirq.)
>>
>> Right. v7 is unchanged, so the question is really only about how v8 will
>> do this. Hopefully, ARM is standardizing this for v8. We probably want
>> the gic (or other irqchip) to setup a raise_softirq function ptr on init
>> rather than having a direct call to gic_raise_softirq.
>
> In my sample ARMv8 model code I have an older version of gic.c moved to
> drivers/irqchip and modified just for the arm64 needs. The gic_of_init()
> function calls set_smp_cross_call(git_raise_softirq).
>
> http://git.kernel.org/?p=linux/kernel/git/cmarinas/linux-aarch64.git;a=commitdiff;h=5cd20480f4d7b56160b3312df14fba3b2bda6798
>
> The gic_secondary_init() is done from a CPU notifier as I wanted to
> separate this from the SoC code (even on arch/arm, all the calls to
> gic_secondary_init() are the same, so it could be factored out to a
> notifier or some function pointer set by gic.c).
>
> And let's assume there is no need for gic_cascade_irq().
What about other asm header dependencies? cpu_logical_map is needed for
example. I guess I'll leave all those for now.
Rob
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/3] irqchip: Move ARM GIC to drivers/irqchip
2012-10-31 14:29 ` Rob Herring
@ 2012-10-31 15:07 ` Russell King - ARM Linux
0 siblings, 0 replies; 15+ messages in thread
From: Russell King - ARM Linux @ 2012-10-31 15:07 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 31, 2012 at 09:29:19AM -0500, Rob Herring wrote:
> What about other asm header dependencies? cpu_logical_map is needed for
> example. I guess I'll leave all those for now.
That's one of the down-sides to moving this code out of arch/arm - your
existing set of five patches adds to the required asm headers (eg, it
now needs set_smp_cross_call() from ARMs asm/smp.h, whereas it didn't
need that before) and any SMP architecture re-using the GIC will need
to provide this function whether or not they use the SPI facility.
Further comments against your patch set...
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 2/3] irqchip: Move ARM VIC to drivers/irqchip
2012-10-30 14:54 [PATCH 0/7] Move GIC and VIC to drivers/irqchip Rob Herring
2012-10-30 14:54 ` [PATCH 1/3] irqchip: Move ARM GIC " Rob Herring
@ 2012-10-30 14:54 ` Rob Herring
2012-10-30 18:27 ` Stephen Warren
2012-10-30 14:54 ` [PATCH 3/3] ARM: highbank: use common irqchip_init Rob Herring
2 siblings, 1 reply; 15+ messages in thread
From: Rob Herring @ 2012-10-30 14:54 UTC (permalink / raw)
To: linux-arm-kernel
From: Rob Herring <rob.herring@calxeda.com>
Now that we have drivers/irqchip, move VIC irqchip to drivers/irqchip.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
---
arch/arm/common/Kconfig | 15 ---------------
arch/arm/common/Makefile | 1 -
drivers/irqchip/Kconfig | 15 +++++++++++++++
drivers/irqchip/Makefile | 1 +
arch/arm/common/vic.c => drivers/irqchip/irq-vic.c | 0
drivers/irqchip/irqchip.c | 14 ++++++++++++++
drivers/irqchip/irqchip.h | 1 +
7 files changed, 31 insertions(+), 16 deletions(-)
rename arch/arm/common/vic.c => drivers/irqchip/irq-vic.c (100%)
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 7bf52b2..9353184 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -1,18 +1,3 @@
-config ARM_VIC
- bool
- select IRQ_DOMAIN
- select MULTI_IRQ_HANDLER
-
-config ARM_VIC_NR
- int
- default 4 if ARCH_S5PV210
- default 3 if ARCH_S5PC100
- default 2
- depends on ARM_VIC
- help
- The maximum number of VICs available in the system, for
- power management.
-
config ICST
bool
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index 4104b82..dc8dd0d 100644
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@ -2,7 +2,6 @@
# Makefile for the linux kernel.
#
-obj-$(CONFIG_ARM_VIC) += vic.o
obj-$(CONFIG_ICST) += icst.o
obj-$(CONFIG_SA1111) += sa1111.o
obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 2d7f350..d80e5c7 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -9,3 +9,18 @@ config ARM_GIC
config GIC_NON_BANKED
bool
+
+config ARM_VIC
+ bool
+ select IRQ_DOMAIN
+ select MULTI_IRQ_HANDLER
+
+config ARM_VIC_NR
+ int
+ default 4 if ARCH_S5PV210
+ default 3 if ARCH_S5PC100
+ default 2
+ depends on ARM_VIC
+ help
+ The maximum number of VICs available in the system, for
+ power management.
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index 94118db..9c7f91e 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -2,3 +2,4 @@ obj-$(CONFIG_IRQCHIP) += irqchip.o
obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o
obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o
obj-$(CONFIG_ARM_GIC) += irq-gic.o
+obj-$(CONFIG_ARM_VIC) += irq-vic.o
diff --git a/arch/arm/common/vic.c b/drivers/irqchip/irq-vic.c
similarity index 100%
rename from arch/arm/common/vic.c
rename to drivers/irqchip/irq-vic.c
diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c
index 3f37397..0872cd7 100644
--- a/drivers/irqchip/irqchip.c
+++ b/drivers/irqchip/irqchip.c
@@ -24,6 +24,20 @@ static const struct of_device_id irqchip_of_match[] __initconst = {
.data = gic_of_init,
},
#endif
+#ifdef CONFIG_ARM_VIC
+ {
+ .compatible = "arm,versatile-vic",
+ .data = vic_of_init,
+ },
+ {
+ .compatible = "arm,pl190-vic",
+ .data = vic_of_init,
+ },
+ {
+ .compatible = "arm,pl190-vic",
+ .data = vic_of_init,
+ },
+#endif
#ifdef CONFIG_ARCH_BCM2835
{
.compatible = "brcm,bcm2835-armctrl-ic",
diff --git a/drivers/irqchip/irqchip.h b/drivers/irqchip/irqchip.h
index 62773ab3..8b8c2b2 100644
--- a/drivers/irqchip/irqchip.h
+++ b/drivers/irqchip/irqchip.h
@@ -15,5 +15,6 @@ int bcm2835_irqchip_init(struct device_node *node, struct device_node *parent);
int armada_370_xp_mpic_of_init(struct device_node *node,
struct device_node *parent);
int gic_of_init(struct device_node *node, struct device_node *parent);
+int vic_of_init(struct device_node *node, struct device_node *parent);
#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 2/3] irqchip: Move ARM VIC to drivers/irqchip
2012-10-30 14:54 ` [PATCH 2/3] irqchip: Move ARM VIC " Rob Herring
@ 2012-10-30 18:27 ` Stephen Warren
0 siblings, 0 replies; 15+ messages in thread
From: Stephen Warren @ 2012-10-30 18:27 UTC (permalink / raw)
To: linux-arm-kernel
On 10/30/2012 08:54 AM, Rob Herring wrote:
> From: Rob Herring <rob.herring@calxeda.com>
>
> Now that we have drivers/irqchip, move VIC irqchip to drivers/irqchip.
> diff --git a/arch/arm/common/vic.c b/drivers/irqchip/irq-vic.c
> similarity index 100%
> rename from arch/arm/common/vic.c
> rename to drivers/irqchip/irq-vic.c
"gic" and "vic" seems a little generic for filenames and symbol names;
what about irq-arm-vic.c and irq-arm-gic.c? Similarly...
> diff --git a/drivers/irqchip/irqchip.h b/drivers/irqchip/irqchip.h
> int gic_of_init(struct device_node *node, struct device_node *parent);
> +int vic_of_init(struct device_node *node, struct device_node *parent);
... perhaps rename those to arm_[gv]ic_of_init()?
Are/will there be multiple versions of the GIC? I guess we can always
introduce a GIC2 later if needed, and leave the current one with an
unversioned name.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 3/3] ARM: highbank: use common irqchip_init
2012-10-30 14:54 [PATCH 0/7] Move GIC and VIC to drivers/irqchip Rob Herring
2012-10-30 14:54 ` [PATCH 1/3] irqchip: Move ARM GIC " Rob Herring
2012-10-30 14:54 ` [PATCH 2/3] irqchip: Move ARM VIC " Rob Herring
@ 2012-10-30 14:54 ` Rob Herring
2 siblings, 0 replies; 15+ messages in thread
From: Rob Herring @ 2012-10-30 14:54 UTC (permalink / raw)
To: linux-arm-kernel
From: Rob Herring <rob.herring@calxeda.com>
Now that we have common irqchip init, use it on highbank platform.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
arch/arm/mach-highbank/highbank.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
index 40e36a5..27b77da 100644
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@ -18,6 +18,7 @@
#include <linux/dma-mapping.h>
#include <linux/io.h>
#include <linux/irq.h>
+#include <linux/irqchip.h>
#include <linux/irqdomain.h>
#include <linux/of.h>
#include <linux/of_irq.h>
@@ -82,11 +83,6 @@ void highbank_set_cpu_jump(int cpu, void *jump_addr)
HB_JUMP_TABLE_PHYS(cpu) + 15);
}
-const static struct of_device_id irq_match[] = {
- { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
- {}
-};
-
#ifdef CONFIG_CACHE_L2X0
static void highbank_l2x0_disable(void)
{
@@ -97,7 +93,7 @@ static void highbank_l2x0_disable(void)
static void __init highbank_init_irq(void)
{
- of_irq_init(irq_match);
+ irqchip_init();
#ifdef CONFIG_CACHE_L2X0
/* Enable PL310 L2 Cache controller */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 15+ messages in thread