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

Commit c538bb3b authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from ath.git. 

Major changes in ath10k:

* enable VHT for IBSS
* initial work to support qca99x0 and the corresponding 10.4 firmware branch
parents 8fc2b61a ed25b113

drivers/net/wireless/ath/ath10k/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ ath10k_core-y += mac.o \ 
		 wmi-tlv.o \

		 bmi.o \

		 hw.o \

		 p2p.o

		 p2p.o \

		 swap.o



ath10k_core-$(CONFIG_ATH10K_DEBUGFS) += spectral.o

ath10k_core-$(CONFIG_NL80211_TESTMODE) += testmode.o

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

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ struct bmi_target_info { 
};



/* in msec */

#define BMI_COMMUNICATION_TIMEOUT_HZ (1*HZ)

#define BMI_COMMUNICATION_TIMEOUT_HZ (2 * HZ)



#define BMI_CE_NUM_TO_TARG 0

#define BMI_CE_NUM_TO_HOST 1

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

+1 −0
Original line number Diff line number Diff line
@@ -452,6 +452,7 @@ int ath10k_ce_completed_recv_next_nolock(struct ath10k_ce_pipe *ce_state, 
{

	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;

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

+12 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include "hif.h"



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

#define CE_COUNT_MAX 8

#define CE_COUNT_MAX 12

#define CE_HTT_H2T_MSG_SRC_NENTRIES 4096



/* Descriptor rings must be aligned to this boundary */
@@ -38,8 +38,13 @@ struct ath10k_ce_pipe; 


#define CE_DESC_FLAGS_GATHER         (1 << 0)

#define CE_DESC_FLAGS_BYTE_SWAP      (1 << 1)

#define CE_DESC_FLAGS_META_DATA_MASK 0xFFFC

#define CE_DESC_FLAGS_META_DATA_LSB  2



/* Following desc flags are used in QCA99X0 */

#define CE_DESC_FLAGS_HOST_INT_DIS	(1 << 2)

#define CE_DESC_FLAGS_TGT_INT_DIS	(1 << 3)



#define CE_DESC_FLAGS_META_DATA_MASK ar->hw_values->ce_desc_meta_data_mask

#define CE_DESC_FLAGS_META_DATA_LSB  ar->hw_values->ce_desc_meta_data_lsb



struct ce_desc {

	__le32 addr;
@@ -423,8 +428,10 @@ static inline u32 ath10k_ce_base_address(struct ath10k *ar, unsigned int ce_id) 


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



#define CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB		8

#define CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK		0x0000ff00

#define CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB \

				ar->regs->ce_wrap_intr_sum_host_msi_lsb

#define CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK \

				ar->regs->ce_wrap_intr_sum_host_msi_mask

#define CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_GET(x) \

	(((x) & CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK) >> \

		CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB)

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

+110 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,

		.uart_pin = 7,

		.has_shifted_cc_wraparound = true,

		.otp_exe_param = 0,

		.fw = {

			.dir = QCA988X_HW_2_0_FW_DIR,

			.fw = QCA988X_HW_2_0_FW_FILE,
@@ -63,6 +64,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca6174 hw2.1",

		.patch_load_addr = QCA6174_HW_2_1_PATCH_LOAD_ADDR,

		.uart_pin = 6,

		.otp_exe_param = 0,

		.fw = {

			.dir = QCA6174_HW_2_1_FW_DIR,

			.fw = QCA6174_HW_2_1_FW_FILE,
@@ -77,6 +79,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca6174 hw3.0",

		.patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,

		.uart_pin = 6,

		.otp_exe_param = 0,

		.fw = {

			.dir = QCA6174_HW_3_0_FW_DIR,

			.fw = QCA6174_HW_3_0_FW_FILE,
@@ -91,6 +94,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca6174 hw3.2",

		.patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,

		.uart_pin = 6,

		.otp_exe_param = 0,

		.fw = {

			/* uses same binaries as hw3.0 */

			.dir = QCA6174_HW_3_0_FW_DIR,
@@ -101,8 +105,68 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

		},

	},

	{

		.id = QCA99X0_HW_2_0_DEV_VERSION,

		.name = "qca99x0 hw2.0",

		.patch_load_addr = QCA99X0_HW_2_0_PATCH_LOAD_ADDR,

		.uart_pin = 7,

		.otp_exe_param = 0x00000700,

		.continuous_frag_desc = true,

		.fw = {

			.dir = QCA99X0_HW_2_0_FW_DIR,

			.fw = QCA99X0_HW_2_0_FW_FILE,

			.otp = QCA99X0_HW_2_0_OTP_FILE,

			.board = QCA99X0_HW_2_0_BOARD_DATA_FILE,

			.board_size = QCA99X0_BOARD_DATA_SZ,

			.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,

		},

	},

};



static const char *const ath10k_core_fw_feature_str[] = {

	[ATH10K_FW_FEATURE_EXT_WMI_MGMT_RX] = "wmi-mgmt-rx",

	[ATH10K_FW_FEATURE_WMI_10X] = "wmi-10.x",

	[ATH10K_FW_FEATURE_HAS_WMI_MGMT_TX] = "has-wmi-mgmt-tx",

	[ATH10K_FW_FEATURE_NO_P2P] = "no-p2p",

	[ATH10K_FW_FEATURE_WMI_10_2] = "wmi-10.2",

	[ATH10K_FW_FEATURE_MULTI_VIF_PS_SUPPORT] = "multi-vif-ps",

	[ATH10K_FW_FEATURE_WOWLAN_SUPPORT] = "wowlan",

	[ATH10K_FW_FEATURE_IGNORE_OTP_RESULT] = "ignore-otp",

	[ATH10K_FW_FEATURE_NO_NWIFI_DECAP_4ADDR_PADDING] = "no-4addr-pad",

	[ATH10K_FW_FEATURE_SUPPORTS_SKIP_CLOCK_INIT] = "skip-clock-init",

};



static unsigned int ath10k_core_get_fw_feature_str(char *buf,

						   size_t buf_len,

						   enum ath10k_fw_features feat)

{

	if (feat >= ARRAY_SIZE(ath10k_core_fw_feature_str) ||

	    WARN_ON(!ath10k_core_fw_feature_str[feat])) {

		return scnprintf(buf, buf_len, "bit%d", feat);

	}



	return scnprintf(buf, buf_len, "%s", ath10k_core_fw_feature_str[feat]);

}



void ath10k_core_get_fw_features_str(struct ath10k *ar,

				     char *buf,

				     size_t buf_len)

{

	unsigned int len = 0;

	int i;



	for (i = 0; i < ATH10K_FW_FEATURE_COUNT; i++) {

		if (test_bit(i, ar->fw_features)) {

			if (len > 0)

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



			len += ath10k_core_get_fw_feature_str(buf + len,

							      buf_len - len,

							      i);

		}

	}

}



static void ath10k_send_suspend_complete(struct ath10k *ar)

{

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot suspend complete\n");
@@ -355,6 +419,7 @@ static int ath10k_download_cal_dt(struct ath10k *ar) 
static int ath10k_download_and_run_otp(struct ath10k *ar)

{

	u32 result, address = ar->hw_params.patch_load_addr;

	u32 bmi_otp_exe_param = ar->hw_params.otp_exe_param;

	int ret;



	ret = ath10k_download_board_data(ar, ar->board_data, ar->board_len);
@@ -380,7 +445,7 @@ static int ath10k_download_and_run_otp(struct ath10k *ar) 
		return ret;

	}



	ret = ath10k_bmi_execute(ar, address, 0, &result);

	ret = ath10k_bmi_execute(ar, address, bmi_otp_exe_param, &result);

	if (ret) {

		ath10k_err(ar, "could not execute otp (%d)\n", ret);

		return ret;
@@ -412,6 +477,13 @@ static int ath10k_download_fw(struct ath10k *ar, enum ath10k_firmware_mode mode) 
		data = ar->firmware_data;

		data_len = ar->firmware_len;

		mode_name = "normal";

		ret = ath10k_swap_code_seg_configure(ar,

				ATH10K_SWAP_CODE_SEG_BIN_TYPE_FW);

		if (ret) {

			ath10k_err(ar, "failed to configure fw code swap: %d\n",

				   ret);

			return ret;

		}

		break;

	case ATH10K_FIRMWARE_MODE_UTF:

		data = ar->testmode.utf->data;
@@ -451,6 +523,8 @@ static void ath10k_core_free_firmware_files(struct ath10k *ar) 
	if (!IS_ERR(ar->cal_file))

		release_firmware(ar->cal_file);



	ath10k_swap_code_seg_release(ar);



	ar->board = NULL;

	ar->board_data = NULL;

	ar->board_len = 0;
@@ -464,6 +538,7 @@ 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)
@@ -737,6 +812,13 @@ static int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name) 
			ath10k_dbg(ar, ATH10K_DBG_BOOT, "found fw ie htt op version %d\n",

				   ar->htt.op_version);

			break;

		case ATH10K_FW_IE_FW_CODE_SWAP_IMAGE:

			ath10k_dbg(ar, ATH10K_DBG_BOOT,

				   "found fw code swap image ie (%zd B)\n",

				   ie_len);

			ar->swap.firmware_codeswap_data = data;

			ar->swap.firmware_codeswap_len = ie_len;

			break;

		default:

			ath10k_warn(ar, "Unknown FW IE: %u\n",

				    le32_to_cpu(hdr->id));
@@ -1014,6 +1096,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->htt.max_num_pending_tx = TARGET_NUM_MSDU_DESC;

		ar->fw_stats_req_mask = WMI_STAT_PDEV | WMI_STAT_VDEV |

			WMI_STAT_PEER;

		ar->max_spatial_stream = WMI_MAX_SPATIAL_STREAM;

		break;

	case ATH10K_FW_WMI_OP_VERSION_10_1:

	case ATH10K_FW_WMI_OP_VERSION_10_2:
@@ -1023,6 +1106,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->max_num_vdevs = TARGET_10X_NUM_VDEVS;

		ar->htt.max_num_pending_tx = TARGET_10X_NUM_MSDU_DESC;

		ar->fw_stats_req_mask = WMI_STAT_PEER;

		ar->max_spatial_stream = WMI_MAX_SPATIAL_STREAM;

		break;

	case ATH10K_FW_WMI_OP_VERSION_TLV:

		ar->max_num_peers = TARGET_TLV_NUM_PEERS;
@@ -1033,6 +1117,17 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->wow.max_num_patterns = TARGET_TLV_NUM_WOW_PATTERNS;

		ar->fw_stats_req_mask = WMI_STAT_PDEV | WMI_STAT_VDEV |

			WMI_STAT_PEER;

		ar->max_spatial_stream = WMI_MAX_SPATIAL_STREAM;

		break;

	case ATH10K_FW_WMI_OP_VERSION_10_4:

		ar->max_num_peers = TARGET_10_4_NUM_PEERS;

		ar->max_num_stations = TARGET_10_4_NUM_STATIONS;

		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 = TARGET_10_4_NUM_MSDU_DESC;

		ar->fw_stats_req_mask = WMI_STAT_PEER;

		ar->max_spatial_stream = WMI_10_4_MAX_SPATIAL_STREAM;

		break;

	case ATH10K_FW_WMI_OP_VERSION_UNSET:

	case ATH10K_FW_WMI_OP_VERSION_MAX:
@@ -1056,6 +1151,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		case ATH10K_FW_WMI_OP_VERSION_TLV:

			ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_TLV;

			break;

		case ATH10K_FW_WMI_OP_VERSION_10_4:

		case ATH10K_FW_WMI_OP_VERSION_UNSET:

		case ATH10K_FW_WMI_OP_VERSION_MAX:

			WARN_ON(1);
@@ -1330,6 +1426,13 @@ static int ath10k_core_probe_fw(struct ath10k *ar) 
		goto err_free_firmware_files;

	}



	ret = ath10k_swap_code_seg_init(ar);

	if (ret) {

		ath10k_err(ar, "failed to initialize code swap segment: %d\n",

			   ret);

		goto err_free_firmware_files;

	}



	mutex_lock(&ar->conf_mutex);



	ret = ath10k_core_start(ar, ATH10K_FIRMWARE_MODE_NORMAL);
@@ -1470,9 +1573,15 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev, 
	switch (hw_rev) {

	case ATH10K_HW_QCA988X:

		ar->regs = &qca988x_regs;

		ar->hw_values = &qca988x_values;

		break;

	case ATH10K_HW_QCA6174:

		ar->regs = &qca6174_regs;

		ar->hw_values = &qca6174_values;

		break;

	case ATH10K_HW_QCA99X0:

		ar->regs = &qca99x0_regs;

		ar->hw_values = &qca99x0_values;

		break;

	default:

		ath10k_err(ar, "unsupported core hardware revision %d\n",