iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mt76: mt7921: robustify hardware initialization flow

Browse Source 
Robustify hardware initialization in the current driver probing flow
to get rid of the device is possibly lost after the machine boot due
to possible firmware abnormal state by trying to recover the failure
with more chances.

Tested-by: Leon Yen <Leon.Yen@mediatek.com>
Tested-by: YN Chen <YN.Chen@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Sean Wang 2021-09-14 23:50:21 +08:00 committed by Felix Fietkau
parent e500c9470e
commit 3a00987687
2 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/net/wireless/mediatek/mt76/mt7921/init.c
View File

@ -146,9 +146,40 @@ int mt7921_mac_init(struct mt7921_dev *dev)
return mt76_connac_mcu_set_rts_thresh(&dev->mt76, 0x92b, 0);
}
static int __mt7921_init_hardware(struct mt7921_dev *dev)
{
struct mt76_dev *mdev = &dev->mt76;
int ret;
/* force firmware operation mode into normal state,
* which should be set before firmware download stage.
*/
mt76_wr(dev, MT_SWDEF_MODE, MT_SWDEF_NORMAL_MODE);
ret = mt7921_mcu_init(dev);
if (ret)
goto out;
ret = mt7921_eeprom_init(dev);
if (ret)
goto out;
ret = mt7921_mcu_set_eeprom(dev);
if (ret)
goto out;
ret = mt7921_mac_init(dev);
out:
if (ret && mdev->eeprom.data) {
devm_kfree(mdev->dev, mdev->eeprom.data);
mdev->eeprom.data = NULL;
}
return ret;
}
static int mt7921_init_hardware(struct mt7921_dev *dev)
{
int ret, idx;
int ret, idx, i;
ret = mt7921_dma_init(dev);
if (ret)
@ -156,22 +187,18 @@ static int mt7921_init_hardware(struct mt7921_dev *dev)
set_bit(MT76_STATE_INITIALIZED, &dev->mphy.state);
/* force firmware operation mode into normal state,
* which should be set before firmware download stage.
*/
mt76_wr(dev, MT_SWDEF_MODE, MT_SWDEF_NORMAL_MODE);
for (i = 0; i < MT7921_MCU_INIT_RETRY_COUNT; i++) {
ret = __mt7921_init_hardware(dev);
if (!ret)
break;
ret = mt7921_mcu_init(dev);
if (ret)
return ret;
mt7921_wpdma_reset(dev, true);
}
ret = mt7921_eeprom_init(dev);
if (ret < 0)
return ret;
ret = mt7921_mcu_set_eeprom(dev);
if (ret)
if (i == MT7921_MCU_INIT_RETRY_COUNT) {
dev_err(dev->mt76.dev, "hardware init failed\n");
return ret;
}
/* Beacon and mgmt frames should occupy wcid 0 */
idx = mt76_wcid_alloc(dev->mt76.wcid_mask, MT7921_WTBL_STA - 1);
@ -183,7 +210,7 @@ static int mt7921_init_hardware(struct mt7921_dev *dev)
dev->mt76.global_wcid.tx_info |= MT_WCID_TX_INFO_SET;
rcu_assign_pointer(dev->mt76.wcid[idx], &dev->mt76.global_wcid);
return mt7921_mac_init(dev);
return 0;
}
int mt7921_register_device(struct mt7921_dev *dev)

1
drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
View File

@ -29,6 +29,7 @@
#define MT7921_RX_MCU_RING_SIZE 512
#define MT7921_DRV_OWN_RETRY_COUNT 10
#define MT7921_MCU_INIT_RETRY_COUNT 10
#define MT7921_FIRMWARE_WM "mediatek/WIFI_RAM_CODE_MT7961_1.bin"
#define MT7921_ROM_PATCH "mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin"