Commit 87ab9cba authored by Russell King's avatar Russell King Committed by Kalle Valo

wlcore: fix bug reading fwlog

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: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/E1lolvc-0003RM-VE@rmk-PC.armlinux.org.uk
parent 98e94771
...@@ -84,6 +84,8 @@ int wlcore_event_fw_logger(struct wl1271 *wl) ...@@ -84,6 +84,8 @@ int wlcore_event_fw_logger(struct wl1271 *wl)
len = min(actual_len, available_len); len = min(actual_len, available_len);
wl12xx_copy_fwlog(wl, &buffer[start_loc], len); wl12xx_copy_fwlog(wl, &buffer[start_loc], len);
clear_ptr = addr_ptr + start_loc + actual_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 */ /* Copy any remaining part from beginning of ring buffer */
len = actual_len - len; len = actual_len - len;
......
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