Skip to contentSkip to conversation

wlcore/wl18xx: fw logger over sdio

PATCH Superseded Guy Mishol 2 participants 2 messages Dec 2, 2015 TI wilink wireless drivers

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Guy Mishol

author
#0 lore raw

PATCH v3 1/1 wlcore/wl18xx: fw logger over sdio

From: Shahar Patury <[email protected]>

enable the FW Logger to work over the SDIO interface instead of only over UART.
in new design we will use fw internal memory instead of packet ram that was used in older (and wl12xx) design.
this change will reduce the impact on tp and stability. adding new event to notify fw logger is ready to be read. adding dynamic configuration to debugfs.

---
V3: Resubmitted again due to compilation errors

 drivers/net/wireless/ti/wl18xx/event.c   |    3 +
 drivers/net/wireless/ti/wl18xx/event.h   |    1 +
 drivers/net/wireless/ti/wl18xx/main.c    |    9 ++-
 drivers/net/wireless/ti/wlcore/cmd.h     |    1 -
 drivers/net/wireless/ti/wlcore/debugfs.c |   60 +++++++++++++++++++
 drivers/net/wireless/ti/wlcore/event.c   |   78 ++++++++++++++++++++++++
 drivers/net/wireless/ti/wlcore/event.h   |    9 +++
 drivers/net/wireless/ti/wlcore/io.c      |   11 ++--
 drivers/net/wireless/ti/wlcore/io.h      |    4 +-
 drivers/net/wireless/ti/wlcore/main.c    |   96 +++--------------------------
 drivers/net/wireless/ti/wlcore/rx.c      |    1 -
 drivers/net/wireless/ti/wlcore/sysfs.c   |   26 --------
 drivers/net/wireless/ti/wlcore/wlcore.h  |    3 -
 13 files changed, 174 insertions(+), 128 deletions(-)
drivers/net/wireless/ti/wl18xx/event.c +2 -0
index 09c7e09..719907a 100644
@@ -205,6 +205,8 @@ int wl18xx_process_mailbox_events(struct wl1271 *wl)
 						 mbox->sc_ssid,
 						 mbox->sc_pwd_len,
 						 mbox->sc_pwd);
+	if (vector & FW_LOGGER_INDICATION)
+		wlcore_event_fw_logger(wl);
 
 	return 0;
 }
drivers/net/wireless/ti/wl18xx/event.h +1 -0
index 9495fad..9ce5d7c 100644
@@ -42,6 +42,7 @@ enum {
 	SMART_CONFIG_SYNC_EVENT_ID               = BIT(22),
 	SMART_CONFIG_DECODE_EVENT_ID             = BIT(23),
 	TIME_SYNC_EVENT_ID                       = BIT(24),
+	FW_LOGGER_INDICATION			= BIT(25),
 };
 
 enum wl18xx_radar_types {
drivers/net/wireless/ti/wl18xx/main.c +5 -4
index 2c2f028..b686156 100644
@@ -461,7 +461,7 @@ static struct wlcore_conf wl18xx_conf = {
 	},
 	.fwlog = {
 		.mode                         = WL12XX_FWLOG_CONTINUOUS,
-		.mem_blocks                   = 2,
+		.mem_blocks                   = 0,
 		.severity                     = 0,
 		.timestamp                    = WL12XX_FWLOG_TIMESTAMP_DISABLED,
 		.output                       = WL12XX_FWLOG_OUTPUT_DBG_PINS,
@@ -584,7 +584,7 @@ static const struct wlcore_partition_set wl18xx_ptable[PART_TABLE_LEN] = {
 		.mem  = { .start = 0x00A00000, .size  = 0x00012000 },
 		.reg  = { .start = 0x00807000, .size  = 0x00005000 },
 		.mem2 = { .start = 0x00800000, .size  = 0x0000B000 },
-		.mem3 = { .start = 0x00000000, .size  = 0x00000000 },
+		.mem3 = { .start = 0x00401594, .size  = 0x00001020 },
 	},
 	[PART_DOWN] = {
 		.mem  = { .start = 0x00000000, .size  = 0x00014000 },
@@ -602,7 +602,7 @@ static const struct wlcore_partition_set wl18xx_ptable[PART_TABLE_LEN] = {
 		.mem  = { .start = 0x00800000, .size  = 0x000050FC },
 		.reg  = { .start = 0x00B00404, .size  = 0x00001000 },
 		.mem2 = { .start = 0x00C00000, .size  = 0x00000400 },
-		.mem3 = { .start = 0x00000000, .size  = 0x00000000 },
+		.mem3 = { .start = 0x00401594, .size  = 0x00001020 },
 	},
 	[PART_PHY_INIT] = {
 		.mem  = { .start = WL18XX_PHY_INIT_MEM_ADDR,
@@ -1029,7 +1029,8 @@ static int wl18xx_boot(struct wl1271 *wl)
 		DFS_CHANNELS_CONFIG_COMPLETE_EVENT |
 		SMART_CONFIG_SYNC_EVENT_ID |
 		SMART_CONFIG_DECODE_EVENT_ID |
-		TIME_SYNC_EVENT_ID;
+		TIME_SYNC_EVENT_ID |
+		FW_LOGGER_INDICATION;
 
 	wl->ap_event_mask = MAX_TX_FAILURE_EVENT_ID;
 
drivers/net/wireless/ti/wlcore/cmd.h +0 -1
index 2fb4fae..deb8475 100644
@@ -626,7 +626,6 @@ struct wl12xx_cmd_remove_peer {
  */
 enum wl12xx_fwlogger_log_mode {
 	WL12XX_FWLOG_CONTINUOUS,
-	WL12XX_FWLOG_ON_DEMAND
 };
 
 /* Include/exclude timestamps from the log messages */
drivers/net/wireless/ti/wlcore/debugfs.c +60 -0

72 lines not on this page · raw message

drivers/net/wireless/ti/wlcore/event.c +78 -0

84 lines not on this page · raw message

drivers/net/wireless/ti/wlcore/event.h +9 -0
index acc7a59..845786a 100644
@@ -64,6 +64,14 @@ enum {
 
 #define NUM_OF_RSSI_SNR_TRIGGERS 8
 
+struct fw_logger_information {
+	u32 max_buff_size;
+	u32 actual_buff_size;
+	u32 num_trace_drop;
+	u32 buff_read_ptr;
+	u32 buff_write_ptr;
+} __packed;
+
 struct wl1271;
 
 int wl1271_event_unmask(struct wl1271 *wl);
@@ -84,4 +92,5 @@ void wlcore_event_max_tx_failure(struct wl1271 *wl, unsigned long sta_bitmap);
 void wlcore_event_inactive_sta(struct wl1271 *wl, unsigned long sta_bitmap);
 void wlcore_event_roc_complete(struct wl1271 *wl);
 void wlcore_event_rssi_trigger(struct wl1271 *wl, s8 *metric_arr);
+int  wlcore_event_fw_logger(struct wl1271 *wl);
 #endif
drivers/net/wireless/ti/wlcore/io.c +6 -5
index 68e74ee..9ac118e 100644
@@ -175,12 +175,13 @@ int wlcore_set_partition(struct wl1271 *wl,
 	if (ret < 0)
 		goto out;
 
-	/*
-	 * We don't need the size of the last partition, as it is
-	 * automatically calculated based on the total memory size and
-	 * the sizes of the previous partitions.
-	 */
 	ret = wlcore_raw_write32(wl, HW_PART3_START_ADDR, p->mem3.start);
+	if (ret < 0)
+		goto out;
+
+	ret = wlcore_raw_write32(wl, HW_PART3_SIZE_ADDR, p->mem3.size);
+	if (ret < 0)
+		goto out;
 
 out:
 	return ret;
drivers/net/wireless/ti/wlcore/io.h +2 -2
index 0305729..020c7b8 100644
@@ -36,8 +36,8 @@
 #define HW_PART1_START_ADDR             (HW_PARTITION_REGISTERS_ADDR + 12)
 #define HW_PART2_SIZE_ADDR              (HW_PARTITION_REGISTERS_ADDR + 16)
 #define HW_PART2_START_ADDR             (HW_PARTITION_REGISTERS_ADDR + 20)
-#define HW_PART3_START_ADDR             (HW_PARTITION_REGISTERS_ADDR + 24)
-
+#define HW_PART3_SIZE_ADDR              (HW_PARTITION_REGISTERS_ADDR + 24)
+#define HW_PART3_START_ADDR             (HW_PARTITION_REGISTERS_ADDR + 28)
 #define HW_ACCESS_REGISTER_SIZE         4
 
 #define HW_ACCESS_PRAM_MAX_RANGE	0x3c000
drivers/net/wireless/ti/wlcore/main.c +10 -86

151 lines not on this page · raw message

drivers/net/wireless/ti/wlcore/rx.c +0 -1
index d92ae35..20ae63b 100644
@@ -150,7 +150,6 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
 	if (desc->packet_class == WL12XX_RX_CLASS_LOGGER) {
 		size_t len = length - sizeof(*desc);
 		wl12xx_copy_fwlog(wl, data + sizeof(*desc), len);
-		wake_up_interruptible(&wl->fwlog_waitq);
 		return 0;
 	}
 
drivers/net/wireless/ti/wlcore/sysfs.c +0 -26
index 24dd288..a9218e5 100644
@@ -119,32 +119,6 @@ static ssize_t wl1271_sysfs_read_fwlog(struct file *filp, struct kobject *kobj,
 	if (ret < 0)
 		return -ERESTARTSYS;
 
-	/* Let only one thread read the log at a time, blocking others */
-	while (wl->fwlog_size == 0) {
-		DEFINE_WAIT(wait);
-
-		prepare_to_wait_exclusive(&wl->fwlog_waitq,
-					  &wait,
-					  TASK_INTERRUPTIBLE);
-
-		if (wl->fwlog_size != 0) {
-			finish_wait(&wl->fwlog_waitq, &wait);
-			break;
-		}
-
-		mutex_unlock(&wl->mutex);
-
-		schedule();
-		finish_wait(&wl->fwlog_waitq, &wait);
-
-		if (signal_pending(current))
-			return -ERESTARTSYS;
-
-		ret = mutex_lock_interruptible(&wl->mutex);
-		if (ret < 0)
-			return -ERESTARTSYS;
-	}
-
 	/* Check if the fwlog is still valid */
 	if (wl->fwlog_size < 0) {
 		mutex_unlock(&wl->mutex);
drivers/net/wireless/ti/wlcore/wlcore.h +0 -3
index ffb0977..aa61f35 100644
@@ -310,9 +310,6 @@ struct wl1271 {
 	/* FW memory block size */
 	u32 fw_mem_block_size;
 
-	/* Sysfs FW log entry readers wait queue */
-	wait_queue_head_t fwlog_waitq;
-
 	/* Hardware recovery work */
 	struct work_struct recovery_work;
 	bool watchdog_recovery;
Signature · 1 line
1.7.9
#1 lore raw
reproduce:

Hi Shahar,

[auto build test WARNING on net-next/master] [also build test WARNING on v4.4-rc3 next-20151127]

url:    https://github.com/0day-ci/linux/commits/Guy-Mishol/wlcore-wl18xx-fw-logger-over-sdio/20151202-222416
config: x86_64-allmodconfig (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All warnings (new ones prefixed by >>):

include/linux/compiler.h:228:8: sparse: attribute 'no_sanitize_address': unknown attribute drivers/net/wireless/ti/wlcore/event.c:79:15: sparse: incompatible types in comparison expression (different type sizes) In file included from include/linux/list.h:8:0,
from include/linux/kobject.h:20,
from include/linux/device.h:17,
from include/linux/platform_device.h:14,
from drivers/net/wireless/ti/wlcore/wlcore.h:25,
from drivers/net/wireless/ti/wlcore/event.c:24:
drivers/net/wireless/ti/wlcore/event.c: In function 'wlcore_event_fw_logger':
include/linux/kernel.h:724:17: warning: comparison of distinct pointer types lacks a cast

     (void) (&_min1 == &_min2);  \
                    ^
>> drivers/net/wireless/ti/wlcore/event.c:79:8: note: in expansion of macro 'min'
     len = min(len, available_len);
           ^

--
/kbuild/src/sparse/include/linux/compiler.h:228:8: sparse: attribute 'no_sanitize_address': unknown attribute /kbuild/src/sparse/drivers/net/wireless/ti/wlcore/event.c:79:15: sparse: incompatible types in comparison expression (different type sizes) In file included from /kbuild/src/sparse/include/linux/list.h:8:0,
from /kbuild/src/sparse/include/linux/kobject.h:20,
from /kbuild/src/sparse/include/linux/device.h:17,
from /kbuild/src/sparse/include/linux/platform_device.h:14,
from /kbuild/src/sparse/drivers/net/wireless/ti/wlcore/wlcore.h:25,
from /kbuild/src/sparse/drivers/net/wireless/ti/wlcore/event.c:24:
/kbuild/src/sparse/drivers/net/wireless/ti/wlcore/event.c: In function 'wlcore_event_fw_logger':
/kbuild/src/sparse/include/linux/kernel.h:724:17: warning: comparison of distinct pointer types lacks a cast

     (void) (&_min1 == &_min2);  \
                    ^
>> /kbuild/src/sparse/drivers/net/wireless/ti/wlcore/event.c:79:8: note: in expansion of macro 'min'
     len = min(len, available_len);
           ^

sparse warnings: (new ones prefixed by >>)

include/linux/compiler.h:228:8: sparse: attribute 'no_sanitize_address': unknown attribute

>> drivers/net/wireless/ti/wlcore/event.c:79:15: sparse: incompatible types in comparison expression (different type sizes)
   In file included from include/linux/list.h:8:0,
                    from include/linux/kobject.h:20,
                    from include/linux/device.h:17,
                    from include/linux/platform_device.h:14,
                    from drivers/net/wireless/ti/wlcore/wlcore.h:25,
                    from drivers/net/wireless/ti/wlcore/event.c:24:
   drivers/net/wireless/ti/wlcore/event.c: In function 'wlcore_event_fw_logger':
   include/linux/kernel.h:724:17: warning: comparison of distinct pointer types lacks a cast
     (void) (&_min1 == &_min2);  \
                    ^
   drivers/net/wireless/ti/wlcore/event.c:79:8: note: in expansion of macro 'min'
     len = min(len, available_len);
           ^
--
   /kbuild/src/sparse/include/linux/compiler.h:228:8: sparse: attribute 'no_sanitize_address': unknown attribute
>> /kbuild/src/sparse/drivers/net/wireless/ti/wlcore/event.c:79:15: sparse: incompatible types in comparison expression (different type sizes)
   In file included from /kbuild/src/sparse/include/linux/list.h:8:0,
                    from /kbuild/src/sparse/include/linux/kobject.h:20,
                    from /kbuild/src/sparse/include/linux/device.h:17,
                    from /kbuild/src/sparse/include/linux/platform_device.h:14,
                    from /kbuild/src/sparse/drivers/net/wireless/ti/wlcore/wlcore.h:25,
                    from /kbuild/src/sparse/drivers/net/wireless/ti/wlcore/event.c:24:
   /kbuild/src/sparse/drivers/net/wireless/ti/wlcore/event.c: In function 'wlcore_event_fw_logger':
   /kbuild/src/sparse/include/linux/kernel.h:724:17: warning: comparison of distinct pointer types lacks a cast
     (void) (&_min1 == &_min2);  \
                    ^
   /kbuild/src/sparse/drivers/net/wireless/ti/wlcore/event.c:79:8: note: in expansion of macro 'min'
     len = min(len, available_len);
           ^

vim +/min +79 drivers/net/wireless/ti/wlcore/event.c

    18	 * along with this program; if not, write to the Free Software
    19	 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
    20	 * 02110-1301 USA
    21	 *
    22	 */
    23	
  > 24	#include "wlcore.h"
    25	#include "debug.h"
    26	#include "io.h"
    27	#include "event.h"
    28	#include "ps.h"
    29	#include "scan.h"
    30	#include "wl12xx_80211.h"
    31	#include "hw_ops.h"
    32	
    33	#define WL18XX_LOGGER_SDIO_BUFF_MAX	(0x1020)
    34	#define WL18XX_DATA_RAM_BASE_ADDRESS	(0x20000000)
    35	#define WL18XX_LOGGER_SDIO_BUFF_ADDR	(0x40159c)
    36	#define WL18XX_LOGGER_BUFF_OFFSET	(sizeof(struct fw_logger_information))
    37	#define WL18XX_LOGGER_READ_POINT_OFFSET		(12)
    38	
    39	int wlcore_event_fw_logger(struct wl1271 *wl)
    40	{
    41		u32 ret;
    42		struct fw_logger_information fw_log;
    43		u8  *buffer;
    44		u32 internal_fw_addrbase = WL18XX_DATA_RAM_BASE_ADDRESS;
    45		u32 addr = WL18XX_LOGGER_SDIO_BUFF_ADDR;
    46		u32 end_buff_addr = WL18XX_LOGGER_SDIO_BUFF_ADDR +
    47					WL18XX_LOGGER_BUFF_OFFSET;
    48		u32 available_len;
    49		u32 clear_addr;
    50		size_t len;
    51		u32 start_loc;
    52	
    53		buffer = kzalloc(WL18XX_LOGGER_SDIO_BUFF_MAX, GFP_KERNEL);
    54		if (!buffer) {
    55			wl1271_error("Fail to allocate fw logger memory");
    56			fw_log.actual_buff_size = 0;
    57			goto out;
    58		}
    59	
    60		ret = wlcore_read(wl, addr, buffer, WL18XX_LOGGER_SDIO_BUFF_MAX,
    61				  false);
    62		if (ret < 0) {
    63			wl1271_error("Fail to read logger buffer, error_id = %d",
    64				     ret);
    65			fw_log.actual_buff_size = 0;
    66			goto free_out;
    67		}
    68	
    69		memcpy(&fw_log, buffer, sizeof(fw_log));
    70	
    71		if (fw_log.actual_buff_size == 0)
    72			goto free_out;
    73	
    74		len = fw_log.actual_buff_size;
    75		start_loc = (fw_log.buff_read_ptr - internal_fw_addrbase) - addr;
    76		end_buff_addr += fw_log.max_buff_size;
    77		available_len = end_buff_addr -
    78				(fw_log.buff_read_ptr - internal_fw_addrbase);
  > 79		len = min(len, available_len);
    80	
    81		wl12xx_copy_fwlog(wl, &buffer[start_loc], len);
    82		clear_addr = addr + start_loc + fw_log.actual_buff_size +

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation