Commit 040cda8a authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-2019-12-17' of... 

Merge tag 'wireless-drivers-2019-12-17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

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

First set of fixes for v5.5. Fixing security issues, some regressions
and few major bugs.

mwifiex

* security fix for handling country Information Elements (CVE-2019-14895)

* security fix for handling TDLS Information Elements

ath9k

* fix endian issue with ath9k_pci_owl_loader

mt76

* fix default mac address handling

iwlwifi

* fix merge damage which lead to firmware crashing during boot on some devices

* fix device initialisation regression on some devices
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents daa6eb5a 0df36b90

drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int ath9k_pci_fixup(struct pci_dev *pdev, const u16 *cal_data, 
			val = swahb32(val);

		}



		__raw_writel(val, mem + reg);

		iowrite32(val, mem + reg);

		usleep_range(100, 120);

	}

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+12 −12
Original line number Diff line number Diff line
@@ -1111,18 +1111,18 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* same thing for QuZ... */

	if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QUZ) {

		if (iwl_trans->cfg == &iwl_ax101_cfg_qu_hr)

			iwl_trans->cfg = &iwl_ax101_cfg_quz_hr;

		else if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr)

			iwl_trans->cfg = &iwl_ax201_cfg_quz_hr;

		else if (iwl_trans->cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)

			iwl_trans->cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;

		else if (iwl_trans->cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)

			iwl_trans->cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;

		else if (iwl_trans->cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)

			iwl_trans->cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;

		else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)

			iwl_trans->cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;

		if (cfg == &iwl_ax101_cfg_qu_hr)

			cfg = &iwl_ax101_cfg_quz_hr;

		else if (cfg == &iwl_ax201_cfg_qu_hr)

			cfg = &iwl_ax201_cfg_quz_hr;

		else if (cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)

			cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;

		else if (cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)

			cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;

		else if (cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)

			cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;

		else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)

			cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;

	}



#endif

drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c

+0 −25
Original line number Diff line number Diff line
@@ -57,24 +57,6 @@ 
#include "internal.h"

#include "fw/dbg.h"



static int iwl_pcie_gen2_force_power_gating(struct iwl_trans *trans)

{

	iwl_set_bits_prph(trans, HPM_HIPM_GEN_CFG,

			  HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE);

	udelay(20);

	iwl_set_bits_prph(trans, HPM_HIPM_GEN_CFG,

			  HPM_HIPM_GEN_CFG_CR_PG_EN |

			  HPM_HIPM_GEN_CFG_CR_SLP_EN);

	udelay(20);

	iwl_clear_bits_prph(trans, HPM_HIPM_GEN_CFG,

			    HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE);



	iwl_trans_sw_reset(trans);

	iwl_clear_bit(trans, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);



	return 0;

}



/*

 * Start up NIC's basic functionality after it has been reset

 * (e.g. after platform boot, or shutdown via iwl_pcie_apm_stop())
@@ -110,13 +92,6 @@ int iwl_pcie_gen2_apm_init(struct iwl_trans *trans) 


	iwl_pcie_apm_config(trans);



	if (trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_22000 &&

	    trans->cfg->integrated) {

		ret = iwl_pcie_gen2_force_power_gating(trans);

		if (ret)

			return ret;

	}



	ret = iwl_finish_nic_init(trans, trans->trans_cfg);

	if (ret)

		return ret;

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+30 −0
Original line number Diff line number Diff line
@@ -1783,6 +1783,29 @@ static int iwl_trans_pcie_clear_persistence_bit(struct iwl_trans *trans) 
	return 0;

}



static int iwl_pcie_gen2_force_power_gating(struct iwl_trans *trans)

{

	int ret;



	ret = iwl_finish_nic_init(trans, trans->trans_cfg);

	if (ret < 0)

		return ret;



	iwl_set_bits_prph(trans, HPM_HIPM_GEN_CFG,

			  HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE);

	udelay(20);

	iwl_set_bits_prph(trans, HPM_HIPM_GEN_CFG,

			  HPM_HIPM_GEN_CFG_CR_PG_EN |

			  HPM_HIPM_GEN_CFG_CR_SLP_EN);

	udelay(20);

	iwl_clear_bits_prph(trans, HPM_HIPM_GEN_CFG,

			    HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE);



	iwl_trans_pcie_sw_reset(trans);



	return 0;

}



static int _iwl_trans_pcie_start_hw(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
@@ -1802,6 +1825,13 @@ static int _iwl_trans_pcie_start_hw(struct iwl_trans *trans) 


	iwl_trans_pcie_sw_reset(trans);



	if (trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_22000 &&

	    trans->cfg->integrated) {

		err = iwl_pcie_gen2_force_power_gating(trans);

		if (err)

			return err;

	}



	err = iwl_pcie_apm_init(trans);

	if (err)

		return err;

drivers/net/wireless/marvell/mwifiex/sta_ioctl.c

+11 −2
Original line number Diff line number Diff line
@@ -229,6 +229,14 @@ static int mwifiex_process_country_ie(struct mwifiex_private *priv, 
			    "11D: skip setting domain info in FW\n");

		return 0;

	}



	if (country_ie_len >

	    (IEEE80211_COUNTRY_STRING_LEN + MWIFIEX_MAX_TRIPLET_802_11D)) {

		mwifiex_dbg(priv->adapter, ERROR,

			    "11D: country_ie_len overflow!, deauth AP\n");

		return -EINVAL;

	}



	memcpy(priv->adapter->country_code, &country_ie[2], 2);



	domain_info->country_code[0] = country_ie[2];
@@ -272,8 +280,9 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss, 
	priv->scan_block = false;



	if (bss) {

		if (adapter->region_code == 0x00)

			mwifiex_process_country_ie(priv, bss);

		if (adapter->region_code == 0x00 &&

		    mwifiex_process_country_ie(priv, bss))

			return -EINVAL;



		/* Allocate and fill new bss descriptor */

		bss_desc = kzalloc(sizeof(struct mwifiex_bssdescriptor),

CRA Git | Maintained and supported by SUSTech CRA and CCSE