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

Commit f019d514 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Implement rt2x00usb_kick_tx_queue() 



rt2x00usb_kick_tx_queue() will loop over all entries
within the INDEX_DONE->INDEX range and kick each entry
which is pending to be kicked. This makes the kick_tx_queue
approach work the same as with the PCI drivers which
will allow for more code generalisation into rt2x00lib.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 565a019a

drivers/net/wireless/rt2x00/rt2500usb.c

+3 −1
Original line number Diff line number Diff line
@@ -1116,8 +1116,10 @@ static void rt2500usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev, 
{

	u16 reg;



	if (queue != QID_BEACON)

	if (queue != QID_BEACON) {

		rt2x00usb_kick_tx_queue(rt2x00dev, queue);

		return;

	}



	rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg);

	if (!rt2x00_get_field16(reg, TXRX_CSR19_BEACON_GEN)) {

drivers/net/wireless/rt2x00/rt2x00queue.h

+3 −0
Original line number Diff line number Diff line
@@ -260,11 +260,14 @@ struct txentry_desc { 
 * @ENTRY_OWNER_DEVICE_CRYPTO: This entry is owned by the device for data

 *	encryption or decryption. The entry should only be touched after

 *	the device has signaled it is done with it.

 * @ENTRY_DATA_PENDING: This entry contains a valid frame and is waiting

 *	for the signal to start sending.

 */

enum queue_entry_flags {

	ENTRY_BCN_ASSIGNED,

	ENTRY_OWNER_DEVICE_DATA,

	ENTRY_OWNER_DEVICE_CRYPTO,

	ENTRY_DATA_PENDING,

};



/**

drivers/net/wireless/rt2x00/rt2x00usb.c

+47 −1
Original line number Diff line number Diff line
@@ -232,9 +232,10 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev, 
	 * Initialize URB and send the frame to the device.

	 */

	__set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);

	__set_bit(ENTRY_DATA_PENDING, &entry->flags);



	usb_fill_bulk_urb(entry_priv->urb, usb_dev, usb_sndbulkpipe(usb_dev, 1),

			  skb->data, length, rt2x00usb_interrupt_txdone, entry);

	usb_submit_urb(entry_priv->urb, GFP_ATOMIC);



	rt2x00queue_index_inc(queue, Q_INDEX);
@@ -242,6 +243,51 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev, 
}

EXPORT_SYMBOL_GPL(rt2x00usb_write_tx_data);



static inline void rt2x00usb_kick_tx_entry(struct queue_entry *entry)

{

	struct queue_entry_priv_usb *entry_priv = entry->priv_data;



	if (__test_and_clear_bit(ENTRY_DATA_PENDING, &entry->flags))

		usb_submit_urb(entry_priv->urb, GFP_ATOMIC);

}



void rt2x00usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

			     const enum data_queue_qid qid)

{

	struct data_queue *queue = rt2x00queue_get_queue(rt2x00dev, qid);

	unsigned long irqflags;

	unsigned int index;

	unsigned int index_done;

	unsigned int i;



	/*

	 * Only protect the range we are going to loop over,

	 * if during our loop a extra entry is set to pending

	 * it should not be kicked during this run, since it

	 * is part of another TX operation.

	 */

	spin_lock_irqsave(&queue->lock, irqflags);

	index = queue->index[Q_INDEX];

	index_done = queue->index[Q_INDEX_DONE];

	spin_unlock_irqrestore(&queue->lock, irqflags);



	/*

	 * Start from the TX done pointer, this guarentees that we will

	 * send out all frames in the correct order.

	 */

	if (index_done < index) {

		for (i = index_done; i < index; i++)

			rt2x00usb_kick_tx_entry(&queue->entries[i]);

	} else {

		for (i = index_done; i < queue->limit; i++)

			rt2x00usb_kick_tx_entry(&queue->entries[i]);



		for (i = 0; i < index; i++)

			rt2x00usb_kick_tx_entry(&queue->entries[i]);

	}

}

EXPORT_SYMBOL_GPL(rt2x00usb_kick_tx_queue);



/*

 * RX data handlers.

 */

drivers/net/wireless/rt2x00/rt2x00usb.h

+11 −0
Original line number Diff line number Diff line
@@ -245,6 +245,17 @@ struct queue_entry_priv_usb_bcn { 
	struct urb *guardian_urb;

};



/**

 * rt2x00usb_kick_tx_queue - Kick data queue

 * @rt2x00dev: Pointer to &struct rt2x00_dev

 * @qid: Data queue to kick

 *

 * This will walk through all entries of the queue and push all pending

 * frames to the hardware as a single burst.

 */

void rt2x00usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,

			     const enum data_queue_qid qid);



/*

 * Device initialization handlers.

 */

drivers/net/wireless/rt2x00/rt73usb.c

+3 −1
Original line number Diff line number Diff line
@@ -1350,8 +1350,10 @@ static void rt73usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev, 
{

	u32 reg;



	if (queue != QID_BEACON)

	if (queue != QID_BEACON) {

		rt2x00usb_kick_tx_queue(rt2x00dev, queue);

		return;

	}



	/*

	 * For Wi-Fi faily generated beacons between participating stations.