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

Commit 85b7a8b3 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Simplify TXD handling of beacons. 



The handling of tx descriptors for beacons can be simplified by updating
write_tx_desc implementations of each driver to write directly to the
queue entry descriptor instead of to a provided memory area.
This is also a preparation for further clean ups where descriptors are
properly reserved in the skb instead of fiddling with the skb data
pointer.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e01f1ec3

drivers/net/wireless/rt2x00/rt2400pci.c

+9 −12
Original line number Diff line number Diff line
@@ -1006,15 +1006,15 @@ static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	struct queue_entry_priv_pci *entry_priv = skbdesc->entry->priv_data;

	__le32 *txd = skbdesc->desc;

	__le32 *txd = entry_priv->desc;

	u32 word;



	/*

	 * Start writing the descriptor words.

	 */

	rt2x00_desc_read(entry_priv->desc, 1, &word);

	rt2x00_desc_read(txd, 1, &word);

	rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, skbdesc->skb_dma);

	rt2x00_desc_write(entry_priv->desc, 1, word);

	rt2x00_desc_write(txd, 1, word);



	rt2x00_desc_read(txd, 2, &word);

	rt2x00_set_field32(&word, TXD_W2_BUFFER_LENGTH, txdesc->length);
@@ -1059,6 +1059,12 @@ static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,

			   test_bit(ENTRY_TXD_RETRY_MODE, &txdesc->flags));

	rt2x00_desc_write(txd, 0, word);



	/*

	 * Register descriptor details in skb frame descriptor.

	 */

	skbdesc->desc = txd;

	skbdesc->desc_len = TXD_DESC_SIZE;

}



/*
@@ -1081,15 +1087,6 @@ static void rt2400pci_write_beacon(struct queue_entry *entry, 
	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);

	rt2x00pci_register_write(rt2x00dev, CSR14, reg);



	/*

	 * Replace rt2x00lib allocated descriptor with the

	 * pointer to the _real_ hardware descriptor.

	 * After that, map the beacon to DMA and update the

	 * descriptor.

	 */

	memcpy(entry_priv->desc, skbdesc->desc, skbdesc->desc_len);

	skbdesc->desc = entry_priv->desc;



	rt2x00queue_map_txskb(rt2x00dev, entry->skb);



	rt2x00_desc_read(entry_priv->desc, 1, &word);

drivers/net/wireless/rt2x00/rt2500pci.c

+9 −12
Original line number Diff line number Diff line
@@ -1164,15 +1164,15 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	struct queue_entry_priv_pci *entry_priv = skbdesc->entry->priv_data;

	__le32 *txd = skbdesc->desc;

	__le32 *txd = entry_priv->desc;

	u32 word;



	/*

	 * Start writing the descriptor words.

	 */

	rt2x00_desc_read(entry_priv->desc, 1, &word);

	rt2x00_desc_read(txd, 1, &word);

	rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, skbdesc->skb_dma);

	rt2x00_desc_write(entry_priv->desc, 1, word);

	rt2x00_desc_write(txd, 1, word);



	rt2x00_desc_read(txd, 2, &word);

	rt2x00_set_field32(&word, TXD_W2_IV_OFFSET, IEEE80211_HEADER);
@@ -1216,6 +1216,12 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, txdesc->length);

	rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);

	rt2x00_desc_write(txd, 0, word);



	/*

	 * Register descriptor details in skb frame descriptor.

	 */

	skbdesc->desc = txd;

	skbdesc->desc_len = TXD_DESC_SIZE;

}



/*
@@ -1238,15 +1244,6 @@ static void rt2500pci_write_beacon(struct queue_entry *entry, 
	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);

	rt2x00pci_register_write(rt2x00dev, CSR14, reg);



	/*

	 * Replace rt2x00lib allocated descriptor with the

	 * pointer to the _real_ hardware descriptor.

	 * After that, map the beacon to DMA and update the

	 * descriptor.

	 */

	memcpy(entry_priv->desc, skbdesc->desc, skbdesc->desc_len);

	skbdesc->desc = entry_priv->desc;



	rt2x00queue_map_txskb(rt2x00dev, entry->skb);



	rt2x00_desc_read(entry_priv->desc, 1, &word);

drivers/net/wireless/rt2x00/rt2500usb.c

+12 −9
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
				    struct txentry_desc *txdesc)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	__le32 *txd = skbdesc->desc;

	__le32 *txd = (__le32 *)(skb->data - TXD_DESC_SIZE);

	u32 word;



	/*
@@ -1075,6 +1075,12 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
		_rt2x00_desc_write(txd, 3, skbdesc->iv[0]);

		_rt2x00_desc_write(txd, 4, skbdesc->iv[1]);

	}



	/*

	 * Register descriptor details in skb frame descriptor.

	 */

	skbdesc->desc = txd;

	skbdesc->desc_len = TXD_DESC_SIZE;

}



/*
@@ -1088,18 +1094,10 @@ static void rt2500usb_write_beacon(struct queue_entry *entry, 
	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;

	struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev);

	struct queue_entry_priv_usb_bcn *bcn_priv = entry->priv_data;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);

	int pipe = usb_sndbulkpipe(usb_dev, entry->queue->usb_endpoint);

	int length;

	u16 reg, reg0;



	/*

	 * Add the descriptor in front of the skb.

	 */

	skb_push(entry->skb, entry->queue->desc_size);

	memcpy(entry->skb->data, skbdesc->desc, skbdesc->desc_len);

	skbdesc->desc = entry->skb->data;



	/*

	 * Disable beaconing while we are reloading the beacon data,

	 * otherwise we might be sending out invalid data.
@@ -1108,6 +1106,11 @@ static void rt2500usb_write_beacon(struct queue_entry *entry, 
	rt2x00_set_field16(&reg, TXRX_CSR19_BEACON_GEN, 0);

	rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);



	/*

	 * Take the descriptor in front of the skb into account.

	 */

	skb_push(entry->skb, TXD_DESC_SIZE);



	/*

	 * USB devices cannot blindly pass the skb->len as the

	 * length of the data to usb_fill_bulk_urb. Pass the skb

drivers/net/wireless/rt2x00/rt2800pci.c

+10 −4
Original line number Diff line number Diff line
@@ -633,7 +633,8 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
				    struct txentry_desc *txdesc)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	__le32 *txd = skbdesc->desc;

	struct queue_entry_priv_pci *entry_priv = skbdesc->entry->priv_data;

	__le32 *txd = entry_priv->desc;

	u32 word;



	/*
@@ -657,15 +658,14 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
			   !test_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W1_BURST,

			   test_bit(ENTRY_TXD_BURST, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W1_SD_LEN0,

			   rt2x00dev->ops->extra_tx_headroom);

	rt2x00_set_field32(&word, TXD_W1_SD_LEN0, TXWI_DESC_SIZE);

	rt2x00_set_field32(&word, TXD_W1_LAST_SEC0, 0);

	rt2x00_set_field32(&word, TXD_W1_DMA_DONE, 0);

	rt2x00_desc_write(txd, 1, word);



	rt2x00_desc_read(txd, 2, &word);

	rt2x00_set_field32(&word, TXD_W2_SD_PTR1,

			   skbdesc->skb_dma + rt2x00dev->ops->extra_tx_headroom);

			   skbdesc->skb_dma + TXWI_DESC_SIZE);

	rt2x00_desc_write(txd, 2, word);



	rt2x00_desc_read(txd, 3, &word);
@@ -673,6 +673,12 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
			   !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W3_QSEL, 2);

	rt2x00_desc_write(txd, 3, word);



	/*

	 * Register descriptor details in skb frame descriptor.

	 */

	skbdesc->desc = txd;

	skbdesc->desc_len = TXD_DESC_SIZE;

}



/*

drivers/net/wireless/rt2x00/rt2800usb.c

+7 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
				    struct txentry_desc *txdesc)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	__le32 *txi = skbdesc->desc;

	__le32 *txi = (__le32 *)(skb->data - TXWI_DESC_SIZE - TXINFO_DESC_SIZE);

	u32 word;



	/*
@@ -422,6 +422,12 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_BURST,

			   test_bit(ENTRY_TXD_BURST, &txdesc->flags));

	rt2x00_desc_write(txi, 0, word);



	/*

	 * Register descriptor details in skb frame descriptor.

	 */

	skbdesc->desc = txi;

	skbdesc->desc_len = TXINFO_DESC_SIZE + TXWI_DESC_SIZE;

}



/*