leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mt76: mt7663s: convert txrx_work to mt76_worker

Browse Source 
In order to improve driver throughput, convert txrx_work to mt76 worker
threads APIs.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Lorenzo Bianconi 2020-09-26 17:06:23 +02:00 committed by Felix Fietkau
parent e0ad800243
commit fefb584d46
5 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/mediatek/mt76/mt76.h
View File

@ -447,7 +447,7 @@ struct mt76_usb {
struct mt76_sdio {
struct workqueue_struct *txrx_wq;
struct work_struct txrx_work;
struct mt76_worker txrx_worker;
struct work_struct status_work;
struct work_struct net_work;
struct work_struct stat_work;

2
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
View File

@ -681,7 +681,7 @@ int mt7663u_mcu_init(struct mt7615_dev *dev);
/* sdio */
u32 mt7663s_read_pcr(struct mt7615_dev *dev);
int mt7663s_mcu_init(struct mt7615_dev *dev);
void mt7663s_txrx_work(struct work_struct *work);
void mt7663s_txrx_worker(struct mt76_worker *w);
void mt7663s_rx_work(struct work_struct *work);
void mt7663s_sdio_irq(struct sdio_func *func);

19
drivers/net/wireless/mediatek/mt76/mt7615/sdio.c
View File

@ -368,8 +368,6 @@ static int mt7663s_probe(struct sdio_func *func,
if (ret < 0)
goto err_free;
INIT_WORK(&mdev->sdio.txrx_work, mt7663s_txrx_work);
ret = mt7663s_hw_init(dev, func);
if (ret)
goto err_deinit;
@ -400,6 +398,13 @@ static int mt7663s_probe(struct sdio_func *func,
if (ret)
goto err_deinit;
ret = mt76_worker_setup(mt76_hw(dev), &mdev->sdio.txrx_worker,
mt7663s_txrx_worker, "sdio-txrx");
if (ret)
goto err_deinit;
sched_set_fifo_low(mdev->sdio.txrx_worker.task);
ret = mt7663_usb_sdio_register_device(dev);
if (ret)
goto err_deinit;
@ -431,6 +436,7 @@ static int mt7663s_suspend(struct device *dev)
{
struct sdio_func *func = dev_to_sdio_func(dev);
struct mt7615_dev *mdev = sdio_get_drvdata(func);
int err;
if (!test_bit(MT76_STATE_SUSPEND, &mdev->mphy.state) &&
mt7615_firmware_offload(mdev)) {
@ -443,9 +449,14 @@ static int mt7663s_suspend(struct device *dev)
sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);
err = mt7615_mcu_set_fw_ctrl(mdev);
if (err)
return err;
mt76_worker_disable(&mdev->mt76.sdio.txrx_worker);
mt76s_stop_txrx(&mdev->mt76);
return mt7615_mcu_set_fw_ctrl(mdev);
return 0;
}
static int mt7663s_resume(struct device *dev)
@ -454,6 +465,8 @@ static int mt7663s_resume(struct device *dev)
struct mt7615_dev *mdev = sdio_get_drvdata(func);
int err;
mt76_worker_enable(&mdev->mt76.sdio.txrx_worker);
err = mt7615_mcu_set_drv_ctrl(mdev);
if (err)
return err;

41
drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
View File

@ -286,34 +286,33 @@ next:
}
mt7663s_tx_update_quota(sdio, qid, pse_sz, ple_sz);
queue_work(sdio->txrx_wq, &sdio->status_work);
return nframes;
}
void mt7663s_txrx_work(struct work_struct *work)
void mt7663s_txrx_worker(struct mt76_worker *w)
{
struct mt76_sdio *sdio = container_of(work, struct mt76_sdio,
txrx_work);
struct mt76_sdio *sdio = container_of(w, struct mt76_sdio,
txrx_worker);
struct mt76_dev *dev = container_of(sdio, struct mt76_dev, sdio);
int i, nframes = 0;
int i, nframes, ret;
/* tx */
for (i = 0; i < MT_TXQ_MCU_WA; i++) {
int ret;
do {
nframes = 0;
ret = mt7663s_tx_run_queue(dev, i);
if (ret < 0)
break;
/* tx */
for (i = 0; i < MT_TXQ_MCU_WA; i++) {
ret = mt7663s_tx_run_queue(dev, i);
if (ret > 0)
nframes += ret;
}
nframes += ret;
}
/* rx */
nframes += mt7663s_rx_handler(dev);
if (nframes)
queue_work(sdio->txrx_wq, &sdio->txrx_work);
queue_work(sdio->txrx_wq, &sdio->status_work);
/* rx */
ret = mt7663s_rx_handler(dev);
if (ret > 0)
nframes += ret;
} while (nframes > 0);
}
void mt7663s_sdio_irq(struct sdio_func *func)
@ -324,5 +323,5 @@ void mt7663s_sdio_irq(struct sdio_func *func)
if (!test_bit(MT76_STATE_INITIALIZED, &dev->mt76.phy.state))
return;
queue_work(sdio->txrx_wq, &sdio->txrx_work);
mt76_worker_schedule(&sdio->txrx_worker);
}

5
drivers/net/wireless/mediatek/mt76/sdio.c
View File

@ -66,7 +66,6 @@ void mt76s_stop_txrx(struct mt76_dev *dev)
{
struct mt76_sdio *sdio = &dev->sdio;
cancel_work_sync(&sdio->txrx_work);
cancel_work_sync(&sdio->status_work);
cancel_work_sync(&sdio->net_work);
cancel_work_sync(&sdio->stat_work);
@ -256,7 +255,7 @@ static void mt76s_tx_kick(struct mt76_dev *dev, struct mt76_queue *q)
{
struct mt76_sdio *sdio = &dev->sdio;
queue_work(sdio->txrx_wq, &sdio->txrx_work);
mt76_worker_schedule(&sdio->txrx_worker);
}
static const struct mt76_queue_ops sdio_queue_ops = {
@ -303,6 +302,8 @@ void mt76s_deinit(struct mt76_dev *dev)
struct mt76_sdio *sdio = &dev->sdio;
int i;
mt76_worker_teardown(&sdio->txrx_worker);
mt76s_stop_txrx(dev);
if (sdio->txrx_wq) {
destroy_workqueue(sdio->txrx_wq);