wlcore: create private static_data area and add operation to parse it (7140df6e) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/ti/wlcore/boot.c

+30 −23

Original line number	Original line	Diff line number	Diff line
	@@ -45,10 +45,17 @@ static void wl1271_boot_set_ecpu_ctrl(struct wl1271 *wl, u32 flag)
	wlcore_write_reg(wl, REG_ECPU_CONTROL, cpu_ctrl);		wlcore_write_reg(wl, REG_ECPU_CONTROL, cpu_ctrl);
	}		}

	static int wlcore_parse_fw_ver(struct wl1271 *wl)		static int wlcore_boot_parse_fw_ver(struct wl1271 *wl,
			struct wl1271_static_data *static_data)
	{		{
	int ret;		int ret;

			strncpy(wl->chip.fw_ver_str, static_data->fw_version,
			sizeof(wl->chip.fw_ver_str));

			/* make sure the string is NULL-terminated */
			wl->chip.fw_ver_str[sizeof(wl->chip.fw_ver_str) - 1] = '\0';

	ret = sscanf(wl->chip.fw_ver_str + 4, "%u.%u.%u.%u.%u",		ret = sscanf(wl->chip.fw_ver_str + 4, "%u.%u.%u.%u.%u",
	&wl->chip.fw_ver[0], &wl->chip.fw_ver[1],		&wl->chip.fw_ver[0], &wl->chip.fw_ver[1],
	&wl->chip.fw_ver[2], &wl->chip.fw_ver[3],		&wl->chip.fw_ver[2], &wl->chip.fw_ver[3],
	@@ -57,43 +64,43 @@ static int wlcore_parse_fw_ver(struct wl1271 *wl)
	if (ret != 5) {		if (ret != 5) {
	wl1271_warning("fw version incorrect value");		wl1271_warning("fw version incorrect value");
	memset(wl->chip.fw_ver, 0, sizeof(wl->chip.fw_ver));		memset(wl->chip.fw_ver, 0, sizeof(wl->chip.fw_ver));
	return -EINVAL;		ret = -EINVAL;
			goto out;
	}		}

	ret = wlcore_identify_fw(wl);		ret = wlcore_identify_fw(wl);
	if (ret < 0)		if (ret < 0)
			goto out;
			out:
	return ret;		return ret;

	return 0;
	}		}

	static int wlcore_boot_fw_version(struct wl1271 *wl)		static int wlcore_boot_static_data(struct wl1271 *wl)
	{		{
	struct wl1271_static_data *static_data;		struct wl1271_static_data *static_data;
			size_t len = sizeof(*static_data) + wl->static_data_priv_len;
	int ret;		int ret;

	static_data = kmalloc(sizeof(*static_data), GFP_KERNEL \| GFP_DMA);		static_data = kmalloc(len, GFP_KERNEL);
	if (!static_data) {		if (!static_data) {
	wl1271_error("Couldn't allocate memory for static data!");		ret = -ENOMEM;
	return -ENOMEM;		goto out;
	}		}

	wl1271_read(wl, wl->cmd_box_addr, static_data, sizeof(*static_data),		wl1271_read(wl, wl->cmd_box_addr, static_data, len, false);
	false);

	strncpy(wl->chip.fw_ver_str, static_data->fw_version,
	sizeof(wl->chip.fw_ver_str));

	kfree(static_data);

	/* make sure the string is NULL-terminated */		ret = wlcore_boot_parse_fw_ver(wl, static_data);
	wl->chip.fw_ver_str[sizeof(wl->chip.fw_ver_str) - 1] = '\0';		if (ret < 0)
			goto out_free;

	ret = wlcore_parse_fw_ver(wl);		ret = wlcore_handle_static_data(wl, static_data);
	if (ret < 0)		if (ret < 0)
	return ret;		goto out_free;

	return 0;		out_free:
			kfree(static_data);
			out:
			return ret;
	}		}

	static int wl1271_boot_upload_firmware_chunk(struct wl1271 wl, void buf,		static int wl1271_boot_upload_firmware_chunk(struct wl1271 wl, void buf,
	@@ -400,9 +407,9 @@ int wlcore_boot_run_firmware(struct wl1271 *wl)
	wl1271_debug(DEBUG_MAILBOX, "MBOX ptrs: 0x%x 0x%x",		wl1271_debug(DEBUG_MAILBOX, "MBOX ptrs: 0x%x 0x%x",
	wl->mbox_ptr[0], wl->mbox_ptr[1]);		wl->mbox_ptr[0], wl->mbox_ptr[1]);

	ret = wlcore_boot_fw_version(wl);		ret = wlcore_boot_static_data(wl);
	if (ret < 0) {		if (ret < 0) {
	wl1271_error("couldn't boot firmware");		wl1271_error("error getting static data");
	return ret;		return ret;
	}		}

drivers/net/wireless/ti/wlcore/boot.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,7 @@ struct wl1271_static_data {
	u8 fw_version[WL1271_FW_VERSION_MAX_LEN];		u8 fw_version[WL1271_FW_VERSION_MAX_LEN];
	u32 hw_version;		u32 hw_version;
	u8 tx_power_table[WL1271_NO_SUBBANDS][WL1271_NO_POWER_LEVELS];		u8 tx_power_table[WL1271_NO_SUBBANDS][WL1271_NO_POWER_LEVELS];
			u8 priv[0];
	};		};

	/* number of times we try to read the INIT interrupt */		/* number of times we try to read the INIT interrupt */

drivers/net/wireless/ti/wlcore/hw_ops.h

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -158,4 +158,13 @@ wlcore_debugfs_init(struct wl1271 wl, struct dentry rootdir)
	return 0;		return 0;
	}		}

			static inline int
			wlcore_handle_static_data(struct wl1271 wl, void static_data)
			{
			if (wl->ops->handle_static_data)
			return wl->ops->handle_static_data(wl, static_data);

			return 0;
			}

	#endif		#endif

drivers/net/wireless/ti/wlcore/wlcore.h

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@

	#include "wlcore_i.h"		#include "wlcore_i.h"
	#include "event.h"		#include "event.h"
			#include "boot.h"

	/* The maximum number of Tx descriptors in all chip families */		/* The maximum number of Tx descriptors in all chip families */
	#define WLCORE_MAX_TX_DESCRIPTORS 32		#define WLCORE_MAX_TX_DESCRIPTORS 32
	@@ -72,6 +73,8 @@ struct wlcore_ops {
	u32 (ap_get_mimo_wide_rate_mask)(struct wl1271 wl,		u32 (ap_get_mimo_wide_rate_mask)(struct wl1271 wl,
	struct wl12xx_vif *wlvif);		struct wl12xx_vif *wlvif);
	int (debugfs_init)(struct wl1271 wl, struct dentry *rootdir);		int (debugfs_init)(struct wl1271 wl, struct dentry *rootdir);
			int (handle_static_data)(struct wl1271 wl,
			struct wl1271_static_data *static_data);
	};		};

	enum wlcore_partitions {		enum wlcore_partitions {
	@@ -373,6 +376,9 @@ struct wl1271 {
	/* RX Data filter rule state - enabled/disabled */		/* RX Data filter rule state - enabled/disabled */
	bool rx_filter_enabled[WL1271_MAX_RX_FILTERS];		bool rx_filter_enabled[WL1271_MAX_RX_FILTERS];

			/* size of the private static data */
			size_t static_data_priv_len;

	/* the current channel type */		/* the current channel type */
	enum nl80211_channel_type channel_type;		enum nl80211_channel_type channel_type;
	};		};