[U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver

[U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver

[Marek Vasut]

Apply the following questionable adjustment to silence GCC.

armada100_fec.c: In function ?armdfec_send?:
armada100_fec.c:589:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Joe Hershberger <joe.hershberger@ni.com>
---
 drivers/net/armada100_fec.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
index d318a36..ed7cf20 100644
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -565,7 +565,7 @@ static int armdfec_send(struct eth_device *dev, void *dataptr, int datasize)
 	struct tx_desc *p_txdesc = darmdfec->p_txdesc;
 	void *p = (void *)dataptr;
 	int retry = PHY_WAIT_ITERATIONS * PHY_WAIT_MICRO_SECONDS;
-	u32 cmd_sts;
+	u32 cmd_sts, temp;
 
 	/* Copy buffer if it's misaligned */
 	if ((u32)dataptr & 0x07) {
@@ -586,7 +586,8 @@ static int armdfec_send(struct eth_device *dev, void *dataptr, int datasize)
 	p_txdesc->byte_cnt = datasize;
 
 	/* Apply send command using high priority TX queue */
-	writel((u32)p_txdesc, &regs->txcdp[TXQ]);
+	temp = (u32)&regs->txcdp[TXQ];
+	writel((u32)p_txdesc, temp);
 	writel(SDMA_CMD_TXDL | SDMA_CMD_TXDH | SDMA_CMD_ERD, &regs->sdma_cmd);
 
 	/*
-- 
1.7.10.4

[U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver

[Prafulla Wadaskar]

> -----Original Message-----
> From: u-boot-bounces at lists.denx.de [mailto:u-boot-
> bounces at lists.denx.de] On Behalf Of Marek Vasut
> Sent: 28 July 2012 01:20
> To: u-boot at lists.denx.de
> Cc: Marek Vasut; Joe Hershberger; u-boot-dm at lists.denx.de
> Subject: [U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver
> 
> Apply the following questionable adjustment to silence GCC.
> 
> armada100_fec.c: In function 'armdfec_send':
> armada100_fec.c:589:2: warning: dereferencing type-punned pointer will
> break strict-aliasing rules [-Wstrict-aliasing]
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Joe Hershberger <joe.hershberger@ni.com>
> ---
>  drivers/net/armada100_fec.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
> index d318a36..ed7cf20 100644
> --- a/drivers/net/armada100_fec.c
> +++ b/drivers/net/armada100_fec.c
> @@ -565,7 +565,7 @@ static int armdfec_send(struct eth_device *dev,
> void *dataptr, int datasize)
>  	struct tx_desc *p_txdesc = darmdfec->p_txdesc;
>  	void *p = (void *)dataptr;
>  	int retry = PHY_WAIT_ITERATIONS * PHY_WAIT_MICRO_SECONDS;
> -	u32 cmd_sts;
> +	u32 cmd_sts, temp;
> 
>  	/* Copy buffer if it's misaligned */
>  	if ((u32)dataptr & 0x07) {
> @@ -586,7 +586,8 @@ static int armdfec_send(struct eth_device *dev,
> void *dataptr, int datasize)
>  	p_txdesc->byte_cnt = datasize;
> 
>  	/* Apply send command using high priority TX queue */
> -	writel((u32)p_txdesc, &regs->txcdp[TXQ]);
> +	temp = (u32)&regs->txcdp[TXQ];
> +	writel((u32)p_txdesc, temp);
>  	writel(SDMA_CMD_TXDL | SDMA_CMD_TXDH | SDMA_CMD_ERD, &regs-
> >sdma_cmd);
> 
>  	/*
> --

Acked-By: Prafulla Wadaskar <prafulla@marvell.com>

Regards...
Prafulla . . .

[U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver

[Marek Vasut]

Dear Prafulla Wadaskar,

> > -----Original Message-----
> > From: u-boot-bounces at lists.denx.de [mailto:u-boot-
> > bounces at lists.denx.de] On Behalf Of Marek Vasut
> > Sent: 28 July 2012 01:20
> > To: u-boot at lists.denx.de
> > Cc: Marek Vasut; Joe Hershberger; u-boot-dm at lists.denx.de
> > Subject: [U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver
> > 
> > Apply the following questionable adjustment to silence GCC.
> > 
> > armada100_fec.c: In function 'armdfec_send':
> > armada100_fec.c:589:2: warning: dereferencing type-punned pointer will
> > break strict-aliasing rules [-Wstrict-aliasing]
> > 
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Joe Hershberger <joe.hershberger@ni.com>
[...]

Joe, can you please pick this for -next (or -master already?) ?

> Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
> 
> Regards...
> Prafulla . . .

Best regards,
Marek Vasut

[U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver

[Joe Hershberger]

Hi Marek,

On Mon, Jul 30, 2012 at 1:35 AM, Marek Vasut <marex@denx.de> wrote:
> Dear Prafulla Wadaskar,
>
>> > -----Original Message-----
>> > From: u-boot-bounces at lists.denx.de [mailto:u-boot-
>> > bounces at lists.denx.de] On Behalf Of Marek Vasut
>> > Sent: 28 July 2012 01:20
>> > To: u-boot at lists.denx.de
>> > Cc: Marek Vasut; Joe Hershberger; u-boot-dm at lists.denx.de
>> > Subject: [U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver
>> >
>> > Apply the following questionable adjustment to silence GCC.
>> >
>> > armada100_fec.c: In function 'armdfec_send':
>> > armada100_fec.c:589:2: warning: dereferencing type-punned pointer will
>> > break strict-aliasing rules [-Wstrict-aliasing]
>> >
>> > Signed-off-by: Marek Vasut <marex@denx.de>
>> > Cc: Joe Hershberger <joe.hershberger@ni.com>
> [...]
>
> Joe, can you please pick this for -next (or -master already?) ?

OK... I figured this was just an RFC, since it was sent to the u-boot-dm list.

I'll pull it into master after release.

Thanks,
-Joe

[U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver

[Marek Vasut]

Dear Joe Hershberger,

> Hi Marek,
> 
> On Mon, Jul 30, 2012 at 1:35 AM, Marek Vasut <marex@denx.de> wrote:
> > Dear Prafulla Wadaskar,
> > 
> >> > -----Original Message-----
> >> > From: u-boot-bounces at lists.denx.de [mailto:u-boot-
> >> > bounces at lists.denx.de] On Behalf Of Marek Vasut
> >> > Sent: 28 July 2012 01:20
> >> > To: u-boot at lists.denx.de
> >> > Cc: Marek Vasut; Joe Hershberger; u-boot-dm at lists.denx.de
> >> > Subject: [U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver
> >> > 
> >> > Apply the following questionable adjustment to silence GCC.
> >> > 
> >> > armada100_fec.c: In function 'armdfec_send':
> >> > armada100_fec.c:589:2: warning: dereferencing type-punned pointer will
> >> > break strict-aliasing rules [-Wstrict-aliasing]
> >> > 
> >> > Signed-off-by: Marek Vasut <marex@denx.de>
> >> > Cc: Joe Hershberger <joe.hershberger@ni.com>
> > 
> > [...]
> > 
> > Joe, can you please pick this for -next (or -master already?) ?
> 
> OK... I figured this was just an RFC, since it was sent to the u-boot-dm
> list.

That was a bad choice to cross post it to both MLs ... and I was already told 
so, quite a lot.

> I'll pull it into master after release.
> 
> Thanks,
> -Joe

Best regards,
Marek Vasut

[U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver

[Prafulla Wadaskar]

> -----Original Message-----
> From: Prafulla Wadaskar
> Sent: 30 July 2012 12:02
> To: 'Marek Vasut'; u-boot at lists.denx.de
> Cc: Joe Hershberger; u-boot-dm at lists.denx.de
> Subject: RE: [U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver
> 
> 
> 
> > -----Original Message-----
> > From: u-boot-bounces at lists.denx.de [mailto:u-boot-
> > bounces at lists.denx.de] On Behalf Of Marek Vasut
> > Sent: 28 July 2012 01:20
> > To: u-boot at lists.denx.de
> > Cc: Marek Vasut; Joe Hershberger; u-boot-dm at lists.denx.de
> > Subject: [U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver
> >
> > Apply the following questionable adjustment to silence GCC.
> >
> > armada100_fec.c: In function 'armdfec_send':
> > armada100_fec.c:589:2: warning: dereferencing type-punned pointer
> will
> > break strict-aliasing rules [-Wstrict-aliasing]
> >
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Joe Hershberger <joe.hershberger@ni.com>
> > ---
> >  drivers/net/armada100_fec.c |    5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/armada100_fec.c
> b/drivers/net/armada100_fec.c
> > index d318a36..ed7cf20 100644
> > --- a/drivers/net/armada100_fec.c
> > +++ b/drivers/net/armada100_fec.c
> > @@ -565,7 +565,7 @@ static int armdfec_send(struct eth_device *dev,
> > void *dataptr, int datasize)
> >  	struct tx_desc *p_txdesc = darmdfec->p_txdesc;
> >  	void *p = (void *)dataptr;
> >  	int retry = PHY_WAIT_ITERATIONS * PHY_WAIT_MICRO_SECONDS;
> > -	u32 cmd_sts;
> > +	u32 cmd_sts, temp;
> >
> >  	/* Copy buffer if it's misaligned */
> >  	if ((u32)dataptr & 0x07) {
> > @@ -586,7 +586,8 @@ static int armdfec_send(struct eth_device *dev,
> > void *dataptr, int datasize)
> >  	p_txdesc->byte_cnt = datasize;
> >
> >  	/* Apply send command using high priority TX queue */
> > -	writel((u32)p_txdesc, &regs->txcdp[TXQ]);
> > +	temp = (u32)&regs->txcdp[TXQ];
> > +	writel((u32)p_txdesc, temp);
> >  	writel(SDMA_CMD_TXDL | SDMA_CMD_TXDH | SDMA_CMD_ERD, &regs-
> > >sdma_cmd);
> >
> >  	/*
> > --
> 
> Acked-By: Prafulla Wadaskar <prafulla@marvell.com>

Hi Joe
May you please pull this patch?

Regards...
Prafulla . . .

[U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver

[Joe Hershberger]

Hi Prafulla,

On Mon, Sep 3, 2012 at 4:09 AM, Prafulla Wadaskar <prafulla@marvell.com> wrote:
>
>
>> -----Original Message-----
>> From: Prafulla Wadaskar
>> Sent: 30 July 2012 12:02
>> To: 'Marek Vasut'; u-boot at lists.denx.de
>> Cc: Joe Hershberger; u-boot-dm at lists.denx.de
>> Subject: RE: [U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver
>>
>>
>>
>> > -----Original Message-----
>> > From: u-boot-bounces at lists.denx.de [mailto:u-boot-
>> > bounces at lists.denx.de] On Behalf Of Marek Vasut
>> > Sent: 28 July 2012 01:20
>> > To: u-boot at lists.denx.de
>> > Cc: Marek Vasut; Joe Hershberger; u-boot-dm at lists.denx.de
>> > Subject: [U-Boot] [PATCH] dm: net: Fixup the armada100 FEC driver
>> >
>> > Apply the following questionable adjustment to silence GCC.
>> >
>> > armada100_fec.c: In function 'armdfec_send':
>> > armada100_fec.c:589:2: warning: dereferencing type-punned pointer
>> will
>> > break strict-aliasing rules [-Wstrict-aliasing]
>> >
>> > Signed-off-by: Marek Vasut <marex@denx.de>
>> > Cc: Joe Hershberger <joe.hershberger@ni.com>
>> > ---
>> >  drivers/net/armada100_fec.c |    5 +++--
>> >  1 file changed, 3 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/drivers/net/armada100_fec.c
>> b/drivers/net/armada100_fec.c
>> > index d318a36..ed7cf20 100644
>> > --- a/drivers/net/armada100_fec.c
>> > +++ b/drivers/net/armada100_fec.c
>> > @@ -565,7 +565,7 @@ static int armdfec_send(struct eth_device *dev,
>> > void *dataptr, int datasize)
>> >     struct tx_desc *p_txdesc = darmdfec->p_txdesc;
>> >     void *p = (void *)dataptr;
>> >     int retry = PHY_WAIT_ITERATIONS * PHY_WAIT_MICRO_SECONDS;
>> > -   u32 cmd_sts;
>> > +   u32 cmd_sts, temp;
>> >
>> >     /* Copy buffer if it's misaligned */
>> >     if ((u32)dataptr & 0x07) {
>> > @@ -586,7 +586,8 @@ static int armdfec_send(struct eth_device *dev,
>> > void *dataptr, int datasize)
>> >     p_txdesc->byte_cnt = datasize;
>> >
>> >     /* Apply send command using high priority TX queue */
>> > -   writel((u32)p_txdesc, &regs->txcdp[TXQ]);
>> > +   temp = (u32)&regs->txcdp[TXQ];
>> > +   writel((u32)p_txdesc, temp);
>> >     writel(SDMA_CMD_TXDL | SDMA_CMD_TXDH | SDMA_CMD_ERD, &regs-
>> > >sdma_cmd);
>> >
>> >     /*
>> > --
>>
>> Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
>
> Hi Joe
> May you please pull this patch?

It's in my queue on patchwork.  I'll try to get to the back-log next week.

Cheers!
-Joe

[U-Boot] [U-Boot-DM] [PATCH] dm: net: Fixup the armada100 FEC driver

[Joe Hershberger]

Hi Marek,

On Fri, Jul 27, 2012 at 2:50 PM, Marek Vasut <marex@denx.de> wrote:
> Apply the following questionable adjustment to silence GCC.
>
> armada100_fec.c: In function ?armdfec_send?:
> armada100_fec.c:589:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Joe Hershberger <joe.hershberger@ni.com>

Applied, thanks.

-Joe