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

Merge tag 'wireless-drivers-2020-03-13' of... 

Merge tag 'wireless-drivers-2020-03-13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for v5.6

Third, and hopefully last, set of fixes for v5.6.

iwlwifi

* 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

* fix link in MAINTAINERS file

rtlwifi

* fix regression causing connect issues in v5.4

wlcore

* remove merge damage which luckily didn't have any impact on functionality
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 242a6df6 e2e57291

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8683,7 +8683,7 @@ M: Emmanuel Grumbach <emmanuel.grumbach@intel.com> 
M:	Luca Coelho <luciano.coelho@intel.com>

M:	Intel Linux Wireless <linuxwifi@intel.com>

L:	linux-wireless@vger.kernel.org

W:	http://intellinuxwireless.org

W:	https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git

S:	Supported

F:	drivers/net/wireless/intel/iwlwifi/

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;

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE