Commit ad2a1ea4 authored by Ryder Lee's avatar Ryder Lee Committed by Felix Fietkau
Browse files

mt76: mt7622: trigger hif interrupt for system reset 



hif interrupt needs to be triggered after MT_MCU_INT_EVENT.

Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 69e74d7f

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

+12 −3
Original line number Diff line number Diff line
@@ -2053,6 +2053,15 @@ void mt7615_tx_token_put(struct mt7615_dev *dev) 
}

EXPORT_SYMBOL_GPL(mt7615_tx_token_put);



static void

mt7615_hif_int_event_trigger(struct mt7615_dev *dev, u8 event)

{

	mt76_wr(dev, MT_MCU_INT_EVENT, event);



	mt7622_trigger_hif_int(dev, true);

	mt7622_trigger_hif_int(dev, false);

}



void mt7615_mac_reset_work(struct work_struct *work)

{

	struct mt7615_phy *phy2;
@@ -2095,7 +2104,7 @@ void mt7615_mac_reset_work(struct work_struct *work) 


	mt7615_mutex_acquire(dev);



	mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_PDMA_STOPPED);

	mt7615_hif_int_event_trigger(dev, MT_MCU_INT_EVENT_PDMA_STOPPED);



	mt7615_tx_token_put(dev);

	idr_init(&dev->token);
@@ -2105,7 +2114,7 @@ void mt7615_mac_reset_work(struct work_struct *work) 


		mt76_wr(dev, MT_WPDMA_MEM_RNG_ERR, 0);



		mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_PDMA_INIT);

		mt7615_hif_int_event_trigger(dev, MT_MCU_INT_EVENT_PDMA_INIT);

		mt7615_wait_reset_state(dev, MT_MCU_CMD_RECOVERY_DONE);

	}
@@ -2128,7 +2137,7 @@ void mt7615_mac_reset_work(struct work_struct *work) 
	if (ext_phy)

		ieee80211_wake_queues(ext_phy->hw);



	mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_RESET_DONE);

	mt7615_hif_int_event_trigger(dev, MT_MCU_INT_EVENT_RESET_DONE);

	mt7615_wait_reset_state(dev, MT_MCU_CMD_NORMAL_STATE);



	mt7615_update_beacons(dev);

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

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ int mt7615_rf_wr(struct mt7615_dev *dev, u32 wf, u32 reg, u32 val) 
				 sizeof(req), false);

}



static void mt7622_trigger_hif_int(struct mt7615_dev *dev, bool en)

void mt7622_trigger_hif_int(struct mt7615_dev *dev, bool en)

{

	if (!is_mt7622(&dev->mt76))

		return;

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

+2 −0
Original line number Diff line number Diff line
@@ -556,6 +556,8 @@ u32 mt7615_mcu_reg_rr(struct mt76_dev *dev, u32 offset); 
void mt7615_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val);

void mt7615_coredump_work(struct work_struct *work);



void mt7622_trigger_hif_int(struct mt7615_dev *dev, bool en);



/* usb */

int mt7663_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,

				   enum mt76_txq_id qid, struct mt76_wcid *wcid,