wifi: ath12k: report station mode per-chain signal strength

Currently, command “iw wlan0 station dump” does not show per-chain signal
strength.

This is because ath12k does not handle the num_per_chain_rssi and
rssi_avg_beacon reported by firmware to ath12k.

To address this, update ath12k to send WMI_REQUEST_STATS_CMDID with the
flag WMI_REQUEST_RSSI_PER_CHAIN_STAT to the firmware. Then, add logic to
handle num_per_chain_rssi and rssi_avg_beacon in the
ath12k_wmi_tlv_fw_stats_parse(), and assign the resulting per-chain signal
strength to the chain_signal of struct station_info.

After that, "iw dev xxx station dump" shows the correct per-chain signal
strength.
Such as:

Station AA:BB:CC:DD:EE:FF (on wlan0)
        inactive time:  212 ms
        rx bytes:       10398
        rx packets:     64
        tx bytes:       4362
        tx packets:     33
        tx retries:     49
        tx failed:      0
        beacon loss:    0
        beacon rx:      14
        rx drop misc:   16
        signal:         -45 [-51, -46] dBm
        beacon signal avg:      -44 dBm

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4

Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219751
Signed-off-by: Lingbo Kong <lingbo.kong@oss.qualcomm.com>
Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20250812030044.688-1-quic_lingbok@quicinc.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index da7e99f2ca0b3100f8682c866669ee0611c9f782..3d1956966a485ab020dc427a44adbcd411d5eead 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -72,6 +72,9 @@
 #define ATH12K_MAX_MLO_PEERS            256
 #define ATH12K_MLO_PEER_ID_INVALID      0xFFFF
 
+#define ATH12K_INVALID_RSSI_FULL -1
+#define ATH12K_INVALID_RSSI_EMPTY -128
+
 enum ath12k_bdf_search {
        ATH12K_BDF_SEARCH_DEFAULT,
        ATH12K_BDF_SEARCH_BUS_AND_BOARD,
@@ -560,6 +563,7 @@ struct ath12k_link_sta {
        u32 bw_prev;
        u32 peer_nss;
        s8 rssi_beacon;
+       s8 chain_signal[IEEE80211_MAX_CHAINS];
 
        /* For now the assoc link will be considered primary */
        bool is_assoc_link;

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 7a43f2e8f905db05d17ab58eba5e370db462edfe..222513cef1541a7cad140d34a916b3e26c410cd7 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -12650,6 +12650,27 @@ static int ath12k_mac_op_get_survey(struct ieee80211_hw *hw, int idx,
        return 0;
 }
 
+static void ath12k_mac_put_chain_rssi(struct station_info *sinfo,
+                                     struct ath12k_link_sta *arsta)
+{
+       s8 rssi;
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(sinfo->chain_signal); i++) {
+               sinfo->chains &= ~BIT(i);
+               rssi = arsta->chain_signal[i];
+
+               if (rssi != ATH12K_DEFAULT_NOISE_FLOOR &&
+                   rssi != ATH12K_INVALID_RSSI_FULL &&
+                   rssi != ATH12K_INVALID_RSSI_EMPTY &&
+                   rssi != 0) {
+                       sinfo->chain_signal[i] = rssi;
+                       sinfo->chains |= BIT(i);
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL);
+               }
+       }
+}
+
 static void ath12k_mac_op_sta_statistics(struct ieee80211_hw *hw,
                                         struct ieee80211_vif *vif,
                                         struct ieee80211_sta *sta,
@@ -12707,6 +12728,12 @@ static void ath12k_mac_op_sta_statistics(struct ieee80211_hw *hw,
            !(ath12k_mac_get_fw_stats(ar, &params)))
                signal = arsta->rssi_beacon;
 
+       params.stats_id = WMI_REQUEST_RSSI_PER_CHAIN_STAT;
+       if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL)) &&
+           ahsta->ahvif->vdev_type == WMI_VDEV_TYPE_STA &&
+           !(ath12k_mac_get_fw_stats(ar, &params)))
+               ath12k_mac_put_chain_rssi(sinfo, arsta);
+
        spin_lock_bh(&ar->data_lock);
        noise_floor = ath12k_pdev_get_noise_floor(ar);
        spin_unlock_bh(&ar->data_lock);

diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c
index 29dadedefdd27a216e5362bbae7c876d42c142d0..b20b0335e24ae04be35c61ce522414bc482118bb 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.c
+++ b/drivers/net/wireless/ath/ath12k/wmi.c
@@ -30,6 +30,9 @@ struct ath12k_wmi_svc_ready_parse {
 struct wmi_tlv_fw_stats_parse {
        const struct wmi_stats_event *ev;
        struct ath12k_fw_stats *stats;
+       const struct wmi_per_chain_rssi_stat_params *rssi;
+       int rssi_num;
+       bool chain_rssi_done;
 };
 
 struct ath12k_wmi_dma_ring_caps_parse {
@@ -185,6 +188,8 @@ static const struct ath12k_wmi_tlv_policy ath12k_wmi_tlv_policies[] = {
                .min_len = sizeof(struct wmi_p2p_noa_event) },
        [WMI_TAG_11D_NEW_COUNTRY_EVENT] = {
                .min_len = sizeof(struct wmi_11d_new_cc_event) },
+       [WMI_TAG_PER_CHAIN_RSSI_STATS] = {
+               .min_len = sizeof(struct wmi_per_chain_rssi_stat_params) },
 };
 
 __le32 ath12k_wmi_tlv_hdr(u32 cmd, u32 len)
@@ -8219,6 +8224,77 @@ exit:
        return ret;
 }
 
+static int ath12k_wmi_tlv_rssi_chain_parse(struct ath12k_base *ab,
+                                          u16 tag, u16 len,
+                                          const void *ptr, void *data)
+{
+       const struct wmi_rssi_stat_params *stats_rssi = ptr;
+       struct wmi_tlv_fw_stats_parse *parse = data;
+       const struct wmi_stats_event *ev = parse->ev;
+       struct ath12k_fw_stats *stats = parse->stats;
+       struct ath12k_link_vif *arvif;
+       struct ath12k_link_sta *arsta;
+       struct ieee80211_sta *sta;
+       struct ath12k_sta *ahsta;
+       struct ath12k *ar;
+       int vdev_id;
+       int j;
+
+       if (!ev) {
+               ath12k_warn(ab, "failed to fetch update stats ev");
+               return -EPROTO;
+       }
+
+       if (tag != WMI_TAG_RSSI_STATS)
+               return -EPROTO;
+
+       if (!stats)
+               return -EINVAL;
+
+       stats->pdev_id = le32_to_cpu(ev->pdev_id);
+       vdev_id = le32_to_cpu(stats_rssi->vdev_id);
+       guard(rcu)();
+       ar = ath12k_mac_get_ar_by_pdev_id(ab, stats->pdev_id);
+       if (!ar) {
+               ath12k_warn(ab, "invalid pdev id %d in rssi chain parse\n",
+                           stats->pdev_id);
+               return -EPROTO;
+       }
+
+       arvif = ath12k_mac_get_arvif(ar, vdev_id);
+       if (!arvif) {
+               ath12k_warn(ab, "not found vif for vdev id %d\n", vdev_id);
+               return -EPROTO;
+       }
+
+       ath12k_dbg(ab, ATH12K_DBG_WMI,
+                  "stats bssid %pM vif %p\n",
+                  arvif->bssid, arvif->ahvif->vif);
+
+       sta = ieee80211_find_sta_by_ifaddr(ath12k_ar_to_hw(ar),
+                                          arvif->bssid,
+                                          NULL);
+       if (!sta) {
+               ath12k_dbg(ab, ATH12K_DBG_WMI,
+                          "not found station of bssid %pM for rssi chain\n",
+                          arvif->bssid);
+               return -EPROTO;
+       }
+
+       ahsta = ath12k_sta_to_ahsta(sta);
+       arsta = &ahsta->deflink;
+
+       BUILD_BUG_ON(ARRAY_SIZE(arsta->chain_signal) >
+                    ARRAY_SIZE(stats_rssi->rssi_avg_beacon));
+
+       for (j = 0; j < ARRAY_SIZE(arsta->chain_signal); j++)
+               arsta->chain_signal[j] = le32_to_cpu(stats_rssi->rssi_avg_beacon[j]);
+
+       stats->stats_id = WMI_REQUEST_RSSI_PER_CHAIN_STAT;
+
+       return 0;
+}
+
 static int ath12k_wmi_tlv_fw_stats_parse(struct ath12k_base *ab,
                                         u16 tag, u16 len,
                                         const void *ptr, void *data)
@@ -8233,6 +8309,22 @@ static int ath12k_wmi_tlv_fw_stats_parse(struct ath12k_base *ab,
        case WMI_TAG_ARRAY_BYTE:
                ret = ath12k_wmi_tlv_fw_stats_data_parse(ab, parse, ptr, len);
                break;
+       case WMI_TAG_PER_CHAIN_RSSI_STATS:
+               parse->rssi = ptr;
+               if (le32_to_cpu(parse->ev->stats_id) & WMI_REQUEST_RSSI_PER_CHAIN_STAT)
+                       parse->rssi_num = le32_to_cpu(parse->rssi->num_per_chain_rssi);
+               break;
+       case WMI_TAG_ARRAY_STRUCT:
+               if (parse->rssi_num && !parse->chain_rssi_done) {
+                       ret = ath12k_wmi_tlv_iter(ab, ptr, len,
+                                                 ath12k_wmi_tlv_rssi_chain_parse,
+                                                 parse);
+                       if (ret)
+                               return ret;
+
+                       parse->chain_rssi_done = true;
+               }
+               break;
        default:
                break;
        }
@@ -8346,6 +8438,12 @@ static void ath12k_update_stats_event(struct ath12k_base *ab, struct sk_buff *sk
                goto complete;
        }
 
+       /* Handle WMI_REQUEST_RSSI_PER_CHAIN_STAT status update */
+       if (stats.stats_id == WMI_REQUEST_RSSI_PER_CHAIN_STAT) {
+               complete(&ar->fw_stats_done);
+               goto complete;
+       }
+
        /* Handle WMI_REQUEST_VDEV_STAT and WMI_REQUEST_BCN_STAT updates. */
        ath12k_wmi_fw_stats_process(ar, &stats);
 

diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h
index f3b0a6f57ec2b0d9f9a1b1831b04639088ded27d..4ae9a58f944a9cf999a52e6eca08e9c8807ea23e 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.h
+++ b/drivers/net/wireless/ath/ath12k/wmi.h
@@ -5875,9 +5875,10 @@ struct wmi_stats_event {
 } __packed;
 
 enum wmi_stats_id {
-       WMI_REQUEST_PDEV_STAT   = BIT(2),
-       WMI_REQUEST_VDEV_STAT   = BIT(3),
-       WMI_REQUEST_BCN_STAT    = BIT(11),
+       WMI_REQUEST_PDEV_STAT           = BIT(2),
+       WMI_REQUEST_VDEV_STAT           = BIT(3),
+       WMI_REQUEST_RSSI_PER_CHAIN_STAT = BIT(8),
+       WMI_REQUEST_BCN_STAT            = BIT(11),
 };
 
 struct wmi_request_stats_cmd {
@@ -5888,6 +5889,17 @@ struct wmi_request_stats_cmd {
        __le32 pdev_id;
 } __packed;
 
+struct wmi_rssi_stat_params {
+       __le32 vdev_id;
+       __le32 rssi_avg_beacon[WMI_MAX_CHAINS];
+       __le32 rssi_avg_data[WMI_MAX_CHAINS];
+       struct ath12k_wmi_mac_addr_params peer_macaddr;
+} __packed;
+
+struct wmi_per_chain_rssi_stat_params {
+       __le32 num_per_chain_rssi;
+} __packed;
+
 #define WLAN_MAX_AC 4
 #define MAX_TX_RATE_VALUES 10