Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

wlcore: fix read pointer update

When reading the fw_log structure from the device's memory, we could
race with the firmware updating the actual_buff_size and buff_write_ptr
members of this structure. This would lead to bytes being dropped from
the log.

Fix this by writing back the actual - now fixed - clear_ptr which
reflects where we read up to in the buffer.

This also means that we must not check that the clear_ptr matches the
current write pointer, so remove that check.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/E1lolvi-0003Ri-39@rmk-PC.armlinux.org.uk

authored by

Russell King and committed by
Kalle Valo
01de6fe4 87ab9cba

+2 -8
+2 -8
drivers/net/wireless/ti/wlcore/event.c
··· 96 96 clear_ptr = addr_ptr + WL18XX_LOGGER_BUFF_OFFSET + len; 97 97 } 98 98 99 - /* double check that clear address and write pointer are the same */ 100 - if (clear_ptr != le32_to_cpu(fw_log.buff_write_ptr)) { 101 - wl1271_error("Calculate of clear addr Clear = %x, write = %x", 102 - clear_ptr, le32_to_cpu(fw_log.buff_write_ptr)); 103 - } 104 - 105 - /* indicate FW about Clear buffer */ 99 + /* Update the read pointer */ 106 100 ret = wlcore_write32(wl, addr + WL18XX_LOGGER_READ_POINT_OFFSET, 107 - fw_log.buff_write_ptr); 101 + clear_ptr); 108 102 free_out: 109 103 kfree(buffer); 110 104 out: