wifi: mt76: mt7915: reserve 8 bits for the index of rf registers

The value of regidx of rf registers is combined with WF selection and
offset. Extend the WF selection field from 4 to 8 bits since the
adie index should also be specified.

Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
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/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
index 6ef3431cad6483332f2b463f70198d92f5d3db90..e1d15394a621468ddc268f948734a5c5d3f5b657 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
@@ -963,7 +963,7 @@ mt7915_twt_stats(struct seq_file *s, void *data)
 }
 
 /* The index of RF registers use the generic regidx, combined with two parts:
- * WF selection [31:28] and offset [27:0].
+ * WF selection [31:24] and offset [23:0].
  */
 static int
 mt7915_rf_regval_get(void *data, u64 *val)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 8d297e4aa7d430c2ee42b052ccff0282f766d70d..1b9f3da8ae96c2012e40dae2d8e25a0107f10a86 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -3447,8 +3447,8 @@ int mt7915_mcu_rf_regval(struct mt7915_dev *dev, u32 regidx, u32 *val, bool set)
                __le32 ofs;
                __le32 data;
        } __packed req = {
-               .idx = cpu_to_le32(u32_get_bits(regidx, GENMASK(31, 28))),
-               .ofs = cpu_to_le32(u32_get_bits(regidx, GENMASK(27, 0))),
+               .idx = cpu_to_le32(u32_get_bits(regidx, GENMASK(31, 24))),
+               .ofs = cpu_to_le32(u32_get_bits(regidx, GENMASK(23, 0))),
                .data = set ? cpu_to_le32(*val) : 0,
        };
        struct sk_buff *skb;