Skip to content

Commit

Permalink
wifi: mt76: mt7915: enable full system reset support
Browse files Browse the repository at this point in the history 
Add mt7915_reset() and refactor mt7915_mac_reset_work() to support
full system recovery.

Co-developed-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Bo Jiao <bo.jiao@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
@nbd168
Bo Jiao authored and nbd168 committed Nov 11, 2022
1 parent b1ddf8b commit 1ad31c3
Show file tree
Hide file tree
Showing 7 changed files with 267 additions and 26 deletions.
11 changes: 6 additions & 5 deletions mt7915/init.c
View file
Expand Up @@ -262,9 +262,8 @@ static void mt7915_led_set_brightness(struct led_classdev *led_cdev,
mt7915_led_set_config(led_cdev, 0xff, 0);
}

static void
mt7915_init_txpower(struct mt7915_dev *dev,
struct ieee80211_supported_band *sband)
void mt7915_init_txpower(struct mt7915_dev *dev,
struct ieee80211_supported_band *sband)
{
int i, n_chains = hweight8(dev->mphy.antenna_mask);
int nss_delta = mt76_tx_power_nss_delta(n_chains);
Expand Down Expand Up @@ -473,7 +472,7 @@ mt7915_mac_init_band(struct mt7915_dev *dev, u8 band)
mt76_rmw(dev, MT_WTBLOFF_TOP_RSCR(band), mask, set);
}

static void mt7915_mac_init(struct mt7915_dev *dev)
void mt7915_mac_init(struct mt7915_dev *dev)
{
int i;
u32 rx_len = is_mt7915(&dev->mt76) ? 0x400 : 0x680;
Expand Down Expand Up @@ -503,7 +502,7 @@ static void mt7915_mac_init(struct mt7915_dev *dev)
}
}

static int mt7915_txbf_init(struct mt7915_dev *dev)
int mt7915_txbf_init(struct mt7915_dev *dev)
{
int ret;

Expand Down Expand Up @@ -1143,6 +1142,8 @@ int mt7915_register_device(struct mt7915_dev *dev)
goto unreg_thermal;
}

dev->recovery.hw_init_done = true;

mt7915_init_debugfs(&dev->phy);

return 0;
Expand Down
214 changes: 212 additions & 2 deletions mt7915/mac.c
View file
Expand Up @@ -1291,7 +1291,7 @@ mt7915_wait_reset_state(struct mt7915_dev *dev, u32 state)
bool ret;

ret = wait_event_timeout(dev->reset_wait,
(READ_ONCE(dev->reset_state) & state),
(READ_ONCE(dev->recovery.state) & state),
MT7915_RESET_TIMEOUT);

WARN(!ret, "Timeout waiting for MCU reset state %x\n", state);
Expand Down Expand Up @@ -1346,6 +1346,171 @@ void mt7915_tx_token_put(struct mt7915_dev *dev)
idr_destroy(&dev->mt76.token);
}

static int
mt7915_mac_restart(struct mt7915_dev *dev)
{
struct mt7915_phy *phy2;
struct mt76_phy *ext_phy;
struct mt76_dev *mdev = &dev->mt76;
int i, ret;
u32 irq_mask;

ext_phy = dev->mt76.phys[MT_BAND1];
phy2 = ext_phy ? ext_phy->priv : NULL;

if (dev->hif2) {
mt76_wr(dev, MT_INT1_MASK_CSR, 0x0);
mt76_wr(dev, MT_INT1_SOURCE_CSR, ~0);
}

if (dev_is_pci(mdev->dev)) {
mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0);
if (dev->hif2)
mt76_wr(dev, MT_PCIE1_MAC_INT_ENABLE, 0x0);
}

set_bit(MT76_RESET, &dev->mphy.state);
set_bit(MT76_MCU_RESET, &dev->mphy.state);
wake_up(&dev->mt76.mcu.wait);
if (ext_phy) {
set_bit(MT76_RESET, &ext_phy->state);
set_bit(MT76_MCU_RESET, &ext_phy->state);
}

/* lock/unlock all queues to ensure that no tx is pending */
mt76_txq_schedule_all(&dev->mphy);
if (ext_phy)
mt76_txq_schedule_all(ext_phy);

/* disable all tx/rx napi */
mt76_worker_disable(&dev->mt76.tx_worker);
mt76_for_each_q_rx(mdev, i) {
if (mdev->q_rx[i].ndesc)
napi_disable(&dev->mt76.napi[i]);
}
napi_disable(&dev->mt76.tx_napi);

/* token reinit */
mt7915_tx_token_put(dev);
idr_init(&dev->mt76.token);

mt7915_dma_reset(dev, true);

local_bh_disable();
mt76_for_each_q_rx(mdev, i) {
if (mdev->q_rx[i].ndesc) {
napi_enable(&dev->mt76.napi[i]);
napi_schedule(&dev->mt76.napi[i]);
}
}
local_bh_enable();
clear_bit(MT76_MCU_RESET, &dev->mphy.state);
clear_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state);

mt76_wr(dev, MT_INT_MASK_CSR, dev->mt76.mmio.irqmask);
mt76_wr(dev, MT_INT_SOURCE_CSR, ~0);

if (dev->hif2) {
mt76_wr(dev, MT_INT1_MASK_CSR, irq_mask);
mt76_wr(dev, MT_INT1_SOURCE_CSR, ~0);
}
if (dev_is_pci(mdev->dev)) {
mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);
if (dev->hif2)
mt76_wr(dev, MT_PCIE1_MAC_INT_ENABLE, 0xff);
}

/* load firmware */
ret = mt7915_mcu_init_firmware(dev);
if (ret)
goto out;

/* set the necessary init items */
ret = mt7915_mcu_set_eeprom(dev);
if (ret)
goto out;

mt7915_mac_init(dev);
mt7915_init_txpower(dev, &dev->mphy.sband_2g.sband);
mt7915_init_txpower(dev, &dev->mphy.sband_5g.sband);
ret = mt7915_txbf_init(dev);

if (test_bit(MT76_STATE_RUNNING, &dev->mphy.state)) {
ret = mt7915_run(dev->mphy.hw);
if (ret)
goto out;
}

if (ext_phy && test_bit(MT76_STATE_RUNNING, &ext_phy->state)) {
ret = mt7915_run(ext_phy->hw);
if (ret)
goto out;
}

out:
/* reset done */
clear_bit(MT76_RESET, &dev->mphy.state);
if (phy2)
clear_bit(MT76_RESET, &phy2->mt76->state);

local_bh_disable();
napi_enable(&dev->mt76.tx_napi);
napi_schedule(&dev->mt76.tx_napi);
local_bh_enable();

mt76_worker_enable(&dev->mt76.tx_worker);

return ret;
}

static void
mt7915_mac_full_reset(struct mt7915_dev *dev)
{
struct mt7915_phy *phy2;
struct mt76_phy *ext_phy;
int i;

ext_phy = dev->mt76.phys[MT_BAND1];
phy2 = ext_phy ? ext_phy->priv : NULL;

dev->recovery.hw_full_reset = true;

wake_up(&dev->mt76.mcu.wait);
ieee80211_stop_queues(mt76_hw(dev));
if (ext_phy)
ieee80211_stop_queues(ext_phy->hw);

cancel_delayed_work_sync(&dev->mphy.mac_work);
if (ext_phy)
cancel_delayed_work_sync(&ext_phy->mac_work);

mutex_lock(&dev->mt76.mutex);
for (i = 0; i < 10; i++) {
if (!mt7915_mac_restart(dev))
break;
}
mutex_unlock(&dev->mt76.mutex);

if (i == 10)
dev_err(dev->mt76.dev, "chip full reset failed\n");

ieee80211_restart_hw(mt76_hw(dev));
if (ext_phy)
ieee80211_restart_hw(ext_phy->hw);

ieee80211_wake_queues(mt76_hw(dev));
if (ext_phy)
ieee80211_wake_queues(ext_phy->hw);

dev->recovery.hw_full_reset = false;
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mphy.mac_work,
MT7915_WATCHDOG_TIME);
if (ext_phy)
ieee80211_queue_delayed_work(ext_phy->hw,
&ext_phy->mac_work,
MT7915_WATCHDOG_TIME);
}

/* system error recovery */
void mt7915_mac_reset_work(struct work_struct *work)
{
Expand All @@ -1358,7 +1523,28 @@ void mt7915_mac_reset_work(struct work_struct *work)
ext_phy = dev->mt76.phys[MT_BAND1];
phy2 = ext_phy ? ext_phy->priv : NULL;

if (!(READ_ONCE(dev->reset_state) & MT_MCU_CMD_STOP_DMA))
/* chip full reset */
if (dev->recovery.restart) {
/* disable WA/WM WDT */
mt76_clear(dev, MT_WFDMA0_MCU_HOST_INT_ENA,
MT_MCU_CMD_WDT_MASK);

mt7915_mac_full_reset(dev);

/* enable mcu irq */
mt7915_irq_enable(dev, MT_INT_MCU_CMD);
mt7915_irq_disable(dev, 0);

/* enable WA/WM WDT */
mt76_set(dev, MT_WFDMA0_MCU_HOST_INT_ENA, MT_MCU_CMD_WDT_MASK);

dev->recovery.state = MT_MCU_CMD_NORMAL_STATE;
dev->recovery.restart = false;
return;
}

/* chip partial reset */
if (!(READ_ONCE(dev->recovery.state) & MT_MCU_CMD_STOP_DMA))
return;

ieee80211_stop_queues(mt76_hw(dev));
Expand Down Expand Up @@ -1432,6 +1618,30 @@ void mt7915_mac_reset_work(struct work_struct *work)
MT7915_WATCHDOG_TIME);
}

void mt7915_reset(struct mt7915_dev *dev)
{
if (!dev->recovery.hw_init_done)
return;

if (dev->recovery.hw_full_reset)
return;

/* wm/wa exception: do full recovery */
if (READ_ONCE(dev->recovery.state) & MT_MCU_CMD_WDT_MASK) {
dev->recovery.restart = true;
dev_info(dev->mt76.dev,
"%s indicated firmware crash, attempting recovery\n",
wiphy_name(dev->mt76.hw->wiphy));

mt7915_irq_disable(dev, MT_INT_MCU_CMD);
queue_work(dev->mt76.wq, &dev->reset_work);
return;
}

queue_work(dev->mt76.wq, &dev->reset_work);
wake_up(&dev->reset_wait);
}

void mt7915_mac_update_stats(struct mt7915_phy *phy)
{
struct mt7915_dev *dev = phy->dev;
Expand Down
18 changes: 13 additions & 5 deletions mt7915/main.c
View file
Expand Up @@ -20,17 +20,13 @@ static bool mt7915_dev_running(struct mt7915_dev *dev)
return phy && test_bit(MT76_STATE_RUNNING, &phy->mt76->state);
}

static int mt7915_start(struct ieee80211_hw *hw)
int mt7915_run(struct ieee80211_hw *hw)
{
struct mt7915_dev *dev = mt7915_hw_dev(hw);
struct mt7915_phy *phy = mt7915_hw_phy(hw);
bool running;
int ret;

flush_work(&dev->init_work);

mutex_lock(&dev->mt76.mutex);

running = mt7915_dev_running(dev);

if (!running) {
Expand Down Expand Up @@ -80,6 +76,18 @@ static int mt7915_start(struct ieee80211_hw *hw)
mt7915_mac_reset_counters(phy);

out:
return ret;
}

static int mt7915_start(struct ieee80211_hw *hw)
{
struct mt7915_dev *dev = mt7915_hw_dev(hw);
int ret;

flush_work(&dev->init_work);

mutex_lock(&dev->mt76.mutex);
ret = mt7915_run(hw);
mutex_unlock(&dev->mt76.mutex);

return ret;
Expand Down
24 changes: 15 additions & 9 deletions mt7915/mcu.c
View file
Expand Up @@ -2249,18 +2249,10 @@ mt7915_mcu_init_rx_airtime(struct mt7915_dev *dev)
sizeof(req), true);
}

int mt7915_mcu_init(struct mt7915_dev *dev)
int mt7915_mcu_init_firmware(struct mt7915_dev *dev)
{
static const struct mt76_mcu_ops mt7915_mcu_ops = {
.headroom = sizeof(struct mt76_connac2_mcu_txd),
.mcu_skb_send_msg = mt7915_mcu_send_message,
.mcu_parse_response = mt7915_mcu_parse_response,
.mcu_restart = mt76_connac_mcu_restart,
};
int ret;

dev->mt76.mcu_ops = &mt7915_mcu_ops;

/* force firmware operation mode into normal state,
* which should be set before firmware download stage.
*/
Expand Down Expand Up @@ -2309,6 +2301,20 @@ int mt7915_mcu_init(struct mt7915_dev *dev)
MCU_WA_PARAM_RED, 0, 0);
}

int mt7915_mcu_init(struct mt7915_dev *dev)
{
static const struct mt76_mcu_ops mt7915_mcu_ops = {
.headroom = sizeof(struct mt76_connac2_mcu_txd),
.mcu_skb_send_msg = mt7915_mcu_send_message,
.mcu_parse_response = mt7915_mcu_parse_response,
.mcu_restart = mt76_connac_mcu_restart,
};

dev->mt76.mcu_ops = &mt7915_mcu_ops;

return mt7915_mcu_init_firmware(dev);
}

void mt7915_mcu_exit(struct mt7915_dev *dev)
{
__mt76_mcu_restart(&dev->mt76);
Expand Down
7 changes: 3 additions & 4 deletions mt7915/mmio.c
View file
Expand Up @@ -746,10 +746,9 @@ static void mt7915_irq_tasklet(struct tasklet_struct *t)
u32 val = mt76_rr(dev, MT_MCU_CMD);

mt76_wr(dev, MT_MCU_CMD, val);
if (val & MT_MCU_CMD_ERROR_MASK) {
dev->reset_state = val;
queue_work(dev->mt76.wq, &dev->reset_work);
wake_up(&dev->reset_wait);
if (val & (MT_MCU_CMD_ERROR_MASK | MT_MCU_CMD_WDT_MASK)) {
dev->recovery.state = val;
mt7915_reset(dev);
}
}
}
Expand Down

0 comments on commit 1ad31c3

Please sign in to comment.