wl18xx: add dynamic fw traces (d1c54096) · Commits · 戴 / test

drivers/net/wireless/ti/wl18xx/acx.c

+27 −0

Original line number	Diff line number	Diff line
		@@ -282,3 +282,30 @@ out:
		kfree(acx);
		return ret;
		}

		int wl18xx_acx_dynamic_fw_traces(struct wl1271 *wl)
		{
		struct acx_dynamic_fw_traces_cfg *acx;
		int ret;

		wl1271_debug(DEBUG_ACX, "acx dynamic fw traces config %d",
		wl->dynamic_fw_traces);

		acx = kzalloc(sizeof(*acx), GFP_KERNEL);
		if (!acx) {
		ret = -ENOMEM;
		goto out;
		}

		acx->dynamic_fw_traces = cpu_to_le32(wl->dynamic_fw_traces);

		ret = wl1271_cmd_configure(wl, ACX_DYNAMIC_TRACES_CFG,
		acx, sizeof(*acx));
		if (ret < 0) {
		wl1271_warning("acx config dynamic fw traces failed: %d", ret);
		goto out;
		}
		out:
		kfree(acx);
		return ret;
		}

+12 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,8 @@ enum {
		ACX_PEER_CAP = 0x0056,
		ACX_INTERRUPT_NOTIFY = 0x0057,
		ACX_RX_BA_FILTER = 0x0058,
		ACX_AP_SLEEP_CFG = 0x0059
		ACX_AP_SLEEP_CFG = 0x0059,
		ACX_DYNAMIC_TRACES_CFG = 0x005A,
		};

		/* numbers of bits the length field takes (add 1 for the actual number) */
		@@ -367,6 +368,15 @@ struct acx_ap_sleep_cfg {
		u8 idle_conn_thresh;
		} __packed;

		/*
		* ACX_DYNAMIC_TRACES_CFG
		* configure the FW dynamic traces
		*/
		struct acx_dynamic_fw_traces_cfg {
		struct acx_header header;
		__le32 dynamic_fw_traces;
		} __packed;

		int wl18xx_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap,
		u32 sdio_blk_size, u32 extra_mem_blks,
		u32 len_field_size);
		@@ -380,5 +390,6 @@ int wl18xx_acx_set_peer_cap(struct wl1271 *wl,
		int wl18xx_acx_interrupt_notify_config(struct wl1271 *wl, bool action);
		int wl18xx_acx_rx_ba_filter(struct wl1271 *wl, bool action);
		int wl18xx_acx_ap_sleep(struct wl1271 *wl);
		int wl18xx_acx_dynamic_fw_traces(struct wl1271 *wl);

		#endif /* __WL18XX_ACX_H__ */

+50 −0

Original line number	Diff line number	Diff line
		@@ -281,6 +281,55 @@ static const struct file_operations radar_detection_ops = {
		.llseek = default_llseek,
		};

		static ssize_t dynamic_fw_traces_write(struct file *file,
		const char __user *user_buf,
		size_t count, loff_t *ppos)
		{
		struct wl1271 *wl = file->private_data;
		unsigned long value;
		int ret;

		ret = kstrtoul_from_user(user_buf, count, 0, &value);
		if (ret < 0)
		return ret;

		mutex_lock(&wl->mutex);

		wl->dynamic_fw_traces = value;

		if (unlikely(wl->state != WLCORE_STATE_ON))
		goto out;

		ret = wl1271_ps_elp_wakeup(wl);
		if (ret < 0)
		goto out;

		ret = wl18xx_acx_dynamic_fw_traces(wl);
		if (ret < 0)
		count = ret;

		wl1271_ps_elp_sleep(wl);
		out:
		mutex_unlock(&wl->mutex);
		return count;
		}

		static ssize_t dynamic_fw_traces_read(struct file *file,
		char __user *userbuf,
		size_t count, loff_t *ppos)
		{
		struct wl1271 *wl = file->private_data;
		return wl1271_format_buffer(userbuf, count, ppos,
		"%d\n", wl->dynamic_fw_traces);
		}

		static const struct file_operations dynamic_fw_traces_ops = {
		.read = dynamic_fw_traces_read,
		.write = dynamic_fw_traces_write,
		.open = simple_open,
		.llseek = default_llseek,
		};

		int wl18xx_debugfs_add_files(struct wl1271 *wl,
		struct dentry *rootdir)
		{
		@@ -433,6 +482,7 @@ int wl18xx_debugfs_add_files(struct wl1271 *wl,

		DEBUGFS_ADD(conf, moddir);
		DEBUGFS_ADD(radar_detection, moddir);
		DEBUGFS_ADD(dynamic_fw_traces, moddir);

		return 0;

+5 −0

Original line number	Diff line number	Diff line
		@@ -1159,6 +1159,11 @@ static int wl18xx_hw_init(struct wl1271 *wl)
		if (ret < 0)
		return ret;

		/* set the dynamic fw traces bitmap */
		ret = wl18xx_acx_dynamic_fw_traces(wl);
		if (ret < 0)
		return ret;

		if (checksum_param) {
		ret = wl18xx_acx_set_checksum_state(wl);
		if (ret != 0)

+3 −0

Original line number	Diff line number	Diff line
		@@ -500,6 +500,9 @@ struct wl1271 {
		/* interface combinations supported by the hw */
		const struct ieee80211_iface_combination *iface_combinations;
		u8 n_iface_combinations;

		/* dynamic fw traces */
		u32 dynamic_fw_traces;
		};

		int wlcore_probe(struct wl1271 wl, struct platform_device pdev);