wcn6740: Update cnss/mhi/qmi/qrtr drivers

Migrate wlan codes to Post-CS4

Bug: 211358472
Test: Basic functions
Change-Id: I4161d344a9260fb855712626048d80e5954e1ac1

4 files changed, 24 insertions, 36 deletions

diff --git a/inc/cnss_plat_ipc_qmi.h b/inc/cnss_plat_ipc_qmi.h
deleted file mode 100644
index c77c186..0000000
--- a/inc/cnss_plat_ipc_qmi.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only
- * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- */
-
-#ifndef _CNSS_PLAT_IPC_QMI_H
-#define _CNSS_PLAT_IPC_QMI_H
-
-/**
- * struct cnss_plat_user_config: Config options provided by user space
- * @dms_mac_addr_supported: DMS MAC address provisioning support
- * @qdss_hw_trace_override: QDSS config for HW trace enable
- * @cal_file_available_bitmask: Calibration file available
- */
-struct cnss_plat_ipc_user_config {
-	u8 dms_mac_addr_supported;
-	u8 qdss_hw_trace_override;
-	u32 cal_file_available_bitmask;
-};
-
-typedef void (*cnss_plat_ipc_connection_update)(void *cb_ctx,
-						bool connection_status);
-
-int cnss_plat_ipc_register(cnss_plat_ipc_connection_update
-			   connection_update_cb, void *cb_ctx);
-void cnss_plat_ipc_unregister(void *cb_ctx);
-int cnss_plat_ipc_qmi_file_download(char *file_name, char *buf, u32 *size);
-int cnss_plat_ipc_qmi_file_upload(char *file_name, u8 *file_buf,
-				  u32 file_size);
-struct cnss_plat_ipc_user_config *cnss_plat_ipc_qmi_user_config(void);
-#endif
diff --git a/inc/mhi_misc.h b/inc/mhi_misc.h
index 75b25f1..3108ac6 100644
--- a/inc/mhi_misc.h
+++ b/inc/mhi_misc.h
@@ -268,6 +268,13 @@ int mhi_get_remote_time(struct mhi_device *mhi_dev,
 					u64 local_time,
 					u64 remote_time));
 
+/**
+ * mhi_force_reset - does host reset request to collect device side dumps
+ * for debugging purpose
+ * @mhi_cntrl: MHI controller
+ */
+int mhi_force_reset(struct mhi_controller *mhi_cntrl);
+
 #else
 
 /**
@@ -572,6 +579,16 @@ int mhi_get_remote_time(struct mhi_device *mhi_dev,
 	return -EPERM;
 }
 
+/**
+ * mhi_force_reset - does host reset request to collect device side dumps
+ * for debugging purpose
+ * @mhi_cntrl: MHI controller
+ */
+int mhi_force_reset(struct mhi_controller *mhi_cntrl)
+{
+	return -EINVAL;
+}
+
 #endif /* CONFIG_MHI_BUS_MISC */
 
 #endif /* _MHI_MISC_H_ */
diff --git a/inc/qcom_ramdump.h b/inc/qcom_ramdump.h
index 9b56dc3..726e868 100644
--- a/inc/qcom_ramdump.h
+++ b/inc/qcom_ramdump.h
@@ -18,7 +18,7 @@ struct qcom_dump_segment {
 };
 
 #if IS_ENABLED(CONFIG_QCOM_RAMDUMP)
-extern int qcom_elf_dump(struct list_head *segs, struct device *dev);
+extern int qcom_elf_dump(struct list_head *segs, struct device *dev, unsigned char class);
 extern int qcom_dump(struct list_head *head, struct device *dev);
 extern int qcom_fw_elf_dump(struct firmware *fw, struct device *dev);
 extern bool dump_enabled(void);
@@ -26,9 +26,10 @@ extern bool dump_enabled(void);
 extern void cnss_register_sscd(void);
 extern void cnss_unregister_sscd(void);
 extern void sscd_release(struct device *dev);
+extern void sscd_set_coredump(void *buf, int buf_len);
 #endif
 #else
-static inline int qcom_elf_dump(struct list_head *segs, struct device *dev)
+static inline int qcom_elf_dump(struct list_head *segs, struct device *dev, unsigned char class)
 {
 	return -ENODEV;
 }
diff --git a/inc/qmi/qmi.h b/inc/qmi/qmi.h
index 7a60439..dccde32 100644
--- a/inc/qmi/qmi.h
+++ b/inc/qmi/qmi.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014, 2019 The Linux Foundation. All rights reserved.
  * Copyright (c) 2017, Linaro Ltd.
  */
 #ifndef __QMI_HELPERS_H__
@@ -91,8 +91,9 @@ struct qmi_elem_info {
 #define QMI_ERR_INTERNAL_V01			3
 #define QMI_ERR_CLIENT_IDS_EXHAUSTED_V01	5
 #define QMI_ERR_INVALID_ID_V01			41
+#define QMI_ERR_NETWORK_NOT_READY_V01		53
 #define QMI_ERR_ENCODING_V01			58
-#define QMI_ERR_DISABLED_V01                    69
+#define QMI_ERR_DISABLED_V01			69
 #define QMI_ERR_INCOMPATIBLE_STATE_V01		90
 #define QMI_ERR_NOT_SUPPORTED_V01		94
 
@@ -162,7 +163,6 @@ struct qmi_ops {
  * struct qmi_txn - transaction context
  * @qmi:	QMI handle this transaction is associated with
  * @id:		transaction id
- * @lock:	for synchronization between handler and waiter of messages
  * @completion:	completion object as the transaction receives a response
  * @result:	result code for the completed transaction
  * @ei:		description of the QMI encoded response (optional)
@@ -173,7 +173,6 @@ struct qmi_txn {
 
 	u16 id;
 
-	struct mutex lock;
 	struct completion completion;
 	int result;
 
@@ -272,5 +271,6 @@ int qmi_txn_init(struct qmi_handle *qmi, struct qmi_txn *txn,
 		 struct qmi_elem_info *ei, void *c_struct);
 int qmi_txn_wait(struct qmi_txn *txn, unsigned long timeout);
 void qmi_txn_cancel(struct qmi_txn *txn);
+void qmi_set_sndtimeo(struct qmi_handle *qmi, long timeo);
 
 #endif