Commit 453bfc2d authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2020-03-08' of... 

Merge tag 'iwlwifi-for-kalle-2020-03-08' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

First batch of fixes intended for v5.6

* Fix a locking issue in time events handling;
* A fix in rate-scaling;
* Fix for a potential NULL pointer deref;
* Enable antenna diversity in some devices that were erroneously not
  doing it;
* Allow FW dumps to continue when the FW is stuck;
* A fix in the HE capabilities handling;
* Another fix for FW dumps where we were reading wrong addresses.
parents 23620594 9352ed01

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+2 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0 = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.tx_with_siso_diversity = true,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};
@@ -309,6 +310,7 @@ const struct iwl_cfg iwl_ax101_cfg_quz_hr = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.tx_with_siso_diversity = true,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};

drivers/net/wireless/intel/iwlwifi/fw/dbg.c

+8 −17
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2015 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@ 
 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2015 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -1409,11 +1409,7 @@ static int iwl_dump_ini_rxf_iter(struct iwl_fw_runtime *fwrt, 
		goto out;

	}



	/*

	 * region register have absolute value so apply rxf offset after

	 * reading the registers

	 */

	offs += rxf_data.offset;

	offs = rxf_data.offset;



	/* Lock fence */

	iwl_write_prph_no_grab(fwrt->trans, RXF_SET_FENCE_MODE + offs, 0x1);
@@ -2494,10 +2490,7 @@ static void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt, u8 wk_idx) 
		goto out;

	}



	if (iwl_fw_dbg_stop_restart_recording(fwrt, &params, true)) {

		IWL_ERR(fwrt, "Failed to stop DBGC recording, aborting dump\n");

		goto out;

	}

	iwl_fw_dbg_stop_restart_recording(fwrt, &params, true);



	IWL_DEBUG_FW_INFO(fwrt, "WRT: Data collection start\n");

	if (iwl_trans_dbg_ini_valid(fwrt->trans))
@@ -2662,14 +2655,14 @@ static int iwl_fw_dbg_restart_recording(struct iwl_trans *trans, 
	return 0;

}



int iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt,

void iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt,

				       struct iwl_fw_dbg_params *params,

				       bool stop)

{

	int ret = 0;



	if (test_bit(STATUS_FW_ERROR, &fwrt->trans->status))

		return 0;

		return;



	if (fw_has_capa(&fwrt->fw->ucode_capa,

			IWL_UCODE_TLV_CAPA_DBG_SUSPEND_RESUME_CMD_SUPP))
@@ -2686,7 +2679,5 @@ int iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt, 
			iwl_fw_set_dbg_rec_on(fwrt);

	}

#endif



	return ret;

}

IWL_EXPORT_SYMBOL(iwl_fw_dbg_stop_restart_recording);

drivers/net/wireless/intel/iwlwifi/fw/dbg.h

+3 −3
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ _iwl_fw_dbg_trigger_simple_stop(struct iwl_fw_runtime *fwrt, 
	_iwl_fw_dbg_trigger_simple_stop((fwrt), (wdev),		\

					iwl_fw_dbg_get_trigger((fwrt)->fw,\

							       (trig)))

int iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt,

void iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt,

				       struct iwl_fw_dbg_params *params,

				       bool stop);

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1467,7 +1467,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
				kmemdup(pieces->dbg_conf_tlv[i],

					pieces->dbg_conf_tlv_len[i],

					GFP_KERNEL);

			if (!pieces->dbg_conf_tlv_len[i])

			if (!pieces->dbg_conf_tlv[i])

				goto out_free_fw;

		}

	}

drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c

+26 −9
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -27,7 +27,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -147,7 +147,11 @@ static u16 rs_fw_get_config_flags(struct iwl_mvm *mvm, 
	     (vht_ena && (vht_cap->cap & IEEE80211_VHT_CAP_RXLDPC))))

		flags |= IWL_TLC_MNG_CFG_FLAGS_LDPC_MSK;



	/* consider our LDPC support in case of HE */

	/* consider LDPC support in case of HE */

	if (he_cap->has_he && (he_cap->he_cap_elem.phy_cap_info[1] &

	    IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD))

		flags |= IWL_TLC_MNG_CFG_FLAGS_LDPC_MSK;



	if (sband->iftype_data && sband->iftype_data->he_cap.has_he &&

	    !(sband->iftype_data->he_cap.he_cap_elem.phy_cap_info[1] &

	     IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD))
@@ -191,11 +195,13 @@ rs_fw_vht_set_enabled_rates(const struct ieee80211_sta *sta, 
{

	u16 supp;

	int i, highest_mcs;

	u8 nss = sta->rx_nss;



	for (i = 0; i < sta->rx_nss; i++) {

		if (i == IWL_TLC_NSS_MAX)

			break;

	/* the station support only a single receive chain */

	if (sta->smps_mode == IEEE80211_SMPS_STATIC)

		nss = 1;



	for (i = 0; i < nss && i < IWL_TLC_NSS_MAX; i++) {

		highest_mcs = rs_fw_vht_highest_rx_mcs_index(vht_cap, i + 1);

		if (!highest_mcs)

			continue;
@@ -241,8 +247,13 @@ rs_fw_he_set_enabled_rates(const struct ieee80211_sta *sta, 
	u16 tx_mcs_160 =

		le16_to_cpu(sband->iftype_data->he_cap.he_mcs_nss_supp.tx_mcs_160);

	int i;

	u8 nss = sta->rx_nss;



	for (i = 0; i < sta->rx_nss && i < IWL_TLC_NSS_MAX; i++) {

	/* the station support only a single receive chain */

	if (sta->smps_mode == IEEE80211_SMPS_STATIC)

		nss = 1;



	for (i = 0; i < nss && i < IWL_TLC_NSS_MAX; i++) {

		u16 _mcs_160 = (mcs_160 >> (2 * i)) & 0x3;

		u16 _mcs_80 = (mcs_80 >> (2 * i)) & 0x3;

		u16 _tx_mcs_160 = (tx_mcs_160 >> (2 * i)) & 0x3;
@@ -303,6 +314,12 @@ static void rs_fw_set_supp_rates(struct ieee80211_sta *sta, 
		cmd->mode = IWL_TLC_MNG_MODE_HT;

		cmd->ht_rates[IWL_TLC_NSS_1][IWL_TLC_HT_BW_NONE_160] =

			cpu_to_le16(ht_cap->mcs.rx_mask[0]);



		/* the station support only a single receive chain */

		if (sta->smps_mode == IEEE80211_SMPS_STATIC)

			cmd->ht_rates[IWL_TLC_NSS_2][IWL_TLC_HT_BW_NONE_160] =

				0;

		else

			cmd->ht_rates[IWL_TLC_NSS_2][IWL_TLC_HT_BW_NONE_160] =

				cpu_to_le16(ht_cap->mcs.rx_mask[1]);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE