[PATCH] PCI: rcar: Change macro name of PCIEPARL and PCIEPARH

linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH] PCI: rcar: Change macro name of PCIEPARL and PCIEPARH
@ 2015-02-04  9:02 Nobuhiro Iwamatsu
  2015-02-04  9:14 ` Phil Edworthy
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Nobuhiro Iwamatsu @ 2015-02-04  9:02 UTC (permalink / raw)
  To: bhelgaas; +Cc: linux-pci, phil.edworthy, horms+renesas, Nobuhiro Iwamatsu

PCIEPARL and PCIEPARH are macro that calculates address of the register.
However, register name is incorrect, PCIEPALR and PCIEPAUR is correct.
This change macro name to PCIEPALR and PCIEPAUR.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---
 drivers/pci/host/pcie-rcar.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index eb12659..183c32d 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -64,8 +64,8 @@
 #define  LAR_ENABLE		(1 << 1)
 
 /* PCIe address reg & mask */
-#define PCIEPARL(x)		(0x03400 + ((x) * 0x20))
-#define PCIEPARH(x)		(0x03404 + ((x) * 0x20))
+#define PCIEPALR(x)		(0x03400 + ((x) * 0x20))
+#define PCIEPAUR(x)		(0x03404 + ((x) * 0x20))
 #define PCIEPAMR(x)		(0x03408 + ((x) * 0x20))
 #define PCIEPTCTLR(x)		(0x0340c + ((x) * 0x20))
 #define  PAR_ENABLE		(1 << 31)
@@ -341,9 +341,9 @@ static void rcar_pcie_setup_window(int win, struct rcar_pcie *pcie)
 	else
 		res_start = res->start;
 
-	rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPARH(win));
+	rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPAUR(win));
 	rcar_pci_write_reg(pcie, lower_32_bits(res_start) & ~0x7F,
-			   PCIEPARL(win));
+			   PCIEPALR(win));
 
 	/* First resource is for IO */
 	mask = PAR_ENABLE;
-- 
2.1.3


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* RE: [PATCH] PCI: rcar: Change macro name of PCIEPARL and PCIEPARH
  2015-02-04  9:02 [PATCH] PCI: rcar: Change macro name of PCIEPARL and PCIEPARH Nobuhiro Iwamatsu
@ 2015-02-04  9:14 ` Phil Edworthy
  2015-02-05  0:35   ` Simon Horman
  2015-02-24  2:03 ` Simon Horman
  2015-02-24  6:26 ` Bjorn Helgaas
  2 siblings, 1 reply; 5+ messages in thread
From: Phil Edworthy @ 2015-02-04  9:14 UTC (permalink / raw)
  To: Nobuhiro Iwamatsu
  Cc: linux-pci@vger.kernel.org, horms+renesas@verge.net.au,
	Nobuhiro Iwamatsu, bhelgaas@google.com

Hi Iwamatsu-san,

On: 04 February 2015 09:03, Nobuhiro Iwamatsu wrote:
> 
> PCIEPARL and PCIEPARH are macro that calculates address of the register.
> However, register name is incorrect, PCIEPALR and PCIEPAUR is correct.
> This change macro name to PCIEPALR and PCIEPAUR.
> 
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Acked-by: Phil Edworthy <phil.edworthy@renesas.com>

Thanks
Phil

> ---
>  drivers/pci/host/pcie-rcar.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> index eb12659..183c32d 100644
> --- a/drivers/pci/host/pcie-rcar.c
> +++ b/drivers/pci/host/pcie-rcar.c
> @@ -64,8 +64,8 @@
>  #define  LAR_ENABLE		(1 << 1)
> 
>  /* PCIe address reg & mask */
> -#define PCIEPARL(x)		(0x03400 + ((x) * 0x20))
> -#define PCIEPARH(x)		(0x03404 + ((x) * 0x20))
> +#define PCIEPALR(x)		(0x03400 + ((x) * 0x20))
> +#define PCIEPAUR(x)		(0x03404 + ((x) * 0x20))
>  #define PCIEPAMR(x)		(0x03408 + ((x) * 0x20))
>  #define PCIEPTCTLR(x)		(0x0340c + ((x) * 0x20))
>  #define  PAR_ENABLE		(1 << 31)
> @@ -341,9 +341,9 @@ static void rcar_pcie_setup_window(int win, struct
> rcar_pcie *pcie)
>  	else
>  		res_start = res->start;
> 
> -	rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPARH(win));
> +	rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPAUR(win));
>  	rcar_pci_write_reg(pcie, lower_32_bits(res_start) & ~0x7F,
> -			   PCIEPARL(win));
> +			   PCIEPALR(win));
> 
>  	/* First resource is for IO */
>  	mask = PAR_ENABLE;
> --
> 2.1.3


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] PCI: rcar: Change macro name of PCIEPARL and PCIEPARH
  2015-02-04  9:14 ` Phil Edworthy
@ 2015-02-05  0:35   ` Simon Horman
  0 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2015-02-05  0:35 UTC (permalink / raw)
  To: Phil Edworthy
  Cc: Nobuhiro Iwamatsu, linux-pci@vger.kernel.org, bhelgaas@google.com

On Wed, Feb 04, 2015 at 09:14:40AM +0000, Phil Edworthy wrote:
> Hi Iwamatsu-san,
> 
> On: 04 February 2015 09:03, Nobuhiro Iwamatsu wrote:
> > 
> > PCIEPARL and PCIEPARH are macro that calculates address of the register.
> > However, register name is incorrect, PCIEPALR and PCIEPAUR is correct.
> > This change macro name to PCIEPALR and PCIEPAUR.
> > 
> > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
> Acked-by: Phil Edworthy <phil.edworthy@renesas.com>

Acked-by: Simon Horman <horms+renesas@verge.net.au>

> 
> Thanks
> Phil
> 
> > ---
> >  drivers/pci/host/pcie-rcar.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> > index eb12659..183c32d 100644
> > --- a/drivers/pci/host/pcie-rcar.c
> > +++ b/drivers/pci/host/pcie-rcar.c
> > @@ -64,8 +64,8 @@
> >  #define  LAR_ENABLE		(1 << 1)
> > 
> >  /* PCIe address reg & mask */
> > -#define PCIEPARL(x)		(0x03400 + ((x) * 0x20))
> > -#define PCIEPARH(x)		(0x03404 + ((x) * 0x20))
> > +#define PCIEPALR(x)		(0x03400 + ((x) * 0x20))
> > +#define PCIEPAUR(x)		(0x03404 + ((x) * 0x20))
> >  #define PCIEPAMR(x)		(0x03408 + ((x) * 0x20))
> >  #define PCIEPTCTLR(x)		(0x0340c + ((x) * 0x20))
> >  #define  PAR_ENABLE		(1 << 31)
> > @@ -341,9 +341,9 @@ static void rcar_pcie_setup_window(int win, struct
> > rcar_pcie *pcie)
> >  	else
> >  		res_start = res->start;
> > 
> > -	rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPARH(win));
> > +	rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPAUR(win));
> >  	rcar_pci_write_reg(pcie, lower_32_bits(res_start) & ~0x7F,
> > -			   PCIEPARL(win));
> > +			   PCIEPALR(win));
> > 
> >  	/* First resource is for IO */
> >  	mask = PAR_ENABLE;
> > --
> > 2.1.3
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] PCI: rcar: Change macro name of PCIEPARL and PCIEPARH
  2015-02-04  9:02 [PATCH] PCI: rcar: Change macro name of PCIEPARL and PCIEPARH Nobuhiro Iwamatsu
  2015-02-04  9:14 ` Phil Edworthy
@ 2015-02-24  2:03 ` Simon Horman
  2015-02-24  6:26 ` Bjorn Helgaas
  2 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2015-02-24  2:03 UTC (permalink / raw)
  To: Nobuhiro Iwamatsu; +Cc: bhelgaas, linux-pci, phil.edworthy

On Wed, Feb 04, 2015 at 06:02:55PM +0900, Nobuhiro Iwamatsu wrote:
> PCIEPARL and PCIEPARH are macro that calculates address of the register.
> However, register name is incorrect, PCIEPALR and PCIEPAUR is correct.
> This change macro name to PCIEPALR and PCIEPAUR.
> 
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>

Acked-by: Simon Horman <horms+renesas@verge.net.au>

> ---
>  drivers/pci/host/pcie-rcar.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> index eb12659..183c32d 100644
> --- a/drivers/pci/host/pcie-rcar.c
> +++ b/drivers/pci/host/pcie-rcar.c
> @@ -64,8 +64,8 @@
>  #define  LAR_ENABLE		(1 << 1)
>  
>  /* PCIe address reg & mask */
> -#define PCIEPARL(x)		(0x03400 + ((x) * 0x20))
> -#define PCIEPARH(x)		(0x03404 + ((x) * 0x20))
> +#define PCIEPALR(x)		(0x03400 + ((x) * 0x20))
> +#define PCIEPAUR(x)		(0x03404 + ((x) * 0x20))
>  #define PCIEPAMR(x)		(0x03408 + ((x) * 0x20))
>  #define PCIEPTCTLR(x)		(0x0340c + ((x) * 0x20))
>  #define  PAR_ENABLE		(1 << 31)
> @@ -341,9 +341,9 @@ static void rcar_pcie_setup_window(int win, struct rcar_pcie *pcie)
>  	else
>  		res_start = res->start;
>  
> -	rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPARH(win));
> +	rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPAUR(win));
>  	rcar_pci_write_reg(pcie, lower_32_bits(res_start) & ~0x7F,
> -			   PCIEPARL(win));
> +			   PCIEPALR(win));
>  
>  	/* First resource is for IO */
>  	mask = PAR_ENABLE;
> -- 
> 2.1.3
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] PCI: rcar: Change macro name of PCIEPARL and PCIEPARH
  2015-02-04  9:02 [PATCH] PCI: rcar: Change macro name of PCIEPARL and PCIEPARH Nobuhiro Iwamatsu
  2015-02-04  9:14 ` Phil Edworthy
  2015-02-24  2:03 ` Simon Horman
@ 2015-02-24  6:26 ` Bjorn Helgaas
  2 siblings, 0 replies; 5+ messages in thread
From: Bjorn Helgaas @ 2015-02-24  6:26 UTC (permalink / raw)
  To: Nobuhiro Iwamatsu; +Cc: linux-pci, phil.edworthy, horms+renesas

On Wed, Feb 04, 2015 at 06:02:55PM +0900, Nobuhiro Iwamatsu wrote:
> PCIEPARL and PCIEPARH are macro that calculates address of the register.
> However, register name is incorrect, PCIEPALR and PCIEPAUR is correct.
> This change macro name to PCIEPALR and PCIEPAUR.
> 
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>

Applied to pci/host-rcar for v4.1, thanks!

> ---
>  drivers/pci/host/pcie-rcar.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> index eb12659..183c32d 100644
> --- a/drivers/pci/host/pcie-rcar.c
> +++ b/drivers/pci/host/pcie-rcar.c
> @@ -64,8 +64,8 @@
>  #define  LAR_ENABLE		(1 << 1)
>  
>  /* PCIe address reg & mask */
> -#define PCIEPARL(x)		(0x03400 + ((x) * 0x20))
> -#define PCIEPARH(x)		(0x03404 + ((x) * 0x20))
> +#define PCIEPALR(x)		(0x03400 + ((x) * 0x20))
> +#define PCIEPAUR(x)		(0x03404 + ((x) * 0x20))
>  #define PCIEPAMR(x)		(0x03408 + ((x) * 0x20))
>  #define PCIEPTCTLR(x)		(0x0340c + ((x) * 0x20))
>  #define  PAR_ENABLE		(1 << 31)
> @@ -341,9 +341,9 @@ static void rcar_pcie_setup_window(int win, struct rcar_pcie *pcie)
>  	else
>  		res_start = res->start;
>  
> -	rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPARH(win));
> +	rcar_pci_write_reg(pcie, upper_32_bits(res_start), PCIEPAUR(win));
>  	rcar_pci_write_reg(pcie, lower_32_bits(res_start) & ~0x7F,
> -			   PCIEPARL(win));
> +			   PCIEPALR(win));
>  
>  	/* First resource is for IO */
>  	mask = PAR_ENABLE;
> -- 
> 2.1.3
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-02-24  6:26 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-04  9:02 [PATCH] PCI: rcar: Change macro name of PCIEPARL and PCIEPARH Nobuhiro Iwamatsu
2015-02-04  9:14 ` Phil Edworthy
2015-02-05  0:35   ` Simon Horman
2015-02-24  2:03 ` Simon Horman
2015-02-24  6:26 ` Bjorn Helgaas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).