WMI_MLO_LINK_SET_ACTIVE_CMDID allows the driver to tell firmware which MLO links should be active or inactive. Add parsing and logging of the corresponding firmware response event. Delivery of the response to the sender is added in a subsequent patch. Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0.c2-00277-QCACOLSWPL_V1_TO_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3 Signed-off-by: Miaoqing Pan --- drivers/net/wireless/ath/ath12k/wmi.c | 36 +++++++++++++++++++++++++++ drivers/net/wireless/ath/ath12k/wmi.h | 6 +++++ 2 files changed, 42 insertions(+) diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c index f41138a7c68e..dde7721182af 100644 --- a/drivers/net/wireless/ath/ath12k/wmi.c +++ b/drivers/net/wireless/ath/ath12k/wmi.c @@ -209,6 +209,8 @@ static const struct ath12k_wmi_tlv_policy ath12k_wmi_tlv_policies[] = { .min_len = sizeof(struct wmi_obss_color_collision_event) }, [WMI_TAG_PDEV_CSA_SWITCH_COUNT_STATUS_EVENT] = { .min_len = sizeof(struct ath12k_wmi_pdev_csa_event) }, + [WMI_TAG_MLO_LINK_SET_ACTIVE_RESP_EVENT] = { + .min_len = sizeof(struct wmi_mlo_link_set_active_resp_event) }, }; __le32 ath12k_wmi_tlv_hdr(u32 cmd, u32 len) @@ -9710,6 +9712,37 @@ static void ath12k_wmi_gtk_offload_status_event(struct ath12k_base *ab, rcu_read_unlock(); } +static void ath12k_wmi_event_mlo_link_set_active(struct ath12k_base *ab, + struct sk_buff *skb) +{ + const struct wmi_mlo_link_set_active_resp_event *ev; + u32 status, use_ieee; + const void **tb; + int ret; + + tb = ath12k_wmi_tlv_parse(ab, skb); + if (IS_ERR(tb)) { + ret = PTR_ERR(tb); + ath12k_warn(ab, "failed to parse mlo link set active resp: %d\n", ret); + return; + } + + ev = tb[WMI_TAG_MLO_LINK_SET_ACTIVE_RESP_EVENT]; + if (!ev) { + ath12k_warn(ab, "mlo link set active resp event tag not found\n"); + return; + } + + status = le32_to_cpu(ev->status); + use_ieee = le32_to_cpu(ev->use_ieee_link_id_bitmap); + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "mlo link set active resp status %u use_ieee 0x%x\n", + status, use_ieee); + + /* Response delivery to waiters will be wired up in a subsequent patch */ +} + static void ath12k_wmi_event_mlo_setup_complete(struct ath12k_base *ab, struct sk_buff *skb) { @@ -10504,6 +10537,9 @@ static void ath12k_wmi_op_rx(struct ath12k_base *ab, struct sk_buff *skb) case WMI_GTK_OFFLOAD_STATUS_EVENTID: ath12k_wmi_gtk_offload_status_event(ab, skb); break; + case WMI_MLO_LINK_SET_ACTIVE_RESP_EVENTID: + ath12k_wmi_event_mlo_link_set_active(ab, skb); + break; case WMI_MLO_SETUP_COMPLETE_EVENTID: ath12k_wmi_event_mlo_setup_complete(ab, skb); break; diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h index 843f1d11f9c8..68dd13cafe51 100644 --- a/drivers/net/wireless/ath/ath12k/wmi.h +++ b/drivers/net/wireless/ath/ath12k/wmi.h @@ -2016,6 +2016,7 @@ enum wmi_tlv_tag { WMI_TAG_VDEV_SET_TPC_POWER_CMD = 0x3B5, WMI_TAG_VDEV_CH_POWER_INFO, WMI_TAG_MLO_LINK_SET_ACTIVE_CMD = 0x3BE, + WMI_TAG_MLO_LINK_SET_ACTIVE_RESP_EVENT, WMI_TAG_EHT_RATE_SET = 0x3C4, WMI_TAG_DCS_INCUMBENT_SIGNAL_INTERFERENCE_TYPE = 0x3C5, WMI_TAG_MLO_TX_SEND_PARAMS, @@ -6496,6 +6497,11 @@ struct wmi_mlo_link_set_active_arg { struct wmi_ml_disallow_mode_bmap_arg disallow_bmap[WMI_ML_MAX_DISALLOW_BMAP_COMB]; }; +struct wmi_mlo_link_set_active_resp_event { + __le32 status; + __le32 use_ieee_link_id_bitmap; +} __packed; + #define ATH12K_MAX_20MHZ_SEGMENTS 16 #define ATH12K_MAX_NUM_ANTENNA 8 #define ATH12K_MAX_NUM_NF_HW_DBM 32 -- 2.34.1