package/kernel/mac80211/patches/rt2x00/705-rt2800-flush-and-txstatus-rework-for-rt2800mmio.patch

   1 From 0d9fbb738a5eadc7abc8060f43ebcc71f6324c07 Mon Sep 17 00:00:00 2001
   2 From: Stanislaw Gruszka <sgruszka@redhat.com>
   3 Date: Tue, 14 Aug 2018 08:58:48 +0200
   4 Subject: [PATCH 5/5] rt2800: flush and txstatus rework for rt2800mmio
   5
   6 Implement custom rt2800mmio flush routine and change txstatus
   7 routine to read TX_STA_FIFO also in the tasklet.
   8
   9 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
  10 ---
  11  .../net/wireless/ralink/rt2x00/rt2800lib.c    |  14 +-
  12  .../net/wireless/ralink/rt2x00/rt2800mmio.c   | 120 +++++++++++++-----
  13  .../net/wireless/ralink/rt2x00/rt2800mmio.h   |   1 +
  14  .../net/wireless/ralink/rt2x00/rt2800pci.c    |   2 +-
  15  4 files changed, 99 insertions(+), 38 deletions(-)
  16
  17 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  18 index 595cb9c90b81..9e7b8933d30c 100644
  19 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  20 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  21 @@ -1147,7 +1147,7 @@ static inline bool rt2800_entry_txstatus_timeout(struct rt2x00_dev *rt2x00dev,
  22                 return false;
  23
  24         if (test_bit(DEVICE_STATE_FLUSHING, &rt2x00dev->flags))
  25 -               tout = msecs_to_jiffies(100);
  26 +               tout = msecs_to_jiffies(50);
  27         else
  28                 tout = msecs_to_jiffies(2000);
  29
  30 @@ -1163,15 +1163,13 @@ bool rt2800_txstatus_timeout(struct rt2x00_dev *rt2x00dev)
  31  {
  32         struct data_queue *queue;
  33         struct queue_entry *entry;
  34 -       unsigned long tout;
  35
  36 -       if (test_bit(DEVICE_STATE_FLUSHING, &rt2x00dev->flags))
  37 -               tout = msecs_to_jiffies(50);
  38 -       else
  39 -               tout = msecs_to_jiffies(1000);
  40 +       if (!test_bit(DEVICE_STATE_FLUSHING, &rt2x00dev->flags)) {
  41 +               unsigned long tout = msecs_to_jiffies(1000);
  42
  43 -       if (time_before(jiffies, rt2x00dev->last_nostatus_check + tout))
  44 -               return false;
  45 +               if (time_before(jiffies, rt2x00dev->last_nostatus_check + tout))
  46 +                       return false;
  47 +       }
  48
  49         rt2x00dev->last_nostatus_check = jiffies;
  50
  51 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
  52 index d0426314c2df..7d83dabb913d 100644
  53 --- a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
  54 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
  55 @@ -191,21 +191,6 @@ static inline void rt2800mmio_enable_interrupt(struct rt2x00_dev *rt2x00dev,
  56         spin_unlock_irq(&rt2x00dev->irqmask_lock);
  57  }
  58
  59 -void rt2800mmio_txstatus_tasklet(unsigned long data)
  60 -{
  61 -       struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
  62 -
  63 -       rt2800_txdone(rt2x00dev);
  64 -
  65 -       if (rt2800_txstatus_timeout(rt2x00dev))
  66 -               rt2800_txdone_nostatus(rt2x00dev);
  67 -
  68 -       if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
  69 -               rt2800mmio_enable_interrupt(rt2x00dev,
  70 -                                           INT_SOURCE_CSR_TX_FIFO_STATUS);
  71 -}
  72 -EXPORT_SYMBOL_GPL(rt2800mmio_txstatus_tasklet);
  73 -
  74  void rt2800mmio_pretbtt_tasklet(unsigned long data)
  75  {
  76         struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
  77 @@ -270,12 +255,26 @@ void rt2800mmio_autowake_tasklet(unsigned long data)
  78  }
  79  EXPORT_SYMBOL_GPL(rt2800mmio_autowake_tasklet);
  80
  81 -static void rt2800mmio_txstatus_interrupt(struct rt2x00_dev *rt2x00dev)
  82 +static void rt2800mmio_txdone(struct rt2x00_dev *rt2x00dev)
  83 +{
  84 +       bool timeout = false;
  85 +
  86 +       while (!kfifo_is_empty(&rt2x00dev->txstatus_fifo) ||
  87 +              (timeout = rt2800_txstatus_timeout(rt2x00dev))) {
  88 +
  89 +               rt2800_txdone(rt2x00dev);
  90 +
  91 +               if (timeout)
  92 +                       rt2800_txdone_nostatus(rt2x00dev);
  93 +       }
  94 +}
  95 +
  96 +static bool rt2800mmio_fetch_txstatus(struct rt2x00_dev *rt2x00dev)
  97  {
  98         u32 status;
  99 -       int i;
 100 +       bool more = false;
 101
 102 -       /*
 103 +       /* FIXEME: rewrite this comment
 104          * The TX_FIFO_STATUS interrupt needs special care. We should
 105          * read TX_STA_FIFO but we should do it immediately as otherwise
 106          * the register can overflow and we would lose status reports.
 107 @@ -286,25 +285,37 @@ static void rt2800mmio_txstatus_interrupt(struct rt2x00_dev *rt2x00dev)
 108          * because we can schedule the tasklet multiple times (when the
 109          * interrupt fires again during tx status processing).
 110          *
 111 -        * Since we have only one producer and one consumer we don't
 112 +        * txstatus tasklet is called with INT_SOURCE_CSR_TX_FIFO_STATUS
 113 +        * disabled so have only one producer and one consumer - we don't
 114          * need to lock the kfifo.
 115          */
 116 -       for (i = 0; i < rt2x00dev->tx->limit; i++) {
 117 +       while (!kfifo_is_full(&rt2x00dev->txstatus_fifo)) {
 118                 status = rt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO);
 119 -
 120                 if (!rt2x00_get_field32(status, TX_STA_FIFO_VALID))
 121                         break;
 122
 123 -               if (!kfifo_put(&rt2x00dev->txstatus_fifo, status)) {
 124 -                       rt2x00_warn(rt2x00dev, "TX status FIFO overrun, drop tx status report\n");
 125 -                       break;
 126 -               }
 127 +               kfifo_put(&rt2x00dev->txstatus_fifo, status);
 128 +               more = true;
 129         }
 130
 131 -       /* Schedule the tasklet for processing the tx status. */
 132 -       tasklet_schedule(&rt2x00dev->txstatus_tasklet);
 133 +       return more;
 134  }
 135
 136 +void rt2800mmio_txstatus_tasklet(unsigned long data)
 137 +{
 138 +       struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
 139 +
 140 +       do {
 141 +               rt2800mmio_txdone(rt2x00dev);
 142 +
 143 +       } while (rt2800mmio_fetch_txstatus(rt2x00dev));
 144 +
 145 +       if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
 146 +               rt2800mmio_enable_interrupt(rt2x00dev,
 147 +                                           INT_SOURCE_CSR_TX_FIFO_STATUS);
 148 +}
 149 +EXPORT_SYMBOL_GPL(rt2800mmio_txstatus_tasklet);
 150 +
 151  irqreturn_t rt2800mmio_interrupt(int irq, void *dev_instance)
 152  {
 153         struct rt2x00_dev *rt2x00dev = dev_instance;
 154 @@ -327,8 +338,10 @@ irqreturn_t rt2800mmio_interrupt(int irq, void *dev_instance)
 155          */
 156         mask = ~reg;
 157
 158 -       if (rt2x00_get_field32(reg, INT_SOURCE_CSR_TX_FIFO_STATUS))
 159 -               rt2800mmio_txstatus_interrupt(rt2x00dev);
 160 +       if (rt2x00_get_field32(reg, INT_SOURCE_CSR_TX_FIFO_STATUS)) {
 161 +               rt2800mmio_fetch_txstatus(rt2x00dev);
 162 +               tasklet_schedule(&rt2x00dev->txstatus_tasklet);
 163 +       }
 164
 165         if (rt2x00_get_field32(reg, INT_SOURCE_CSR_PRE_TBTT))
 166                 tasklet_hi_schedule(&rt2x00dev->pretbtt_tasklet);
 167 @@ -453,6 +466,55 @@ void rt2800mmio_kick_queue(struct data_queue *queue)
 168  }
 169  EXPORT_SYMBOL_GPL(rt2800mmio_kick_queue);
 170
 171 +void rt2800mmio_flush_queue(struct data_queue *queue, bool drop)
 172 +{
 173 +       struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;
 174 +       bool tx_queue = false;
 175 +       unsigned int i;
 176 +
 177 +       //printk("FLUSH queue %d len %d drop %d\n", queue->qid, queue->length, drop);
 178 +
 179 +       switch (queue->qid) {
 180 +       case QID_AC_VO:
 181 +       case QID_AC_VI:
 182 +       case QID_AC_BE:
 183 +       case QID_AC_BK:
 184 +               tx_queue = true;
 185 +               break;
 186 +       case QID_RX:
 187 +               break;
 188 +       default:
 189 +               return;
 190 +       }
 191 +
 192 +       for (i = 0; i < 5; i++) {
 193 +               /*
 194 +                * Check if the driver is already done, otherwise we
 195 +                * have to sleep a little while to give the driver/hw
 196 +                * the oppurtunity to complete interrupt process itself.
 197 +                */
 198 +               if (rt2x00queue_empty(queue))
 199 +                       break;
 200 +
 201 +               /*
 202 +                * For TX queues schedule completion tasklet to catch
 203 +                * tx status timeouts, othewise just wait.
 204 +                */
 205 +               if (tx_queue) {
 206 +                       tasklet_disable(&rt2x00dev->txstatus_tasklet);
 207 +                       rt2800mmio_txdone(rt2x00dev);
 208 +                       tasklet_enable(&rt2x00dev->txstatus_tasklet);
 209 +               }
 210 +
 211 +               /*
 212 +                * Wait for a little while to give the driver
 213 +                * the oppurtunity to recover itself.
 214 +                */
 215 +               msleep(50);
 216 +       }
 217 +}
 218 +EXPORT_SYMBOL_GPL(rt2800mmio_flush_queue);
 219 +
 220  void rt2800mmio_stop_queue(struct data_queue *queue)
 221  {
 222         struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;
 223 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.h b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.h
 224 index b63312ce3f27..3a513273f414 100644
 225 --- a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.h
 226 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.h
 227 @@ -148,6 +148,7 @@ void rt2800mmio_toggle_irq(struct rt2x00_dev *rt2x00dev,
 228  /* Queue handlers */
 229  void rt2800mmio_start_queue(struct data_queue *queue);
 230  void rt2800mmio_kick_queue(struct data_queue *queue);
 231 +void rt2800mmio_flush_queue(struct data_queue *queue, bool drop);
 232  void rt2800mmio_stop_queue(struct data_queue *queue);
 233  void rt2800mmio_queue_init(struct data_queue *queue);
 234
 235 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800pci.c b/drivers/net/wireless/ralink/rt2x00/rt2800pci.c
 236 index 71b1affc3885..0291441ac548 100644
 237 --- a/drivers/net/wireless/ralink/rt2x00/rt2800pci.c
 238 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800pci.c
 239 @@ -364,7 +364,7 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {
 240         .start_queue            = rt2800mmio_start_queue,
 241         .kick_queue             = rt2800mmio_kick_queue,
 242         .stop_queue             = rt2800mmio_stop_queue,
 243 -       .flush_queue            = rt2x00mmio_flush_queue,
 244 +       .flush_queue            = rt2800mmio_flush_queue,
 245         .write_tx_desc          = rt2800mmio_write_tx_desc,
 246         .write_tx_data          = rt2800_write_tx_data,
 247         .write_beacon           = rt2800_write_beacon,
 248 --
 249 2.18.0
 250