wifi: mt76: mt7915: set correct antenna for radar detection on MT7915D

For MT7915D, correct antenna index should be set to let DFS radar
detection work on the 5 GHz band.

Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 89a3810ee53f5e96229773f4e1a424124594ab08..d0285a02775a8562e70daa40a46b0ee1ad5ee1d6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -1818,6 +1818,13 @@ static int mt7915_dfs_start_rdd(struct mt7915_dev *dev, int chain)
        if (err < 0)
                return err;
 
+       if (is_mt7915(&dev->mt76)) {
+               err = mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_SET_WF_ANT, chain,
+                                             0, dev->dbdc_support ? 2 : 0);
+               if (err < 0)
+                       return err;
+       }
+
        return mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_DET_MODE, chain,
                                       MT_RX_SEL0, 1);
 }
@@ -1938,6 +1945,14 @@ stop:
        if (err < 0)
                return err;
 
+       if (is_mt7915(&dev->mt76)) {
+               err = mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_SET_WF_ANT,
+                                             phy->band_idx, 0,
+                                             dev->dbdc_support ? 2 : 0);
+               if (err < 0)
+                       return err;
+       }
+
        mt7915_dfs_stop_radar_detector(phy);
        phy->mt76->dfs_state = MT_DFS_STATE_DISABLED;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index 1eb11617a62553ab22ad82b1a76ddc7f56d482d8..c90a148d6239e6804cb8856f3f722016d5378853 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -357,6 +357,7 @@ enum mt7915_rdd_cmd {
        RDD_DET_MODE,
        RDD_RADAR_EMULATE,
        RDD_START_TXQ = 20,
+       RDD_SET_WF_ANT = 30,
        RDD_CAC_START = 50,
        RDD_CAC_END,
        RDD_NORMAL_START,