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

Commit 81c1f74d authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from ath.git 

Major changes:

ath10k

* add board 2 API support for automatically choosing correct board file
* data path optimisations
* disable PCI power save for qca988x and QCA99x0 due to interop reasons

wil6210

* BlockAckReq support
* firmware crashdump using devcoredump
* capture all frames with sniffer
parents f8273baf bc6f9ae6

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

+10 −0
Original line number Diff line number Diff line
@@ -82,6 +82,16 @@ enum bmi_cmd_id { 


#define BMI_NVRAM_SEG_NAME_SZ 16



#define BMI_PARAM_GET_EEPROM_BOARD_ID 0x10



#define ATH10K_BMI_BOARD_ID_FROM_OTP_MASK   0x7c00

#define ATH10K_BMI_BOARD_ID_FROM_OTP_LSB    10



#define ATH10K_BMI_CHIP_ID_FROM_OTP_MASK    0x18000

#define ATH10K_BMI_CHIP_ID_FROM_OTP_LSB     15



#define ATH10K_BMI_BOARD_ID_STATUS_MASK 0xff



struct bmi_cmd {

	__le32 id; /* enum bmi_cmd_id */

	union {

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

+4 −6
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ 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)

		return -EIO;

		return -ENOSPC;



	desc->addr = __cpu_to_le32(paddr);

	desc->nbytes = 0;
@@ -1076,9 +1076,7 @@ void ath10k_ce_deinit_pipe(struct ath10k *ar, unsigned int ce_id) 
}



int ath10k_ce_alloc_pipe(struct ath10k *ar, int ce_id,

			 const struct ce_attr *attr,

			 void (*send_cb)(struct ath10k_ce_pipe *),

			 void (*recv_cb)(struct ath10k_ce_pipe *))

			 const struct ce_attr *attr)

{

	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

	struct ath10k_ce_pipe *ce_state = &ar_pci->ce_states[ce_id];
@@ -1104,10 +1102,10 @@ int ath10k_ce_alloc_pipe(struct ath10k *ar, int ce_id, 
	ce_state->src_sz_max = attr->src_sz_max;



	if (attr->src_nentries)

		ce_state->send_cb = send_cb;

		ce_state->send_cb = attr->send_cb;



	if (attr->dest_nentries)

		ce_state->recv_cb = recv_cb;

		ce_state->recv_cb = attr->recv_cb;



	if (attr->src_nentries) {

		ce_state->src_ring = ath10k_ce_alloc_src_ring(ar, ce_id, attr);

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

+4 −3
Original line number Diff line number Diff line
@@ -209,9 +209,7 @@ int ath10k_ce_init_pipe(struct ath10k *ar, unsigned int ce_id, 
			const struct ce_attr *attr);

void ath10k_ce_deinit_pipe(struct ath10k *ar, unsigned int ce_id);

int ath10k_ce_alloc_pipe(struct ath10k *ar, int ce_id,

			 const struct ce_attr *attr,

			 void (*send_cb)(struct ath10k_ce_pipe *),

			 void (*recv_cb)(struct ath10k_ce_pipe *));

			 const struct ce_attr *attr);

void ath10k_ce_free_pipe(struct ath10k *ar, int ce_id);



/*==================CE Engine Shutdown=======================*/
@@ -277,6 +275,9 @@ struct ce_attr { 


	/* #entries in destination ring - Must be a power of 2 */

	unsigned int dest_nentries;



	void (*send_cb)(struct ath10k_ce_pipe *);

	void (*recv_cb)(struct ath10k_ce_pipe *);

};



#define SR_BA_ADDRESS		0x0000

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

+293 −50
Original line number Diff line number Diff line
@@ -448,6 +448,56 @@ static int ath10k_download_cal_dt(struct ath10k *ar) 
	return ret;

}



static int ath10k_core_get_board_id_from_otp(struct ath10k *ar)

{

	u32 result, address;

	u8 board_id, chip_id;

	int ret;



	address = ar->hw_params.patch_load_addr;



	if (!ar->otp_data || !ar->otp_len) {

		ath10k_warn(ar,

			    "failed to retrieve board id because of invalid otp\n");

		return -ENODATA;

	}



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

		   "boot upload otp to 0x%x len %zd for board id\n",

		   address, ar->otp_len);



	ret = ath10k_bmi_fast_download(ar, address, ar->otp_data, ar->otp_len);

	if (ret) {

		ath10k_err(ar, "could not write otp for board id check: %d\n",

			   ret);

		return ret;

	}



	ret = ath10k_bmi_execute(ar, address, BMI_PARAM_GET_EEPROM_BOARD_ID,

				 &result);

	if (ret) {

		ath10k_err(ar, "could not execute otp for board id check: %d\n",

			   ret);

		return ret;

	}



	board_id = MS(result, ATH10K_BMI_BOARD_ID_FROM_OTP);

	chip_id = MS(result, ATH10K_BMI_CHIP_ID_FROM_OTP);



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

		   "boot get otp board id result 0x%08x board_id %d chip_id %d\n",

		   result, board_id, chip_id);



	if ((result & ATH10K_BMI_BOARD_ID_STATUS_MASK) != 0)

		return -EOPNOTSUPP;



	ar->id.bmi_ids_valid = true;

	ar->id.bmi_board_id = board_id;

	ar->id.bmi_chip_id = chip_id;



	return 0;

}



static int ath10k_download_and_run_otp(struct ath10k *ar)

{

	u32 result, address = ar->hw_params.patch_load_addr;
@@ -486,8 +536,8 @@ static int ath10k_download_and_run_otp(struct ath10k *ar) 
	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot otp execute result %d\n", result);



	if (!(skip_otp || test_bit(ATH10K_FW_FEATURE_IGNORE_OTP_RESULT,

				   ar->fw_features))

	    && result != 0) {

				   ar->fw_features)) &&

	    result != 0) {

		ath10k_err(ar, "otp calibration failed: %d", result);

		return -EINVAL;

	}
@@ -541,11 +591,18 @@ static int ath10k_download_fw(struct ath10k *ar, enum ath10k_firmware_mode mode) 
	return ret;

}



static void ath10k_core_free_firmware_files(struct ath10k *ar)

static void ath10k_core_free_board_files(struct ath10k *ar)

{

	if (!IS_ERR(ar->board))

		release_firmware(ar->board);



	ar->board = NULL;

	ar->board_data = NULL;

	ar->board_len = 0;

}



static void ath10k_core_free_firmware_files(struct ath10k *ar)

{

	if (!IS_ERR(ar->otp))

		release_firmware(ar->otp);
@@ -557,10 +614,6 @@ static void ath10k_core_free_firmware_files(struct ath10k *ar) 


	ath10k_swap_code_seg_release(ar);



	ar->board = NULL;

	ar->board_data = NULL;

	ar->board_len = 0;



	ar->otp = NULL;

	ar->otp_data = NULL;

	ar->otp_len = 0;
@@ -570,7 +623,6 @@ static void ath10k_core_free_firmware_files(struct ath10k *ar) 
	ar->firmware_len = 0;



	ar->cal_file = NULL;



}



static int ath10k_fetch_cal_file(struct ath10k *ar)
@@ -592,68 +644,251 @@ static int ath10k_fetch_cal_file(struct ath10k *ar) 
	return 0;

}



static int ath10k_core_fetch_spec_board_file(struct ath10k *ar)

static int ath10k_core_fetch_board_data_api_1(struct ath10k *ar)

{

	char filename[100];



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

		  ath10k_bus_str(ar->hif.bus), ar->spec_board_id);

	if (!ar->hw_params.fw.board) {

		ath10k_err(ar, "failed to find board file fw entry\n");

		return -EINVAL;

	}



	ar->board = ath10k_fetch_fw_file(ar, ar->hw_params.fw.dir, filename);

	ar->board = ath10k_fetch_fw_file(ar,

					 ar->hw_params.fw.dir,

					 ar->hw_params.fw.board);

	if (IS_ERR(ar->board))

		return PTR_ERR(ar->board);



	ar->board_data = ar->board->data;

	ar->board_len = ar->board->size;

	ar->spec_board_loaded = true;



	return 0;

}



static int ath10k_core_fetch_generic_board_file(struct ath10k *ar)

static int ath10k_core_parse_bd_ie_board(struct ath10k *ar,

					 const void *buf, size_t buf_len,

					 const char *boardname)

{

	if (!ar->hw_params.fw.board) {

		ath10k_err(ar, "failed to find board file fw entry\n");

		return -EINVAL;

	const struct ath10k_fw_ie *hdr;

	bool name_match_found;

	int ret, board_ie_id;

	size_t board_ie_len;

	const void *board_ie_data;



	name_match_found = false;



	/* go through ATH10K_BD_IE_BOARD_ elements */

	while (buf_len > sizeof(struct ath10k_fw_ie)) {

		hdr = buf;

		board_ie_id = le32_to_cpu(hdr->id);

		board_ie_len = le32_to_cpu(hdr->len);

		board_ie_data = hdr->data;



		buf_len -= sizeof(*hdr);

		buf += sizeof(*hdr);



		if (buf_len < ALIGN(board_ie_len, 4)) {

			ath10k_err(ar, "invalid ATH10K_BD_IE_BOARD length: %zu < %zu\n",

				   buf_len, ALIGN(board_ie_len, 4));

			ret = -EINVAL;

			goto out;

		}



	ar->board = ath10k_fetch_fw_file(ar,

					 ar->hw_params.fw.dir,

					 ar->hw_params.fw.board);

		switch (board_ie_id) {

		case ATH10K_BD_IE_BOARD_NAME:

			ath10k_dbg_dump(ar, ATH10K_DBG_BOOT, "board name", "",

					board_ie_data, board_ie_len);



			if (board_ie_len != strlen(boardname))

				break;



			ret = memcmp(board_ie_data, boardname, strlen(boardname));

			if (ret)

				break;



			name_match_found = true;

			ath10k_dbg(ar, ATH10K_DBG_BOOT,

				   "boot found match for name '%s'",

				   boardname);

			break;

		case ATH10K_BD_IE_BOARD_DATA:

			if (!name_match_found)

				/* no match found */

				break;



			ath10k_dbg(ar, ATH10K_DBG_BOOT,

				   "boot found board data for '%s'",

				   boardname);



			ar->board_data = board_ie_data;

			ar->board_len = board_ie_len;



			ret = 0;

			goto out;

		default:

			ath10k_warn(ar, "unknown ATH10K_BD_IE_BOARD found: %d\n",

				    board_ie_id);

			break;

		}



		/* jump over the padding */

		board_ie_len = ALIGN(board_ie_len, 4);



		buf_len -= board_ie_len;

		buf += board_ie_len;

	}



	/* no match found */

	ret = -ENOENT;



out:

	return ret;

}



static int ath10k_core_fetch_board_data_api_n(struct ath10k *ar,

					      const char *boardname,

					      const char *filename)

{

	size_t len, magic_len, ie_len;

	struct ath10k_fw_ie *hdr;

	const u8 *data;

	int ret, ie_id;



	ar->board = ath10k_fetch_fw_file(ar, ar->hw_params.fw.dir, filename);

	if (IS_ERR(ar->board))

		return PTR_ERR(ar->board);



	ar->board_data = ar->board->data;

	ar->board_len = ar->board->size;

	ar->spec_board_loaded = false;

	data = ar->board->data;

	len = ar->board->size;



	/* magic has extra null byte padded */

	magic_len = strlen(ATH10K_BOARD_MAGIC) + 1;

	if (len < magic_len) {

		ath10k_err(ar, "failed to find magic value in %s/%s, file too short: %zu\n",

			   ar->hw_params.fw.dir, filename, len);

		ret = -EINVAL;

		goto err;

	}



	if (memcmp(data, ATH10K_BOARD_MAGIC, magic_len)) {

		ath10k_err(ar, "found invalid board magic\n");

		ret = -EINVAL;

		goto err;

	}



	/* magic is padded to 4 bytes */

	magic_len = ALIGN(magic_len, 4);

	if (len < magic_len) {

		ath10k_err(ar, "failed: %s/%s too small to contain board data, len: %zu\n",

			   ar->hw_params.fw.dir, filename, len);

		ret = -EINVAL;

		goto err;

	}



	data += magic_len;

	len -= magic_len;



	while (len > sizeof(struct ath10k_fw_ie)) {

		hdr = (struct ath10k_fw_ie *)data;

		ie_id = le32_to_cpu(hdr->id);

		ie_len = le32_to_cpu(hdr->len);



		len -= sizeof(*hdr);

		data = hdr->data;



		if (len < ALIGN(ie_len, 4)) {

			ath10k_err(ar, "invalid length for board ie_id %d ie_len %zu len %zu\n",

				   ie_id, ie_len, len);

			ret = -EINVAL;

			goto err;

		}



		switch (ie_id) {

		case ATH10K_BD_IE_BOARD:

			ret = ath10k_core_parse_bd_ie_board(ar, data, ie_len,

							    boardname);

			if (ret == -ENOENT)

				/* no match found, continue */

				break;

			else if (ret)

				/* there was an error, bail out */

				goto err;



			/* board data found */

			goto out;

		}



		/* jump over the padding */

		ie_len = ALIGN(ie_len, 4);



		len -= ie_len;

		data += ie_len;

	}



out:

	if (!ar->board_data || !ar->board_len) {

		ath10k_err(ar,

			   "failed to fetch board data for %s from %s/%s\n",

			   ar->hw_params.fw.dir, boardname, filename);

		ret = -ENODATA;

		goto err;

	}



	return 0;



err:

	ath10k_core_free_board_files(ar);

	return ret;

}



static int ath10k_core_create_board_name(struct ath10k *ar, char *name,

					 size_t name_len)

{

	if (ar->id.bmi_ids_valid) {

		scnprintf(name, name_len,

			  "bus=%s,bmi-chip-id=%d,bmi-board-id=%d",

			  ath10k_bus_str(ar->hif.bus),

			  ar->id.bmi_chip_id,

			  ar->id.bmi_board_id);

		goto out;

	}



	scnprintf(name, name_len,

		  "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x",

		  ath10k_bus_str(ar->hif.bus),

		  ar->id.vendor, ar->id.device,

		  ar->id.subsystem_vendor, ar->id.subsystem_device);



out:

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot using board name '%s'\n", name);



	return 0;

}



static int ath10k_core_fetch_board_file(struct ath10k *ar)

{

	char boardname[100];

	int ret;



	if (strlen(ar->spec_board_id) > 0) {

		ret = ath10k_core_fetch_spec_board_file(ar);

	ret = ath10k_core_create_board_name(ar, boardname, sizeof(boardname));

	if (ret) {

			ath10k_info(ar, "failed to load spec board file, falling back to generic: %d\n",

				    ret);

			goto generic;

		ath10k_err(ar, "failed to create board name: %d", ret);

		return ret;

	}



		ath10k_dbg(ar, ATH10K_DBG_BOOT, "found specific board file for %s\n",

			   ar->spec_board_id);

		return 0;

	}

	ar->bd_api = 2;

	ret = ath10k_core_fetch_board_data_api_n(ar, boardname,

						 ATH10K_BOARD_API2_FILE);

	if (!ret)

		goto success;



generic:

	ret = ath10k_core_fetch_generic_board_file(ar);

	ar->bd_api = 1;

	ret = ath10k_core_fetch_board_data_api_1(ar);

	if (ret) {

		ath10k_err(ar, "failed to fetch generic board data: %d\n", ret);

		ath10k_err(ar, "failed to fetch board data\n");

		return ret;

	}



success:

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "using board api %d\n", ar->bd_api);

	return 0;

}
@@ -885,12 +1120,6 @@ static int ath10k_core_fetch_firmware_files(struct ath10k *ar) 
	/* calibration file is optional, don't check for any errors */

	ath10k_fetch_cal_file(ar);



	ret = ath10k_core_fetch_board_file(ar);

	if (ret) {

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

		return ret;

	}



	ar->fw_api = 5;

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);
@@ -1500,6 +1729,19 @@ static int ath10k_core_probe_fw(struct ath10k *ar) 
		goto err_power_down;

	}



	ret = ath10k_core_get_board_id_from_otp(ar);

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

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

			   ret);

		return ret;

	}



	ret = ath10k_core_fetch_board_file(ar);

	if (ret) {

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

		goto err_free_firmware_files;

	}



	ret = ath10k_core_init_firmware_features(ar);

	if (ret) {

		ath10k_err(ar, "fatal problem with firmware features: %d\n",
@@ -1627,6 +1869,7 @@ void ath10k_core_unregister(struct ath10k *ar) 
	ath10k_testmode_destroy(ar);



	ath10k_core_free_firmware_files(ar);

	ath10k_core_free_board_files(ar);



	ath10k_debug_unregister(ar);

}

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

+40 −2
Original line number Diff line number Diff line
@@ -250,6 +250,30 @@ struct ath10k_fw_stats { 
	struct list_head peers;

};



#define ATH10K_TPC_TABLE_TYPE_FLAG	1

#define ATH10K_TPC_PREAM_TABLE_END	0xFFFF



struct ath10k_tpc_table {

	u32 pream_idx[WMI_TPC_RATE_MAX];

	u8 rate_code[WMI_TPC_RATE_MAX];

	char tpc_value[WMI_TPC_RATE_MAX][WMI_TPC_TX_N_CHAIN * WMI_TPC_BUF_SIZE];

};



struct ath10k_tpc_stats {

	u32 reg_domain;

	u32 chan_freq;

	u32 phy_mode;

	u32 twice_antenna_reduction;

	u32 twice_max_rd_power;

	s32 twice_antenna_gain;

	u32 power_limit;

	u32 num_tx_chain;

	u32 ctl;

	u32 rate_max;

	u8 flag[WMI_TPC_FLAG];

	struct ath10k_tpc_table tpc_table[WMI_TPC_FLAG];

};



struct ath10k_dfs_stats {

	u32 phy_errors;

	u32 pulses_total;
@@ -378,6 +402,11 @@ struct ath10k_debug { 
	struct ath10k_dfs_stats dfs_stats;

	struct ath_dfs_pool_stats dfs_pool_stats;



	/* used for tpc-dump storage, protected by data-lock */

	struct ath10k_tpc_stats *tpc_stats;



	struct completion tpc_complete;



	/* protected by conf_mutex */

	u32 fw_dbglog_mask;

	u32 fw_dbglog_level;
@@ -647,10 +676,19 @@ struct ath10k { 
		struct ath10k_swap_code_seg_info *firmware_swap_code_seg_info;

	} swap;



	char spec_board_id[100];

	bool spec_board_loaded;

	struct {

		u32 vendor;

		u32 device;

		u32 subsystem_vendor;

		u32 subsystem_device;



		bool bmi_ids_valid;

		u8 bmi_board_id;

		u8 bmi_chip_id;

	} id;



	int fw_api;

	int bd_api;

	enum ath10k_cal_mode cal_mode;



	struct {