Re: [PATCH net-next] cxgb4: fix incorrect cim_la output for T6

[David Miller]

From: Ganesh Goudar 
Date: Wed, 31 May 2017 19:10:21 +0530

> take care of UpDbgLaRdPtr[0-3] restriction for T6.
> 
> Signed-off-by: Ganesh Goudar 
> ---
> v2:
> - not using loop to increment UPDBGLARDPTR

Applied, thank you.

[PATCH net-next] cxgb4: fix incorrect cim_la output for T6

[Ganesh Goudar]

take care of UpDbgLaRdPtr[0-3] restriction for T6.

Signed-off-by: Ganesh Goudar 
---
v2:
- not using loop to increment UPDBGLARDPTR

 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c 
b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 9160c88..822c560 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -8312,7 +8312,16 @@ int t4_cim_read_la(struct adapter *adap, u32 *la_buf, 
unsigned int *wrptr)
ret = t4_cim_read(adap, UP_UP_DBG_LA_DATA_A, 1, _buf[i]);
if (ret)
break;
-   idx = (idx + 1) & UPDBGLARDPTR_M;
+
+   /* Bits 0-3 of UpDbgLaRdPtr can be between  to 1001 to
+* identify the 32-bit portion of the full 312-bit data
+*/
+   if (is_t6(adap->params.chip) && (idx & 0xf) >= 9)
+   idx = (idx & 0xff0) + 0x10;
+   else
+   idx++;
+   /* address can't exceed 0xfff */
+   idx &= UPDBGLARDPTR_M;
}
 restart:
if (cfg & UPDBGLAEN_F) {
-- 
2.1.0

Re: [PATCH net-next] cxgb4: fix incorrect cim_la output for T6

[Ganesh Goudar]

On Friday, May 05/19/17, 2017 at 14:17:11 +, David Laight wrote:
> From: Ganesh Goudar
> > Sent: 19 May 2017 11:12
> T6
> > 
> > take care of UpDbgLaRdPtr[0-3] restriction for T6
> > 
> > Signed-off-by: Ganesh Goudar 
> > ---
> >  drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 7 +++
> >  1 file changed, 7 insertions(+)
> > 
> > diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c 
> > b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> > index aded42b96..917b46b 100644
> > --- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> > +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> > @@ -8268,6 +8268,13 @@ int t4_cim_read_la(struct adapter *adap, u32 
> > *la_buf, unsigned int *wrptr)
> > if (ret)
> > break;
> > idx = (idx + 1) & UPDBGLARDPTR_M;
> > +
> > +   /* Bits 0-3 of UpDbgLaRdPtr can be between  to 1001 to
> > +* identify the 32-bit portion of the full 312-bit data
> > +*/
> > +   if (is_t6(adap->params.chip))
> > +   while ((idx & 0xf) > 9)
> > +   idx = (idx + 1) % UPDBGLARDPTR_M;
> 
> Why the loop, maybe:
>   if (is_t6(adap->params.chip) && (idx & 0xf) >= 9)
>   idx = (idx & 0xf0) + 0x10;
>   else
>   idx++;
>   idx &= UPDBGLARDPTR_M;
> 
>   David
>
Yes, it is sensible I will send a v2, thanks David.

Thanks 

RE: [PATCH net-next] cxgb4: fix incorrect cim_la output for T6

[David Laight]

From: Ganesh Goudar
> Sent: 19 May 2017 11:12
T6
> 
> take care of UpDbgLaRdPtr[0-3] restriction for T6
> 
> Signed-off-by: Ganesh Goudar 
> ---
>  drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 7 +++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c 
> b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> index aded42b96..917b46b 100644
> --- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> @@ -8268,6 +8268,13 @@ int t4_cim_read_la(struct adapter *adap, u32 *la_buf, 
> unsigned int *wrptr)
>   if (ret)
>   break;
>   idx = (idx + 1) & UPDBGLARDPTR_M;
> +
> + /* Bits 0-3 of UpDbgLaRdPtr can be between  to 1001 to
> +  * identify the 32-bit portion of the full 312-bit data
> +  */
> + if (is_t6(adap->params.chip))
> + while ((idx & 0xf) > 9)
> + idx = (idx + 1) % UPDBGLARDPTR_M;

Why the loop, maybe:
if (is_t6(adap->params.chip) && (idx & 0xf) >= 9)
idx = (idx & 0xf0) + 0x10;
else
idx++;
idx &= UPDBGLARDPTR_M;

David

[PATCH net-next] cxgb4: fix incorrect cim_la output for T6

[Ganesh Goudar]

take care of UpDbgLaRdPtr[0-3] restriction for T6

Signed-off-by: Ganesh Goudar 
---
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c 
b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index aded42b96..917b46b 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -8268,6 +8268,13 @@ int t4_cim_read_la(struct adapter *adap, u32 *la_buf, 
unsigned int *wrptr)
if (ret)
break;
idx = (idx + 1) & UPDBGLARDPTR_M;
+
+   /* Bits 0-3 of UpDbgLaRdPtr can be between  to 1001 to
+* identify the 32-bit portion of the full 312-bit data
+*/
+   if (is_t6(adap->params.chip))
+   while ((idx & 0xf) > 9)
+   idx = (idx + 1) % UPDBGLARDPTR_M;
}
 restart:
if (cfg & UPDBGLAEN_F) {
-- 
2.1.0