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

mt76: mt7921s: add reset support 



Introduce wifi chip reset support for mt7921 device to recover
mcu hangs or abnormal wifi system.

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

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

+2 −0
Original line number Diff line number Diff line
@@ -507,6 +507,7 @@ struct mt76_sdio { 
	struct sdio_func *func;

	void *intr_data;

	u8 hw_ver;

	wait_queue_head_t wait;



	struct {

		int pse_data_quota;
@@ -1255,6 +1256,7 @@ int mt76s_alloc_tx(struct mt76_dev *dev); 
void mt76s_deinit(struct mt76_dev *dev);

void mt76s_sdio_irq(struct sdio_func *func);

void mt76s_txrx_worker(struct mt76_sdio *sdio);

bool mt76s_txqs_empty(struct mt76_dev *dev);

int mt76s_hw_init(struct mt76_dev *dev, struct sdio_func *func,

		  int hw_ver);

u32 mt76s_rr(struct mt76_dev *dev, u32 offset);

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

+2 −0
Original line number Diff line number Diff line
@@ -217,6 +217,8 @@ int mt7921_register_device(struct mt7921_dev *dev) 
	spin_lock_init(&dev->pm.wake.lock);

	mutex_init(&dev->pm.mutex);

	init_waitqueue_head(&dev->pm.wait);

	if (mt76_is_sdio(&dev->mt76))

		init_waitqueue_head(&dev->mt76.sdio.wait);

	spin_lock_init(&dev->pm.txq_lock);

	INIT_DELAYED_WORK(&dev->mphy.mac_work, mt7921_mac_work);

	INIT_DELAYED_WORK(&dev->phy.scan_work, mt7921_scan_work);

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

+1 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ mt7921_mcu_rx_unsolicited_event(struct mt7921_dev *dev, struct sk_buff *skb) 
		mt7921_mcu_debug_msg_event(dev, skb);

		break;

	case MCU_EVENT_COREDUMP:

		dev->fw_assert = true;

		mt76_connac_mcu_coredump_event(&dev->mt76, skb,

					       &dev->coredump);

		return;

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

+4 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ struct mt7921_dev { 
	struct work_struct reset_work;

	bool hw_full_reset:1;

	bool hw_init_done:1;

	bool fw_assert:1;



	struct list_head sta_poll_list;

	spinlock_t sta_poll_lock;
@@ -425,6 +426,9 @@ void mt7921e_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, 
			  struct sk_buff *skb);

int mt7921e_mac_reset(struct mt7921_dev *dev);

int mt7921e_mcu_init(struct mt7921_dev *dev);

int mt7921s_wfsys_reset(struct mt7921_dev *dev);

int mt7921s_mac_reset(struct mt7921_dev *dev);

int mt7921s_init_reset(struct mt7921_dev *dev);

int mt7921e_mcu_drv_pmctrl(struct mt7921_dev *dev);

int mt7921e_mcu_fw_pmctrl(struct mt7921_dev *dev);

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

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static void mt7921s_unregister_device(struct mt7921_dev *dev) 
	cancel_work_sync(&pm->wake_work);



	mt76s_deinit(&dev->mt76);

	mt7921s_wfsys_reset(dev);

	mt7921_mcu_exit(dev);



	mt76_free_device(&dev->mt76);
@@ -104,6 +105,8 @@ static int mt7921s_probe(struct sdio_func *func, 
		.type = MT76_BUS_SDIO,

	};

	static const struct mt7921_hif_ops mt7921_sdio_ops = {

		.init_reset = mt7921s_init_reset,

		.reset = mt7921s_mac_reset,

		.mcu_init = mt7921s_mcu_init,

		.drv_own = mt7921s_mcu_drv_pmctrl,

		.fw_own = mt7921s_mcu_fw_pmctrl,