Commit c21a7f9f authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

wifi: mt76: mt7921: move shared runtime-pm code on mt792x-lib 



Moving hif_ops marcos in mt792x.h, we can move shared runtime-pm code
between mt7925 and mt7921 in mt792x-lib module.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 5c041325

drivers/net/wireless/mediatek/mt76/mt7921/init.c

+2 −2
Original line number Diff line number Diff line
@@ -192,8 +192,8 @@ int mt7921_register_device(struct mt792x_dev *dev) 
	dev->mt76.phy.priv = &dev->phy;

	dev->mt76.tx_worker.fn = mt792x_tx_worker;



	INIT_DELAYED_WORK(&dev->pm.ps_work, mt7921_pm_power_save_work);

	INIT_WORK(&dev->pm.wake_work, mt7921_pm_wake_work);

	INIT_DELAYED_WORK(&dev->pm.ps_work, mt792x_pm_power_save_work);

	INIT_WORK(&dev->pm.wake_work, mt792x_pm_wake_work);

	spin_lock_init(&dev->pm.wake.lock);

	mutex_init(&dev->pm.mutex);

	init_waitqueue_head(&dev->pm.wait);

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

+0 −70
Original line number Diff line number Diff line
@@ -699,76 +699,6 @@ void mt7921_mac_reset_work(struct work_struct *work) 
	mt76_connac_power_save_sched(&dev->mt76.phy, pm);

}



void mt7921_pm_wake_work(struct work_struct *work)

{

	struct mt792x_dev *dev;

	struct mt76_phy *mphy;



	dev = (struct mt792x_dev *)container_of(work, struct mt792x_dev,

						pm.wake_work);

	mphy = dev->phy.mt76;



	if (!mt7921_mcu_drv_pmctrl(dev)) {

		struct mt76_dev *mdev = &dev->mt76;

		int i;



		if (mt76_is_sdio(mdev)) {

			mt76_connac_pm_dequeue_skbs(mphy, &dev->pm);

			mt76_worker_schedule(&mdev->sdio.txrx_worker);

		} else {

			local_bh_disable();

			mt76_for_each_q_rx(mdev, i)

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

			local_bh_enable();

			mt76_connac_pm_dequeue_skbs(mphy, &dev->pm);

			mt76_connac_tx_cleanup(mdev);

		}

		if (test_bit(MT76_STATE_RUNNING, &mphy->state))

			ieee80211_queue_delayed_work(mphy->hw, &mphy->mac_work,

						     MT792x_WATCHDOG_TIME);

	}



	ieee80211_wake_queues(mphy->hw);

	wake_up(&dev->pm.wait);

}



void mt7921_pm_power_save_work(struct work_struct *work)

{

	struct mt792x_dev *dev;

	unsigned long delta;

	struct mt76_phy *mphy;



	dev = (struct mt792x_dev *)container_of(work, struct mt792x_dev,

						pm.ps_work.work);

	mphy = dev->phy.mt76;



	delta = dev->pm.idle_timeout;

	if (test_bit(MT76_HW_SCANNING, &mphy->state) ||

	    test_bit(MT76_HW_SCHED_SCANNING, &mphy->state) ||

	    dev->fw_assert)

		goto out;



	if (mutex_is_locked(&dev->mt76.mutex))

		/* if mt76 mutex is held we should not put the device

		 * to sleep since we are currently accessing device

		 * register map. We need to wait for the next power_save

		 * trigger.

		 */

		goto out;



	if (time_is_after_jiffies(dev->pm.last_activity + delta)) {

		delta = dev->pm.last_activity + delta - jiffies;

		goto out;

	}



	if (!mt7921_mcu_fw_pmctrl(dev)) {

		cancel_delayed_work_sync(&mphy->mac_work);

		return;

	}

out:

	queue_delayed_work(dev->mt76.wq, &dev->pm.ps_work, delta);

}



void mt7921_coredump_work(struct work_struct *work)

{

	struct mt792x_dev *dev;

drivers/net/wireless/mediatek/mt76/mt7921/mcu.c

+0 −44
Original line number Diff line number Diff line
@@ -942,50 +942,6 @@ int mt7921_mcu_sta_update(struct mt792x_dev *dev, struct ieee80211_sta *sta, 
	return mt76_connac_mcu_sta_cmd(&dev->mphy, &info);

}



int mt7921_mcu_drv_pmctrl(struct mt792x_dev *dev)

{

	struct mt76_phy *mphy = &dev->mt76.phy;

	struct mt76_connac_pm *pm = &dev->pm;

	int err = 0;



	mutex_lock(&pm->mutex);



	if (!test_bit(MT76_STATE_PM, &mphy->state))

		goto out;



	err = __mt792x_mcu_drv_pmctrl(dev);

out:

	mutex_unlock(&pm->mutex);



	if (err)

		mt792x_reset(&dev->mt76);



	return err;

}

EXPORT_SYMBOL_GPL(mt7921_mcu_drv_pmctrl);



int mt7921_mcu_fw_pmctrl(struct mt792x_dev *dev)

{

	struct mt76_phy *mphy = &dev->mt76.phy;

	struct mt76_connac_pm *pm = &dev->pm;

	int err = 0;



	mutex_lock(&pm->mutex);



	if (mt76_connac_skip_fw_pmctrl(mphy, pm))

		goto out;



	err = __mt792x_mcu_fw_pmctrl(dev);

out:

	mutex_unlock(&pm->mutex);



	if (err)

		mt792x_reset(&dev->mt76);



	return err;

}

EXPORT_SYMBOL_GPL(mt7921_mcu_fw_pmctrl);



int mt7921_mcu_set_beacon_filter(struct mt792x_dev *dev,

				 struct ieee80211_vif *vif,

				 bool enable)

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

+0 −4
Original line number Diff line number Diff line
@@ -297,10 +297,6 @@ int mt7921_mcu_uni_rx_ba(struct mt792x_dev *dev, 
void mt7921_scan_work(struct work_struct *work);

void mt7921_roc_work(struct work_struct *work);

int mt7921_mcu_uni_bss_ps(struct mt792x_dev *dev, struct ieee80211_vif *vif);

int mt7921_mcu_drv_pmctrl(struct mt792x_dev *dev);

int mt7921_mcu_fw_pmctrl(struct mt792x_dev *dev);

void mt7921_pm_wake_work(struct work_struct *work);

void mt7921_pm_power_save_work(struct work_struct *work);

void mt7921_coredump_work(struct work_struct *work);

int mt7921_get_txpwr_info(struct mt792x_dev *dev, struct mt7921_txpwr *txpwr);

int mt7921_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

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

+3 −3
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static int mt7921_pci_suspend(struct device *device) 
	cancel_delayed_work_sync(&pm->ps_work);

	cancel_work_sync(&pm->wake_work);



	err = mt7921_mcu_drv_pmctrl(dev);

	err = mt792x_mcu_drv_pmctrl(dev);

	if (err < 0)

		goto restore_suspend;
@@ -372,7 +372,7 @@ static int mt7921_pci_suspend(struct device *device) 
	synchronize_irq(pdev->irq);

	tasklet_kill(&mdev->irq_tasklet);



	err = mt7921_mcu_fw_pmctrl(dev);

	err = mt792x_mcu_fw_pmctrl(dev);

	if (err)

		goto restore_napi;
@@ -406,7 +406,7 @@ static int mt7921_pci_resume(struct device *device) 
	struct mt76_connac_pm *pm = &dev->pm;

	int i, err;



	err = mt7921_mcu_drv_pmctrl(dev);

	err = mt792x_mcu_drv_pmctrl(dev);

	if (err < 0)

		goto failed;