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

Commit f3355dd9 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8192ce: rtl8192cu: rtl8192de: rtl8192se: rtl8723ae: rtl8723be:... 


rtlwifi: rtl8192ce: rtl8192cu: rtl8192de: rtl8192se: rtl8723ae: rtl8723be: rtl8188eu: Modify for new API

The addition of a driver for the RTL8821AE requires a new API for the
fill_tx_desc() and set_desc() callback routines. This commit makes the
appropriate modifications in all the other drivers.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 997bc71a

drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c

+1 −1
Original line number Diff line number Diff line
@@ -980,7 +980,7 @@ void exhalbtc_set_chip_type(u8 chip_type) 
	case BT_RTL8723A:

		gl_bt_coexist.board_info.bt_chip_type = BTC_CHIP_RTL8723A;

		break;

	case BT_RTL8821:

	case BT_RTL8821A:

		gl_bt_coexist.board_info.bt_chip_type = BTC_CHIP_RTL8821;

		break;

	case BT_RTL8723B:

drivers/net/wireless/rtlwifi/pci.c

+38 −26
Original line number Diff line number Diff line
@@ -811,19 +811,19 @@ done: 
		if (pci_dma_mapping_error(rtlpci->pdev, bufferaddress))

			return;

		tmp_one = 1;

		rtlpriv->cfg->ops->set_desc((u8 *) pdesc, false,

		rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, false,

					    HW_DESC_RXBUFF_ADDR,

					    (u8 *)&bufferaddress);

		rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false,

		rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, false,

					    HW_DESC_RXPKT_LEN,

					    (u8 *)&rtlpci->rxbuffersize);



		if (index == rtlpci->rxringcount - 1)

			rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false,

			rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, false,

						    HW_DESC_RXERO,

						    &tmp_one);



		rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false, HW_DESC_RXOWN,

		rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, false, HW_DESC_RXOWN,

					    &tmp_one);



		index = (index + 1) % rtlpci->rxringcount;
@@ -983,6 +983,8 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw) 
	struct sk_buff *pskb = NULL;

	struct rtl_tx_desc *pdesc = NULL;

	struct rtl_tcb_desc tcb_desc;

	/*This is for new trx flow*/

	struct rtl_tx_buffer_desc *pbuffer_desc = NULL;

	u8 temp_one = 1;



	memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc));
@@ -1004,11 +1006,12 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw) 
	info = IEEE80211_SKB_CB(pskb);

	pdesc = &ring->desc[0];

	rtlpriv->cfg->ops->fill_tx_desc(hw, hdr, (u8 *) pdesc,

		info, NULL, pskb, BEACON_QUEUE, &tcb_desc);

					(u8 *)pbuffer_desc, info, NULL, pskb,

					BEACON_QUEUE, &tcb_desc);



	__skb_queue_tail(&ring->queue, pskb);



	rtlpriv->cfg->ops->set_desc((u8 *) pdesc, true, HW_DESC_OWN,

	rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, true, HW_DESC_OWN,

				    &temp_one);



	return;
@@ -1113,7 +1116,7 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw, 
					      ((i + 1) % entries) *

					      sizeof(*ring);



		rtlpriv->cfg->ops->set_desc((u8 *)&(ring[i]),

		rtlpriv->cfg->ops->set_desc(hw, (u8 *)&(ring[i]),

					    true, HW_DESC_TX_NEXTDESC_ADDR,

					    (u8 *)&nextdescaddress);

	}
@@ -1188,19 +1191,19 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw) 
				dev_kfree_skb_any(skb);

				return 1;

			}

			rtlpriv->cfg->ops->set_desc((u8 *)entry, false,

			rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry, false,

						    HW_DESC_RXBUFF_ADDR,

						    (u8 *)&bufferaddress);

			rtlpriv->cfg->ops->set_desc((u8 *)entry, false,

			rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry, false,

						    HW_DESC_RXPKT_LEN,

						    (u8 *)&rtlpci->

						    rxbuffersize);

			rtlpriv->cfg->ops->set_desc((u8 *) entry, false,

			rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry, false,

						    HW_DESC_RXOWN,

						    &tmp_one);

		}



		rtlpriv->cfg->ops->set_desc((u8 *) entry, false,

		rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry, false,

					    HW_DESC_RXERO, &tmp_one);

	}

	return 0;
@@ -1331,7 +1334,7 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw) 


			for (i = 0; i < rtlpci->rxringcount; i++) {

				entry = &rtlpci->rx_ring[rx_queue_idx].desc[i];

				rtlpriv->cfg->ops->set_desc((u8 *) entry,

				rtlpriv->cfg->ops->set_desc(hw, (u8 *)entry,

							    false,

							    HW_DESC_RXOWN,

							    &tmp_one);
@@ -1424,6 +1427,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, 
	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct rtl8192_tx_ring *ring;

	struct rtl_tx_desc *pdesc;

	struct rtl_tx_buffer_desc *ptx_bd_desc = NULL;

	u8 idx;

	u8 hw_queue = _rtl_mac_to_hwqueue(hw, skb);

	unsigned long flags;
@@ -1464,6 +1468,9 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, 
		idx = 0;



	pdesc = &ring->desc[idx];

	if (rtlpriv->use_new_trx_flow) {

		ptx_bd_desc = &ring->buffer_desc[idx];

	} else {

		own = (u8) rtlpriv->cfg->ops->get_desc((u8 *)pdesc,

				true, HW_DESC_OWN);
@@ -1473,9 +1480,11 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, 
				 hw_queue, ring->idx, idx,

				 skb_queue_len(&ring->queue));



		spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);

			spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock,

					       flags);

			return skb->len;

		}

	}



	if (ieee80211_is_data_qos(fc)) {

		tid = rtl_get_tid(skb);
@@ -1494,17 +1503,20 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, 
		rtlpriv->cfg->ops->led_control(hw, LED_CTL_TX);



	rtlpriv->cfg->ops->fill_tx_desc(hw, hdr, (u8 *)pdesc,

			info, sta, skb, hw_queue, ptcb_desc);

			(u8 *)ptx_bd_desc, info, sta, skb, hw_queue, ptcb_desc);



	__skb_queue_tail(&ring->queue, skb);



	rtlpriv->cfg->ops->set_desc((u8 *)pdesc, true,

				    HW_DESC_OWN, &temp_one);



	if (rtlpriv->use_new_trx_flow) {

		rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, true,

					    HW_DESC_OWN, (u8 *)&hw_queue);

	} else {

		rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, true,

					    HW_DESC_OWN, (u8 *)&temp_one);

	}



	if ((ring->entries - skb_queue_len(&ring->queue)) < 2 &&

	    hw_queue != BEACON_QUEUE) {



		RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,

			 "less desc left, stop skb_queue@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n",

			 hw_queue, ring->idx, idx,

drivers/net/wireless/rtlwifi/pci.h

+10 −0
Original line number Diff line number Diff line
@@ -137,12 +137,22 @@ struct rtl_tx_cmd_desc { 
	u32 dword[16];

} __packed;



/* In new TRX flow, Buffer_desc is new concept

 * But TX wifi info == TX descriptor in old flow

 * RX wifi info == RX descriptor in old flow

 */

struct rtl_tx_buffer_desc {

	u32 dword[8]; /*seg = 4*/

} __packed;



struct rtl8192_tx_ring {

	struct rtl_tx_desc *desc;

	dma_addr_t dma;

	unsigned int idx;

	unsigned int entries;

	struct sk_buff_head queue;

	/*add for new trx flow*/

	struct rtl_tx_buffer_desc *buffer_desc; /*tx buffer descriptor*/

};



struct rtl8192_rx_ring {

drivers/net/wireless/rtlwifi/rtl8188ee/trx.c

+4 −4
Original line number Diff line number Diff line
@@ -489,9 +489,8 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw, 


void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,

			  struct ieee80211_hdr *hdr, u8 *pdesc_tx,

			  struct ieee80211_tx_info *info,

			  struct ieee80211_sta *sta,

			  struct sk_buff *skb,

			  u8 *pbd_desc_tx, struct ieee80211_tx_info *info,

			  struct ieee80211_sta *sta, struct sk_buff *skb,

			  u8 hw_queue, struct rtl_tcb_desc *ptcb_desc)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -734,7 +733,8 @@ void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw, 
		      pdesc, TX_DESC_SIZE);

}



void rtl88ee_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)

void rtl88ee_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,

		      u8 desc_name, u8 *val)

{

	if (istx == true) {

		switch (desc_name) {

drivers/net/wireless/rtlwifi/rtl8188ee/trx.h

+4 −4
Original line number Diff line number Diff line
@@ -777,15 +777,15 @@ struct rx_desc_88e { 


void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,

			  struct ieee80211_hdr *hdr, u8 *pdesc_tx,

			  struct ieee80211_tx_info *info,

			  struct ieee80211_sta *sta,

			  struct sk_buff *skb,

			  u8 *pbd_desc_tx, struct ieee80211_tx_info *info,

			  struct ieee80211_sta *sta, struct sk_buff *skb,

			  u8 hw_queue, struct rtl_tcb_desc *ptcb_desc);

bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,

			   struct rtl_stats *status,

			   struct ieee80211_rx_status *rx_status,

			   u8 *pdesc, struct sk_buff *skb);

void rtl88ee_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val);

void rtl88ee_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,

		      u8 desc_name, u8 *val);

u32 rtl88ee_get_desc(u8 *pdesc, bool istx, u8 desc_name);

void rtl88ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);

void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,