* [PATCH 1/2] x86/dtb: make irq host list accessible
@ 2011-04-27 14:34 Sebastian Andrzej Siewior
2011-04-29 22:26 ` Grant Likely
0 siblings, 1 reply; 6+ messages in thread
From: Sebastian Andrzej Siewior @ 2011-04-27 14:34 UTC (permalink / raw)
To: x86; +Cc: linux-kernel, sodaville, Grant Likely, Torben Hohn,
Florian Fainelli
From: Torben Hohn <torbenh@linutronix.de>
There is an gpio irq chip comming which needs this from the outside.
There is no EXPORT_SYMBOL because this does not yet work in modules.
Signed-off-by: Torben Hohn <torbenh@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
arch/x86/include/asm/irq_controller.h | 2 ++
arch/x86/kernel/devicetree.c | 15 +++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/irq_controller.h b/arch/x86/include/asm/irq_controller.h
index 423bbbd..04fecc0 100644
--- a/arch/x86/include/asm/irq_controller.h
+++ b/arch/x86/include/asm/irq_controller.h
@@ -9,4 +9,6 @@ struct irq_domain {
struct list_head l;
};
+extern void irq_add_of_interrupt_host(struct irq_domain *ih);
+extern void irq_remove_of_interrupt_host(struct irq_domain *ih);
#endif
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index e90f084..58c4208 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -26,8 +26,7 @@ static DEFINE_RAW_SPINLOCK(big_irq_lock);
int __initdata of_ioapic;
-#ifdef CONFIG_X86_IO_APIC
-static void add_interrupt_host(struct irq_domain *ih)
+void irq_add_of_interrupt_host(struct irq_domain *ih)
{
unsigned long flags;
@@ -35,7 +34,15 @@ static void add_interrupt_host(struct irq_domain *ih)
list_add(&ih->l, &irq_domains);
raw_spin_unlock_irqrestore(&big_irq_lock, flags);
}
-#endif
+
+void irq_remove_of_interrupt_host(struct irq_domain *ih)
+{
+ unsigned long flags;
+
+ raw_spin_lock_irqsave(&big_irq_lock, flags);
+ list_del(&ih->l);
+ raw_spin_unlock_irqrestore(&big_irq_lock, flags);
+}
static struct irq_domain *get_ih_from_node(struct device_node *controller)
{
@@ -415,7 +422,7 @@ static void __init ioapic_add_ofnode(struct device_node *np)
id->controller = np;
id->xlate = ioapic_xlate;
id->priv = (void *)i;
- add_interrupt_host(id);
+ irq_add_of_interrupt_host(id);
return;
}
}
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] x86/dtb: make irq host list accessible
2011-04-27 14:34 [PATCH 1/2] x86/dtb: make irq host list accessible Sebastian Andrzej Siewior
@ 2011-04-29 22:26 ` Grant Likely
2011-04-30 9:02 ` Sebastian Andrzej Siewior
0 siblings, 1 reply; 6+ messages in thread
From: Grant Likely @ 2011-04-29 22:26 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: x86, linux-kernel, sodaville, Torben Hohn, Florian Fainelli
On Wed, Apr 27, 2011 at 04:34:23PM +0200, Sebastian Andrzej Siewior wrote:
> From: Torben Hohn <torbenh@linutronix.de>
>
> There is an gpio irq chip comming which needs this from the outside.
> There is no EXPORT_SYMBOL because this does not yet work in modules.
>
> Signed-off-by: Torben Hohn <torbenh@linutronix.de>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> ---
> arch/x86/include/asm/irq_controller.h | 2 ++
> arch/x86/kernel/devicetree.c | 15 +++++++++++----
> 2 files changed, 13 insertions(+), 4 deletions(-)
Can you rework this to sit on top of the of_irq_domain series I sent
out yesterday? I *really* hope to get of_irq_domain merged into .40,
but this change would conflict.
Thanks,
g.
>
> diff --git a/arch/x86/include/asm/irq_controller.h b/arch/x86/include/asm/irq_controller.h
> index 423bbbd..04fecc0 100644
> --- a/arch/x86/include/asm/irq_controller.h
> +++ b/arch/x86/include/asm/irq_controller.h
> @@ -9,4 +9,6 @@ struct irq_domain {
> struct list_head l;
> };
>
> +extern void irq_add_of_interrupt_host(struct irq_domain *ih);
> +extern void irq_remove_of_interrupt_host(struct irq_domain *ih);
> #endif
> diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
> index e90f084..58c4208 100644
> --- a/arch/x86/kernel/devicetree.c
> +++ b/arch/x86/kernel/devicetree.c
> @@ -26,8 +26,7 @@ static DEFINE_RAW_SPINLOCK(big_irq_lock);
>
> int __initdata of_ioapic;
>
> -#ifdef CONFIG_X86_IO_APIC
> -static void add_interrupt_host(struct irq_domain *ih)
> +void irq_add_of_interrupt_host(struct irq_domain *ih)
> {
> unsigned long flags;
>
> @@ -35,7 +34,15 @@ static void add_interrupt_host(struct irq_domain *ih)
> list_add(&ih->l, &irq_domains);
> raw_spin_unlock_irqrestore(&big_irq_lock, flags);
> }
> -#endif
> +
> +void irq_remove_of_interrupt_host(struct irq_domain *ih)
> +{
> + unsigned long flags;
> +
> + raw_spin_lock_irqsave(&big_irq_lock, flags);
> + list_del(&ih->l);
> + raw_spin_unlock_irqrestore(&big_irq_lock, flags);
> +}
>
> static struct irq_domain *get_ih_from_node(struct device_node *controller)
> {
> @@ -415,7 +422,7 @@ static void __init ioapic_add_ofnode(struct device_node *np)
> id->controller = np;
> id->xlate = ioapic_xlate;
> id->priv = (void *)i;
> - add_interrupt_host(id);
> + irq_add_of_interrupt_host(id);
> return;
> }
> }
> --
> 1.7.4.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] x86/dtb: make irq host list accessible
2011-04-29 22:26 ` Grant Likely
@ 2011-04-30 9:02 ` Sebastian Andrzej Siewior
2011-05-02 21:59 ` Grant Likely
0 siblings, 1 reply; 6+ messages in thread
From: Sebastian Andrzej Siewior @ 2011-04-30 9:02 UTC (permalink / raw)
To: Grant Likely; +Cc: x86, linux-kernel, sodaville, Torben Hohn, Florian Fainelli
* Grant Likely | 2011-04-29 16:26:00 [-0600]:
>On Wed, Apr 27, 2011 at 04:34:23PM +0200, Sebastian Andrzej Siewior wrote:
>> From: Torben Hohn <torbenh@linutronix.de>
>>
>> There is an gpio irq chip comming which needs this from the outside.
>> There is no EXPORT_SYMBOL because this does not yet work in modules.
>>
>Can you rework this to sit on top of the of_irq_domain series I sent
>out yesterday? I *really* hope to get of_irq_domain merged into .40,
>but this change would conflict.
This patch should be obsolete with of_irq_domain beeing generic now.
Could you please take look at the gpio driver? If there is nothing
obvious wrong I would rework it to work with of_irq_domain() and
repost.
>Thanks,
>g.
Sebastian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] x86/dtb: make irq host list accessible
2011-04-30 9:02 ` Sebastian Andrzej Siewior
@ 2011-05-02 21:59 ` Grant Likely
2011-05-18 10:47 ` Sebastian Andrzej Siewior
0 siblings, 1 reply; 6+ messages in thread
From: Grant Likely @ 2011-05-02 21:59 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: x86, linux-kernel, sodaville, Torben Hohn, Florian Fainelli
On Sat, Apr 30, 2011 at 11:02:18AM +0200, Sebastian Andrzej Siewior wrote:
> * Grant Likely | 2011-04-29 16:26:00 [-0600]:
>
> >On Wed, Apr 27, 2011 at 04:34:23PM +0200, Sebastian Andrzej Siewior wrote:
> >> From: Torben Hohn <torbenh@linutronix.de>
> >>
> >> There is an gpio irq chip comming which needs this from the outside.
> >> There is no EXPORT_SYMBOL because this does not yet work in modules.
> >>
> >Can you rework this to sit on top of the of_irq_domain series I sent
> >out yesterday? I *really* hope to get of_irq_domain merged into .40,
> >but this change would conflict.
>
> This patch should be obsolete with of_irq_domain beeing generic now.
> Could you please take look at the gpio driver? If there is nothing
> obvious wrong I would rework it to work with of_irq_domain() and
> repost.
okay, will do.
g.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] x86/dtb: make irq host list accessible
2011-05-02 21:59 ` Grant Likely
@ 2011-05-18 10:47 ` Sebastian Andrzej Siewior
2011-05-26 20:06 ` Grant Likely
0 siblings, 1 reply; 6+ messages in thread
From: Sebastian Andrzej Siewior @ 2011-05-18 10:47 UTC (permalink / raw)
To: Grant Likely; +Cc: x86, linux-kernel, sodaville, Torben Hohn, Florian Fainelli
Grant Likely wrote:
>> This patch should be obsolete with of_irq_domain beeing generic now.
>> Could you please take look at the gpio driver? If there is nothing
>> obvious wrong I would rework it to work with of_irq_domain() and
>> repost.
>
> okay, will do.
Ping :)
> g.
Sebastian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] x86/dtb: make irq host list accessible
2011-05-18 10:47 ` Sebastian Andrzej Siewior
@ 2011-05-26 20:06 ` Grant Likely
0 siblings, 0 replies; 6+ messages in thread
From: Grant Likely @ 2011-05-26 20:06 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: x86, linux-kernel, sodaville, Torben Hohn, Florian Fainelli
On Wed, May 18, 2011 at 12:47:58PM +0200, Sebastian Andrzej Siewior wrote:
> Grant Likely wrote:
> >>This patch should be obsolete with of_irq_domain beeing generic now.
> >>Could you please take look at the gpio driver? If there is nothing
> >>obvious wrong I would rework it to work with of_irq_domain() and
> >>repost.
> >
> >okay, will do.
>
> Ping :)
The of_irq_domain patches needed heavy rework after review, and the
rework didn't happen until late last night. Unfortunately that means
I also didn't get a change to look at the gpio driver, and so it won't
make it into $NEXT_KERNEL (entirely my fault, and I'm sorry).
However, I do hope that the new irq_domain will get finalized quickly
so that I can pick up your patches early in $NEXT_KERNEL stabilization
cycle.
g.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-05-26 20:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-27 14:34 [PATCH 1/2] x86/dtb: make irq host list accessible Sebastian Andrzej Siewior
2011-04-29 22:26 ` Grant Likely
2011-04-30 9:02 ` Sebastian Andrzej Siewior
2011-05-02 21:59 ` Grant Likely
2011-05-18 10:47 ` Sebastian Andrzej Siewior
2011-05-26 20:06 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox