Commit 033ae79b authored by Sean Wang's avatar Sean Wang Committed by Felix Fietkau
Browse files

mt76: mt7921: refactor init.c to be bus independent 



This is a preliminary patch to introduce mt7921s support.

Make init.c reusable between mt7921s and mt7921e

Tested-by: default avatarDeren Wu <deren.wu@mediatek.com>
Acked-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent dfc7743d

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

+3 −0
Original line number Diff line number Diff line
@@ -343,6 +343,9 @@ int mt7921_dma_init(struct mt7921_dev *dev) 
	struct mt76_bus_ops *bus_ops;

	int ret;



	dev->phy.dev = dev;

	dev->phy.mt76 = &dev->mt76.phy;

	dev->mt76.phy.priv = &dev->phy;

	dev->bus_ops = dev->mt76.bus;

	bus_ops = devm_kmemdup(dev->mt76.dev, dev->bus_ops, sizeof(*bus_ops),

			       GFP_KERNEL);

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

+1 −26
Original line number Diff line number Diff line
@@ -181,10 +181,6 @@ static int mt7921_init_hardware(struct mt7921_dev *dev) 
{

	int ret, idx, i;



	ret = mt7921_dma_init(dev);

	if (ret)

		return ret;



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



	for (i = 0; i < MT7921_MCU_INIT_RETRY_COUNT; i++) {
@@ -192,7 +188,7 @@ static int mt7921_init_hardware(struct mt7921_dev *dev) 
		if (!ret)

			break;



		mt7921_wpdma_reset(dev, true);

		mt7921_init_reset(dev);

	}



	if (i == MT7921_MCU_INIT_RETRY_COUNT) {
@@ -289,24 +285,3 @@ int mt7921_register_device(struct mt7921_dev *dev) 


	return 0;

}
 


void mt7921_unregister_device(struct mt7921_dev *dev)

{

	int i;

	struct mt76_connac_pm *pm = &dev->pm;



	mt76_unregister_device(&dev->mt76);

	mt76_for_each_q_rx(&dev->mt76, i)

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

	cancel_delayed_work_sync(&pm->ps_work);

	cancel_work_sync(&pm->wake_work);



	mt7921_tx_token_put(dev);

	mt7921_mcu_drv_pmctrl(dev);

	mt7921_dma_cleanup(dev);

	mt7921_wfsys_reset(dev);

	mt7921_mcu_exit(dev);



	tasklet_disable(&dev->irq_tasklet);

	mt76_free_device(&dev->mt76);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -133,11 +133,13 @@ struct mt7921_phy { 
	struct delayed_work scan_work;

};



#define mt7921_init_reset(dev)		((dev)->hif_ops->init_reset(dev))

#define mt7921_dev_reset(dev)		((dev)->hif_ops->reset(dev))

#define mt7921_mcu_init(dev)		((dev)->hif_ops->mcu_init(dev))

#define __mt7921_mcu_drv_pmctrl(dev)	((dev)->hif_ops->drv_own(dev))

#define	__mt7921_mcu_fw_pmctrl(dev)	((dev)->hif_ops->fw_own(dev))

struct mt7921_hif_ops {

	int (*init_reset)(struct mt7921_dev *dev);

	int (*reset)(struct mt7921_dev *dev);

	int (*mcu_init)(struct mt7921_dev *dev);

	int (*drv_own)(struct mt7921_dev *dev);

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

+32 −1
Original line number Diff line number Diff line
@@ -93,6 +93,32 @@ static void mt7921_irq_tasklet(unsigned long data) 
		napi_schedule(&dev->mt76.napi[MT_RXQ_MAIN]);

}



static int mt7921e_init_reset(struct mt7921_dev *dev)

{

	return mt7921_wpdma_reset(dev, true);

}



static void mt7921e_unregister_device(struct mt7921_dev *dev)

{

	int i;

	struct mt76_connac_pm *pm = &dev->pm;



	mt76_unregister_device(&dev->mt76);

	mt76_for_each_q_rx(&dev->mt76, i)

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

	cancel_delayed_work_sync(&pm->ps_work);

	cancel_work_sync(&pm->wake_work);



	mt7921_tx_token_put(dev);

	mt7921_mcu_drv_pmctrl(dev);

	mt7921_dma_cleanup(dev);

	mt7921_wfsys_reset(dev);

	mt7921_mcu_exit(dev);



	tasklet_disable(&dev->irq_tasklet);

	mt76_free_device(&dev->mt76);

}



static int mt7921_pci_probe(struct pci_dev *pdev,

			    const struct pci_device_id *id)

{
@@ -116,6 +142,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, 
	};



	static const struct mt7921_hif_ops mt7921_pcie_ops = {

		.init_reset = mt7921e_init_reset,

		.reset = mt7921e_mac_reset,

		.mcu_init = mt7921e_mcu_init,

		.drv_own = mt7921e_mcu_drv_pmctrl,
@@ -172,6 +199,10 @@ static int mt7921_pci_probe(struct pci_dev *pdev, 
	if (ret)

		goto err_free_dev;



	ret = mt7921_dma_init(dev);

	if (ret)

		goto err_free_irq;



	ret = mt7921_register_device(dev);

	if (ret)

		goto err_free_irq;
@@ -193,7 +224,7 @@ static void mt7921_pci_remove(struct pci_dev *pdev) 
	struct mt76_dev *mdev = pci_get_drvdata(pdev);

	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);



	mt7921_unregister_device(dev);

	mt7921e_unregister_device(dev);

	devm_free_irq(&pdev->dev, pdev->irq, dev);

	pci_free_irq_vectors(pdev);

}