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

mt76: mt7921: fix MT7921E reset failure 



There is a missing mt7921e_driver_own in the MT7921E reset procedure
since the mt7921 mcu.c has been refactored for MT7921S, that will
result in MT7921E reset failure, so add it back now.

Fixes: dfc7743d ("mt76: mt7921: refactor mcu.c to be bus independent")
Reported-by: default avatarYN Chen <YN.Chen@mediatek.com>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 8c55516d

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

+1 −0
Original line number Diff line number Diff line
@@ -446,6 +446,7 @@ int mt7921_mcu_restart(struct mt76_dev *dev); 


void mt7921e_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,

			  struct sk_buff *skb);

int mt7921e_driver_own(struct mt7921_dev *dev);

int mt7921e_mac_reset(struct mt7921_dev *dev);

int mt7921e_mcu_init(struct mt7921_dev *dev);

int mt7921s_wfsys_reset(struct mt7921_dev *dev);

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

+4 −0
Original line number Diff line number Diff line
@@ -321,6 +321,10 @@ int mt7921e_mac_reset(struct mt7921_dev *dev) 
		MT_INT_MCU_CMD);

	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);



	err = mt7921e_driver_own(dev);

	if (err)

		return err;



	err = mt7921_run_firmware(dev);

	if (err)

		goto out;

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

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include "mt7921.h"

#include "mcu.h"



static int mt7921e_driver_own(struct mt7921_dev *dev)

int mt7921e_driver_own(struct mt7921_dev *dev)

{

	u32 reg = mt7921_reg_map_l1(dev, MT_TOP_LPCR_HOST_BAND0);