Patchwork [U-Boot] drivers/net/mvgbe.c: Fix GCC 4.6 warnings

login
register
mail settings
Submitter Anatolij Gustschin
Date Nov. 19, 2011, 6:59 p.m.
Message ID <1321729176-5520-1-git-send-email-agust@denx.de>
Download mbox | patch
Permalink /patch/126604/
State Accepted
Commit e6e556c16b7a6db9d78b8765dee05ce9ed7537f0
Delegated to: Prafulla Wadaskar
Headers show

Comments

Anatolij Gustschin - Nov. 19, 2011, 6:59 p.m.
Fix:
mvgbe.c: In function 'mvgbe_send':
mvgbe.c:555:2: warning: dereferencing type-punned pointer will
break strict-aliasing rules [-Wstrict-aliasing]
mvgbe.c: In function 'mvgbe_recv':
mvgbe.c:640:2: warning: dereferencing type-punned pointer will
break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
---
 drivers/net/mvgbe.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
Prafulla Wadaskar - Nov. 21, 2011, 4:35 a.m.
> -----Original Message-----
> From: Anatolij Gustschin [mailto:agust@denx.de]
> Sent: Sunday, November 20, 2011 12:30 AM
> To: u-boot@lists.denx.de
> Cc: Prafulla Wadaskar
> Subject: [PATCH] drivers/net/mvgbe.c: Fix GCC 4.6 warnings
> 
> Fix:
> mvgbe.c: In function 'mvgbe_send':
> mvgbe.c:555:2: warning: dereferencing type-punned pointer will
> break strict-aliasing rules [-Wstrict-aliasing]
> mvgbe.c: In function 'mvgbe_recv':
> mvgbe.c:640:2: warning: dereferencing type-punned pointer will
> break strict-aliasing rules [-Wstrict-aliasing]
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Prafulla Wadaskar <prafulla@marvell.com>
> ---
>  drivers/net/mvgbe.c |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
> index fd13428..de7cdd7 100644
> --- a/drivers/net/mvgbe.c
> +++ b/drivers/net/mvgbe.c
> @@ -531,6 +531,7 @@ static int mvgbe_send(struct eth_device
> *dev, void *dataptr,
>  	struct mvgbe_txdesc *p_txdesc = dmvgbe->p_txdesc;
>  	void *p = (void *)dataptr;
>  	u32 cmd_sts;
> +	u32 txuq0_reg_addr;
> 
>  	/* Copy buffer if it's misaligned */
>  	if ((u32) dataptr & 0x07) {
> @@ -552,7 +553,8 @@ static int mvgbe_send(struct eth_device
> *dev, void *dataptr,
>  	p_txdesc->byte_cnt = datasize;
> 
>  	/* Set this tc desc as zeroth TXUQ */
> -	MVGBE_REG_WR(regs->tcqdp[TXUQ], (u32) p_txdesc);
> +	txuq0_reg_addr = (u32)&regs->tcqdp[TXUQ];
> +	writel((u32) p_txdesc, txuq0_reg_addr);
> 
>  	/* ensure tx desc writes above are performed before we
> start Tx DMA */
>  	isb();
> @@ -583,6 +585,7 @@ static int mvgbe_recv(struct eth_device
> *dev)
>  	struct mvgbe_rxdesc *p_rxdesc_curr = dmvgbe->p_rxdesc_curr;
>  	u32 cmd_sts;
>  	u32 timeout = 0;
> +	u32 rxdesc_curr_addr;
> 
>  	/* wait untill rx packet available or timeout */
>  	do {
> @@ -637,8 +640,8 @@ static int mvgbe_recv(struct eth_device
> *dev)
>  	p_rxdesc_curr->buf_size = PKTSIZE_ALIGN;
>  	p_rxdesc_curr->byte_cnt = 0;
> 
> -	writel((unsigned)p_rxdesc_curr->nxtdesc_p,
> -		(u32) &dmvgbe->p_rxdesc_curr);
> +	rxdesc_curr_addr = (u32)&dmvgbe->p_rxdesc_curr;
> +	writel((unsigned)p_rxdesc_curr->nxtdesc_p,
> rxdesc_curr_addr);
> 
>  	return 0;
>  }

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

Regards..
Prafulla . .

> --
> 1.7.5.4
Wolfgang Denk - Dec. 5, 2011, 10:04 p.m.
Dear Anatolij Gustschin,

In message <1321729176-5520-1-git-send-email-agust@denx.de> you wrote:
> Fix:
> mvgbe.c: In function 'mvgbe_send':
> mvgbe.c:555:2: warning: dereferencing type-punned pointer will
> break strict-aliasing rules [-Wstrict-aliasing]
> mvgbe.c: In function 'mvgbe_recv':
> mvgbe.c:640:2: warning: dereferencing type-punned pointer will
> break strict-aliasing rules [-Wstrict-aliasing]
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Prafulla Wadaskar <prafulla@marvell.com>
> ---
>  drivers/net/mvgbe.c |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index fd13428..de7cdd7 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -531,6 +531,7 @@  static int mvgbe_send(struct eth_device *dev, void *dataptr,
 	struct mvgbe_txdesc *p_txdesc = dmvgbe->p_txdesc;
 	void *p = (void *)dataptr;
 	u32 cmd_sts;
+	u32 txuq0_reg_addr;
 
 	/* Copy buffer if it's misaligned */
 	if ((u32) dataptr & 0x07) {
@@ -552,7 +553,8 @@  static int mvgbe_send(struct eth_device *dev, void *dataptr,
 	p_txdesc->byte_cnt = datasize;
 
 	/* Set this tc desc as zeroth TXUQ */
-	MVGBE_REG_WR(regs->tcqdp[TXUQ], (u32) p_txdesc);
+	txuq0_reg_addr = (u32)&regs->tcqdp[TXUQ];
+	writel((u32) p_txdesc, txuq0_reg_addr);
 
 	/* ensure tx desc writes above are performed before we start Tx DMA */
 	isb();
@@ -583,6 +585,7 @@  static int mvgbe_recv(struct eth_device *dev)
 	struct mvgbe_rxdesc *p_rxdesc_curr = dmvgbe->p_rxdesc_curr;
 	u32 cmd_sts;
 	u32 timeout = 0;
+	u32 rxdesc_curr_addr;
 
 	/* wait untill rx packet available or timeout */
 	do {
@@ -637,8 +640,8 @@  static int mvgbe_recv(struct eth_device *dev)
 	p_rxdesc_curr->buf_size = PKTSIZE_ALIGN;
 	p_rxdesc_curr->byte_cnt = 0;
 
-	writel((unsigned)p_rxdesc_curr->nxtdesc_p,
-		(u32) &dmvgbe->p_rxdesc_curr);
+	rxdesc_curr_addr = (u32)&dmvgbe->p_rxdesc_curr;
+	writel((unsigned)p_rxdesc_curr->nxtdesc_p, rxdesc_curr_addr);
 
 	return 0;
 }