package/kernel/mac80211/patches/rt2x00/023-rt2800-move-txstatus-pending-routine.patch

   1 From 2bbea7645c3d095014a080db170941818650e141 Mon Sep 17 00:00:00 2001
   2 From: Stanislaw Gruszka <sgruszka@redhat.com>
   3 Date: Sat, 9 Feb 2019 12:08:33 +0100
   4 Subject: [PATCH 23/28] rt2800: move txstatus pending routine
   5
   6 Move rt2800usb_txstatus_pending routine to rt2800lib. It will be reused
   7 by rt2800mmio code.
   8
   9 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
  10 ---
  11  .../net/wireless/ralink/rt2x00/rt2800lib.c    | 17 ++++++++++++++
  12  .../net/wireless/ralink/rt2x00/rt2800lib.h    |  1 +
  13  .../net/wireless/ralink/rt2x00/rt2800usb.c    | 22 +++----------------
  14  3 files changed, 21 insertions(+), 19 deletions(-)
  15
  16 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  17 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  18 @@ -1183,6 +1183,23 @@ bool rt2800_txstatus_timeout(struct rt2x
  19  }
  20  EXPORT_SYMBOL_GPL(rt2800_txstatus_timeout);
  21
  22 +/*
  23 + * test if there is an entry in any TX queue for which DMA is done
  24 + * but the TX status has not been returned yet
  25 + */
  26 +bool rt2800_txstatus_pending(struct rt2x00_dev *rt2x00dev)
  27 +{
  28 +       struct data_queue *queue;
  29 +
  30 +       tx_queue_for_each(rt2x00dev, queue) {
  31 +               if (rt2x00queue_get_entry(queue, Q_INDEX_DMA_DONE) !=
  32 +                   rt2x00queue_get_entry(queue, Q_INDEX_DONE))
  33 +                       return true;
  34 +       }
  35 +       return false;
  36 +}
  37 +EXPORT_SYMBOL_GPL(rt2800_txstatus_pending);
  38 +
  39  void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev)
  40  {
  41         struct data_queue *queue;
  42 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
  43 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
  44 @@ -198,6 +198,7 @@ void rt2800_txdone_entry(struct queue_en
  45  void rt2800_txdone(struct rt2x00_dev *rt2x00dev, unsigned int quota);
  46  void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev);
  47  bool rt2800_txstatus_timeout(struct rt2x00_dev *rt2x00dev);
  48 +bool rt2800_txstatus_pending(struct rt2x00_dev *rt2x00dev);
  49
  50  void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc);
  51  void rt2800_clear_beacon(struct queue_entry *entry);
  52 --- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
  53 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
  54 @@ -100,22 +100,6 @@ static void rt2800usb_stop_queue(struct
  55         }
  56  }
  57
  58 -/*
  59 - * test if there is an entry in any TX queue for which DMA is done
  60 - * but the TX status has not been returned yet
  61 - */
  62 -static bool rt2800usb_txstatus_pending(struct rt2x00_dev *rt2x00dev)
  63 -{
  64 -       struct data_queue *queue;
  65 -
  66 -       tx_queue_for_each(rt2x00dev, queue) {
  67 -               if (rt2x00queue_get_entry(queue, Q_INDEX_DMA_DONE) !=
  68 -                   rt2x00queue_get_entry(queue, Q_INDEX_DONE))
  69 -                       return true;
  70 -       }
  71 -       return false;
  72 -}
  73 -
  74  #define TXSTATUS_READ_INTERVAL 1000000
  75
  76  static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,
  77 @@ -145,7 +129,7 @@ static bool rt2800usb_tx_sta_fifo_read_c
  78         if (rt2800_txstatus_timeout(rt2x00dev))
  79                 queue_work(rt2x00dev->workqueue, &rt2x00dev->txdone_work);
  80
  81 -       if (rt2800usb_txstatus_pending(rt2x00dev)) {
  82 +       if (rt2800_txstatus_pending(rt2x00dev)) {
  83                 /* Read register after 1 ms */
  84                 hrtimer_start(&rt2x00dev->txstatus_timer,
  85                               TXSTATUS_READ_INTERVAL,
  86 @@ -160,7 +144,7 @@ stop_reading:
  87          * clear_bit someone could do rt2x00usb_interrupt_txdone, so recheck
  88          * here again if status reading is needed.
  89          */
  90 -       if (rt2800usb_txstatus_pending(rt2x00dev) &&
  91 +       if (rt2800_txstatus_pending(rt2x00dev) &&
  92             !test_and_set_bit(TX_STATUS_READING, &rt2x00dev->flags))
  93                 return true;
  94         else
  95 @@ -489,7 +473,7 @@ static void rt2800usb_work_txdone(struct
  96                  * if the medium is busy, thus the TX_STA_FIFO entry is
  97                  * also delayed -> use a timer to retrieve it.
  98                  */
  99 -               if (rt2800usb_txstatus_pending(rt2x00dev))
 100 +               if (rt2800_txstatus_pending(rt2x00dev))
 101                         rt2800usb_async_read_tx_status(rt2x00dev);
 102         }
 103  }