[PATCH] ARM: orion: convert the irq_reg_{readl, writel} calls to the new API

[PATCH] ARM: orion: convert the irq_reg_{readl, writel} calls to the new API

[Gregory CLEMENT]

The commit "genirq: Generic chip: Change irq_reg_{readl,writel}
arguments" modified the API. In the same tome the
arch/arm/plat-orion/gpio.c file received a fix with the use of the old
API: "ARM: orion: Fix for certain sequence of request_irq can cause
irq storm". This commit fixes the use of the API.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
Hi Jason,

This patch fix a build error in linux-next:

arch/arm/plat-orion/gpio.c:509:12: error: too few arguments to function 'irq_reg_readl'
arch/arm/plat-orion/gpio.c:511:2: error: too few arguments to function 'irq_reg_writel'
arch/arm/plat-orion/gpio.c:523:12: error: too few arguments to function 'irq_reg_readl'
arch/arm/plat-orion/gpio.c:525:2: error: too few arguments to function 'irq_reg_writel'

But if we want to apply it on the mvebu branch we need to add a
dependecy to "332fd7c4fef5 genirq: Generic chip: Change
irq_reg_{readl,writel} arguments"

Thanks,

Gregory

 arch/arm/plat-orion/gpio.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index e53fc8df7e4e..5168a52a17f9 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -506,9 +506,9 @@ static void orion_gpio_unmask_irq(struct irq_data *d)
 	u32 mask = d->mask;
 
 	irq_gc_lock(gc);
-	reg_val = irq_reg_readl(gc->reg_base + ct->regs.mask);
+	reg_val = irq_reg_readl(gc, ct->regs.mask);
 	reg_val |= mask;
-	irq_reg_writel(reg_val, gc->reg_base + ct->regs.mask);
+	irq_reg_writel(gc, reg_val, ct->regs.mask);
 	irq_gc_unlock(gc);
 }
 
@@ -520,9 +520,9 @@ static void orion_gpio_mask_irq(struct irq_data *d)
 	u32 reg_val;
 
 	irq_gc_lock(gc);
-	reg_val = irq_reg_readl(gc->reg_base + ct->regs.mask);
+	reg_val = irq_reg_readl(gc, ct->regs.mask);
 	reg_val &= ~mask;
-	irq_reg_writel(reg_val, gc->reg_base + ct->regs.mask);
+	irq_reg_writel(gc, reg_val, ct->regs.mask);
 	irq_gc_unlock(gc);
 }
 
-- 
1.9.1

[PATCH] ARM: orion: convert the irq_reg_{readl, writel} calls to the new API

[Olof Johansson]

On Tue, Nov 25, 2014 at 7:19 AM, Gregory CLEMENT
<gregory.clement@free-electrons.com> wrote:
> The commit "genirq: Generic chip: Change irq_reg_{readl,writel}
> arguments" modified the API. In the same tome the
> arch/arm/plat-orion/gpio.c file received a fix with the use of the old
> API: "ARM: orion: Fix for certain sequence of request_irq can cause
> irq storm". This commit fixes the use of the API.
>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> ---
> Hi Jason,
>
> This patch fix a build error in linux-next:
>
> arch/arm/plat-orion/gpio.c:509:12: error: too few arguments to function 'irq_reg_readl'
> arch/arm/plat-orion/gpio.c:511:2: error: too few arguments to function 'irq_reg_writel'
> arch/arm/plat-orion/gpio.c:523:12: error: too few arguments to function 'irq_reg_readl'
> arch/arm/plat-orion/gpio.c:525:2: error: too few arguments to function 'irq_reg_writel'
>
> But if we want to apply it on the mvebu branch we need to add a
> dependecy to "332fd7c4fef5 genirq: Generic chip: Change
> irq_reg_{readl,writel} arguments"

Please take this through the same repo as the change in the prototype:

Acked-by: Olof Johansson <olof@lixom.net>



-Olof

[PATCH] ARM: orion: convert the irq_reg_{readl, writel} calls to the new API

[Arnd Bergmann]

On Tuesday 25 November 2014 12:24:16 Olof Johansson wrote:
> On Tue, Nov 25, 2014 at 7:19 AM, Gregory CLEMENT
> <gregory.clement@free-electrons.com> wrote:
> > The commit "genirq: Generic chip: Change irq_reg_{readl,writel}
> > arguments" modified the API. In the same tome the
> > arch/arm/plat-orion/gpio.c file received a fix with the use of the old
> > API: "ARM: orion: Fix for certain sequence of request_irq can cause
> > irq storm". This commit fixes the use of the API.
> >
> > Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> > ---
> > Hi Jason,
> >
> > This patch fix a build error in linux-next:
> >
> > arch/arm/plat-orion/gpio.c:509:12: error: too few arguments to function 'irq_reg_readl'
> > arch/arm/plat-orion/gpio.c:511:2: error: too few arguments to function 'irq_reg_writel'
> > arch/arm/plat-orion/gpio.c:523:12: error: too few arguments to function 'irq_reg_readl'
> > arch/arm/plat-orion/gpio.c:525:2: error: too few arguments to function 'irq_reg_writel'
> >
> > But if we want to apply it on the mvebu branch we need to add a
> > dependecy to "332fd7c4fef5 genirq: Generic chip: Change
> > irq_reg_{readl,writel} arguments"
> 
> Please take this through the same repo as the change in the prototype:
> 
> Acked-by: Olof Johansson <olof@lixom.net>
> 

As mentioned before, the problem here is that the prototype gets changed
in the irqchip repo, while the gpio driver only starts using this interface
in the mvebu repo. Both trees are owned by Jason, so he should be able
to find a solution though.

	Arnd

[PATCH] ARM: orion: convert the irq_reg_{readl,writel} calls to the new API

[Jason Cooper]

Gregory,

+tglx: heads up.

On Tue, Nov 25, 2014 at 04:19:12PM +0100, Gregory CLEMENT wrote:
> The commit "genirq: Generic chip: Change irq_reg_{readl,writel}
> arguments" modified the API. In the same tome the
> arch/arm/plat-orion/gpio.c file received a fix with the use of the old
> API: "ARM: orion: Fix for certain sequence of request_irq can cause
> irq storm". This commit fixes the use of the API.
> 
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> ---
> Hi Jason,
> 
> This patch fix a build error in linux-next:
> 
> arch/arm/plat-orion/gpio.c:509:12: error: too few arguments to function 'irq_reg_readl'
> arch/arm/plat-orion/gpio.c:511:2: error: too few arguments to function 'irq_reg_writel'
> arch/arm/plat-orion/gpio.c:523:12: error: too few arguments to function 'irq_reg_readl'
> arch/arm/plat-orion/gpio.c:525:2: error: too few arguments to function 'irq_reg_writel'
> 
> But if we want to apply it on the mvebu branch we need to add a
> dependecy to "332fd7c4fef5 genirq: Generic chip: Change
> irq_reg_{readl,writel} arguments"
> 
> Thanks,
> 
> Gregory
> 
>  arch/arm/plat-orion/gpio.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Applied to irqchip/core (source of genirq API change) with a dependency
on tags/mvebu-fixes-3.18 (in mainline since v3.18-rc5) with Olof's Ack.

ThomasG, this means we'll be pulling in two patches not related to
irqchip, but this was the least offensive path I could come up with to
solve the issue.

bisection will fail iff building legacy plat-orion code, *and* it lands between

  19e1c15753d2 Merge tag 'tags/mvebu-fixes-3.18' into irqchip/core

and

  2f90bce7ff1f ARM: orion: convert the irq_reg_{readl,writel} calls to the new API

which is a one patch window.  I hope that's tolerable. :-/


Thanks for putting this together Gregory!

thx,

Jason.

[PATCH] ARM: orion: convert the irq_reg_{readl, writel} calls to the new API

[Jason Cooper]

On Tue, Nov 25, 2014 at 09:59:11PM +0100, Arnd Bergmann wrote:
> On Tuesday 25 November 2014 12:24:16 Olof Johansson wrote:
> > On Tue, Nov 25, 2014 at 7:19 AM, Gregory CLEMENT
> > <gregory.clement@free-electrons.com> wrote:
> > > The commit "genirq: Generic chip: Change irq_reg_{readl,writel}
> > > arguments" modified the API. In the same tome the
> > > arch/arm/plat-orion/gpio.c file received a fix with the use of the old
> > > API: "ARM: orion: Fix for certain sequence of request_irq can cause
> > > irq storm". This commit fixes the use of the API.
> > >
> > > Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> > > ---
> > > Hi Jason,
> > >
> > > This patch fix a build error in linux-next:
> > >
> > > arch/arm/plat-orion/gpio.c:509:12: error: too few arguments to function 'irq_reg_readl'
> > > arch/arm/plat-orion/gpio.c:511:2: error: too few arguments to function 'irq_reg_writel'
> > > arch/arm/plat-orion/gpio.c:523:12: error: too few arguments to function 'irq_reg_readl'
> > > arch/arm/plat-orion/gpio.c:525:2: error: too few arguments to function 'irq_reg_writel'
> > >
> > > But if we want to apply it on the mvebu branch we need to add a
> > > dependecy to "332fd7c4fef5 genirq: Generic chip: Change
> > > irq_reg_{readl,writel} arguments"
> > 
> > Please take this through the same repo as the change in the prototype:
> > 
> > Acked-by: Olof Johansson <olof@lixom.net>
> > 
> 
> As mentioned before, the problem here is that the prototype gets changed
> in the irqchip repo, while the gpio driver only starts using this interface
> in the mvebu repo. Both trees are owned by Jason, so he should be able
> to find a solution though.

I made myself promise not rebase mvebu/fixes.  :-)

thx,

Jason.

[PATCH] ARM: orion: convert the irq_reg_{readl,writel} calls to the new API

[Jason Cooper]

grmbl.  Helps if I actually add tglx...

Soory for the extra noise.

On Tue, Nov 25, 2014 at 09:37:56PM -0500, Jason Cooper wrote:
> Gregory,
> 
> +tglx: heads up.
> 
> On Tue, Nov 25, 2014 at 04:19:12PM +0100, Gregory CLEMENT wrote:
> > The commit "genirq: Generic chip: Change irq_reg_{readl,writel}
> > arguments" modified the API. In the same tome the
> > arch/arm/plat-orion/gpio.c file received a fix with the use of the old
> > API: "ARM: orion: Fix for certain sequence of request_irq can cause
> > irq storm". This commit fixes the use of the API.
> > 
> > Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> > ---
> > Hi Jason,
> > 
> > This patch fix a build error in linux-next:
> > 
> > arch/arm/plat-orion/gpio.c:509:12: error: too few arguments to function 'irq_reg_readl'
> > arch/arm/plat-orion/gpio.c:511:2: error: too few arguments to function 'irq_reg_writel'
> > arch/arm/plat-orion/gpio.c:523:12: error: too few arguments to function 'irq_reg_readl'
> > arch/arm/plat-orion/gpio.c:525:2: error: too few arguments to function 'irq_reg_writel'
> > 
> > But if we want to apply it on the mvebu branch we need to add a
> > dependecy to "332fd7c4fef5 genirq: Generic chip: Change
> > irq_reg_{readl,writel} arguments"
> > 
> > Thanks,
> > 
> > Gregory
> > 
> >  arch/arm/plat-orion/gpio.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> Applied to irqchip/core (source of genirq API change) with a dependency
> on tags/mvebu-fixes-3.18 (in mainline since v3.18-rc5) with Olof's Ack.
> 
> ThomasG, this means we'll be pulling in two patches not related to
> irqchip, but this was the least offensive path I could come up with to
> solve the issue.
> 
> bisection will fail iff building legacy plat-orion code, *and* it lands between
> 
>   19e1c15753d2 Merge tag 'tags/mvebu-fixes-3.18' into irqchip/core
> 
> and
> 
>   2f90bce7ff1f ARM: orion: convert the irq_reg_{readl,writel} calls to the new API
> 
> which is a one patch window.  I hope that's tolerable. :-/
> 
> 
> Thanks for putting this together Gregory!
> 
> thx,
> 
> Jason.

[PATCH] ARM: orion: convert the irq_reg_{readl, writel} calls to the new API

[Arnd Bergmann]

On Tuesday 25 November 2014 21:38:53 Jason Cooper wrote:
> On Tue, Nov 25, 2014 at 09:59:11PM +0100, Arnd Bergmann wrote:
> > On Tuesday 25 November 2014 12:24:16 Olof Johansson wrote:
> > > On Tue, Nov 25, 2014 at 7:19 AM, Gregory CLEMENT
> > > <gregory.clement@free-electrons.com> wrote:
> > > > The commit "genirq: Generic chip: Change irq_reg_{readl,writel}
> > > > arguments" modified the API. In the same tome the
> > > > arch/arm/plat-orion/gpio.c file received a fix with the use of the old
> > > > API: "ARM: orion: Fix for certain sequence of request_irq can cause
> > > > irq storm". This commit fixes the use of the API.
> > > >
> > > > Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> > > > ---
> > > > Hi Jason,
> > > >
> > > > This patch fix a build error in linux-next:
> > > >
> > > > arch/arm/plat-orion/gpio.c:509:12: error: too few arguments to function 'irq_reg_readl'
> > > > arch/arm/plat-orion/gpio.c:511:2: error: too few arguments to function 'irq_reg_writel'
> > > > arch/arm/plat-orion/gpio.c:523:12: error: too few arguments to function 'irq_reg_readl'
> > > > arch/arm/plat-orion/gpio.c:525:2: error: too few arguments to function 'irq_reg_writel'
> > > >
> > > > But if we want to apply it on the mvebu branch we need to add a
> > > > dependecy to "332fd7c4fef5 genirq: Generic chip: Change
> > > > irq_reg_{readl,writel} arguments"
> > > 
> > > Please take this through the same repo as the change in the prototype:
> > > 
> > > Acked-by: Olof Johansson <olof@lixom.net>
> > > 
> > 
> > As mentioned before, the problem here is that the prototype gets changed
> > in the irqchip repo, while the gpio driver only starts using this interface
> > in the mvebu repo. Both trees are owned by Jason, so he should be able
> > to find a solution though.
> 
> I made myself promise not rebase mvebu/fixes.  :-)

Ah, I hadn't realized that the gpio change is already in 3.18-rc, that actually
simplifies it.

	Arnd