openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rt2800: move txstatus pending routine 

Move rt2800usb_txstatus_pending routine to rt2800lib. It will be reused
by rt2800mmio code.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Stanislaw Gruszka 2019-03-27 10:58:26 +01:00 committed by Kalle Valo
parent f61131505e
commit 6efa798764
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/wireless/ralink/rt2x00/rt2800lib.c
View File

@ -1183,6 +1183,23 @@ bool rt2800_txstatus_timeout(struct rt2x00_dev *rt2x00dev)
} }
EXPORT_SYMBOL_GPL(rt2800_txstatus_timeout); EXPORT_SYMBOL_GPL(rt2800_txstatus_timeout);
/*
* test if there is an entry in any TX queue for which DMA is done
* but the TX status has not been returned yet
*/
bool rt2800_txstatus_pending(struct rt2x00_dev *rt2x00dev)
{
struct data_queue *queue;
tx_queue_for_each(rt2x00dev, queue) {
if (rt2x00queue_get_entry(queue, Q_INDEX_DMA_DONE) !=
rt2x00queue_get_entry(queue, Q_INDEX_DONE))
return true;
}
return false;
}
EXPORT_SYMBOL_GPL(rt2800_txstatus_pending);
void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev) void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev)
{ {
struct data_queue *queue; struct data_queue *queue;

1
drivers/net/wireless/ralink/rt2x00/rt2800lib.h
View File

@ -198,6 +198,7 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi,
void rt2800_txdone(struct rt2x00_dev *rt2x00dev, unsigned int quota); void rt2800_txdone(struct rt2x00_dev *rt2x00dev, unsigned int quota);
void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev); void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev);
bool rt2800_txstatus_timeout(struct rt2x00_dev *rt2x00dev); bool rt2800_txstatus_timeout(struct rt2x00_dev *rt2x00dev);
bool rt2800_txstatus_pending(struct rt2x00_dev *rt2x00dev);
void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc); void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc);
void rt2800_clear_beacon(struct queue_entry *entry); void rt2800_clear_beacon(struct queue_entry *entry);

22
drivers/net/wireless/ralink/rt2x00/rt2800usb.c
View File

@ -100,22 +100,6 @@ static void rt2800usb_stop_queue(struct data_queue *queue)
} }
} }
/*
* test if there is an entry in any TX queue for which DMA is done
* but the TX status has not been returned yet
*/
static bool rt2800usb_txstatus_pending(struct rt2x00_dev *rt2x00dev)
{
struct data_queue *queue;
tx_queue_for_each(rt2x00dev, queue) {
if (rt2x00queue_get_entry(queue, Q_INDEX_DMA_DONE) !=
rt2x00queue_get_entry(queue, Q_INDEX_DONE))
return true;
}
return false;
}
#define TXSTATUS_READ_INTERVAL 1000000 #define TXSTATUS_READ_INTERVAL 1000000
static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev, static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,
@ -145,7 +129,7 @@ static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,
if (rt2800_txstatus_timeout(rt2x00dev)) if (rt2800_txstatus_timeout(rt2x00dev))
queue_work(rt2x00dev->workqueue, &rt2x00dev->txdone_work); queue_work(rt2x00dev->workqueue, &rt2x00dev->txdone_work);
if (rt2800usb_txstatus_pending(rt2x00dev)) { if (rt2800_txstatus_pending(rt2x00dev)) {
/* Read register after 1 ms */ /* Read register after 1 ms */
hrtimer_start(&rt2x00dev->txstatus_timer, hrtimer_start(&rt2x00dev->txstatus_timer,
TXSTATUS_READ_INTERVAL, TXSTATUS_READ_INTERVAL,
@ -160,7 +144,7 @@ static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,
* clear_bit someone could do rt2x00usb_interrupt_txdone, so recheck * clear_bit someone could do rt2x00usb_interrupt_txdone, so recheck
* here again if status reading is needed. * here again if status reading is needed.
*/ */
if (rt2800usb_txstatus_pending(rt2x00dev) && if (rt2800_txstatus_pending(rt2x00dev) &&
!test_and_set_bit(TX_STATUS_READING, &rt2x00dev->flags)) !test_and_set_bit(TX_STATUS_READING, &rt2x00dev->flags))
return true; return true;
else else
@ -489,7 +473,7 @@ static void rt2800usb_work_txdone(struct work_struct *work)
* if the medium is busy, thus the TX_STA_FIFO entry is * if the medium is busy, thus the TX_STA_FIFO entry is
* also delayed -> use a timer to retrieve it. * also delayed -> use a timer to retrieve it.
*/ */
if (rt2800usb_txstatus_pending(rt2x00dev)) if (rt2800_txstatus_pending(rt2x00dev))
rt2800usb_async_read_tx_status(rt2x00dev); rt2800usb_async_read_tx_status(rt2x00dev);
} }
} }