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

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

ath10k: move fw_features to struct ath10k_fw_file 



Preparation for testmode.c to use ath10k_core_fetch_board_data_api_n().

Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 45317355

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

+15 −13
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ void ath10k_core_get_fw_features_str(struct ath10k *ar, 
	int i;



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

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

		if (test_bit(i, ar->normal_mode_fw.fw_file.fw_features)) {

			if (len > 0)

				len += scnprintf(buf + len, buf_len - len, ",");
@@ -627,7 +627,7 @@ 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)) &&

				   ar->running_fw->fw_file.fw_features)) &&

	    result != 0) {

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

		return -EINVAL;
@@ -1074,13 +1074,13 @@ static int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name, 
					ath10k_dbg(ar, ATH10K_DBG_BOOT,

						   "Enabling feature bit: %i\n",

						   i);

					__set_bit(i, ar->fw_features);

					__set_bit(i, fw_file->fw_features);

				}

			}



			ath10k_dbg_dump(ar, ATH10K_DBG_BOOT, "features", "",

					ar->fw_features,

					sizeof(ar->fw_features));

					ar->running_fw->fw_file.fw_features,

					sizeof(fw_file->fw_features));

			break;

		case ATH10K_FW_IE_FW_IMAGE:

			ath10k_dbg(ar, ATH10K_DBG_BOOT,
@@ -1430,8 +1430,10 @@ static void ath10k_core_restart(struct work_struct *work) 


static int ath10k_core_init_firmware_features(struct ath10k *ar)

{

	if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, ar->fw_features) &&

	    !test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {

	struct ath10k_fw_file *fw_file = &ar->normal_mode_fw.fw_file;



	if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, fw_file->fw_features) &&

	    !test_bit(ATH10K_FW_FEATURE_WMI_10X, fw_file->fw_features)) {

		ath10k_err(ar, "feature bits corrupted: 10.2 feature requires 10.x feature to be set as well");

		return -EINVAL;

	}
@@ -1450,7 +1452,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		break;

	case ATH10K_CRYPT_MODE_SW:

		if (!test_bit(ATH10K_FW_FEATURE_RAW_MODE_SUPPORT,

			      ar->fw_features)) {

			      fw_file->fw_features)) {

			ath10k_err(ar, "cryptmode > 0 requires raw mode support from firmware");

			return -EINVAL;

		}
@@ -1469,7 +1471,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 


	if (rawmode) {

		if (!test_bit(ATH10K_FW_FEATURE_RAW_MODE_SUPPORT,

			      ar->fw_features)) {

			      fw_file->fw_features)) {

			ath10k_err(ar, "rawmode = 1 requires support from firmware");

			return -EINVAL;

		}
@@ -1495,9 +1497,9 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
	 * ATH10K_FW_IE_WMI_OP_VERSION.

	 */

	if (ar->wmi.op_version == ATH10K_FW_WMI_OP_VERSION_UNSET) {

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

		if (test_bit(ATH10K_FW_FEATURE_WMI_10X, fw_file->fw_features)) {

			if (test_bit(ATH10K_FW_FEATURE_WMI_10_2,

				     ar->fw_features))

				     fw_file->fw_features))

				ar->wmi.op_version = ATH10K_FW_WMI_OP_VERSION_10_2;

			else

				ar->wmi.op_version = ATH10K_FW_WMI_OP_VERSION_10_1;
@@ -1553,7 +1555,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->max_spatial_stream = ar->hw_params.max_spatial_stream;



		if (test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL,

			     ar->fw_features))

			     fw_file->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;
@@ -1621,7 +1623,7 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, 
	 * to set the clock source once the target is initialized.

	 */

	if (test_bit(ATH10K_FW_FEATURE_SUPPORTS_SKIP_CLOCK_INIT,

		     ar->fw_features)) {

		     ar->running_fw->fw_file.fw_features)) {

		status = ath10k_bmi_write32(ar, hi_skip_clock_init, 1);

		if (status) {

			ath10k_err(ar, "could not write to skip_clock_init: %d\n",

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

+2 −3
Original line number Diff line number Diff line
@@ -632,6 +632,8 @@ struct ath10k_fw_file { 


	char fw_version[ETHTOOL_FWVERS_LEN];



	DECLARE_BITMAP(fw_features, ATH10K_FW_FEATURE_COUNT);



	const void *firmware_data;

	size_t firmware_len;
@@ -675,8 +677,6 @@ struct ath10k { 
	/* protected by conf_mutex */

	bool ani_enabled;



	DECLARE_BITMAP(fw_features, ATH10K_FW_FEATURE_COUNT);



	bool p2p;



	struct {
@@ -895,7 +895,6 @@ struct ath10k { 
	struct {

		/* protected by conf_mutex */

		struct ath10k_fw_components utf_mode_fw;

		DECLARE_BITMAP(orig_fw_features, ATH10K_FW_FEATURE_COUNT);

		enum ath10k_fw_wmi_op_version orig_wmi_op_version;

		enum ath10k_fw_wmi_op_version op_version;

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

+1 −1
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ static int ath10k_htt_rx_nwifi_hdrlen(struct ath10k *ar, 
	int len = ieee80211_hdrlen(hdr->frame_control);



	if (!test_bit(ATH10K_FW_FEATURE_NO_NWIFI_DECAP_4ADDR_PADDING,

		      ar->fw_features))

		      ar->running_fw->fw_file.fw_features))

		len = round_up(len, 4);



	return len;

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

+6 −3
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ static void ath10k_htt_tx_free_txq(struct ath10k_htt *htt) 
	struct ath10k *ar = htt->ar;

	size_t size;



	if (!test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL, ar->fw_features))

	if (!test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL,

		      ar->running_fw->fw_file.fw_features))

		return;



	size = sizeof(*htt->tx_q_state.vaddr);
@@ -282,7 +283,8 @@ static int ath10k_htt_tx_alloc_txq(struct ath10k_htt *htt) 
	size_t size;

	int ret;



	if (!test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL, ar->fw_features))

	if (!test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL,

		      ar->running_fw->fw_file.fw_features))

		return 0;



	htt->tx_q_state.num_peers = HTT_TX_Q_STATE_NUM_PEERS;
@@ -513,7 +515,8 @@ int ath10k_htt_send_frag_desc_bank_cfg(struct ath10k_htt *htt) 
	info |= SM(htt->tx_q_state.type,

		   HTT_FRAG_DESC_BANK_CFG_INFO_Q_STATE_DEPTH_TYPE);



	if (test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL, ar->fw_features))

	if (test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL,

		     ar->running_fw->fw_file.fw_features))

		info |= HTT_FRAG_DESC_BANK_CFG_INFO_Q_STATE_VALID;



	cfg = &cmd->frag_desc_bank_cfg;

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

+8 −6
Original line number Diff line number Diff line
@@ -1772,7 +1772,7 @@ static int ath10k_mac_vif_setup_ps(struct ath10k_vif *arvif) 


	if (enable_ps && ath10k_mac_num_vifs_started(ar) > 1 &&

	    !test_bit(ATH10K_FW_FEATURE_MULTI_VIF_PS_SUPPORT,

		      ar->fw_features)) {

		      ar->running_fw->fw_file.fw_features)) {

		ath10k_warn(ar, "refusing to enable ps on vdev %i: not supported by fw\n",

			    arvif->vdev_id);

		enable_ps = false;
@@ -2060,7 +2060,8 @@ static void ath10k_peer_assoc_h_crypto(struct ath10k *ar, 
	}



	if (sta->mfp &&

	    test_bit(ATH10K_FW_FEATURE_MFP_SUPPORT, ar->fw_features)) {

	    test_bit(ATH10K_FW_FEATURE_MFP_SUPPORT,

		     ar->running_fw->fw_file.fw_features)) {

		arg->peer_flags |= ar->wmi.peer_flags->pmf;

	}

}
@@ -3207,7 +3208,8 @@ ath10k_mac_tx_h_get_txmode(struct ath10k *ar, 
	 */

	if (ar->htt.target_version_major < 3 &&

	    (ieee80211_is_nullfunc(fc) || ieee80211_is_qos_nullfunc(fc)) &&

	    !test_bit(ATH10K_FW_FEATURE_HAS_WMI_MGMT_TX, ar->fw_features))

	    !test_bit(ATH10K_FW_FEATURE_HAS_WMI_MGMT_TX,

		      ar->running_fw->fw_file.fw_features))

		return ATH10K_HW_TXRX_MGMT;



	/* Workaround:
@@ -3394,7 +3396,7 @@ ath10k_mac_tx_h_get_txpath(struct ath10k *ar, 
		return ATH10K_MAC_TX_HTT;

	case ATH10K_HW_TXRX_MGMT:

		if (test_bit(ATH10K_FW_FEATURE_HAS_WMI_MGMT_TX,

			     ar->fw_features))

			     ar->running_fw->fw_file.fw_features))

			return ATH10K_MAC_TX_WMI_MGMT;

		else if (ar->htt.target_version_major >= 3)

			return ATH10K_MAC_TX_HTT;
@@ -4435,7 +4437,7 @@ static int ath10k_start(struct ieee80211_hw *hw) 
	}



	if (test_bit(ATH10K_FW_FEATURE_SUPPORTS_ADAPTIVE_CCA,

		     ar->fw_features)) {

		     ar->running_fw->fw_file.fw_features)) {

		ret = ath10k_wmi_pdev_enable_adaptive_cca(ar, 1,

							  WMI_CCA_DETECT_LEVEL_AUTO,

							  WMI_CCA_DETECT_MARGIN_AUTO);
@@ -7694,7 +7696,7 @@ int ath10k_mac_register(struct ath10k *ar) 
	ar->hw->wiphy->available_antennas_rx = ar->cfg_rx_chainmask;

	ar->hw->wiphy->available_antennas_tx = ar->cfg_tx_chainmask;



	if (!test_bit(ATH10K_FW_FEATURE_NO_P2P, ar->fw_features))

	if (!test_bit(ATH10K_FW_FEATURE_NO_P2P, ar->normal_mode_fw.fw_file.fw_features))

		ar->hw->wiphy->interface_modes |=

			BIT(NL80211_IFTYPE_P2P_DEVICE) |

			BIT(NL80211_IFTYPE_P2P_CLIENT) |