rt2x00: Limit rt2x00pci rxdone processing to 16 entries at once
authorHelmut Schaa <helmut.schaa@googlemail.com>
Mon, 28 Mar 2011 11:29:44 +0000 (13:29 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 4 Apr 2011 20:20:01 +0000 (16:20 -0400)
Instead of receiving an unlimited number of frames, stop after 16
entries and reschedule the rxdone tasklet. This allows other tasklets
to be run inbetween.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rt2x00/rt2400pci.c
drivers/net/wireless/rt2x00/rt2500pci.c
drivers/net/wireless/rt2x00/rt2800pci.c
drivers/net/wireless/rt2x00/rt2x00pci.c
drivers/net/wireless/rt2x00/rt2x00pci.h
drivers/net/wireless/rt2x00/rt61pci.c

index 329f3283697b65a4c5c27c91c2268affa3b1dd8c..137a24e520daf52d0cb98aa680e71bef8017ae64 100644 (file)
@@ -1368,8 +1368,10 @@ static void rt2400pci_tbtt_tasklet(unsigned long data)
 static void rt2400pci_rxdone_tasklet(unsigned long data)
 {
        struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
-       rt2x00pci_rxdone(rt2x00dev);
-       rt2400pci_enable_interrupt(rt2x00dev, CSR8_RXDONE);
+       if (rt2x00pci_rxdone(rt2x00dev))
+               tasklet_schedule(&rt2x00dev->rxdone_tasklet);
+       else
+               rt2400pci_enable_interrupt(rt2x00dev, CSR8_RXDONE);
 }
 
 static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance)
index 58277878889eb14ba90c63817107ca76e02dbfe8..198fc0a0d77c569defb9fb88f552f80af9522253 100644 (file)
@@ -1500,8 +1500,10 @@ static void rt2500pci_tbtt_tasklet(unsigned long data)
 static void rt2500pci_rxdone_tasklet(unsigned long data)
 {
        struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
-       rt2x00pci_rxdone(rt2x00dev);
-       rt2500pci_enable_interrupt(rt2x00dev, CSR8_RXDONE);
+       if (rt2x00pci_rxdone(rt2x00dev))
+               tasklet_schedule(&rt2x00dev->rxdone_tasklet);
+       else
+               rt2500pci_enable_interrupt(rt2x00dev, CSR8_RXDONE);
 }
 
 static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance)
index 808073aa9dcc7e8a6496699461e4824cd9dde9ff..4672dc99fe46562c3d4276f35ef897a7cccaccc4 100644 (file)
@@ -806,8 +806,10 @@ static void rt2800pci_tbtt_tasklet(unsigned long data)
 static void rt2800pci_rxdone_tasklet(unsigned long data)
 {
        struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
-       rt2x00pci_rxdone(rt2x00dev);
-       rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_RX_DONE);
+       if (rt2x00pci_rxdone(rt2x00dev))
+               tasklet_schedule(&rt2x00dev->rxdone_tasklet);
+       else
+               rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_RX_DONE);
 }
 
 static void rt2800pci_autowake_tasklet(unsigned long data)
index 4dd82b0b05201bf63888cbe4412f7fdcb3bbfc9b..9649bd0cd7188801ab80bb51d17cfdde7ee1a922 100644 (file)
@@ -60,14 +60,15 @@ int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev,
 }
 EXPORT_SYMBOL_GPL(rt2x00pci_regbusy_read);
 
-void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
+bool rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
 {
        struct data_queue *queue = rt2x00dev->rx;
        struct queue_entry *entry;
        struct queue_entry_priv_pci *entry_priv;
        struct skb_frame_desc *skbdesc;
+       int max_rx = 16;
 
-       while (1) {
+       while (--max_rx) {
                entry = rt2x00queue_get_entry(queue, Q_INDEX);
                entry_priv = entry->priv_data;
 
@@ -93,6 +94,8 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
                 */
                rt2x00lib_rxdone(entry);
        }
+
+       return !max_rx;
 }
 EXPORT_SYMBOL_GPL(rt2x00pci_rxdone);
 
index 746ce8fe8cf4375154babc8631545ba66b4f542b..07961b8b369a291497df773b64d681b4533a506a 100644 (file)
@@ -101,8 +101,11 @@ struct queue_entry_priv_pci {
 /**
  * rt2x00pci_rxdone - Handle RX done events
  * @rt2x00dev: Device pointer, see &struct rt2x00_dev.
+ *
+ * Returns true if there are still rx frames pending and false if all
+ * pending rx frames were processed.
  */
-void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev);
+bool rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev);
 
 /*
  * Device initialization handlers.
index 77e8113b91e1c59e2476c709ce09ac51e839d162..8ee1514a7943ddc0ddcb54d436bfc096fcceb2d1 100644 (file)
@@ -2313,8 +2313,10 @@ static void rt61pci_tbtt_tasklet(unsigned long data)
 static void rt61pci_rxdone_tasklet(unsigned long data)
 {
        struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
-       rt2x00pci_rxdone(rt2x00dev);
-       rt61pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_RXDONE);
+       if (rt2x00pci_rxdone(rt2x00dev))
+               rt2x00pci_rxdone(rt2x00dev);
+       else
+               rt61pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_RXDONE);
 }
 
 static void rt61pci_autowake_tasklet(unsigned long data)