Commit 21665a69 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville

[PATCH] bcm43xx: MANUALWLAN fixes

During testing of bcm43xx interference mitigation, two problems were
discovered:

(1) When the MANUALWLAN mode was set, routines _stack_save and _stack_restore
    generated assertions that were traced to saving ILT registers with addresses
    > 0xFFF. This problem was fixed by adding one bit to the field used for
    the offset, and subtracting one bit from the space used for the id.
(2) In MANUALWLAN mode, the IRQ XMIT errors are generated. The cause of these
    errors has not yet been located. Any suggestions on debugging this problem
    would be greatly appreciated.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent db98e0b4
...@@ -882,10 +882,10 @@ static void _stack_save(u32 *_stackptr, size_t *stackidx, ...@@ -882,10 +882,10 @@ static void _stack_save(u32 *_stackptr, size_t *stackidx,
{ {
u32 *stackptr = &(_stackptr[*stackidx]); u32 *stackptr = &(_stackptr[*stackidx]);
assert((offset & 0xF000) == 0x0000); assert((offset & 0xE000) == 0x0000);
assert((id & 0xF0) == 0x00); assert((id & 0xF8) == 0x00);
*stackptr = offset; *stackptr = offset;
*stackptr |= ((u32)id) << 12; *stackptr |= ((u32)id) << 13;
*stackptr |= ((u32)value) << 16; *stackptr |= ((u32)value) << 16;
(*stackidx)++; (*stackidx)++;
assert(*stackidx < BCM43xx_INTERFSTACK_SIZE); assert(*stackidx < BCM43xx_INTERFSTACK_SIZE);
...@@ -896,12 +896,12 @@ static u16 _stack_restore(u32 *stackptr, ...@@ -896,12 +896,12 @@ static u16 _stack_restore(u32 *stackptr,
{ {
size_t i; size_t i;
assert((offset & 0xF000) == 0x0000); assert((offset & 0xE000) == 0x0000);
assert((id & 0xF0) == 0x00); assert((id & 0xF8) == 0x00);
for (i = 0; i < BCM43xx_INTERFSTACK_SIZE; i++, stackptr++) { for (i = 0; i < BCM43xx_INTERFSTACK_SIZE; i++, stackptr++) {
if ((*stackptr & 0x00000FFF) != offset) if ((*stackptr & 0x00001FFF) != offset)
continue; continue;
if (((*stackptr & 0x0000F000) >> 12) != id) if (((*stackptr & 0x00007000) >> 13) != id)
continue; continue;
return ((*stackptr & 0xFFFF0000) >> 16); return ((*stackptr & 0xFFFF0000) >> 16);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment