Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f624434a authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-for-davem-2018-05-31' of... 

Merge tag 'wireless-drivers-next-for-davem-2018-05-31' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for 4.18

Hopefully the last pull request to 4.18 before the merge window.
Nothing major here, we have smaller new features and of course a lots
of fixes.

Major changes:

ath10k

* add memory dump support for QCA9888 and QCA99X0

* add support to configure channel dwell time

* support new DFS host confirmation feature in the firmware

ath

* update various regulatory mappings

wcn36xx

* various fixes to improve reliability

* add Factory Test Mode support

brmfmac

* add debugfs file for reading firmware capabilities

mwifiex

* support sysfs initiated device coredump
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8051ac76 76606886

drivers/net/wireless/ath/ath10k/ahb.c

+3 −6
Original line number Diff line number Diff line
@@ -180,13 +180,10 @@ static void ath10k_ahb_clock_disable(struct ath10k *ar) 
{

	struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);



	if (!IS_ERR_OR_NULL(ar_ahb->cmd_clk))

	clk_disable_unprepare(ar_ahb->cmd_clk);



	if (!IS_ERR_OR_NULL(ar_ahb->ref_clk))

	clk_disable_unprepare(ar_ahb->ref_clk);



	if (!IS_ERR_OR_NULL(ar_ahb->rtc_clk))

	clk_disable_unprepare(ar_ahb->rtc_clk);

}

drivers/net/wireless/ath/ath10k/core.h

+22 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#define WO(_f)      ((_f##_OFFSET) >> 2)



#define ATH10K_SCAN_ID 0

#define ATH10K_SCAN_CHANNEL_SWITCH_WMI_EVT_OVERHEAD 10 /* msec */

#define WMI_READY_TIMEOUT (5 * HZ)

#define ATH10K_FLUSH_TIMEOUT_HZ (5 * HZ)

#define ATH10K_CONNECTION_LOSS_HZ (3 * HZ)
@@ -175,6 +176,7 @@ struct ath10k_wmi { 
	struct completion service_ready;

	struct completion unified_ready;

	struct completion barrier;

	struct completion radar_confirm;

	wait_queue_head_t tx_credits_wq;

	DECLARE_BITMAP(svc_map, WMI_SERVICE_MAX);

	struct wmi_cmd_map *cmd;
@@ -377,6 +379,21 @@ struct ath10k_dfs_stats { 
	u32 radar_detected;

};



enum ath10k_radar_confirmation_state {

	ATH10K_RADAR_CONFIRMATION_IDLE = 0,

	ATH10K_RADAR_CONFIRMATION_INPROGRESS,

	ATH10K_RADAR_CONFIRMATION_STOPPED,

};



struct ath10k_radar_found_info {

	u32 pri_min;

	u32 pri_max;

	u32 width_min;

	u32 width_max;

	u32 sidx_min;

	u32 sidx_max;

};



#define ATH10K_MAX_NUM_PEER_IDS (1 << 11) /* htt rx_desc limit */



struct ath10k_peer {
@@ -1109,6 +1126,11 @@ struct ath10k { 


	u32 sta_tid_stats_mask;



	/* protected by data_lock */

	enum ath10k_radar_confirmation_state radar_conf_state;

	struct ath10k_radar_found_info last_radar_info;

	struct work_struct radar_confirmation_work;



	/* must be last */

	u8 drv_priv[0] __aligned(sizeof(void *));

};

drivers/net/wireless/ath/ath10k/coredump.c

+98 −0
Original line number Diff line number Diff line
@@ -701,6 +701,89 @@ static const struct ath10k_mem_region qca988x_hw20_mem_regions[] = { 
	},

};



static const struct ath10k_mem_region qca99x0_hw20_mem_regions[] = {

	{

		.type = ATH10K_MEM_REGION_TYPE_DRAM,

		.start = 0x400000,

		.len = 0x60000,

		.name = "DRAM",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_REG,

		.start = 0x98000,

		.len = 0x50000,

		.name = "IRAM",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOSRAM,

		.start = 0xC0000,

		.len = 0x40000,

		.name = "SRAM",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x30000,

		.len = 0x7000,

		.name = "APB REG 1",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x3f000,

		.len = 0x3000,

		.name = "APB REG 2",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x43000,

		.len = 0x3000,

		.name = "WIFI REG",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x4A000,

		.len = 0x5000,

		.name = "CE REG",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x80000,

		.len = 0x6000,

		.name = "SOC REG",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

};



static const struct ath10k_mem_region qca9984_hw10_mem_regions[] = {

	{

		.type = ATH10K_MEM_REGION_TYPE_DRAM,
@@ -848,6 +931,21 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
			.size = ARRAY_SIZE(qca9984_hw10_mem_regions),

		},

	},

	{

		.hw_id = QCA9888_HW_2_0_DEV_VERSION,

		.region_table = {

			.regions = qca9984_hw10_mem_regions,

			.size = ARRAY_SIZE(qca9984_hw10_mem_regions),

		},

	},

	{

		.hw_id = QCA99X0_HW_2_0_DEV_VERSION,

		.region_table = {

			.regions = qca99x0_hw20_mem_regions,

			.size = ARRAY_SIZE(qca99x0_hw20_mem_regions),

		},

	},



};



static u32 ath10k_coredump_get_ramdump_size(struct ath10k *ar)

drivers/net/wireless/ath/ath10k/debug.c

+17 −11
Original line number Diff line number Diff line
@@ -987,13 +987,13 @@ static ssize_t ath10k_write_htt_max_amsdu_ampdu(struct file *file, 
{

	struct ath10k *ar = file->private_data;

	int res;

	char buf[64];

	char buf[64] = {0};

	unsigned int amsdu, ampdu;



	simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);



	/* make sure that buf is null terminated */

	buf[sizeof(buf) - 1] = 0;

	res = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,

				     user_buf, count);

	if (res <= 0)

		return res;



	res = sscanf(buf, "%u %u", &amsdu, &ampdu);
@@ -1043,14 +1043,14 @@ static ssize_t ath10k_write_fw_dbglog(struct file *file, 
{

	struct ath10k *ar = file->private_data;

	int ret;

	char buf[96];

	char buf[96] = {0};

	unsigned int log_level;

	u64 mask;



	simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);



	/* make sure that buf is null terminated */

	buf[sizeof(buf) - 1] = 0;

	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,

				     user_buf, count);

	if (ret <= 0)

		return ret;



	ret = sscanf(buf, "%llx %u", &mask, &log_level);
@@ -1519,7 +1519,13 @@ static void ath10k_tpc_stats_print(struct ath10k_tpc_stats *tpc_stats, 
	*len += scnprintf(buf + *len, buf_len - *len,

			  "********************************\n");

	*len += scnprintf(buf + *len, buf_len - *len,

			  "No.  Preamble Rate_code tpc_value1 tpc_value2 tpc_value3\n");

			  "No.  Preamble Rate_code ");



	for (i = 0; i < WMI_TPC_TX_N_CHAIN; i++)

		*len += scnprintf(buf + *len, buf_len - *len,

				  "tpc_value%d ", i);



	*len += scnprintf(buf + *len, buf_len - *len, "\n");



	for (i = 0; i < tpc_stats->rate_max; i++) {

		*len += scnprintf(buf + *len, buf_len - *len,

drivers/net/wireless/ath/ath10k/debugfs_sta.c

+15 −15
Original line number Diff line number Diff line
@@ -254,12 +254,12 @@ static ssize_t ath10k_dbg_sta_write_addba(struct file *file, 
	struct ath10k *ar = arsta->arvif->ar;

	u32 tid, buf_size;

	int ret;

	char buf[64];

	char buf[64] = {0};



	simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);



	/* make sure that buf is null terminated */

	buf[sizeof(buf) - 1] = '\0';

	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,

				     user_buf, count);

	if (ret <= 0)

		return ret;



	ret = sscanf(buf, "%u %u", &tid, &buf_size);

	if (ret != 2)
@@ -305,12 +305,12 @@ static ssize_t ath10k_dbg_sta_write_addba_resp(struct file *file, 
	struct ath10k *ar = arsta->arvif->ar;

	u32 tid, status;

	int ret;

	char buf[64];



	simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);

	char buf[64] = {0};



	/* make sure that buf is null terminated */

	buf[sizeof(buf) - 1] = '\0';

	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,

				     user_buf, count);

	if (ret <= 0)

		return ret;



	ret = sscanf(buf, "%u %u", &tid, &status);

	if (ret != 2)
@@ -355,12 +355,12 @@ static ssize_t ath10k_dbg_sta_write_delba(struct file *file, 
	struct ath10k *ar = arsta->arvif->ar;

	u32 tid, initiator, reason;

	int ret;

	char buf[64];



	simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);

	char buf[64] = {0};



	/* make sure that buf is null terminated */

	buf[sizeof(buf) - 1] = '\0';

	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,

				     user_buf, count);

	if (ret <= 0)

		return ret;



	ret = sscanf(buf, "%u %u %u", &tid, &initiator, &reason);

	if (ret != 3)