Commit 970be1df authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: disable BH around napi_schedule() calls 



napi_schedule() can call __raise_softirq_irqoff(), which can perform softirq
handling, so it must not be called in a pure process context with BH enabled.

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent abe3f3da

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

+5 −2
Original line number Diff line number Diff line
@@ -1471,17 +1471,20 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev) 
	mutex_unlock(&dev->mt76.mutex);



	mt76_worker_enable(&dev->mt76.tx_worker);

	napi_enable(&dev->mt76.tx_napi);

	napi_schedule(&dev->mt76.tx_napi);



	tasklet_enable(&dev->mt76.pre_tbtt_tasklet);

	mt7603_beacon_set_timer(dev, -1, beacon_int);



	local_bh_disable();

	napi_enable(&dev->mt76.tx_napi);

	napi_schedule(&dev->mt76.tx_napi);



	napi_enable(&dev->mt76.napi[0]);

	napi_schedule(&dev->mt76.napi[0]);



	napi_enable(&dev->mt76.napi[1]);

	napi_schedule(&dev->mt76.napi[1]);

	local_bh_enable();



	ieee80211_wake_queues(dev->mt76.hw);

	mt76_txq_schedule_all(&dev->mphy);

drivers/net/wireless/mediatek/mt76/mt7615/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -164,12 +164,14 @@ static int mt7615_pci_resume(struct pci_dev *pdev) 
		dev_err(mdev->dev, "PDMA engine must be reinitialized\n");



	mt76_worker_enable(&mdev->tx_worker);

	local_bh_disable();

	mt76_for_each_q_rx(mdev, i) {

		napi_enable(&mdev->napi[i]);

		napi_schedule(&mdev->napi[i]);

	}

	napi_enable(&mdev->tx_napi);

	napi_schedule(&mdev->tx_napi);

	local_bh_enable();



	if (!test_bit(MT76_STATE_SUSPEND, &dev->mphy.state) &&

	    mt7615_firmware_offload(dev))

drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c

+3 −0
Original line number Diff line number Diff line
@@ -326,6 +326,8 @@ void mt7615_mac_reset_work(struct work_struct *work) 
		clear_bit(MT76_RESET, &phy2->mt76->state);



	mt76_worker_enable(&dev->mt76.tx_worker);



	local_bh_disable();

	napi_enable(&dev->mt76.tx_napi);

	napi_schedule(&dev->mt76.tx_napi);
@@ -334,6 +336,7 @@ void mt7615_mac_reset_work(struct work_struct *work) 


	napi_enable(&dev->mt76.napi[1]);

	napi_schedule(&dev->mt76.napi[1]);

	local_bh_enable();



	ieee80211_wake_queues(mt76_hw(dev));

	if (ext_phy)

drivers/net/wireless/mediatek/mt76/mt76x0/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ static int mt76x0e_resume(struct pci_dev *pdev) 


	mt76_worker_enable(&mdev->tx_worker);



	local_bh_disable();

	mt76_for_each_q_rx(mdev, i) {

		mt76_queue_rx_reset(dev, i);

		napi_enable(&mdev->napi[i]);
@@ -284,6 +285,7 @@ static int mt76x0e_resume(struct pci_dev *pdev) 


	napi_enable(&mdev->tx_napi);

	napi_schedule(&mdev->tx_napi);

	local_bh_enable();



	return mt76x0e_init_hardware(dev, true);

}

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

+4 −2
Original line number Diff line number Diff line
@@ -491,15 +491,17 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev) 
	clear_bit(MT76_RESET, &dev->mphy.state);



	mt76_worker_enable(&dev->mt76.tx_worker);

	tasklet_enable(&dev->mt76.pre_tbtt_tasklet);



	local_bh_disable();

	napi_enable(&dev->mt76.tx_napi);

	napi_schedule(&dev->mt76.tx_napi);



	tasklet_enable(&dev->mt76.pre_tbtt_tasklet);



	mt76_for_each_q_rx(&dev->mt76, i) {

		napi_enable(&dev->mt76.napi[i]);

		napi_schedule(&dev->mt76.napi[i]);

	}

	local_bh_enable();



	if (restart) {

		set_bit(MT76_RESTART, &dev->mphy.state);