mt76: mt7615: add multiple wiphy support to the rx path

Program the RMAC CHFREQ registers to properly indicate the band that the
frames are received on.
Add some sanity checks to the programmed values, because the firmware
programs these registers differently

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index 89d6a21820acca57a430644bf24f4aebe51104d4..886c54a912524aaca3de4095cd83d142989863a5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -70,6 +70,8 @@ void mt7615_mac_reset_counters(struct mt7615_dev *dev)
 int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)
 {
        struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;
+       struct mt76_phy *mphy = &dev->mt76.phy;
+       struct mt7615_phy *phy = &dev->phy;
        struct ieee80211_supported_band *sband;
        struct ieee80211_hdr *hdr;
        __le32 *rxd = (__le32 *)skb->data;
@@ -78,11 +80,28 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)
        u32 rxd2 = le32_to_cpu(rxd[2]);
        bool unicast, remove_pad, insert_ccmp_hdr = false;
        int i, idx;
+       u8 chfreq;
+
+       memset(status, 0, sizeof(*status));
 
-       if (!test_bit(MT76_STATE_RUNNING, &dev->mphy.state))
+       chfreq = FIELD_GET(MT_RXD1_NORMAL_CH_FREQ, rxd1);
+       if (!(chfreq & MT_CHFREQ_VALID))
                return -EINVAL;
 
-       memset(status, 0, sizeof(*status));
+       if (chfreq & MT_CHFREQ_DBDC_IDX) {
+               mphy = dev->mt76.phy2;
+               if (!mphy)
+                       return -EINVAL;
+
+               phy = mphy->priv;
+               status->ext_phy = true;
+       }
+
+       if ((chfreq & MT_CHFREQ_SEQ) != phy->chfreq_seq)
+               return -EINVAL;
+
+       if (!test_bit(MT76_STATE_RUNNING, &mphy->state))
+               return -EINVAL;
 
        unicast = (rxd1 & MT_RXD1_NORMAL_ADDR_TYPE) == MT_RXD1_NORMAL_U2M;
        idx = FIELD_GET(MT_RXD2_NORMAL_WLAN_IDX, rxd2);
@@ -98,13 +117,12 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)
                spin_unlock_bh(&dev->sta_poll_lock);
        }
 
-       /* TODO: properly support DBDC */
-       status->freq = dev->mphy.chandef.chan->center_freq;
-       status->band = dev->mphy.chandef.chan->band;
+       status->freq = mphy->chandef.chan->center_freq;
+       status->band = mphy->chandef.chan->band;
        if (status->band == NL80211_BAND_5GHZ)
-               sband = &dev->mphy.sband_5g.sband;
+               sband = &mphy->sband_5g.sband;
        else
-               sband = &dev->mphy.sband_2g.sband;
+               sband = &mphy->sband_2g.sband;
 
        if (rxd2 & MT_RXD2_NORMAL_FCS_ERR)
                status->flag |= RX_FLAG_FAILED_FCS_CRC;
@@ -124,13 +142,13 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)
                status->flag |= RX_FLAG_AMPDU_DETAILS;
 
                /* all subframes of an A-MPDU have the same timestamp */
-               if (dev->rx_ampdu_ts != rxd[12]) {
-                       if (!++dev->ampdu_ref)
-                               dev->ampdu_ref++;
+               if (phy->rx_ampdu_ts != rxd[12]) {
+                       if (!++phy->ampdu_ref)
+                               phy->ampdu_ref++;
                }
-               dev->rx_ampdu_ts = rxd[12];
+               phy->rx_ampdu_ts = rxd[12];
 
-               status->ampdu_ref = dev->ampdu_ref;
+               status->ampdu_ref = phy->ampdu_ref;
        }
 
        remove_pad = rxd1 & MT_RXD1_NORMAL_HDR_OFFSET;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
index 35e2d258db5e3a07f06455391d16f7d42c5570b2..6b60ca80a24196387443070701712f2ca4178363 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
@@ -178,6 +178,7 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw,
 static int mt7615_set_channel(struct mt7615_phy *phy)
 {
        struct mt7615_dev *dev = phy->dev;
+       bool ext_phy = phy != &dev->phy;
        int ret;
 
        cancel_delayed_work_sync(&dev->mt76.mac_work);
@@ -185,6 +186,7 @@ static int mt7615_set_channel(struct mt7615_phy *phy)
        mutex_lock(&dev->mt76.mutex);
        set_bit(MT76_RESET, &phy->mt76->state);
 
+       phy->chfreq_seq = (phy->chfreq_seq + 1) & MT_CHFREQ_SEQ;
        phy->dfs_state = -1;
        mt76_set_channel(phy->mt76);
 
@@ -192,6 +194,11 @@ static int mt7615_set_channel(struct mt7615_phy *phy)
        if (ret)
                goto out;
 
+       mt76_wr(dev, MT_CHFREQ(ext_phy),
+               MT_CHFREQ_VALID |
+               (ext_phy * MT_CHFREQ_DBDC_IDX) |
+               phy->chfreq_seq);
+
        ret = mt7615_dfs_init_radar_detector(phy);
        mt7615_mac_cca_stats_reset(phy);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 37d3b09712921df3b2fc57a146a64fdc570393bc..64c8ad64733bc24a0b8770acd0a0e7accbaeeced 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -36,6 +36,10 @@
 #define MT_FRAC_SCALE          12
 #define MT_FRAC(val, div)      (((val) << MT_FRAC_SCALE) / (div))
 
+#define MT_CHFREQ_VALID                BIT(7)
+#define MT_CHFREQ_DBDC_IDX     BIT(6)
+#define MT_CHFREQ_SEQ          GENMASK(5, 0)
+
 struct mt7615_vif;
 struct mt7615_sta;
 
@@ -92,8 +96,12 @@ struct mt7615_phy {
 
        u16 chainmask;
 
+       u8 chfreq_seq;
        u8 rdd_state;
        int dfs_state;
+
+       __le32 rx_ampdu_ts;
+       u32 ampdu_ref;
 };
 
 struct mt7615_dev {
@@ -106,9 +114,6 @@ struct mt7615_dev {
        u32 vif_mask;
        u32 omac_mask;
 
-       __le32 rx_ampdu_ts;
-       u32 ampdu_ref;
-
        struct list_head sta_poll_list;
        spinlock_t sta_poll_lock;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
index a805561d10c425fcb28d739fe607b5c7853f7e78..d0602a3b0ac1f4bb7f5f73c8953005c0b4592f07 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
@@ -200,6 +200,8 @@
 #define MT_WF_RFCR1_DROP_CFEND         BIT(7)
 #define MT_WF_RFCR1_DROP_CFACK         BIT(8)
 
+#define MT_CHFREQ(_band)               MT_WF_RMAC((_band) ? 0x130 : 0x030)
+
 #define MT_WF_RMAC_MIB_TIME0           MT_WF_RMAC(0x03c4)
 #define MT_WF_RMAC_MIB_RXTIME_CLR      BIT(31)
 #define MT_WF_RMAC_MIB_RXTIME_EN       BIT(30)