mt76: mt7615: check mcu returned values in mt7615_ops

Properly check returned values from mcu utility routines in
mt7615_ops.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
index 2380854..4caf2b6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
@@ -29,6 +29,7 @@ static int mt7615_start(struct ieee80211_hw *hw)
        struct mt7615_dev *dev = mt7615_hw_dev(hw);
        struct mt7615_phy *phy = mt7615_hw_phy(hw);
        bool running;
+       int ret;
 
        if (!mt7615_wait_for_mcu_init(dev))
                return -EIO;
@@ -38,21 +39,38 @@ static int mt7615_start(struct ieee80211_hw *hw)
        running = mt7615_dev_running(dev);
 
        if (!running) {
-               mt7615_mcu_set_pm(dev, 0, 0);
-               mt76_connac_mcu_set_mac_enable(&dev->mt76, 0, true, false);
+               ret = mt7615_mcu_set_pm(dev, 0, 0);
+               if (ret)
+                       goto out;
+
+               ret = mt76_connac_mcu_set_mac_enable(&dev->mt76, 0, true, false);
+               if (ret)
+                       goto out;
+
                mt7615_mac_enable_nf(dev, 0);
        }
 
        if (phy != &dev->phy) {
-               mt7615_mcu_set_pm(dev, 1, 0);
-               mt76_connac_mcu_set_mac_enable(&dev->mt76, 1, true, false);
+               ret = mt7615_mcu_set_pm(dev, 1, 0);
+               if (ret)
+                       goto out;
+
+               ret = mt76_connac_mcu_set_mac_enable(&dev->mt76, 1, true, false);
+               if (ret)
+                       goto out;
+
                mt7615_mac_enable_nf(dev, 1);
        }
 
-       if (mt7615_firmware_offload(dev))
-               mt76_connac_mcu_set_channel_domain(phy->mt76);
+       if (mt7615_firmware_offload(dev)) {
+               ret = mt76_connac_mcu_set_channel_domain(phy->mt76);
+               if (ret)
+                       goto out;
+       }
 
-       mt7615_mcu_set_chan_info(phy, MCU_EXT_CMD_SET_RX_PATH);
+       ret = mt7615_mcu_set_chan_info(phy, MCU_EXT_CMD_SET_RX_PATH);
+       if (ret)
+               goto out;
 
        set_bit(MT76_STATE_RUNNING, &phy->mt76->state);
 
@@ -62,9 +80,10 @@ static int mt7615_start(struct ieee80211_hw *hw)
        if (!running)
                mt7615_mac_reset_counters(dev);
 
+out:
        mt7615_mutex_release(dev);
 
-       return 0;
+       return ret;
 }
 
 static void mt7615_stop(struct ieee80211_hw *hw)
@@ -197,7 +216,9 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,
        dev->omac_mask |= BIT_ULL(mvif->mt76.omac_idx);
        phy->omac_mask |= BIT_ULL(mvif->mt76.omac_idx);
 
-       mt7615_mcu_set_dbdc(dev);
+       ret = mt7615_mcu_set_dbdc(dev);
+       if (ret)
+               goto out;
 
        idx = MT7615_WTBL_RESERVED - mvif->mt76.idx;
 
@@ -296,8 +317,13 @@ int mt7615_set_channel(struct mt7615_phy *phy)
        mt76_set_channel(phy->mt76);
 
        if (is_mt7615(&dev->mt76) && dev->flash_eeprom) {
-               mt7615_mcu_apply_rx_dcoc(phy);
-               mt7615_mcu_apply_tx_dpd(phy);
+               ret = mt7615_mcu_apply_rx_dcoc(phy);
+               if (ret)
+                       goto out;
+
+               ret = mt7615_mcu_apply_tx_dpd(phy);
+               if (ret)
+                       goto out;
        }
 
        ret = mt7615_mcu_set_chan_info(phy, MCU_EXT_CMD_CHANNEL_SWITCH);
@@ -306,8 +332,13 @@ int mt7615_set_channel(struct mt7615_phy *phy)
 
        mt7615_mac_set_timing(phy);
        ret = mt7615_dfs_init_radar_detector(phy);
+       if (ret)
+               goto out;
+
        mt7615_mac_cca_stats_reset(phy);
-       mt7615_mcu_set_sku_en(phy, true);
+       ret = mt7615_mcu_set_sku_en(phy, true);
+       if (ret)
+               goto out;
 
        mt7615_mac_reset_counters(dev);
        phy->noise = 0;
@@ -587,15 +618,21 @@ int mt7615_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
        if (err)
                return err;
 
-       if (vif->type == NL80211_IFTYPE_STATION && !sta->tdls)
-               mt7615_mcu_add_bss_info(phy, vif, sta, true);
+       if (vif->type == NL80211_IFTYPE_STATION && !sta->tdls) {
+               err = mt7615_mcu_add_bss_info(phy, vif, sta, true);
+               if (err)
+                       return err;
+       }
+
        mt7615_mac_wtbl_update(dev, idx,
                               MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
-       mt7615_mcu_sta_add(&dev->phy, vif, sta, true);
+       err = mt7615_mcu_sta_add(&dev->phy, vif, sta, true);
+       if (err)
+               return err;
 
        mt76_connac_power_save_sched(phy->mt76, &dev->pm);
 
-       return 0;
+       return err;
 }
 EXPORT_SYMBOL_GPL(mt7615_mac_sta_add);
 
@@ -715,13 +752,13 @@ static int mt7615_set_rts_threshold(struct ieee80211_hw *hw, u32 val)
 {
        struct mt7615_dev *dev = mt7615_hw_dev(hw);
        struct mt7615_phy *phy = mt7615_hw_phy(hw);
-       int band = phy != &dev->phy;
+       int err, band = phy != &dev->phy;
 
        mt7615_mutex_acquire(dev);
-       mt76_connac_mcu_set_rts_thresh(&dev->mt76, val, band);
+       err = mt76_connac_mcu_set_rts_thresh(&dev->mt76, val, band);
        mt7615_mutex_release(dev);
 
-       return 0;
+       return err;
 }
 
 static int
@@ -749,16 +786,16 @@ mt7615_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        case IEEE80211_AMPDU_RX_START:
                mt76_rx_aggr_start(&dev->mt76, &msta->wcid, tid, ssn,
                                   params->buf_size);
-               mt7615_mcu_add_rx_ba(dev, params, true);
+               ret = mt7615_mcu_add_rx_ba(dev, params, true);
                break;
        case IEEE80211_AMPDU_RX_STOP:
                mt76_rx_aggr_stop(&dev->mt76, &msta->wcid, tid);
-               mt7615_mcu_add_rx_ba(dev, params, false);
+               ret = mt7615_mcu_add_rx_ba(dev, params, false);
                break;
        case IEEE80211_AMPDU_TX_OPERATIONAL:
                mtxq->aggr = true;
                mtxq->send_bar = false;
-               mt7615_mcu_add_tx_ba(dev, params, true);
+               ret = mt7615_mcu_add_tx_ba(dev, params, true);
                ssn = mt7615_mac_get_sta_tid_sn(dev, msta->wcid.idx, tid);
                ieee80211_send_bar(vif, sta->addr, tid,
                                   IEEE80211_SN_TO_SEQ(ssn));
@@ -766,7 +803,7 @@ mt7615_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        case IEEE80211_AMPDU_TX_STOP_FLUSH:
        case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
                mtxq->aggr = false;
-               mt7615_mcu_add_tx_ba(dev, params, false);
+               ret = mt7615_mcu_add_tx_ba(dev, params, false);
                break;
        case IEEE80211_AMPDU_TX_START:
                ssn = mt7615_mac_get_sta_tid_sn(dev, msta->wcid.idx, tid);
@@ -775,7 +812,7 @@ mt7615_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                break;
        case IEEE80211_AMPDU_TX_STOP_CONT:
                mtxq->aggr = false;
-               mt7615_mcu_add_tx_ba(dev, params, false);
+               ret = mt7615_mcu_add_tx_ba(dev, params, false);
                ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
                break;
        }
@@ -1091,6 +1128,7 @@ static int mt7615_cancel_remain_on_channel(struct ieee80211_hw *hw,
                                           struct ieee80211_vif *vif)
 {
        struct mt7615_phy *phy = mt7615_hw_phy(hw);
+       int err;
 
        if (!test_and_clear_bit(MT76_STATE_ROC, &phy->mt76->state))
                return 0;
@@ -1099,10 +1137,10 @@ static int mt7615_cancel_remain_on_channel(struct ieee80211_hw *hw,
        cancel_work_sync(&phy->roc_work);
 
        mt7615_mutex_acquire(phy->dev);
-       mt7615_mcu_set_roc(phy, vif, NULL, 0);
+       err = mt7615_mcu_set_roc(phy, vif, NULL, 0);
        mt7615_mutex_release(phy->dev);
 
-       return 0;
+       return err;
 }
 
 static void mt7615_sta_set_decap_offload(struct ieee80211_hw *hw,