mt76: use le32/16_get_bits() whenever possible

Switch to use le32/16_get_bits() to simplfy codes and specify
the size explicitly to avoid potential issues.

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/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
index 415ea17b9be6da0ad5cdf22e682b3ae76330eb7c..37b092e3ea51d14363e16fa86164d791656476e7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
@@ -76,7 +76,7 @@ void mt7603_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
        __le32 *end = (__le32 *)&skb->data[skb->len];
        enum rx_pkt_type type;
 
-       type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));
+       type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);
 
        if (q == MT_RXQ_MCU) {
                if (type == PKT_TYPE_RX_EVENT)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index 2e5d26616bc228ef64a3c4ac761a096b2f50aacc..17713c821d808fc6fc933902be03b350c7c02112 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -1130,7 +1130,7 @@ mt7603_fill_txs(struct mt7603_dev *dev, struct mt7603_sta *sta,
        }
 
        rate_set_tsf = READ_ONCE(sta->rate_set_tsf);
-       rs_idx = !((u32)(FIELD_GET(MT_TXS1_F0_TIMESTAMP, le32_to_cpu(txs_data[1])) -
+       rs_idx = !((u32)(le32_get_bits(txs_data[1], MT_TXS1_F0_TIMESTAMP) -
                         rate_set_tsf) < 1000000);
        rs_idx ^= rate_set_tsf & BIT(0);
        rs = &sta->rateset[rs_idx];
@@ -1244,14 +1244,11 @@ void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data)
        struct mt7603_sta *msta = NULL;
        struct mt76_wcid *wcid;
        __le32 *txs_data = data;
-       u32 txs;
        u8 wcidx;
        u8 pid;
 
-       txs = le32_to_cpu(txs_data[4]);
-       pid = FIELD_GET(MT_TXS4_PID, txs);
-       txs = le32_to_cpu(txs_data[3]);
-       wcidx = FIELD_GET(MT_TXS3_WCID, txs);
+       pid = le32_get_bits(txs_data[4], MT_TXS4_PID);
+       wcidx = le32_get_bits(txs_data[3], MT_TXS3_WCID);
 
        if (pid == MT_PACKET_ID_NO_ACK)
                return;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index d1d87240f24f9c21273d39d9201c5fc1be7af7b8..bd687f7de628934e380e81e798ae98703e6f28ff 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -261,7 +261,7 @@ static int mt7615_reverse_frag0_hdr_trans(struct sk_buff *skb, u16 hdr_gap)
        struct ieee80211_hdr hdr;
        u16 frame_control;
 
-       if (FIELD_GET(MT_RXD1_NORMAL_ADDR_TYPE, le32_to_cpu(rxd[1])) !=
+       if (le32_get_bits(rxd[1], MT_RXD1_NORMAL_ADDR_TYPE) !=
            MT_RXD1_NORMAL_U2M)
                return -EINVAL;
 
@@ -1427,7 +1427,7 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta,
        }
 
        rate_set_tsf = READ_ONCE(sta->rate_set_tsf);
-       rs_idx = !((u32)(FIELD_GET(MT_TXS4_F0_TIMESTAMP, le32_to_cpu(txs_data[4])) -
+       rs_idx = !((u32)(le32_get_bits(txs_data[4], MT_TXS4_F0_TIMESTAMP) -
                         rate_set_tsf) < 1000000);
        rs_idx ^= rate_set_tsf & BIT(0);
        rs = &sta->rateset[rs_idx];
@@ -1558,14 +1558,11 @@ static void mt7615_mac_add_txs(struct mt7615_dev *dev, void *data)
        struct mt76_wcid *wcid;
        struct mt76_phy *mphy = &dev->mt76.phy;
        __le32 *txs_data = data;
-       u32 txs;
        u8 wcidx;
        u8 pid;
 
-       txs = le32_to_cpu(txs_data[0]);
-       pid = FIELD_GET(MT_TXS0_PID, txs);
-       txs = le32_to_cpu(txs_data[2]);
-       wcidx = FIELD_GET(MT_TXS2_WCID, txs);
+       pid = le32_get_bits(txs_data[0], MT_TXS0_PID);
+       wcidx = le32_get_bits(txs_data[2], MT_TXS2_WCID);
 
        if (pid == MT_PACKET_ID_NO_ACK)
                return;
@@ -1653,7 +1650,7 @@ static void mt7615_mac_tx_free(struct mt7615_dev *dev, void *data, int len)
                        mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[i], false);
        }
 
-       count = FIELD_GET(MT_TX_FREE_MSDU_ID_CNT, le16_to_cpu(free->ctrl));
+       count = le16_get_bits(free->ctrl, MT_TX_FREE_MSDU_ID_CNT);
        if (is_mt7615(&dev->mt76)) {
                __le16 *token = &free->token[0];
 
@@ -1686,7 +1683,8 @@ bool mt7615_rx_check(struct mt76_dev *mdev, void *data, int len)
        __le32 *end = (__le32 *)&rxd[len / 4];
        enum rx_pkt_type type;
 
-       type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));
+       type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);
+
        switch (type) {
        case PKT_TYPE_TXRX_NOTIFY:
                mt7615_mac_tx_free(dev, data, len);
@@ -1710,8 +1708,8 @@ void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
        enum rx_pkt_type type;
        u16 flag;
 
-       type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));
-       flag = FIELD_GET(MT_RXD0_PKT_FLAG, le32_to_cpu(rxd[0]));
+       type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);
+       flag = le32_get_bits(rxd[0], MT_RXD0_PKT_FLAG);
        if (type == PKT_TYPE_RX_EVENT && flag == 0x1)
                type = PKT_TYPE_NORMAL_MCU;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index b02451c775c0cac64be30171e05c4be4308ca41b..44866d4dab977534fdf4488dc8093a83f2b8ef50 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -226,8 +226,8 @@ mt7915_mac_decode_he_radiotap_ru(struct mt76_rx_status *status,
        u32 ru_h, ru_l;
        u8 ru, offs = 0;
 
-       ru_l = FIELD_GET(MT_PRXV_HE_RU_ALLOC_L, le32_to_cpu(rxv[0]));
-       ru_h = FIELD_GET(MT_PRXV_HE_RU_ALLOC_H, le32_to_cpu(rxv[1]));
+       ru_l = le32_get_bits(rxv[0], MT_PRXV_HE_RU_ALLOC_L);
+       ru_h = le32_get_bits(rxv[1], MT_PRXV_HE_RU_ALLOC_H);
        ru = (u8)(ru_l | ru_h << 4);
 
        status->bw = RATE_INFO_BW_HE_RU;
@@ -400,7 +400,7 @@ static int mt7915_reverse_frag0_hdr_trans(struct sk_buff *skb, u16 hdr_gap)
        struct ieee80211_hdr hdr;
        u16 frame_control;
 
-       if (FIELD_GET(MT_RXD3_NORMAL_ADDR_TYPE, le32_to_cpu(rxd[3])) !=
+       if (le32_get_bits(rxd[3], MT_RXD3_NORMAL_ADDR_TYPE) !=
            MT_RXD3_NORMAL_U2M)
                return -EINVAL;
 
@@ -861,7 +861,7 @@ mt7915_mac_fill_rx_vector(struct mt7915_dev *dev, struct sk_buff *skb)
        u8 snr;
        int i;
 
-       band_idx = FIELD_GET(MT_RXV_HDR_BAND_IDX, le32_to_cpu(rxv_hdr[1]));
+       band_idx = le32_get_bits(rxv_hdr[1], MT_RXV_HDR_BAND_IDX);
        if (band_idx && !phy->band_idx)
                phy = mt7915_ext_phy(dev);
 
@@ -1356,7 +1356,7 @@ mt7915_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi)
        if (!sta || !(sta->ht_cap.ht_supported || sta->he_cap.has_he))
                return;
 
-       tid = FIELD_GET(MT_TXD1_TID, le32_to_cpu(txwi[1]));
+       tid = le32_get_bits(txwi[1], MT_TXD1_TID);
        if (tid >= 6) /* skip VO queue */
                return;
 
@@ -1404,7 +1404,7 @@ mt7915_txwi_free(struct mt7915_dev *dev, struct mt76_txwi_cache *t,
                if (likely(t->skb->protocol != cpu_to_be16(ETH_P_PAE)))
                        mt7915_tx_check_aggr(sta, txwi);
        } else {
-               wcid_idx = FIELD_GET(MT_TXD1_WLAN_IDX, le32_to_cpu(txwi[1]));
+               wcid_idx = le32_get_bits(txwi[1], MT_TXD1_WLAN_IDX);
        }
 
        __mt76_tx_complete_skb(mdev, wcid_idx, t->skb, free_list);
@@ -1438,12 +1438,7 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len)
                mt76_queue_tx_cleanup(dev, mphy_ext->q_tx[MT_TXQ_BE], false);
        }
 
-       /*
-        * TODO: MT_TX_FREE_LATENCY is msdu time from the TXD is queued into PLE,
-        * to the time ack is received or dropped by hw (air + hw queue time).
-        * Should avoid accessing WTBL to get Tx airtime, and use it instead.
-        */
-       total = FIELD_GET(MT_TX_FREE_MSDU_CNT, le16_to_cpu(free->ctrl));
+       total = le16_get_bits(free->ctrl, MT_TX_FREE_MSDU_CNT);
        v3 = (FIELD_GET(MT_TX_FREE_VER, txd) == 0x4);
        if (WARN_ON_ONCE((void *)&free->info[total >> v3] > end))
                return;
@@ -1636,18 +1631,13 @@ static void mt7915_mac_add_txs(struct mt7915_dev *dev, void *data)
        struct mt76_wcid *wcid;
        __le32 *txs_data = data;
        u16 wcidx;
-       u32 txs;
        u8 pid;
 
-       txs = le32_to_cpu(txs_data[0]);
-       if (FIELD_GET(MT_TXS0_TXS_FORMAT, txs) > 1)
+       if (le32_get_bits(txs_data[0], MT_TXS0_TXS_FORMAT) > 1)
                return;
 
-       txs = le32_to_cpu(txs_data[2]);
-       wcidx = FIELD_GET(MT_TXS2_WCID, txs);
-
-       txs = le32_to_cpu(txs_data[3]);
-       pid = FIELD_GET(MT_TXS3_PID, txs);
+       wcidx = le32_get_bits(txs_data[2], MT_TXS2_WCID);
+       pid = le32_get_bits(txs_data[3], MT_TXS3_PID);
 
        if (pid < MT_PACKET_ID_FIRST)
                return;
@@ -1684,7 +1674,8 @@ bool mt7915_rx_check(struct mt76_dev *mdev, void *data, int len)
        __le32 *end = (__le32 *)&rxd[len / 4];
        enum rx_pkt_type type;
 
-       type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));
+       type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);
+
        switch (type) {
        case PKT_TYPE_TXRX_NOTIFY:
                mt7915_mac_tx_free(dev, data, len);
@@ -1709,7 +1700,7 @@ void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
        __le32 *end = (__le32 *)&skb->data[skb->len];
        enum rx_pkt_type type;
 
-       type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));
+       type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);
 
        switch (type) {
        case PKT_TYPE_TXRX_NOTIFY:

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index ea2a655acc6ae67e2747d1019b8a87c6e28ff61b..8bd8b4fe1047dba6c04ad7bf8f0c4404b2d3f4b3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -176,8 +176,8 @@ mt7921_mac_decode_he_radiotap_ru(struct mt76_rx_status *status,
        u32 ru_h, ru_l;
        u8 ru, offs = 0;
 
-       ru_l = FIELD_GET(MT_PRXV_HE_RU_ALLOC_L, le32_to_cpu(rxv[0]));
-       ru_h = FIELD_GET(MT_PRXV_HE_RU_ALLOC_H, le32_to_cpu(rxv[1]));
+       ru_l = le32_get_bits(rxv[0], MT_PRXV_HE_RU_ALLOC_L);
+       ru_h = le32_get_bits(rxv[1], MT_PRXV_HE_RU_ALLOC_H);
        ru = (u8)(ru_l | ru_h << 4);
 
        status->bw = RATE_INFO_BW_HE_RU;
@@ -247,19 +247,19 @@ mt7921_mac_decode_he_mu_radiotap(struct sk_buff *skb, __le32 *rxv)
                         MU_PREP(FLAGS2_SIG_B_SYMS_USERS,
                                 le32_get_bits(rxv[2], MT_CRXV_HE_NUM_USER));
 
-       he_mu->ru_ch1[0] = FIELD_GET(MT_CRXV_HE_RU0, le32_to_cpu(rxv[3]));
+       he_mu->ru_ch1[0] = le32_get_bits(rxv[3], MT_CRXV_HE_RU0);
 
        if (status->bw >= RATE_INFO_BW_40) {
                he_mu->flags1 |= HE_BITS(MU_FLAGS1_CH2_RU_KNOWN);
                he_mu->ru_ch2[0] =
-                       FIELD_GET(MT_CRXV_HE_RU1, le32_to_cpu(rxv[3]));
+                       le32_get_bits(rxv[3], MT_CRXV_HE_RU1);
        }
 
        if (status->bw >= RATE_INFO_BW_80) {
                he_mu->ru_ch1[1] =
-                       FIELD_GET(MT_CRXV_HE_RU2, le32_to_cpu(rxv[3]));
+                       le32_get_bits(rxv[3], MT_CRXV_HE_RU2);
                he_mu->ru_ch2[1] =
-                       FIELD_GET(MT_CRXV_HE_RU3, le32_to_cpu(rxv[3]));
+                       le32_get_bits(rxv[3], MT_CRXV_HE_RU3);
        }
 }
 
@@ -409,7 +409,7 @@ static int mt7921_reverse_frag0_hdr_trans(struct sk_buff *skb, u16 hdr_gap)
        struct ieee80211_hdr hdr;
        u16 frame_control;
 
-       if (FIELD_GET(MT_RXD3_NORMAL_ADDR_TYPE, le32_to_cpu(rxd[3])) !=
+       if (le32_get_bits(rxd[3], MT_RXD3_NORMAL_ADDR_TYPE) !=
            MT_RXD3_NORMAL_U2M)
                return -EINVAL;
 
@@ -1024,7 +1024,7 @@ void mt7921_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi)
        if (!sta || !(sta->ht_cap.ht_supported || sta->he_cap.has_he))
                return;
 
-       tid = FIELD_GET(MT_TXD1_TID, le32_to_cpu(txwi[1]));
+       tid = le32_get_bits(txwi[1], MT_TXD1_TID);
        if (tid >= 6) /* skip VO queue */
                return;
 
@@ -1163,18 +1163,13 @@ void mt7921_mac_add_txs(struct mt7921_dev *dev, void *data)
        struct mt76_wcid *wcid;
        __le32 *txs_data = data;
        u16 wcidx;
-       u32 txs;
        u8 pid;
 
-       txs = le32_to_cpu(txs_data[0]);
-       if (FIELD_GET(MT_TXS0_TXS_FORMAT, txs) > 1)
+       if (le32_get_bits(txs_data[0], MT_TXS0_TXS_FORMAT) > 1)
                return;
 
-       txs = le32_to_cpu(txs_data[2]);
-       wcidx = FIELD_GET(MT_TXS2_WCID, txs);
-
-       txs = le32_to_cpu(txs_data[3]);
-       pid = FIELD_GET(MT_TXS3_PID, txs);
+       wcidx = le32_get_bits(txs_data[2], MT_TXS2_WCID);
+       pid = le32_get_bits(txs_data[3], MT_TXS3_PID);
 
        if (pid < MT_PACKET_ID_FIRST)
                return;
@@ -1213,8 +1208,8 @@ void mt7921_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
        enum rx_pkt_type type;
        u16 flag;
 
-       type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));
-       flag = FIELD_GET(MT_RXD0_PKT_FLAG, le32_to_cpu(rxd[0]));
+       type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);
+       flag = le32_get_bits(rxd[0], MT_RXD0_PKT_FLAG);
 
        if (type == PKT_TYPE_RX_EVENT && flag == 0x1)
                type = PKT_TYPE_NORMAL_MCU;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c
index 8ca58293ddf1b3f64cd025d38dfded17a03501c2..5ca14dbbdd265921df54308e857440c90b2f1d1b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c
@@ -137,7 +137,7 @@ mt7921_txwi_free(struct mt7921_dev *dev, struct mt76_txwi_cache *t,
 
                wcid_idx = wcid->idx;
        } else {
-               wcid_idx = FIELD_GET(MT_TXD1_WLAN_IDX, le32_to_cpu(txwi[1]));
+               wcid_idx = le32_get_bits(txwi[1], MT_TXD1_WLAN_IDX);
        }
 
        __mt76_tx_complete_skb(mdev, wcid_idx, t->skb, free_list);
@@ -164,11 +164,7 @@ mt7921e_mac_tx_free(struct mt7921_dev *dev, void *data, int len)
        mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_PSD], false);
        mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_BE], false);
 
-       /* TODO: MT_TX_FREE_LATENCY is msdu time from the TXD is queued into PLE,
-        * to the time ack is received or dropped by hw (air + hw queue time).
-        * Should avoid accessing WTBL to get Tx airtime, and use it instead.
-        */
-       count = FIELD_GET(MT_TX_FREE_MSDU_CNT, le16_to_cpu(free->ctrl));
+       count = le16_get_bits(free->ctrl, MT_TX_FREE_MSDU_CNT);
        if (WARN_ON_ONCE((void *)&free->info[count] > end))
                return;
 
@@ -231,7 +227,8 @@ bool mt7921e_rx_check(struct mt76_dev *mdev, void *data, int len)
        __le32 *end = (__le32 *)&rxd[len / 4];
        enum rx_pkt_type type;
 
-       type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));
+       type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);
+
        switch (type) {
        case PKT_TYPE_TXRX_NOTIFY:
                mt7921e_mac_tx_free(dev, data, len);
@@ -252,7 +249,7 @@ void mt7921e_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
        __le32 *rxd = (__le32 *)skb->data;
        enum rx_pkt_type type;
 
-       type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0]));
+       type = le32_get_bits(rxd[0], MT_RXD0_PKT_TYPE);
 
        switch (type) {
        case PKT_TYPE_TXRX_NOTIFY:

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c
index 4fd1d4765b04d3a3d9c84028349c2e83f9eb121e..09bcabd6cb8a315e97f4f2bbebafe5f3368e4837 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c
@@ -202,7 +202,7 @@ void mt7921s_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e)
        struct mt76_wcid *wcid;
        u16 idx;
 
-       idx = FIELD_GET(MT_TXD1_WLAN_IDX, le32_to_cpu(txwi[1]));
+       idx = le32_get_bits(txwi[1], MT_TXD1_WLAN_IDX);
        wcid = rcu_dereference(mdev->wcid[idx]);
        sta = wcid_to_sta(wcid);
 

diff --git a/drivers/net/wireless/mediatek/mt76/sdio_txrx.c b/drivers/net/wireless/mediatek/mt76/sdio_txrx.c
index 9fcf507e09bd6952d6d74e666464e53b1ee2d44e..a2601aa9e7b1ceb1352640219fa781dbf63659ec 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/sdio_txrx.c
+++ b/drivers/net/wireless/mediatek/mt76/sdio_txrx.c
@@ -118,7 +118,7 @@ mt76s_rx_run_queue(struct mt76_dev *dev, enum mt76_rxq_id qid,
                __le32 *rxd = (__le32 *)buf;
 
                /* parse rxd to get the actual packet length */
-               len = FIELD_GET(GENMASK(15, 0), le32_to_cpu(rxd[0]));
+               len = le32_get_bits(rxd[0], GENMASK(15, 0));
                e->skb = mt76s_build_rx_skb(buf, len, round_up(len + 4, 4));
                if (!e->skb)
                        break;