On 08/24/2018 03:23 AM, Kalle Valo wrote:
Michael Büsch <m@xxxxxxx> writes:
On Thu, 23 Aug 2018 23:00:53 +0530
prabhu <d.praabhu@xxxxxxxxx> wrote:
The following commits introduce this regression in 4.18
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=66cffd6daab76caebab26eb803b92182414fc182
Ok. Kalle, can you please revert the commit
66cffd6daab76caebab26eb803b92182414fc182
?
Please submit a proper patch with an explanation why it needs to be
reverted.
Before doing a revert, let's see if we can keep the fix for open firmware, the
situation for which commit 66cffd6daab7 was "needed". I think the following
should do:
diff --git a/drivers/net/wireless/broadcom/b43/dma.c
b/drivers/net/wireless/broadcom/b43/dma.c
index 6b0e1ec346cb..2c37366b3592 100644
--- a/drivers/net/wireless/broadcom/b43/dma.c
+++ b/drivers/net/wireless/broadcom/b43/dma.c
@@ -1519,12 +1519,14 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
} else {
/* More than a single header/data pair were missed.
* Report this error, and reset the controller to
- * revive operation.
+ * revive operation. If running the open-source
+ * firmware, then do a restart.
*/
b43dbg(dev->wl,
"Out of order TX status report on DMA ring %d.
Expected %d, but got %d\n",
ring->index, firstused, slot);
- b43_controller_restart(dev, "Out of order TX");
+ if (dev->fw.opensource)
+ b43_controller_restart(dev, "Out of order TX");
return;
}
}
At the moment, I am working with prabhu to see if upgrading his firmware will
help his problem with no change in the driver. If not, then I will have him test
this patch.
Larry
