ET131x regression fixes
cover ET131x regression fixes
These fix an RX and a TX bug in the wrap handling logic when converting it from a mass of bitfields. They'll apply before or after the big block I sent earlier.
---
Alan Cox (2):
et131x: Fix the add_10bit macro
et131x: Correct WRAP bit handling
drivers/staging/et131x/et1310_address_map.h | 2 +- drivers/staging/et131x/et1310_rx.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-)
Signature · 1 line
The lunar night club was most disappointing - not atmosphere at all.
PATCH 1/2 et131x: Correct WRAP bit handling
add_10bit loses the existing wrap value
Signed-off-by Alan Cox <[email protected]>
---
drivers/staging/et131x/et1310_rx.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-)
drivers/staging/et131x/et1310_rx.c +14 -6
@@ -1177,12 +1177,20 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev)static inline u32 bump_fbr (u32 *fbr,u32 limit) { -u32 v = *fbr; -add_10bit (&v,1 ); -if (v > limit) - v = (*fbr & ~ET_DMA10_MASK ) ^ET_DMA10_WRAP ; - *fbr = v; -return v; +u32 v = *fbr; + v++; +/* This works for all cases where limit < 1024. The 1023 case +works because 1023++ is 1024 which means the if condition is not +taken but the carry of the bit into the wrap bit toggles the wrap +value correctly */ +if ((v &ET_DMA10_MASK ) > limit) { + v &= ~ET_DMA10_MASK ; + v ^=ET_DMA10_WRAP ; + } +/* For the 1023 case */ + v &= (ET_DMA10_MASK |ET_DMA10_WRAP ); + *fbr = v; +return v; }/**
PATCH 2/2 et131x: Fix the add_10bit macro
In reply to Alan CoxDuh.. we need to preserve the wrap bit when adding.
Signed-off-by Alan Cox <[email protected]>
---
drivers/staging/et131x/et1310_address_map.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/et131x/et1310_address_map.h +1 -1
@@ -223,7 +223,7 @@ typedef union _TXDMA_PR_NUM_DES_t {extern inline void add_10bit (u32 *v,int n) { - *v =INDEX10 (*v + n); + *v =INDEX10 (*v + n) | (*v &ET_DMA10_WRAP ); }/*