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

Commit 03afb6e4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2017-12-08' of... 

Merge tag 'wireless-drivers-for-davem-2017-12-08' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for 4.15

Second set of fixes for 4.15. This time a lot of iwlwifi patches and
two brcmfmac patches. Most important here are the MIC and IVC fixes
for iwlwifi to unbreak 9000 series.

iwlwifi

* fix rate-scaling to not start lowest possible rate

* fix the TX queue hang detection for AP/GO modes

* fix the TX queue hang timeout in monitor interfaces

* fix packet injection

* remove a wrong error message when dumping PCI registers

* fix race condition with RF-kill

* tell mac80211 when the MIC has been stripped (9000 series)

* tell mac80211 when the IVC has been stripped (9000 series)

* add 2 new PCI IDs, one for 9000 and one for 22000

* fix a queue hang due during a P2P Remain-on-Channel operation

brcmfmac

* fix a race which sometimes caused a crash during sdio unbind

* fix a kernel-doc related build error
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8a7b741e a41886f5

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c

+2 −2
Original line number Diff line number Diff line
@@ -2070,7 +2070,7 @@ static int brcmf_sdio_txpkt_hdalign(struct brcmf_sdio *bus, struct sk_buff *pkt) 
	return head_pad;

}



/**

/*

 * struct brcmf_skbuff_cb reserves first two bytes in sk_buff::cb for

 * bus layer usage.

 */
@@ -4121,8 +4121,8 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err, 
	sdio_release_host(sdiodev->func[1]);

fail:

	brcmf_dbg(TRACE, "failed: dev=%s, err=%d\n", dev_name(dev), err);

	device_release_driver(dev);

	device_release_driver(&sdiodev->func[2]->dev);

	device_release_driver(dev);

}



struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)

drivers/net/wireless/intel/iwlwifi/fw/api/txq.h

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ 
 * @IWL_MVM_DQA_CMD_QUEUE: a queue reserved for sending HCMDs to the FW

 * @IWL_MVM_DQA_AUX_QUEUE: a queue reserved for aux frames

 * @IWL_MVM_DQA_P2P_DEVICE_QUEUE: a queue reserved for P2P device frames

 * @IWL_MVM_DQA_INJECT_MONITOR_QUEUE: a queue reserved for injection using

 *	monitor mode. Note this queue is the same as the queue for P2P device

 *	but we can't have active monitor mode along with P2P device anyway.

 * @IWL_MVM_DQA_GCAST_QUEUE: a queue reserved for P2P GO/SoftAP GCAST frames

 * @IWL_MVM_DQA_BSS_CLIENT_QUEUE: a queue reserved for BSS activity, to ensure

 *	that we are never left without the possibility to connect to an AP.
@@ -87,6 +90,7 @@ enum iwl_mvm_dqa_txq { 
	IWL_MVM_DQA_CMD_QUEUE = 0,

	IWL_MVM_DQA_AUX_QUEUE = 1,

	IWL_MVM_DQA_P2P_DEVICE_QUEUE = 2,

	IWL_MVM_DQA_INJECT_MONITOR_QUEUE = 2,

	IWL_MVM_DQA_GCAST_QUEUE = 3,

	IWL_MVM_DQA_BSS_CLIENT_QUEUE = 4,

	IWL_MVM_DQA_MIN_MGMT_QUEUE = 5,

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

+0 −2
Original line number Diff line number Diff line
@@ -209,8 +209,6 @@ static inline void iwl_fw_dbg_stop_recording(struct iwl_fw_runtime *fwrt) 


static inline void iwl_fw_dump_conf_clear(struct iwl_fw_runtime *fwrt)

{

	iwl_fw_dbg_stop_recording(fwrt);



	fwrt->dump.conf = FW_DBG_INVALID;

}

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+3 −1
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ 
#define FH_RSCSR_FRAME_INVALID		0x55550000

#define FH_RSCSR_FRAME_ALIGN		0x40

#define FH_RSCSR_RPA_EN			BIT(25)

#define FH_RSCSR_RADA_EN		BIT(26)

#define FH_RSCSR_RXQ_POS		16

#define FH_RSCSR_RXQ_MASK		0x3F0000
@@ -128,7 +129,8 @@ struct iwl_rx_packet { 
	 * 31:    flag flush RB request

	 * 30:    flag ignore TC (terminal counter) request

	 * 29:    flag fast IRQ request

	 * 28-26: Reserved

	 * 28-27: Reserved

	 * 26:    RADA enabled

	 * 25:    Offload enabled

	 * 24:    RPF enabled

	 * 23:    RSS enabled

drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ static int iwl_mvm_mac_ctxt_cmd_listener(struct iwl_mvm *mvm, 
					 u32 action)

{

	struct iwl_mac_ctx_cmd cmd = {};

	u32 tfd_queue_msk = 0;

	u32 tfd_queue_msk = BIT(mvm->snif_queue);

	int ret;



	WARN_ON(vif->type != NL80211_IFTYPE_MONITOR);