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

wifi: mt76: mt7921: move runtime-pm pci code in mt792x-lib 



Move the following runtime-pm pci routines in mt792x-lib since they are
shared between mt7921 and mt7925 chipsets:
- __mt7921e_mcu_drv_pmctrl
- mt7921e_mcu_drv_pmctrl
- mt7921e_mcu_fw_pmctrl

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 c21a7f9f

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

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static int mt7921_init_hardware(struct mt792x_dev *dev) 


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



	for (i = 0; i < MT7921_MCU_INIT_RETRY_COUNT; i++) {

	for (i = 0; i < MT792x_MCU_INIT_RETRY_COUNT; i++) {

		ret = __mt7921_init_hardware(dev);

		if (!ret)

			break;
@@ -136,7 +136,7 @@ static int mt7921_init_hardware(struct mt792x_dev *dev) 
		mt792x_init_reset(dev);

	}



	if (i == MT7921_MCU_INIT_RETRY_COUNT) {

	if (i == MT792x_MCU_INIT_RETRY_COUNT) {

		dev_err(dev->mt76.dev, "hardware init failed\n");

		return ret;

	}

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

+0 −7
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ 
#define MT7921_RX_RING_SIZE		1536

#define MT7921_RX_MCU_RING_SIZE		512



#define MT7921_DRV_OWN_RETRY_COUNT	10

#define MT7921_MCU_INIT_RETRY_COUNT	10

#define MT7921_WFSYS_INIT_RETRY_COUNT	2



#define MT7921_FIRMWARE_WM		"mediatek/WIFI_RAM_CODE_MT7961_1.bin"

#define MT7921_ROM_PATCH		"mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin"
@@ -312,9 +308,6 @@ int mt7921e_mcu_init(struct mt792x_dev *dev); 
int mt7921s_wfsys_reset(struct mt792x_dev *dev);

int mt7921s_mac_reset(struct mt792x_dev *dev);

int mt7921s_init_reset(struct mt792x_dev *dev);

int __mt7921e_mcu_drv_pmctrl(struct mt792x_dev *dev);

int mt7921e_mcu_drv_pmctrl(struct mt792x_dev *dev);

int mt7921e_mcu_fw_pmctrl(struct mt792x_dev *dev);



int mt7921s_mcu_init(struct mt792x_dev *dev);

int mt7921s_mcu_drv_pmctrl(struct mt792x_dev *dev);

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

+4 −4
Original line number Diff line number Diff line
@@ -181,8 +181,8 @@ static int mt7921_pci_probe(struct pci_dev *pdev, 
		.init_reset = mt7921e_init_reset,

		.reset = mt7921e_mac_reset,

		.mcu_init = mt7921e_mcu_init,

		.drv_own = mt7921e_mcu_drv_pmctrl,

		.fw_own = mt7921e_mcu_fw_pmctrl,

		.drv_own = mt792xe_mcu_drv_pmctrl,

		.fw_own = mt792xe_mcu_fw_pmctrl,

	};

	static const struct mt792x_irq_map irq_map = {

		.host_irq_enable = MT_WFDMA0_HOST_INT_ENA,
@@ -268,11 +268,11 @@ static int mt7921_pci_probe(struct pci_dev *pdev, 
	bus_ops->rmw = mt7921_rmw;

	dev->mt76.bus = bus_ops;



	ret = mt7921e_mcu_fw_pmctrl(dev);

	ret = mt792xe_mcu_fw_pmctrl(dev);

	if (ret)

		goto err_free_dev;



	ret = __mt7921e_mcu_drv_pmctrl(dev);

	ret = __mt792xe_mcu_drv_pmctrl(dev);

	if (ret)

		goto err_free_dev;

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ int mt7921e_mac_reset(struct mt792x_dev *dev) 
{

	int i, err;



	mt7921e_mcu_drv_pmctrl(dev);

	mt792xe_mcu_drv_pmctrl(dev);



	mt76_connac_free_pending_tx_skbs(&dev->pm, NULL);

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

+0 −65
Original line number Diff line number Diff line
@@ -61,68 +61,3 @@ int mt7921e_mcu_init(struct mt792x_dev *dev) 


	return err;

}
 


int __mt7921e_mcu_drv_pmctrl(struct mt792x_dev *dev)

{

	int i, err = 0;



	for (i = 0; i < MT7921_DRV_OWN_RETRY_COUNT; i++) {

		mt76_wr(dev, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_CLR_OWN);

		if (mt76_poll_msec_tick(dev, MT_CONN_ON_LPCTL,

					PCIE_LPCR_HOST_OWN_SYNC, 0, 50, 1))

			break;

	}



	if (i == MT7921_DRV_OWN_RETRY_COUNT) {

		dev_err(dev->mt76.dev, "driver own failed\n");

		err = -EIO;

	}



	return err;

}



int mt7921e_mcu_drv_pmctrl(struct mt792x_dev *dev)

{

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

	struct mt76_connac_pm *pm = &dev->pm;

	int err;



	err = __mt7921e_mcu_drv_pmctrl(dev);

	if (err < 0)

		goto out;



	mt792x_wpdma_reinit_cond(dev);

	clear_bit(MT76_STATE_PM, &mphy->state);



	pm->stats.last_wake_event = jiffies;

	pm->stats.doze_time += pm->stats.last_wake_event -

			       pm->stats.last_doze_event;

out:

	return err;

}



int mt7921e_mcu_fw_pmctrl(struct mt792x_dev *dev)

{

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

	struct mt76_connac_pm *pm = &dev->pm;

	int i;



	for (i = 0; i < MT7921_DRV_OWN_RETRY_COUNT; i++) {

		mt76_wr(dev, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_SET_OWN);

		if (mt76_poll_msec_tick(dev, MT_CONN_ON_LPCTL,

					PCIE_LPCR_HOST_OWN_SYNC, 4, 50, 1))

			break;

	}



	if (i == MT7921_DRV_OWN_RETRY_COUNT) {

		dev_err(dev->mt76.dev, "firmware own failed\n");

		clear_bit(MT76_STATE_PM, &mphy->state);

		return -EIO;

	}



	pm->stats.last_doze_event = jiffies;

	pm->stats.awake_time += pm->stats.last_doze_event -

				pm->stats.last_wake_event;



	return 0;

}