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

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

Merge tag 'wireless-drivers-next-for-davem-2016-04-11' of... 

Merge tag 'wireless-drivers-next-for-davem-2016-04-11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers patches for 4.7

Major changes:

iwlwifi

* support for Link Quality measurement
* more work 9000 devices and MSIx
* continuation of the Dynamic Queue Allocation work
* make the paging less memory hungry
* 9000 new Rx path
* removal of IWLWIFI_UAPSD Kconfig option

ath10k

* implement push-pull tx model using mac80211 software queuing support
* enable scan in AP mode (NL80211_FEATURE_AP_SCAN)

wil6210

* add basic PBSS (Personal Basic Service Set) support
* add initial P2P support
* add oob_mode module parameter
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4923ec0b 20ac1b32

Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt

+16 −7
Original line number Diff line number Diff line
@@ -5,12 +5,18 @@ Required properties: 
	* "qcom,ath10k"

	* "qcom,ipq4019-wifi"



PCI based devices uses compatible string "qcom,ath10k" and takes only

calibration data via "qcom,ath10k-calibration-data". Rest of the properties

are not applicable for PCI based devices.

PCI based devices uses compatible string "qcom,ath10k" and takes calibration

data along with board specific data via "qcom,ath10k-calibration-data".

Rest of the properties are not applicable for PCI based devices.



AHB based devices (i.e. ipq4019) uses compatible string "qcom,ipq4019-wifi"

and also uses most of the properties defined in this doc.

and also uses most of the properties defined in this doc (except

"qcom,ath10k-calibration-data"). It uses "qcom,ath10k-pre-calibration-data"

to carry pre calibration data.



In general, entry "qcom,ath10k-pre-calibration-data" and

"qcom,ath10k-calibration-data" conflict with each other and only one

can be provided per device.



Optional properties:

- reg: Address and length of the register set for the device.
@@ -35,8 +41,11 @@ Optional properties: 
- qcom,msi_addr: MSI interrupt address.

- qcom,msi_base: Base value to add before writing MSI data into

		MSI address register.

- qcom,ath10k-calibration-data : calibration data as an array, the

				 length can vary between hw versions

- qcom,ath10k-calibration-data : calibration data + board specific data

				 as an array, the length can vary between

				 hw versions.

- qcom,ath10k-pre-calibration-data : pre calibration data as an array,

				     the length can vary between hw versions.



Example (to supply the calibration data alone):
@@ -105,5 +114,5 @@ wifi0: wifi@a000000 { 
			  "legacy";

	qcom,msi_addr = <0x0b006040>;

	qcom,msi_base = <0x40>;

	qcom,ath10k-calibration-data = [ 01 02 03 ... ];

	qcom,ath10k-pre-calibration-data = [ 01 02 03 ... ];

};

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

+23 −21
Original line number Diff line number Diff line
@@ -411,7 +411,8 @@ int __ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, u32 paddr) 


	lockdep_assert_held(&ar_pci->ce_lock);



	if (CE_RING_DELTA(nentries_mask, write_index, sw_index - 1) == 0)

	if ((pipe->id != 5) &&

	    CE_RING_DELTA(nentries_mask, write_index, sw_index - 1) == 0)

		return -ENOSPC;



	desc->addr = __cpu_to_le32(paddr);
@@ -425,6 +426,19 @@ int __ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, u32 paddr) 
	return 0;

}



void ath10k_ce_rx_update_write_idx(struct ath10k_ce_pipe *pipe, u32 nentries)

{

	struct ath10k *ar = pipe->ar;

	struct ath10k_ce_ring *dest_ring = pipe->dest_ring;

	unsigned int nentries_mask = dest_ring->nentries_mask;

	unsigned int write_index = dest_ring->write_index;

	u32 ctrl_addr = pipe->ctrl_addr;



	write_index = CE_RING_IDX_ADD(nentries_mask, write_index, nentries);

	ath10k_ce_dest_ring_write_index_set(ar, ctrl_addr, write_index);

	dest_ring->write_index = write_index;

}



int ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, u32 paddr)

{

	struct ath10k *ar = pipe->ar;
@@ -444,14 +458,10 @@ int ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, u32 paddr) 
 */

int ath10k_ce_completed_recv_next_nolock(struct ath10k_ce_pipe *ce_state,

					 void **per_transfer_contextp,

					 u32 *bufferp,

					 unsigned int *nbytesp,

					 unsigned int *transfer_idp,

					 unsigned int *flagsp)

					 unsigned int *nbytesp)

{

	struct ath10k_ce_ring *dest_ring = ce_state->dest_ring;

	unsigned int nentries_mask = dest_ring->nentries_mask;

	struct ath10k *ar = ce_state->ar;

	unsigned int sw_index = dest_ring->sw_index;



	struct ce_desc *base = dest_ring->base_addr_owner_space;
@@ -476,20 +486,16 @@ int ath10k_ce_completed_recv_next_nolock(struct ath10k_ce_pipe *ce_state, 
	desc->nbytes = 0;



	/* Return data from completed destination descriptor */

	*bufferp = __le32_to_cpu(sdesc.addr);

	*nbytesp = nbytes;

	*transfer_idp = MS(__le16_to_cpu(sdesc.flags), CE_DESC_FLAGS_META_DATA);



	if (__le16_to_cpu(sdesc.flags) & CE_DESC_FLAGS_BYTE_SWAP)

		*flagsp = CE_RECV_FLAG_SWAPPED;

	else

		*flagsp = 0;



	if (per_transfer_contextp)

		*per_transfer_contextp =

			dest_ring->per_transfer_context[sw_index];



	/* sanity */

	/* Copy engine 5 (HTT Rx) will reuse the same transfer context.

	 * So update transfer context all CEs except CE5.

	 */

	if (ce_state->id != 5)

		dest_ring->per_transfer_context[sw_index] = NULL;



	/* Update sw_index */
@@ -501,10 +507,7 @@ int ath10k_ce_completed_recv_next_nolock(struct ath10k_ce_pipe *ce_state, 


int ath10k_ce_completed_recv_next(struct ath10k_ce_pipe *ce_state,

				  void **per_transfer_contextp,

				  u32 *bufferp,

				  unsigned int *nbytesp,

				  unsigned int *transfer_idp,

				  unsigned int *flagsp)

				  unsigned int *nbytesp)

{

	struct ath10k *ar = ce_state->ar;

	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
@@ -513,8 +516,7 @@ int ath10k_ce_completed_recv_next(struct ath10k_ce_pipe *ce_state, 
	spin_lock_bh(&ar_pci->ce_lock);

	ret = ath10k_ce_completed_recv_next_nolock(ce_state,

						   per_transfer_contextp,

						   bufferp, nbytesp,

						   transfer_idp, flagsp);

						   nbytesp);

	spin_unlock_bh(&ar_pci->ce_lock);



	return ret;

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

+6 −9
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


/* Maximum number of Copy Engine's supported */

#define CE_COUNT_MAX 12

#define CE_HTT_H2T_MSG_SRC_NENTRIES 4096

#define CE_HTT_H2T_MSG_SRC_NENTRIES 8192



/* Descriptor rings must be aligned to this boundary */

#define CE_DESC_RING_ALIGN	8
@@ -166,6 +166,7 @@ int ath10k_ce_num_free_src_entries(struct ath10k_ce_pipe *pipe); 
int __ath10k_ce_rx_num_free_bufs(struct ath10k_ce_pipe *pipe);

int __ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, u32 paddr);

int ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, u32 paddr);

void ath10k_ce_rx_update_write_idx(struct ath10k_ce_pipe *pipe, u32 nentries);



/* recv flags */

/* Data is byte-swapped */
@@ -177,10 +178,7 @@ int ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, u32 paddr); 
 */

int ath10k_ce_completed_recv_next(struct ath10k_ce_pipe *ce_state,

				  void **per_transfer_contextp,

				  u32 *bufferp,

				  unsigned int *nbytesp,

				  unsigned int *transfer_idp,

				  unsigned int *flagsp);

				  unsigned int *nbytesp);

/*

 * Supply data for the next completed unprocessed send descriptor.

 * Pops 1 completed send buffer from Source ring.
@@ -212,10 +210,7 @@ int ath10k_ce_revoke_recv_next(struct ath10k_ce_pipe *ce_state, 


int ath10k_ce_completed_recv_next_nolock(struct ath10k_ce_pipe *ce_state,

					 void **per_transfer_contextp,

					 u32 *bufferp,

					 unsigned int *nbytesp,

					 unsigned int *transfer_idp,

					 unsigned int *flagsp);

					 unsigned int *nbytesp);



/*

 * Support clean shutdown by allowing the caller to cancel
@@ -416,6 +411,8 @@ static inline u32 ath10k_ce_base_address(struct ath10k *ar, unsigned int ce_id) 
	(((int)(toidx)-(int)(fromidx)) & (nentries_mask))



#define CE_RING_IDX_INCR(nentries_mask, idx) (((idx) + 1) & (nentries_mask))

#define CE_RING_IDX_ADD(nentries_mask, idx, num) \

		(((idx) + (num)) & (nentries_mask))



#define CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB \

				ar->regs->ce_wrap_intr_sum_host_msi_lsb

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

+133 −23
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,

		.hw_4addr_pad = ATH10K_HW_4ADDR_PAD_AFTER,

		.cal_data_len = 2116,

		.fw = {

			.dir = QCA988X_HW_2_0_FW_DIR,

			.fw = QCA988X_HW_2_0_FW_FILE,
@@ -78,6 +79,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,

		.cal_data_len = 8124,

		.fw = {

			.dir = QCA6174_HW_2_1_FW_DIR,

			.fw = QCA6174_HW_2_1_FW_FILE,
@@ -97,6 +99,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,

		.hw_4addr_pad = ATH10K_HW_4ADDR_PAD_AFTER,

		.cal_data_len = 8124,

		.fw = {

			.dir = QCA6174_HW_2_1_FW_DIR,

			.fw = QCA6174_HW_2_1_FW_FILE,
@@ -116,6 +119,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,

		.hw_4addr_pad = ATH10K_HW_4ADDR_PAD_AFTER,

		.cal_data_len = 8124,

		.fw = {

			.dir = QCA6174_HW_3_0_FW_DIR,

			.fw = QCA6174_HW_3_0_FW_FILE,
@@ -135,6 +139,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,

		.hw_4addr_pad = ATH10K_HW_4ADDR_PAD_AFTER,

		.cal_data_len = 8124,

		.fw = {

			/* uses same binaries as hw3.0 */

			.dir = QCA6174_HW_3_0_FW_DIR,
@@ -156,11 +161,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.channel_counters_freq_hz = 150000,

		.max_probe_resp_desc_thres = 24,

		.hw_4addr_pad = ATH10K_HW_4ADDR_PAD_BEFORE,

		.num_msdu_desc = 1424,

		.qcache_active_peers = 50,

		.tx_chain_mask = 0xf,

		.rx_chain_mask = 0xf,

		.max_spatial_stream = 4,

		.cal_data_len = 12064,

		.fw = {

			.dir = QCA99X0_HW_2_0_FW_DIR,

			.fw = QCA99X0_HW_2_0_FW_FILE,
@@ -179,6 +183,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,

		.cal_data_len = 8124,

		.fw = {

			.dir = QCA9377_HW_1_0_FW_DIR,

			.fw = QCA9377_HW_1_0_FW_FILE,
@@ -197,6 +202,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,

		.cal_data_len = 8124,

		.fw = {

			.dir = QCA9377_HW_1_0_FW_DIR,

			.fw = QCA9377_HW_1_0_FW_FILE,
@@ -217,11 +223,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.channel_counters_freq_hz = 125000,

		.max_probe_resp_desc_thres = 24,

		.hw_4addr_pad = ATH10K_HW_4ADDR_PAD_BEFORE,

		.num_msdu_desc = 2500,

		.qcache_active_peers = 35,

		.tx_chain_mask = 0x3,

		.rx_chain_mask = 0x3,

		.max_spatial_stream = 2,

		.cal_data_len = 12064,

		.fw = {

			.dir = QCA4019_HW_1_0_FW_DIR,

			.fw = QCA4019_HW_1_0_FW_FILE,
@@ -466,18 +471,18 @@ static int ath10k_download_board_data(struct ath10k *ar, const void *data, 
	return ret;

}



static int ath10k_download_cal_file(struct ath10k *ar)

static int ath10k_download_cal_file(struct ath10k *ar,

				    const struct firmware *file)

{

	int ret;



	if (!ar->cal_file)

	if (!file)

		return -ENOENT;



	if (IS_ERR(ar->cal_file))

		return PTR_ERR(ar->cal_file);

	if (IS_ERR(file))

		return PTR_ERR(file);



	ret = ath10k_download_board_data(ar, ar->cal_file->data,

					 ar->cal_file->size);

	ret = ath10k_download_board_data(ar, file->data, file->size);

	if (ret) {

		ath10k_err(ar, "failed to download cal_file data: %d\n", ret);

		return ret;
@@ -488,7 +493,7 @@ static int ath10k_download_cal_file(struct ath10k *ar) 
	return 0;

}



static int ath10k_download_cal_dt(struct ath10k *ar)

static int ath10k_download_cal_dt(struct ath10k *ar, const char *dt_name)

{

	struct device_node *node;

	int data_len;
@@ -502,13 +507,12 @@ static int ath10k_download_cal_dt(struct ath10k *ar) 
		 */

		return -ENOENT;



	if (!of_get_property(node, "qcom,ath10k-calibration-data",

			     &data_len)) {

	if (!of_get_property(node, dt_name, &data_len)) {

		/* The calibration data node is optional */

		return -ENOENT;

	}



	if (data_len != QCA988X_CAL_DATA_LEN) {

	if (data_len != ar->hw_params.cal_data_len) {

		ath10k_warn(ar, "invalid calibration data length in DT: %d\n",

			    data_len);

		ret = -EMSGSIZE;
@@ -521,8 +525,7 @@ static int ath10k_download_cal_dt(struct ath10k *ar) 
		goto out;

	}



	ret = of_property_read_u8_array(node, "qcom,ath10k-calibration-data",

					data, data_len);

	ret = of_property_read_u8_array(node, dt_name, data, data_len);

	if (ret) {

		ath10k_warn(ar, "failed to read calibration data from DT: %d\n",

			    ret);
@@ -726,6 +729,14 @@ static int ath10k_fetch_cal_file(struct ath10k *ar) 
{

	char filename[100];



	/* pre-cal-<bus>-<id>.bin */

	scnprintf(filename, sizeof(filename), "pre-cal-%s-%s.bin",

		  ath10k_bus_str(ar->hif.bus), dev_name(ar->dev));



	ar->pre_cal_file = ath10k_fetch_fw_file(ar, ATH10K_FW_DIR, filename);

	if (!IS_ERR(ar->pre_cal_file))

		goto success;



	/* cal-<bus>-<id>.bin */

	scnprintf(filename, sizeof(filename), "cal-%s-%s.bin",

		  ath10k_bus_str(ar->hif.bus), dev_name(ar->dev));
@@ -734,7 +745,7 @@ static int ath10k_fetch_cal_file(struct ath10k *ar) 
	if (IS_ERR(ar->cal_file))

		/* calibration file is optional, don't print any warnings */

		return PTR_ERR(ar->cal_file);



success:

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "found calibration file %s/%s\n",

		   ATH10K_FW_DIR, filename);
@@ -1258,11 +1269,77 @@ static int ath10k_core_fetch_firmware_files(struct ath10k *ar) 
	return 0;

}



static int ath10k_core_pre_cal_download(struct ath10k *ar)

{

	int ret;



	ret = ath10k_download_cal_file(ar, ar->pre_cal_file);

	if (ret == 0) {

		ar->cal_mode = ATH10K_PRE_CAL_MODE_FILE;

		goto success;

	}



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

		   "boot did not find a pre calibration file, try DT next: %d\n",

		   ret);



	ret = ath10k_download_cal_dt(ar, "qcom,ath10k-pre-calibration-data");

	if (ret) {

		ath10k_dbg(ar, ATH10K_DBG_BOOT,

			   "unable to load pre cal data from DT: %d\n", ret);

		return ret;

	}

	ar->cal_mode = ATH10K_PRE_CAL_MODE_DT;



success:

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot using calibration mode %s\n",

		   ath10k_cal_mode_str(ar->cal_mode));



	return 0;

}



static int ath10k_core_pre_cal_config(struct ath10k *ar)

{

	int ret;



	ret = ath10k_core_pre_cal_download(ar);

	if (ret) {

		ath10k_dbg(ar, ATH10K_DBG_BOOT,

			   "failed to load pre cal data: %d\n", ret);

		return ret;

	}



	ret = ath10k_core_get_board_id_from_otp(ar);

	if (ret) {

		ath10k_err(ar, "failed to get board id: %d\n", ret);

		return ret;

	}



	ret = ath10k_download_and_run_otp(ar);

	if (ret) {

		ath10k_err(ar, "failed to run otp: %d\n", ret);

		return ret;

	}



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

		   "pre cal configuration done successfully\n");



	return 0;

}



static int ath10k_download_cal_data(struct ath10k *ar)

{

	int ret;



	ret = ath10k_download_cal_file(ar);

	ret = ath10k_core_pre_cal_config(ar);

	if (ret == 0)

		return 0;



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

		   "pre cal download procedure failed, try cal file: %d\n",

		   ret);



	ret = ath10k_download_cal_file(ar, ar->cal_file);

	if (ret == 0) {

		ar->cal_mode = ATH10K_CAL_MODE_FILE;

		goto done;
@@ -1272,7 +1349,7 @@ static int ath10k_download_cal_data(struct ath10k *ar) 
		   "boot did not find a calibration file, try DT next: %d\n",

		   ret);



	ret = ath10k_download_cal_dt(ar);

	ret = ath10k_download_cal_dt(ar, "qcom,ath10k-calibration-data");

	if (ret == 0) {

		ar->cal_mode = ATH10K_CAL_MODE_DT;

		goto done;
@@ -1509,7 +1586,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
	case ATH10K_FW_WMI_OP_VERSION_10_1:

	case ATH10K_FW_WMI_OP_VERSION_10_2:

	case ATH10K_FW_WMI_OP_VERSION_10_2_4:

		if (test_bit(WMI_SERVICE_PEER_STATS, ar->wmi.svc_map)) {

		if (ath10k_peer_stats_enabled(ar)) {

			ar->max_num_peers = TARGET_10X_TX_STATS_NUM_PEERS;

			ar->max_num_stations = TARGET_10X_TX_STATS_NUM_STATIONS;

		} else {
@@ -1538,9 +1615,15 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->num_active_peers = TARGET_10_4_ACTIVE_PEERS;

		ar->max_num_vdevs = TARGET_10_4_NUM_VDEVS;

		ar->num_tids = TARGET_10_4_TGT_NUM_TIDS;

		ar->htt.max_num_pending_tx = ar->hw_params.num_msdu_desc;

		ar->fw_stats_req_mask = WMI_STAT_PEER;

		ar->fw_stats_req_mask = WMI_10_4_STAT_PEER |

					WMI_10_4_STAT_PEER_EXTD;

		ar->max_spatial_stream = ar->hw_params.max_spatial_stream;



		if (test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL,

			     ar->fw_features))

			ar->htt.max_num_pending_tx = TARGET_10_4_NUM_MSDU_DESC_PFC;

		else

			ar->htt.max_num_pending_tx = TARGET_10_4_NUM_MSDU_DESC;

		break;

	case ATH10K_FW_WMI_OP_VERSION_UNSET:

	case ATH10K_FW_WMI_OP_VERSION_MAX:
@@ -1578,6 +1661,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode)

{

	int status;

	u32 val;



	lockdep_assert_held(&ar->conf_mutex);
@@ -1698,6 +1782,21 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode) 
	ath10k_dbg(ar, ATH10K_DBG_BOOT, "firmware %s booted\n",

		   ar->hw->wiphy->fw_version);



	if (test_bit(WMI_SERVICE_EXT_RES_CFG_SUPPORT, ar->wmi.svc_map)) {

		val = 0;

		if (ath10k_peer_stats_enabled(ar))

			val = WMI_10_4_PEER_STATS;



		status = ath10k_wmi_ext_resource_config(ar,

							WMI_HOST_PLATFORM_HIGH_PERF, val);

		if (status) {

			ath10k_err(ar,

				   "failed to send ext resource cfg command : %d\n",

				   status);

			goto err_hif_stop;

		}

	}



	status = ath10k_wmi_cmd_init(ar);

	if (status) {

		ath10k_err(ar, "could not send WMI init command (%d)\n",
@@ -1834,11 +1933,20 @@ static int ath10k_core_probe_fw(struct ath10k *ar) 


	ath10k_debug_print_hwfw_info(ar);



	ret = ath10k_core_pre_cal_download(ar);

	if (ret) {

		/* pre calibration data download is not necessary

		 * for all the chipsets. Ignore failures and continue.

		 */

		ath10k_dbg(ar, ATH10K_DBG_BOOT,

			   "could not load pre cal data: %d\n", ret);

	}



	ret = ath10k_core_get_board_id_from_otp(ar);

	if (ret && ret != -EOPNOTSUPP) {

		ath10k_err(ar, "failed to get board id from otp: %d\n",

			   ret);

		return ret;

		goto err_free_firmware_files;

	}



	ret = ath10k_core_fetch_board_file(ar);
@@ -2048,7 +2156,9 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev, 


	mutex_init(&ar->conf_mutex);

	spin_lock_init(&ar->data_lock);

	spin_lock_init(&ar->txqs_lock);



	INIT_LIST_HEAD(&ar->txqs);

	INIT_LIST_HEAD(&ar->peers);

	init_waitqueue_head(&ar->peer_mapping_wq);

	init_waitqueue_head(&ar->htt.empty_tx_wq);

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

+39 −2
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ struct ath10k_skb_cb { 
	u8 eid;

	u16 msdu_id;

	struct ieee80211_vif *vif;

	struct ieee80211_txq *txq;

} __packed;



struct ath10k_skb_rxcb {
@@ -297,6 +298,9 @@ struct ath10k_dfs_stats { 


struct ath10k_peer {

	struct list_head list;

	struct ieee80211_vif *vif;

	struct ieee80211_sta *sta;



	int vdev_id;

	u8 addr[ETH_ALEN];

	DECLARE_BITMAP(peer_ids, ATH10K_MAX_NUM_PEER_IDS);
@@ -305,6 +309,12 @@ struct ath10k_peer { 
	struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1];

};



struct ath10k_txq {

	struct list_head list;

	unsigned long num_fw_queued;

	unsigned long num_push_allowed;

};



struct ath10k_sta {

	struct ath10k_vif *arvif;
@@ -313,6 +323,7 @@ struct ath10k_sta { 
	u32 bw;

	u32 nss;

	u32 smps;

	u16 peer_id;



	struct work_struct update_wk;
@@ -335,6 +346,7 @@ struct ath10k_vif { 
	struct list_head list;



	u32 vdev_id;

	u16 peer_id;

	enum wmi_vdev_type vdev_type;

	enum wmi_vdev_subtype vdev_subtype;

	u32 beacon_interval;
@@ -549,12 +561,17 @@ enum ath10k_dev_flags { 


	/* Bluetooth coexistance enabled */

	ATH10K_FLAG_BTCOEX,



	/* Per Station statistics service */

	ATH10K_FLAG_PEER_STATS,

};



enum ath10k_cal_mode {

	ATH10K_CAL_MODE_FILE,

	ATH10K_CAL_MODE_OTP,

	ATH10K_CAL_MODE_DT,

	ATH10K_PRE_CAL_MODE_FILE,

	ATH10K_PRE_CAL_MODE_DT,

};



enum ath10k_crypt_mode {
@@ -573,6 +590,10 @@ static inline const char *ath10k_cal_mode_str(enum ath10k_cal_mode mode) 
		return "otp";

	case ATH10K_CAL_MODE_DT:

		return "dt";

	case ATH10K_PRE_CAL_MODE_FILE:

		return "pre-cal-file";

	case ATH10K_PRE_CAL_MODE_DT:

		return "pre-cal-dt";

	}



	return "unknown";
@@ -680,11 +701,10 @@ struct ath10k { 
		/* The padding bytes's location is different on various chips */

		enum ath10k_hw_4addr_pad hw_4addr_pad;



		u32 num_msdu_desc;

		u32 qcache_active_peers;

		u32 tx_chain_mask;

		u32 rx_chain_mask;

		u32 max_spatial_stream;

		u32 cal_data_len;



		struct ath10k_hw_params_fw {

			const char *dir;
@@ -708,6 +728,7 @@ struct ath10k { 
	const void *firmware_data;

	size_t firmware_len;



	const struct firmware *pre_cal_file;

	const struct firmware *cal_file;



	struct {
@@ -756,6 +777,9 @@ struct ath10k { 
	/* current operating channel definition */

	struct cfg80211_chan_def chandef;



	/* currently configured operating channel in firmware */

	struct ieee80211_channel *tgt_oper_chan;



	unsigned long long free_vdev_map;

	struct ath10k_vif *monitor_arvif;

	bool monitor;
@@ -786,9 +810,13 @@ struct ath10k { 


	/* protects shared structure data */

	spinlock_t data_lock;

	/* protects: ar->txqs, artxq->list */

	spinlock_t txqs_lock;



	struct list_head txqs;

	struct list_head arvifs;

	struct list_head peers;

	struct ath10k_peer *peer_map[ATH10K_MAX_NUM_PEER_IDS];

	wait_queue_head_t peer_mapping_wq;



	/* protected by conf_mutex */
@@ -876,6 +904,15 @@ struct ath10k { 
	u8 drv_priv[0] __aligned(sizeof(void *));

};



static inline bool ath10k_peer_stats_enabled(struct ath10k *ar)

{

	if (test_bit(ATH10K_FLAG_PEER_STATS, &ar->dev_flags) &&

	    test_bit(WMI_SERVICE_PEER_STATS, ar->wmi.svc_map))

		return true;



	return false;

}



struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,

				  enum ath10k_bus bus,

				  enum ath10k_hw_rev hw_rev,