| From 1ce20111294e5acdd363d7108083e51e4c3efd12 Mon Sep 17 00:00:00 2001 |
| From: Peter Chiu <chui-hao.chiu@mediatek.com> |
| Date: Mon, 29 Jan 2024 10:38:35 +0800 |
| Subject: [PATCH 14/15] wifi: mt76: mt7915: fix mcu command format for mt7915 |
| tx stats |
| |
| The mcu command format are different for mt7915 and mt7986. |
| Fix the mt7915_mcu_wed_wa_tx_stats to support mt7915 and mt7986. |
| |
| Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com> |
| --- |
| mt7915/mcu.c | 42 ++++++++++++++++++++++++++++++------------ |
| 1 file changed, 30 insertions(+), 12 deletions(-) |
| |
| diff --git a/mt7915/mcu.c b/mt7915/mcu.c |
| index 7a2a537d..f27ef673 100644 |
| --- a/mt7915/mcu.c |
| +++ b/mt7915/mcu.c |
| @@ -3960,30 +3960,46 @@ int mt7915_mcu_wed_wa_tx_stats(struct mt7915_dev *dev, u16 wlan_idx) |
| { |
| struct { |
| __le32 cmd; |
| - __le32 num; |
| - __le32 __rsv; |
| - __le16 wlan_idx; |
| - } req = { |
| + __le32 arg0; |
| + __le32 arg1; |
| + __le16 arg2; |
| + } __packed req = { |
| .cmd = cpu_to_le32(0x15), |
| - .num = cpu_to_le32(1), |
| - .wlan_idx = cpu_to_le16(wlan_idx), |
| }; |
| struct mt7915_mcu_wa_tx_stat { |
| - __le16 wlan_idx; |
| - u8 __rsv[2]; |
| + union { |
| + struct { |
| + u8 wcid; |
| + u8 __rsv[3]; |
| + } __packed mt7915_hdr; |
| + struct { |
| + u16 wcid; |
| + u8 __rsv2[2]; |
| + } __packed mt7986_hdr; |
| + } u; |
| |
| /* tx_bytes is deprecated since WA byte counter uses u32, |
| * which easily leads to overflow. |
| */ |
| __le32 tx_bytes; |
| __le32 tx_packets; |
| - } *res; |
| + } __packed *res; |
| struct mt76_wcid *wcid; |
| struct sk_buff *skb; |
| - int ret; |
| + int ret, len; |
| + u16 ret_wcid; |
| + |
| + if (is_mt7915(&dev->mt76)) { |
| + req.arg0 = cpu_to_le32(wlan_idx); |
| + len = sizeof(req) - sizeof(req.arg2); |
| + } else { |
| + req.arg0 = cpu_to_le32(1); |
| + req.arg2 = cpu_to_le16(wlan_idx); |
| + len = sizeof(req); |
| + } |
| |
| ret = mt76_mcu_send_and_get_msg(&dev->mt76, MCU_WA_PARAM_CMD(QUERY), |
| - &req, sizeof(req), true, &skb); |
| + &req, len, true, &skb); |
| if (ret) |
| return ret; |
| |
| @@ -3992,7 +4008,9 @@ int mt7915_mcu_wed_wa_tx_stats(struct mt7915_dev *dev, u16 wlan_idx) |
| |
| res = (struct mt7915_mcu_wa_tx_stat *)skb->data; |
| |
| - if (le16_to_cpu(res->wlan_idx) != wlan_idx) { |
| + ret_wcid = is_mt7915(&dev->mt76) ? res->u.mt7915_hdr.wcid : |
| + le16_to_cpu(res->u.mt7986_hdr.wcid); |
| + if (ret_wcid != wlan_idx) { |
| ret = -EINVAL; |
| goto out; |
| } |
| -- |
| 2.18.0 |
| |