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

mt76: mt7921: introduce mt7921_wpdma_reinit_cond utility routine 



Add mt7921_wpdma_reinit_cond to check dummy reg if driver needs to
reinitialized WPDMA after driver_own operation

Co-developed-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Co-developed-by: default avatarLeon Yen <leon.yen@mediatek.com>
Signed-off-by: default avatarLeon Yen <leon.yen@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 5536e735

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

+2 −0
Original line number Diff line number Diff line
@@ -64,11 +64,13 @@ struct mt76_connac_pm { 
	struct delayed_work ps_work;

	unsigned long last_activity;

	unsigned long idle_timeout;



	struct {

		unsigned long last_wake_event;

		unsigned long awake_time;

		unsigned long last_doze_event;

		unsigned long doze_time;

		unsigned int lp_wake;

	} stats;

};

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

+3 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ mt7921_pm_stats(struct seq_file *s, void *data) 
{

	struct mt7921_dev *dev = dev_get_drvdata(s->private);

	struct mt76_connac_pm *pm = &dev->pm;



	unsigned long awake_time = pm->stats.awake_time;

	unsigned long doze_time = pm->stats.doze_time;
@@ -281,6 +282,8 @@ mt7921_pm_stats(struct seq_file *s, void *data) 
		   jiffies_to_msecs(awake_time),

		   jiffies_to_msecs(doze_time));



	seq_printf(s, "low power wakes: %9d\n", pm->stats.lp_wake);



	return 0;

}

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

+25 −0
Original line number Diff line number Diff line
@@ -353,6 +353,31 @@ int mt7921_wpdma_reset(struct mt7921_dev *dev, bool force) 
	return 0;

}



int mt7921_wpdma_reinit_cond(struct mt7921_dev *dev)

{

	struct mt76_connac_pm *pm = &dev->pm;

	int err;



	/* check if the wpdma must be reinitialized */

	if (mt7921_dma_need_reinit(dev)) {

		/* disable interrutpts */

		mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0);

		mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0);



		err = mt7921_wpdma_reset(dev, false);

		if (err) {

			dev_err(dev->mt76.dev, "wpdma reset failed\n");

			return err;

		}



		/* enable interrutpts */

		mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);

		pm->stats.lp_wake++;

	}



	return 0;

}



int mt7921_dma_init(struct mt7921_dev *dev)

{

	/* Increase buffer size to receive large VHT/HE MPDUs */

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

+6 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ int mt7921_eeprom_get_target_power(struct mt7921_dev *dev, 
void mt7921_eeprom_init_sku(struct mt7921_dev *dev);

int mt7921_dma_init(struct mt7921_dev *dev);

int mt7921_wpdma_reset(struct mt7921_dev *dev, bool force);

int mt7921_wpdma_reinit_cond(struct mt7921_dev *dev);

void mt7921_dma_cleanup(struct mt7921_dev *dev);

int mt7921_run_firmware(struct mt7921_dev *dev);

int mt7921_mcu_init(struct mt7921_dev *dev);
@@ -315,6 +316,11 @@ mt7921_l1_rmw(struct mt7921_dev *dev, u32 addr, u32 mask, u32 val) 
#define mt7921_l1_set(dev, addr, val)	mt7921_l1_rmw(dev, addr, 0, val)

#define mt7921_l1_clear(dev, addr, val)	mt7921_l1_rmw(dev, addr, val, 0)



static inline bool mt7921_dma_need_reinit(struct mt7921_dev *dev)

{

	return !mt76_get_field(dev, MT_WFDMA_DUMMY_CR, MT_WFDMA_NEED_REINIT);

}



void mt7921_mac_init(struct mt7921_dev *dev);

bool mt7921_mac_wtbl_update(struct mt7921_dev *dev, int idx, u32 mask);

void mt7921_mac_reset_counters(struct mt7921_phy *phy);