wifi: ath12k: refactor QMI MLO host capability helper function

Currently, QMI MLO host capability parameters are specific to the WCN7850
platform. To make use of this helper function across all the platforms,
move the platform specific MLO capability parameter to the HW param
configuration.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240113001659.1022465-2-quic_periyasa@quicinc.com

diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index de60d988d8608f0ec2525d8bfb467886a7b099e8..cbb6e2b6d8264e577d4bbd81d664d6694d505121 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -914,6 +914,9 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
                .rfkill_on_level = 0,
 
                .rddm_size = 0,
+
+               .def_num_link = 0,
+               .max_mlo_peer = 256,
        },
        {
                .name = "wcn7850 hw2.0",
@@ -978,6 +981,9 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
                .rfkill_on_level = 1,
 
                .rddm_size = 0x780000,
+
+               .def_num_link = 2,
+               .max_mlo_peer = 32,
        },
        {
                .name = "qcn9274 hw2.0",
@@ -1040,6 +1046,9 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
                .rfkill_on_level = 0,
 
                .rddm_size = 0,
+
+               .def_num_link = 0,
+               .max_mlo_peer = 256,
        },
 };
 

diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index fa8230def22b02f8c463659efd4248fe09dadd51..0c3b416ae150f45262ced488f6f7c2f9be41fb0e 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -192,6 +192,9 @@ struct ath12k_hw_params {
        u32 rfkill_on_level;
 
        u32 rddm_size;
+
+       u8 def_num_link;
+       u16 max_mlo_peer;
 };
 
 struct ath12k_hw_ops {

diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c
index c4c7f31a91cddc7c4646faf86bee2ff0f7175f28..916dec6267029fd7a96357b2a268577ea5ac4d9c 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/qmi.c
+++ b/drivers/net/wireless/ath/ath12k/qmi.c
@@ -1893,8 +1893,16 @@ static const struct qmi_elem_info qmi_wlanfw_fw_ready_ind_msg_v01_ei[] = {
        },
 };
 
-static void ath12k_host_cap_parse_mlo(struct qmi_wlanfw_host_cap_req_msg_v01 *req)
+static void ath12k_host_cap_parse_mlo(struct ath12k_base *ab,
+                                     struct qmi_wlanfw_host_cap_req_msg_v01 *req)
 {
+       struct wlfw_host_mlo_chip_info_s_v01 *info;
+       u8 hw_link_id = 0;
+       int i;
+
+       if (!ab->hw_params->def_num_link)
+               return;
+
        req->mlo_capable_valid = 1;
        req->mlo_capable = 1;
        req->mlo_chip_id_valid = 1;
@@ -1905,16 +1913,22 @@ static void ath12k_host_cap_parse_mlo(struct qmi_wlanfw_host_cap_req_msg_v01 *re
        /* Max peer number generally won't change for the same device
         * but needs to be synced with host driver.
         */
-       req->max_mlo_peer = 32;
+       req->max_mlo_peer = ab->hw_params->max_mlo_peer;
        req->mlo_num_chips_valid = 1;
        req->mlo_num_chips = 1;
+
+       info = &req->mlo_chip_info[0];
+       info->chip_id = 0;
+       info->num_local_links = ab->hw_params->def_num_link;
+
+       for (i = 0; i < info->num_local_links; i++) {
+               info->hw_link_id[i] = hw_link_id;
+               info->valid_mlo_link_id[i] = 1;
+
+               hw_link_id++;
+       }
+
        req->mlo_chip_info_valid = 1;
-       req->mlo_chip_info[0].chip_id = 0;
-       req->mlo_chip_info[0].num_local_links = 2;
-       req->mlo_chip_info[0].hw_link_id[0] = 0;
-       req->mlo_chip_info[0].hw_link_id[1] = 1;
-       req->mlo_chip_info[0].valid_mlo_link_id[0] = 1;
-       req->mlo_chip_info[0].valid_mlo_link_id[1] = 1;
 }
 
 static int ath12k_qmi_host_cap_send(struct ath12k_base *ab)
@@ -1960,10 +1974,10 @@ static int ath12k_qmi_host_cap_send(struct ath12k_base *ab)
                 */
                req.nm_modem |= SLEEP_CLOCK_SELECT_INTERNAL_BIT;
                req.nm_modem |= PLATFORM_CAP_PCIE_GLOBAL_RESET;
-
-               ath12k_host_cap_parse_mlo(&req);
        }
 
+       ath12k_host_cap_parse_mlo(ab, &req);
+
        ret = qmi_txn_init(&ab->qmi.handle, &txn,
                           qmi_wlanfw_host_cap_resp_msg_v01_ei, &resp);
        if (ret < 0)