ath11k: Fetch device information via QMI for WCN6750

Since WPPS Q6 does the PCIe enumeration of WCN6750, device
information like BAR and BAR size is not known to the APPS
processor (Application Processor SubSystem). In order to
fetch these details, a QMI message called device info request
will be sent to the target. Therefore, add logic to fetch
BAR details from the target.

Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.1.0.1-00887-QCAMSLSWPLZ-1
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.4.0.1-00192-QCAHKSWPL_SILICONZ-1

Signed-off-by: Manikanta Pubbisetty <quic_mpubbise@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220429170502.20080-6-quic_mpubbise@quicinc.com

diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c
index c89e7610823712960834df14584679341e63cdad..ad422256f1c60ac4cb1c52770aea83a57c47dff1 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/qmi.c
+++ b/drivers/net/wireless/ath/ath11k/qmi.c
@@ -13,6 +13,8 @@
 #include <linux/of_address.h>
 #include <linux/ioport.h>
 #include <linux/firmware.h>
+#include <linux/of_device.h>
+#include <linux/of_irq.h>
 
 #define SLEEP_CLOCK_SELECT_INTERNAL_BIT        0x02
 #define HOST_CSTATE_BIT                        0x04
@@ -749,6 +751,68 @@ static struct qmi_elem_info qmi_wlanfw_cap_req_msg_v01_ei[] = {
        },
 };
 
+static struct qmi_elem_info qmi_wlanfw_device_info_req_msg_v01_ei[] = {
+       {
+               .data_type      = QMI_EOTI,
+               .array_type     = NO_ARRAY,
+               .tlv_type       = QMI_COMMON_TLV_TYPE,
+       },
+};
+
+static struct qmi_elem_info qmi_wlfw_device_info_resp_msg_v01_ei[] = {
+       {
+               .data_type      = QMI_STRUCT,
+               .elem_len       = 1,
+               .elem_size      = sizeof(struct qmi_response_type_v01),
+               .array_type     = NO_ARRAY,
+               .tlv_type       = 0x02,
+               .offset         = offsetof(struct qmi_wlanfw_device_info_resp_msg_v01,
+                                          resp),
+               .ei_array       = qmi_response_type_v01_ei,
+       },
+       {
+               .data_type      = QMI_OPT_FLAG,
+               .elem_len       = 1,
+               .elem_size      = sizeof(u8),
+               .array_type     = NO_ARRAY,
+               .tlv_type       = 0x10,
+               .offset         = offsetof(struct qmi_wlanfw_device_info_resp_msg_v01,
+                                          bar_addr_valid),
+       },
+       {
+               .data_type      = QMI_UNSIGNED_8_BYTE,
+               .elem_len       = 1,
+               .elem_size      = sizeof(u64),
+               .array_type     = NO_ARRAY,
+               .tlv_type       = 0x10,
+               .offset         = offsetof(struct qmi_wlanfw_device_info_resp_msg_v01,
+                                          bar_addr),
+       },
+       {
+               .data_type      = QMI_OPT_FLAG,
+               .elem_len       = 1,
+               .elem_size      = sizeof(u8),
+               .array_type     = NO_ARRAY,
+               .tlv_type       = 0x11,
+               .offset         = offsetof(struct qmi_wlanfw_device_info_resp_msg_v01,
+                                          bar_size_valid),
+       },
+       {
+               .data_type      = QMI_UNSIGNED_4_BYTE,
+               .elem_len       = 1,
+               .elem_size      = sizeof(u32),
+               .array_type     = NO_ARRAY,
+               .tlv_type       = 0x11,
+               .offset         = offsetof(struct qmi_wlanfw_device_info_resp_msg_v01,
+                                          bar_size),
+       },
+       {
+               .data_type      = QMI_EOTI,
+               .array_type     = NO_ARRAY,
+               .tlv_type       = QMI_COMMON_TLV_TYPE,
+       },
+};
+
 static struct qmi_elem_info qmi_wlanfw_rf_chip_info_s_v01_ei[] = {
        {
                .data_type      = QMI_UNSIGNED_4_BYTE,
@@ -2008,6 +2072,80 @@ static int ath11k_qmi_assign_target_mem_chunk(struct ath11k_base *ab)
        return 0;
 }
 
+static int ath11k_qmi_request_device_info(struct ath11k_base *ab)
+{
+       struct qmi_wlanfw_device_info_req_msg_v01 req = {};
+       struct qmi_wlanfw_device_info_resp_msg_v01 resp = {};
+       struct qmi_txn txn;
+       void __iomem *bar_addr_va;
+       int ret;
+
+       /* device info message req is only sent for hybrid bus devices */
+       if (!ab->hw_params.hybrid_bus_type)
+               return 0;
+
+       ret = qmi_txn_init(&ab->qmi.handle, &txn,
+                          qmi_wlfw_device_info_resp_msg_v01_ei, &resp);
+       if (ret < 0)
+               goto out;
+
+       ret = qmi_send_request(&ab->qmi.handle, NULL, &txn,
+                              QMI_WLANFW_DEVICE_INFO_REQ_V01,
+                              QMI_WLANFW_DEVICE_INFO_REQ_MSG_V01_MAX_LEN,
+                              qmi_wlanfw_device_info_req_msg_v01_ei, &req);
+       if (ret < 0) {
+               qmi_txn_cancel(&txn);
+               ath11k_warn(ab, "failed to send qmi target device info request: %d\n",
+                           ret);
+               goto out;
+       }
+
+       ret = qmi_txn_wait(&txn, msecs_to_jiffies(ATH11K_QMI_WLANFW_TIMEOUT_MS));
+       if (ret < 0) {
+               ath11k_warn(ab, "failed to wait qmi target device info request: %d\n",
+                           ret);
+               goto out;
+       }
+
+       if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
+               ath11k_warn(ab, "qmi device info request failed: %d %d\n",
+                           resp.resp.result, resp.resp.error);
+               ret = -EINVAL;
+               goto out;
+       }
+
+       if (!resp.bar_addr_valid || !resp.bar_size_valid) {
+               ath11k_warn(ab, "qmi device info response invalid: %d %d\n",
+                           resp.resp.result, resp.resp.error);
+               ret = -EINVAL;
+               goto out;
+       }
+
+       if (!resp.bar_addr ||
+           resp.bar_size != ATH11K_QMI_DEVICE_BAR_SIZE) {
+               ath11k_warn(ab, "qmi device info invalid address and size: %llu %u\n",
+                           resp.bar_addr, resp.bar_size);
+               ret = -EINVAL;
+               goto out;
+       }
+
+       bar_addr_va = devm_ioremap(ab->dev, resp.bar_addr, resp.bar_size);
+
+       if (!bar_addr_va) {
+               ath11k_warn(ab, "qmi device info ioremap failed\n");
+               ab->mem_len = 0;
+               ret = -EIO;
+               goto out;
+       }
+
+       ab->mem = bar_addr_va;
+       ab->mem_len = resp.bar_size;
+
+       return 0;
+out:
+       return ret;
+}
+
 static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)
 {
        struct qmi_wlanfw_cap_req_msg_v01 req;
@@ -2749,6 +2887,12 @@ static int ath11k_qmi_event_load_bdf(struct ath11k_qmi *qmi)
                return ret;
        }
 
+       ret = ath11k_qmi_request_device_info(ab);
+       if (ret < 0) {
+               ath11k_warn(ab, "failed to request qmi device info: %d\n", ret);
+               return ret;
+       }
+
        if (ab->hw_params.supports_regdb)
                ath11k_qmi_load_bdf_qmi(ab, true);
 

diff --git a/drivers/net/wireless/ath/ath11k/qmi.h b/drivers/net/wireless/ath/ath11k/qmi.h
index e0201e1847337fb27dfb8f569db1a50e6cecbfc8..c24e6995cca3593518d222b3a09eccb72bde9447 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/qmi.h
+++ b/drivers/net/wireless/ath/ath11k/qmi.h
@@ -38,6 +38,8 @@
 #define ATH11K_FIRMWARE_MODE_OFF               4
 #define ATH11K_COLD_BOOT_FW_RESET_DELAY                (40 * HZ)
 
+#define ATH11K_QMI_DEVICE_BAR_SIZE             0x200000
+
 struct ath11k_base;
 
 enum ath11k_qmi_file_type {
@@ -287,10 +289,12 @@ struct qmi_wlanfw_fw_cold_cal_done_ind_msg_v01 {
        char placeholder;
 };
 
-#define QMI_WLANFW_CAP_REQ_MSG_V01_MAX_LEN     0
-#define QMI_WLANFW_CAP_RESP_MSG_V01_MAX_LEN    235
-#define QMI_WLANFW_CAP_REQ_V01                 0x0024
-#define QMI_WLANFW_CAP_RESP_V01                        0x0024
+#define QMI_WLANFW_CAP_REQ_MSG_V01_MAX_LEN             0
+#define QMI_WLANFW_CAP_RESP_MSG_V01_MAX_LEN            235
+#define QMI_WLANFW_CAP_REQ_V01                         0x0024
+#define QMI_WLANFW_CAP_RESP_V01                                0x0024
+#define QMI_WLANFW_DEVICE_INFO_REQ_V01                 0x004C
+#define QMI_WLANFW_DEVICE_INFO_REQ_MSG_V01_MAX_LEN     0
 
 enum qmi_wlanfw_pipedir_enum_v01 {
        QMI_WLFW_PIPEDIR_NONE_V01 = 0,
@@ -383,6 +387,18 @@ struct qmi_wlanfw_cap_req_msg_v01 {
        char placeholder;
 };
 
+struct qmi_wlanfw_device_info_req_msg_v01 {
+       char placeholder;
+};
+
+struct qmi_wlanfw_device_info_resp_msg_v01 {
+       struct qmi_response_type_v01 resp;
+       u64 bar_addr;
+       u32 bar_size;
+       u8 bar_addr_valid;
+       u8 bar_size_valid;
+};
+
 #define QMI_WLANFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_LEN    6182
 #define QMI_WLANFW_BDF_DOWNLOAD_RESP_MSG_V01_MAX_LEN   7
 #define QMI_WLANFW_BDF_DOWNLOAD_RESP_V01               0x0025