Commit 7b6e9df9 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Kalle Valo
Browse files

wifi: rtw88: Move enum rtw_tx_queue_type mapping code to tx.{c,h} 



This code is not specific to the PCIe bus type but can be re-used by USB
and SDIO bus types. Move it to tx.{c,h} to avoid code-duplication in the
future. While here, add checking of the ac argument in
rtw_tx_ac_to_hwq() so we're not accessing entries beyond the end of the
array.

Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230204233001.1511643-4-martin.blumenstingl@googlemail.com
parent c9089796

drivers/net/wireless/realtek/rtw88/pci.c

+2 −33
Original line number Diff line number Diff line
@@ -670,37 +670,6 @@ static void rtw_pci_deep_ps(struct rtw_dev *rtwdev, bool enter) 
	spin_unlock_bh(&rtwpci->irq_lock);

}



static const enum rtw_tx_queue_type ac_to_hwq[] = {

	[IEEE80211_AC_VO] = RTW_TX_QUEUE_VO,

	[IEEE80211_AC_VI] = RTW_TX_QUEUE_VI,

	[IEEE80211_AC_BE] = RTW_TX_QUEUE_BE,

	[IEEE80211_AC_BK] = RTW_TX_QUEUE_BK,

};



static_assert(ARRAY_SIZE(ac_to_hwq) == IEEE80211_NUM_ACS);



static enum rtw_tx_queue_type rtw_hw_queue_mapping(struct sk_buff *skb)

{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	__le16 fc = hdr->frame_control;

	u8 q_mapping = skb_get_queue_mapping(skb);

	enum rtw_tx_queue_type queue;



	if (unlikely(ieee80211_is_beacon(fc)))

		queue = RTW_TX_QUEUE_BCN;

	else if (unlikely(ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc)))

		queue = RTW_TX_QUEUE_MGMT;

	else if (is_broadcast_ether_addr(hdr->addr1) ||

		 is_multicast_ether_addr(hdr->addr1))

		queue = RTW_TX_QUEUE_HI0;

	else if (WARN_ON_ONCE(q_mapping >= ARRAY_SIZE(ac_to_hwq)))

		queue = ac_to_hwq[IEEE80211_AC_BE];

	else

		queue = ac_to_hwq[q_mapping];



	return queue;

}



static void rtw_pci_release_rsvd_page(struct rtw_pci *rtwpci,

				      struct rtw_pci_tx_ring *ring)

{
@@ -798,7 +767,7 @@ static void rtw_pci_flush_queues(struct rtw_dev *rtwdev, u32 queues, bool drop) 
	} else {

		for (i = 0; i < rtwdev->hw->queues; i++)

			if (queues & BIT(i))

				pci_queues |= BIT(ac_to_hwq[i]);

				pci_queues |= BIT(rtw_tx_ac_to_hwq(i));

	}



	__rtw_pci_flush_queues(rtwdev, pci_queues, drop);
@@ -952,7 +921,7 @@ static int rtw_pci_tx_write(struct rtw_dev *rtwdev, 
			    struct rtw_tx_pkt_info *pkt_info,

			    struct sk_buff *skb)

{

	enum rtw_tx_queue_type queue = rtw_hw_queue_mapping(skb);

	enum rtw_tx_queue_type queue = rtw_tx_queue_mapping(skb);

	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv;

	struct rtw_pci_tx_ring *ring;

	int ret;

drivers/net/wireless/realtek/rtw88/tx.c

+41 −0
Original line number Diff line number Diff line
@@ -682,3 +682,44 @@ void rtw_txq_cleanup(struct rtw_dev *rtwdev, struct ieee80211_txq *txq) 
		list_del_init(&rtwtxq->list);

	spin_unlock_bh(&rtwdev->txq_lock);

}



static const enum rtw_tx_queue_type ac_to_hwq[] = {

	[IEEE80211_AC_VO] = RTW_TX_QUEUE_VO,

	[IEEE80211_AC_VI] = RTW_TX_QUEUE_VI,

	[IEEE80211_AC_BE] = RTW_TX_QUEUE_BE,

	[IEEE80211_AC_BK] = RTW_TX_QUEUE_BK,

};



static_assert(ARRAY_SIZE(ac_to_hwq) == IEEE80211_NUM_ACS);



enum rtw_tx_queue_type rtw_tx_ac_to_hwq(enum ieee80211_ac_numbers ac)

{

	if (WARN_ON(unlikely(ac >= IEEE80211_NUM_ACS)))

		return RTW_TX_QUEUE_BE;



	return ac_to_hwq[ac];

}

EXPORT_SYMBOL(rtw_tx_ac_to_hwq);



enum rtw_tx_queue_type rtw_tx_queue_mapping(struct sk_buff *skb)

{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	__le16 fc = hdr->frame_control;

	u8 q_mapping = skb_get_queue_mapping(skb);

	enum rtw_tx_queue_type queue;



	if (unlikely(ieee80211_is_beacon(fc)))

		queue = RTW_TX_QUEUE_BCN;

	else if (unlikely(ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc)))

		queue = RTW_TX_QUEUE_MGMT;

	else if (is_broadcast_ether_addr(hdr->addr1) ||

		 is_multicast_ether_addr(hdr->addr1))

		queue = RTW_TX_QUEUE_HI0;

	else if (WARN_ON_ONCE(q_mapping >= ARRAY_SIZE(ac_to_hwq)))

		queue = ac_to_hwq[IEEE80211_AC_BE];

	else

		queue = ac_to_hwq[q_mapping];



	return queue;

}

EXPORT_SYMBOL(rtw_tx_queue_mapping);

drivers/net/wireless/realtek/rtw88/tx.h

+3 −0
Original line number Diff line number Diff line
@@ -131,6 +131,9 @@ rtw_tx_write_data_h2c_get(struct rtw_dev *rtwdev, 
			  struct rtw_tx_pkt_info *pkt_info,

			  u8 *buf, u32 size);



enum rtw_tx_queue_type rtw_tx_ac_to_hwq(enum ieee80211_ac_numbers ac);

enum rtw_tx_queue_type rtw_tx_queue_mapping(struct sk_buff *skb);



static inline

void fill_txdesc_checksum_common(u8 *txdesc, size_t words)

{