Skip to content

Commit a33b8ab

Browse files
nbd168nbd168
committed
mt76: move tx tasklet to struct mt76_dev
Allows it to be scheduled from core code Signed-off-by: Felix Fietkau <[email protected]>
1 parent db9f11d commit a33b8ab

File tree

9 files changed

+21
-20
lines changed

9 files changed

+21
-20
lines changed

‎drivers/net/wireless/mediatek/mt76/mt76.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,6 @@ struct mt76_usb {
386386
u8 data[32];
387387

388388
struct tasklet_struct rx_tasklet;
389-
struct tasklet_struct tx_tasklet;
390389
struct delayed_work stat_work;
391390

392391
u8 out_ep[__MT_EP_OUT_MAX];
@@ -448,6 +447,8 @@ struct mt76_dev {
448447
const struct mt76_queue_ops *queue_ops;
449448
int tx_dma_idx[4];
450449

450+
struct tasklet_struct tx_tasklet;
451+
451452
wait_queue_head_t tx_wait;
452453
struct sk_buff_head status_list;
453454

‎drivers/net/wireless/mediatek/mt76/mt7603/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ irqreturn_t mt7603_irq_handler(int irq, void *dev_instance)
3535

3636
if (intr & MT_INT_TX_DONE_ALL) {
3737
mt7603_irq_disable(dev, MT_INT_TX_DONE_ALL);
38-
tasklet_schedule(&dev->tx_tasklet);
38+
tasklet_schedule(&dev->mt76.tx_tasklet);
3939
}
4040

4141
if (intr & MT_INT_RX_DONE(0)) {

‎drivers/net/wireless/mediatek/mt76/mt7603/dma.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ int mt7603_dma_init(struct mt7603_dev *dev)
164164
init_waitqueue_head(&dev->mt76.mmio.mcu.wait);
165165
skb_queue_head_init(&dev->mt76.mmio.mcu.res_q);
166166

167-
tasklet_init(&dev->tx_tasklet, mt7603_tx_tasklet, (unsigned long)dev);
167+
tasklet_init(&dev->mt76.tx_tasklet, mt7603_tx_tasklet, (unsigned long)dev);
168168

169169
mt76_clear(dev, MT_WPDMA_GLO_CFG,
170170
MT_WPDMA_GLO_CFG_TX_DMA_EN |
@@ -224,6 +224,6 @@ void mt7603_dma_cleanup(struct mt7603_dev *dev)
224224
MT_WPDMA_GLO_CFG_RX_DMA_EN |
225225
MT_WPDMA_GLO_CFG_TX_WRITEBACK_DONE);
226226

227-
tasklet_kill(&dev->tx_tasklet);
227+
tasklet_kill(&dev->mt76.tx_tasklet);
228228
mt76_dma_cleanup(&dev->mt76);
229229
}

‎drivers/net/wireless/mediatek/mt76/mt7603/mac.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,7 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)
12771277
/* lock/unlock all queues to ensure that no tx is pending */
12781278
mt76_txq_schedule_all(&dev->mt76);
12791279

1280-
tasklet_disable(&dev->tx_tasklet);
1280+
tasklet_disable(&dev->mt76.tx_tasklet);
12811281
tasklet_disable(&dev->pre_tbtt_tasklet);
12821282
napi_disable(&dev->mt76.napi[0]);
12831283
napi_disable(&dev->mt76.napi[1]);
@@ -1324,8 +1324,8 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)
13241324
clear_bit(MT76_RESET, &dev->mt76.state);
13251325
mutex_unlock(&dev->mt76.mutex);
13261326

1327-
tasklet_enable(&dev->tx_tasklet);
1328-
tasklet_schedule(&dev->tx_tasklet);
1327+
tasklet_enable(&dev->mt76.tx_tasklet);
1328+
tasklet_schedule(&dev->mt76.tx_tasklet);
13291329

13301330
tasklet_enable(&dev->pre_tbtt_tasklet);
13311331
mt7603_beacon_set_timer(dev, -1, beacon_int);

‎drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ struct mt7603_dev {
145145
unsigned int reset_cause[__RESET_CAUSE_MAX];
146146

147147
struct delayed_work mac_work;
148-
struct tasklet_struct tx_tasklet;
149148
struct tasklet_struct pre_tbtt_tasklet;
150149
};
151150

‎drivers/net/wireless/mediatek/mt76/mt76x0/usb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ static int __maybe_unused mt76x0_resume(struct usb_interface *usb_intf)
332332
goto err;
333333

334334
tasklet_enable(&usb->rx_tasklet);
335-
tasklet_enable(&usb->tx_tasklet);
335+
tasklet_enable(&dev->mt76.tx_tasklet);
336336

337337
ret = mt76x0u_init_hardware(dev);
338338
if (ret)

‎drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ int mt76x02_dma_init(struct mt76x02_dev *dev)
180180
if (!status_fifo)
181181
return -ENOMEM;
182182

183-
tasklet_init(&dev->tx_tasklet, mt76x02_tx_tasklet, (unsigned long) dev);
183+
tasklet_init(&dev->mt76.tx_tasklet, mt76x02_tx_tasklet,
184+
(unsigned long) dev);
184185
tasklet_init(&dev->pre_tbtt_tasklet, mt76x02_pre_tbtt_tasklet,
185186
(unsigned long)dev);
186187

@@ -250,7 +251,7 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance)
250251

251252
if (intr & MT_INT_TX_DONE_ALL) {
252253
mt76x02_irq_disable(dev, MT_INT_TX_DONE_ALL);
253-
tasklet_schedule(&dev->tx_tasklet);
254+
tasklet_schedule(&dev->mt76.tx_tasklet);
254255
}
255256

256257
if (intr & MT_INT_RX_DONE(0)) {
@@ -276,7 +277,7 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance)
276277

277278
if (intr & MT_INT_TX_STAT) {
278279
mt76x02_mac_poll_tx_status(dev, true);
279-
tasklet_schedule(&dev->tx_tasklet);
280+
tasklet_schedule(&dev->mt76.tx_tasklet);
280281
}
281282

282283
if (intr & MT_INT_GPTIMER) {
@@ -306,7 +307,7 @@ static void mt76x02_dma_enable(struct mt76x02_dev *dev)
306307

307308
void mt76x02_dma_cleanup(struct mt76x02_dev *dev)
308309
{
309-
tasklet_kill(&dev->tx_tasklet);
310+
tasklet_kill(&dev->mt76.tx_tasklet);
310311
mt76_dma_cleanup(&dev->mt76);
311312
}
312313
EXPORT_SYMBOL_GPL(mt76x02_dma_cleanup);
@@ -425,7 +426,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
425426
set_bit(MT76_RESET, &dev->mt76.state);
426427

427428
tasklet_disable(&dev->pre_tbtt_tasklet);
428-
tasklet_disable(&dev->tx_tasklet);
429+
tasklet_disable(&dev->mt76.tx_tasklet);
429430

430431
for (i = 0; i < ARRAY_SIZE(dev->mt76.napi); i++)
431432
napi_disable(&dev->mt76.napi[i]);
@@ -478,8 +479,8 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
478479

479480
clear_bit(MT76_RESET, &dev->mt76.state);
480481

481-
tasklet_enable(&dev->tx_tasklet);
482-
tasklet_schedule(&dev->tx_tasklet);
482+
tasklet_enable(&dev->mt76.tx_tasklet);
483+
tasklet_schedule(&dev->mt76.tx_tasklet);
483484

484485
tasklet_enable(&dev->pre_tbtt_tasklet);
485486

‎drivers/net/wireless/mediatek/mt76/mt76x2/usb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ static int __maybe_unused mt76x2u_resume(struct usb_interface *intf)
124124
goto err;
125125

126126
tasklet_enable(&usb->rx_tasklet);
127-
tasklet_enable(&usb->tx_tasklet);
127+
tasklet_enable(&dev->mt76.tx_tasklet);
128128

129129
err = mt76x2u_init_hardware(dev);
130130
if (err < 0)

‎drivers/net/wireless/mediatek/mt76/usb.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ static void mt76u_complete_tx(struct urb *urb)
702702
dev_err(dev->dev, "tx urb failed: %d\n", urb->status);
703703
e->done = true;
704704

705-
tasklet_schedule(&dev->usb.tx_tasklet);
705+
tasklet_schedule(&dev->tx_tasklet);
706706
}
707707

708708
static int
@@ -843,7 +843,7 @@ static void mt76u_stop_tx(struct mt76_dev *dev)
843843
void mt76u_stop_queues(struct mt76_dev *dev)
844844
{
845845
tasklet_disable(&dev->usb.rx_tasklet);
846-
tasklet_disable(&dev->usb.tx_tasklet);
846+
tasklet_disable(&dev->tx_tasklet);
847847

848848
mt76u_stop_rx(dev);
849849
mt76u_stop_tx(dev);
@@ -898,7 +898,7 @@ int mt76u_init(struct mt76_dev *dev,
898898
struct mt76_usb *usb = &dev->usb;
899899

900900
tasklet_init(&usb->rx_tasklet, mt76u_rx_tasklet, (unsigned long)dev);
901-
tasklet_init(&usb->tx_tasklet, mt76u_tx_tasklet, (unsigned long)dev);
901+
tasklet_init(&dev->tx_tasklet, mt76u_tx_tasklet, (unsigned long)dev);
902902
INIT_DELAYED_WORK(&usb->stat_work, mt76u_tx_status_data);
903903
skb_queue_head_init(&dev->rx_skb[MT_RXQ_MAIN]);
904904

0 commit comments

Comments
 (0)