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

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

Merge tag 'wireless-drivers-next-for-davem-2018-08-05' of... 

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



Kalle Valo says:

====================
wireless-drivers-next patches for 4.19

This time a bigger pull request as we have two new Mediatek drivers
MT76x2u (CONFIG_MT76x2U) and MT76x0U (CONFIG_MT76x0U). Also iwlwifi got
support for the new IEEE 802.11ax standard, the successor for
802.11ac. And naturally smaller new features and bugfixes all over.

Major changes:

wcn36xx

* fix WEP in client mode

wil6210

* add support for Talyn-MB (Talyn ver 2.0) device

* add support for enhanced DMA firmware feature

iwlwifi

* implement 802.11ax D2.0

* support for the new 22560 device family

* new PCI IDs for 22000 and 22560

qtnfmac

* implement cfg80211 power management callback

* enable multiple SSIDs scan support

* qtnfmac: implement basic WoWLAN support

mt7601u

* fall back to software encryption for hw unsupported ciphers

* enable 802.11 Management Frame Protection (MFP)

mt76

* support setting RTS threshold

* add USB support

* add support for MT76x2u devices

* add support for MT76x0U devices

mwifiex

* allow user space to set all other IEs except WMM IE

rsi

* add firmware support for AP+BT dual mode
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6277547f e800a333

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

+2 −2
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ ath10k_htc_process_lookahead_bundle(struct ath10k_htc *htc, 
	struct ath10k *ar = htc->ar;

	int bundle_cnt = len / sizeof(*report);



	if (!bundle_cnt || (bundle_cnt > HTC_HOST_MAX_MSG_PER_BUNDLE)) {

	if (!bundle_cnt || (bundle_cnt > HTC_HOST_MAX_MSG_PER_RX_BUNDLE)) {

		ath10k_warn(ar, "Invalid lookahead bundle count: %d\n",

			    bundle_cnt);

		return -EINVAL;
@@ -655,7 +655,7 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc) 
	    sizeof(msg->hdr) + sizeof(msg->ready_ext)) {

		htc->max_msgs_per_htc_bundle =

			min_t(u8, msg->ready_ext.max_msgs_per_htc_bundle,

			      HTC_HOST_MAX_MSG_PER_BUNDLE);

			      HTC_HOST_MAX_MSG_PER_RX_BUNDLE);

		ath10k_dbg(ar, ATH10K_DBG_HTC,

			   "Extended ready message. RX bundle size: %d\n",

			   htc->max_msgs_per_htc_bundle);

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

+3 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ struct ath10k; 
 * 4-byte aligned.

 */



#define HTC_HOST_MAX_MSG_PER_BUNDLE        8

#define HTC_HOST_MAX_MSG_PER_RX_BUNDLE        8

#define HTC_HOST_MAX_MSG_PER_TX_BUNDLE        16



enum ath10k_htc_tx_flags {

	ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE = 0x01,
@@ -58,6 +59,7 @@ enum ath10k_htc_tx_flags { 
};



enum ath10k_htc_rx_flags {

	ATH10K_HTC_FLAGS_RECV_1MORE_BLOCK = 0x01,

	ATH10K_HTC_FLAG_TRAILER_PRESENT = 0x02,

	ATH10K_HTC_FLAG_BUNDLE_MASK     = 0xF0

};

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

+8 −5
Original line number Diff line number Diff line
@@ -268,11 +268,12 @@ int ath10k_htt_rx_ring_refill(struct ath10k *ar) 
	spin_lock_bh(&htt->rx_ring.lock);

	ret = ath10k_htt_rx_ring_fill_n(htt, (htt->rx_ring.fill_level -

					      htt->rx_ring.fill_cnt));

	spin_unlock_bh(&htt->rx_ring.lock);



	if (ret)

		ath10k_htt_rx_ring_free(htt);



	spin_unlock_bh(&htt->rx_ring.lock);



	return ret;

}
@@ -284,7 +285,9 @@ void ath10k_htt_rx_free(struct ath10k_htt *htt) 
	skb_queue_purge(&htt->rx_in_ord_compl_q);

	skb_queue_purge(&htt->tx_fetch_ind_q);



	spin_lock_bh(&htt->rx_ring.lock);

	ath10k_htt_rx_ring_free(htt);

	spin_unlock_bh(&htt->rx_ring.lock);



	dma_free_coherent(htt->ar->dev,

			  ath10k_htt_get_rx_ring_size(htt),
@@ -1089,7 +1092,7 @@ static void ath10k_htt_rx_h_queue_msdu(struct ath10k *ar, 
	status = IEEE80211_SKB_RXCB(skb);

	*status = *rx_status;



	__skb_queue_tail(&ar->htt.rx_msdus_q, skb);

	skb_queue_tail(&ar->htt.rx_msdus_q, skb);

}



static void ath10k_process_rx(struct ath10k *ar, struct sk_buff *skb)
@@ -2810,7 +2813,7 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) 
		break;

	}

	case HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND: {

		__skb_queue_tail(&htt->rx_in_ord_compl_q, skb);

		skb_queue_tail(&htt->rx_in_ord_compl_q, skb);

		return false;

	}

	case HTT_T2H_MSG_TYPE_TX_CREDIT_UPDATE_IND:
@@ -2874,7 +2877,7 @@ static int ath10k_htt_rx_deliver_msdu(struct ath10k *ar, int quota, int budget) 
		if (skb_queue_empty(&ar->htt.rx_msdus_q))

			break;



		skb = __skb_dequeue(&ar->htt.rx_msdus_q);

		skb = skb_dequeue(&ar->htt.rx_msdus_q);

		if (!skb)

			break;

		ath10k_process_rx(ar, skb);
@@ -2905,7 +2908,7 @@ int ath10k_htt_txrx_compl_task(struct ath10k *ar, int budget) 
		goto exit;

	}



	while ((skb = __skb_dequeue(&htt->rx_in_ord_compl_q))) {

	while ((skb = skb_dequeue(&htt->rx_in_ord_compl_q))) {

		spin_lock_bh(&htt->rx_ring.lock);

		ret = ath10k_htt_rx_in_ord_ind(ar, skb);

		spin_unlock_bh(&htt->rx_ring.lock);

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

+1 −1
Original line number Diff line number Diff line
@@ -1056,7 +1056,7 @@ static u8 ath10k_htt_tx_get_tid(struct sk_buff *skb, bool is_eth) 
	if (!is_eth && ieee80211_is_mgmt(hdr->frame_control))

		return HTT_DATA_TX_EXT_TID_MGMT;

	else if (cb->flags & ATH10K_SKB_F_QOS)

		return skb->priority % IEEE80211_QOS_CTL_TID_MASK;

		return skb->priority & IEEE80211_QOS_CTL_TID_MASK;

	else

		return HTT_DATA_TX_EXT_TID_NON_QOS_MCAST_BCAST;

}

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

+3 −2
Original line number Diff line number Diff line
@@ -4026,7 +4026,7 @@ void ath10k_mac_tx_push_pending(struct ath10k *ar) 
				   drv_priv);



		/* Prevent aggressive sta/tid taking over tx queue */

		max = 16;

		max = HTC_HOST_MAX_MSG_PER_TX_BUNDLE;

		ret = 0;

		while (ath10k_mac_tx_can_push(hw, txq) && max--) {

			ret = ath10k_mac_tx_push_txq(hw, txq);
@@ -4047,6 +4047,7 @@ void ath10k_mac_tx_push_pending(struct ath10k *ar) 
	rcu_read_unlock();

	spin_unlock_bh(&ar->txqs_lock);

}

EXPORT_SYMBOL(ath10k_mac_tx_push_pending);



/************/

/* Scanning */
@@ -4287,7 +4288,7 @@ static void ath10k_mac_op_wake_tx_queue(struct ieee80211_hw *hw, 
	struct ieee80211_txq *f_txq;

	struct ath10k_txq *f_artxq;

	int ret = 0;

	int max = 16;

	int max = HTC_HOST_MAX_MSG_PER_TX_BUNDLE;



	spin_lock_bh(&ar->txqs_lock);

	if (list_empty(&artxq->list))