diff mbox series

[wireless-drivers-next,3/4] net: wlcore: fix bug reading fwlog

Message ID E1lolvc-0003RM-VE@rmk-PC.armlinux.org.uk
State Accepted
Commit 87ab9cbaee7c11dd12587d60fb16f3ec22c1a5b3
Delegated to: Kalle Valo
Headers show
Series TI wlcore firmware log fixes | expand

Commit Message

Russell King June 3, 2021, 11:54 a.m. UTC
With logging enabled, it has been observed that the driver spews
messages such as:

wlcore: ERROR Calculate of clear addr Clear = 204025b0, write = 204015b0

The problem occurs because 204025b0 is the end of the buffer, and
204015b0 is the beginning, and the calculation for "clear"ing the
buffer does not take into account that if we read to the very end
of the ring buffer, we are actually at the beginning of the buffer.

Fix this.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 drivers/net/wireless/ti/wlcore/event.c | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series


diff --git a/drivers/net/wireless/ti/wlcore/event.c b/drivers/net/wireless/ti/wlcore/event.c
index 875198fb1480..8a67a708c96e 100644
--- a/drivers/net/wireless/ti/wlcore/event.c
+++ b/drivers/net/wireless/ti/wlcore/event.c
@@ -84,6 +84,8 @@  int wlcore_event_fw_logger(struct wl1271 *wl)
 	len = min(actual_len, available_len);
 	wl12xx_copy_fwlog(wl, &buffer[start_loc], len);
 	clear_ptr = addr_ptr + start_loc + actual_len;
+	if (clear_ptr == buff_end_ptr)
+		clear_ptr = buff_start_ptr;
 	/* Copy any remaining part from beginning of ring buffer */
 	len = actual_len - len;