qcacld-3.0: Add support for QMI component

Add support for QMI component.

Change-Id: I63735800ea1166e875ff12bfd22df3c3d9c6312f
CRs-Fixed: 3337043

Kbuild

@@ -2578,6 +2578,26 @@ $(call add-wlan-objs,dp_comp,$(WLAN_DP_COMP_OBJS))
 
 #######################################################
 
+######################### QMI_COMPONENT #########################
+QMI_COMP_CORE_DIR := components/qmi/core/src
+QMI_COMP_UCFG_DIR := components/qmi/dispatcher/src
+QMI_COMP_OS_IF_DIR := os_if/qmi/src
+
+QMI_COMP_INC := -I$(WLAN_ROOT)/components/qmi/core/inc       \
+		-I$(WLAN_ROOT)/components/qmi/core/src       \
+		-I$(WLAN_ROOT)/components/qmi/dispatcher/inc \
+		-I$(WLAN_ROOT)/os_if/qmi/inc
+
+ifeq ($(CONFIG_QMI_COMPONENT_ENABLE), y)
+WLAN_QMI_COMP_OBJS := $(QMI_COMP_CORE_DIR)/wlan_qmi_main.o \
+		 $(QMI_COMP_UCFG_DIR)/wlan_qmi_ucfg_api.o  \
+		 $(QMI_COMP_OS_IF_DIR)/os_if_qmi.o
+endif
+
+$(call add-wlan-objs,qmi_comp,$(WLAN_QMI_COMP_OBJS))
+
+#######################################################
+
 ######################### SON #########################
 #SON_CORE_DIR := components/son/core/src
 #SON_CORE_INC := -I$(WLAN_ROOT)/components/son/core/inc
@@ -3129,6 +3149,8 @@ INCS +=		$(NAN_TGT_INC)
 INCS +=		$(NAN_OS_IF_INC)
 ###########DP_COMPONENT ####################
 INCS +=		$(DP_COMP_INC)
+###########QMI_COMPONENT ####################
+INCS +=		$(QMI_COMP_INC)
 ################ SON ################
 INCS +=		$(SON_CORE_INC)
 INCS +=		$(SON_UCFG_INC)
@@ -4265,6 +4287,7 @@ cppflags-$(CONFIG_WLAN_TRACEPOINTS) += -DWLAN_TRACEPOINTS
 
 cppflags-$(CONFIG_QCACLD_FEATURE_SON) += -DFEATURE_PERPKT_INFO
 cppflags-$(CONFIG_QCACLD_FEATURE_SON) += -DQCA_ENHANCED_STATS_SUPPORT
+cppflags-$(CONFIG_QMI_COMPONENT_ENABLE) += -DQMI_COMPONENT_ENABLE
 
 ifdef CONFIG_MAX_LOGS_PER_SEC
 ccflags-y += -DWLAN_MAX_LOGS_PER_SEC=$(CONFIG_MAX_LOGS_PER_SEC)

components/qmi/core/inc/wlan_qmi_main.h

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: wlan_qmi_main.h
+ *
+ * QMI component core function declarations
+ */
+
+#ifndef _WLAN_QMI_MAIN_H_
+#define _WLAN_QMI_MAIN_H_
+
+#include "wlan_objmgr_psoc_obj.h"
+#include <qdf_trace.h>
+
+#define qmi_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_QMI, params)
+#define qmi_debug_rl(params...) \
+	QDF_TRACE_DEBUG_RL(QDF_MODULE_ID_QMI, params)
+
+#define qmi_info(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_QMI, params)
+#define qmi_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_QMI, params)
+#define qmi_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_QMI, params)
+#define qmi_fatal(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_QMI, params)
+
+#define qmi_nofl_debug(params...) \
+	QDF_TRACE_DEBUG_NO_FL(QDF_MODULE_ID_QMI, params)
+#define qmi_nofl_info(params...) \
+	QDF_TRACE_INFO_NO_FL(QDF_MODULE_ID_QMI, params)
+#define qmi_nofl_warn(params...) \
+	QDF_TRACE_WARN_NO_FL(QDF_MODULE_ID_QMI, params)
+#define qmi_nofl_err(params...) \
+	QDF_TRACE_ERROR_NO_FL(QDF_MODULE_ID_QMI, params)
+#define qmi_nofl_fatal(params...) \
+	QDF_TRACE_FATAL_NO_FL(QDF_MODULE_ID_QMI, params)
+
+/**
+ * qmi_psoc_obj_create_notification() - Function to allocate per psoc QMI
+ *  private object
+ * @psoc: psoc context
+ * @arg: Pointer to arguments
+ *
+ * This function gets called from object manager when psoc is being
+ * created and creates QMI soc context.
+ *
+ * Return: QDF status
+ */
+QDF_STATUS
+qmi_psoc_obj_create_notification(struct wlan_objmgr_psoc *psoc, void *arg);
+
+/**
+ * qmi_psoc_obj_destroy_notification() - Free per psoc QMI private object
+ * @psoc: psoc context
+ * @arg: Pointer to arguments
+ *
+ * This function gets called from object manager when psoc is being
+ * deleted and delete QMI soc context.
+ *
+ * Return: QDF status
+ */
+QDF_STATUS
+qmi_psoc_obj_destroy_notification(struct wlan_objmgr_psoc *psoc, void *arg);
+#endif

components/qmi/core/inc/wlan_qmi_objmgr.h

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: wlan_qmi_objmgr.h
+ *
+ * This file contains various object manager related wrappers and helpers
+ */
+
+#ifndef _WLAN_QMI_OBJMGR_H_
+#define _WLAN_QMI_OBJMGR_H_
+
+#include "wlan_cmn.h"
+#include "wlan_objmgr_cmn.h"
+#include "wlan_objmgr_psoc_obj.h"
+#include "wlan_qmi_priv.h"
+
+#define qmi_comp_psoc_get_ref(psoc) wlan_objmgr_psoc_try_get_ref(psoc, \
+								 WLAN_QMI_ID)
+
+#define qmi_comp_psoc_put_ref(psoc) wlan_objmgr_psoc_release_ref(psoc, \
+								 WLAN_QMI_ID)
+
+/**
+ * qmi_psoc_get_priv() - Wrapper to retrieve psoc priv obj
+ * @psoc: psoc pointer
+ *
+ * Return: QMI psoc private object
+ */
+static inline
+struct wlan_qmi_psoc_context *qmi_psoc_get_priv(struct wlan_objmgr_psoc *psoc)
+{
+	struct wlan_qmi_psoc_context *qmi_ctx;
+
+	qmi_ctx = wlan_objmgr_psoc_get_comp_private_obj(psoc,
+							WLAN_UMAC_COMP_QMI);
+	QDF_BUG(qmi_ctx);
+
+	return qmi_ctx;
+}
+#endif

components/qmi/core/inc/wlan_qmi_priv.h

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: wlan_qmi_priv.h
+ *
+ * Declare various struct, macros which are used private to QMI component.
+ */
+
+#ifndef _WLAN_QMI_PRIV_H_
+#define _WLAN_QMI_PRIV_H_
+
+#include "wlan_qmi_public_struct.h"
+#include "wlan_objmgr_psoc_obj.h"
+
+/**
+ * struct wlan_qmi_psoc_context - psoc related data required for QMI
+ * @psoc: object manager psoc context
+ * @qmi_cbs: QMI callbacks
+ */
+struct wlan_qmi_psoc_context {
+	struct wlan_objmgr_psoc *psoc;
+	struct wlan_qmi_psoc_callbacks qmi_cbs;
+};
+#endif

components/qmi/core/src/wlan_qmi_main.c

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: wlan_qmi_main.c
+ *
+ * QMI component core function definitions
+ */
+
+#include "wlan_qmi_main.h"
+#include "wlan_qmi_public_struct.h"
+#include "wlan_qmi_objmgr.h"
+
+QDF_STATUS
+qmi_psoc_obj_create_notification(struct wlan_objmgr_psoc *psoc, void *arg)
+{
+	struct wlan_qmi_psoc_context *qmi_ctx;
+	QDF_STATUS status;
+
+	qmi_ctx = qdf_mem_malloc(sizeof(*qmi_ctx));
+	if (!qmi_ctx)
+		return QDF_STATUS_E_NOMEM;
+
+	qmi_ctx->psoc = psoc;
+
+	status = wlan_objmgr_psoc_component_obj_attach(psoc, WLAN_UMAC_COMP_QMI,
+						       qmi_ctx,
+						       QDF_STATUS_SUCCESS);
+	if (QDF_IS_STATUS_ERROR(status)) {
+		qmi_err("Failed to attach psoc QMI component obj");
+		qdf_mem_free(qmi_ctx);
+		return status;
+	}
+
+	return status;
+}
+
+QDF_STATUS
+qmi_psoc_obj_destroy_notification(struct wlan_objmgr_psoc *psoc, void *arg)
+{
+	struct wlan_qmi_psoc_context *qmi_ctx;
+	QDF_STATUS status;
+
+	qmi_ctx = qmi_psoc_get_priv(psoc);
+	if (!qmi_ctx) {
+		qmi_err("psoc priv is NULL");
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	status = wlan_objmgr_psoc_component_obj_detach(psoc, WLAN_UMAC_COMP_QMI,
+						       qmi_ctx);
+	if (QDF_IS_STATUS_ERROR(status))
+		qmi_err("Failed to detach psoc QMI component obj");
+
+	qdf_mem_free(qmi_ctx);
+
+	return status;
+}

components/qmi/dispatcher/inc/wlan_qmi_public_struct.h

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: wlan_qmi_public_struct.h
+ *
+ * Contains QMI public data structure definitions.
+ */
+
+#ifndef _WLAN_QMI_PUBLIC_STRUCT_H_
+#define _WLAN_QMI_PUBLIC_STRUCT_H_
+
+/**
+ * struct wlan_qmi_psoc_callbacks - struct containing callbacks
+ *  to osif QMI APIs
+ */
+struct wlan_qmi_psoc_callbacks {
+};
+#endif

components/qmi/dispatcher/inc/wlan_qmi_ucfg_api.h

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: wlan_qmi_ucfg_api.h
+ *
+ * QMI component north bound interface
+ */
+
+#ifndef _WLAN_QMI_UCFG_API_H_
+#define _WLAN_QMI_UCFG_API_H_
+
+#include <wlan_objmgr_psoc_obj.h>
+#include <wlan_qmi_public_struct.h>
+
+#ifdef QMI_COMPONENT_ENABLE
+/**
+ * ucfg_qmi_init() - API to init QMI component
+ *
+ * This API is invoked from hdd_component_init during all component init.
+ * This API will register all required handlers for psoc object
+ * create/delete notification.
+ *
+ * Return: QDF status
+ */
+QDF_STATUS ucfg_qmi_init(void);
+
+/**
+ * ucfg_qmi_deinit() - API to deinit QMI component
+ *
+ * This API is invoked from hdd_component_deinit during all component deinit.
+ * This API will unregister all required handlers for psoc object
+ * create/delete notification.
+ *
+ * Return: QDF status
+ */
+QDF_STATUS ucfg_qmi_deinit(void);
+
+/**
+ * ucfg_qmi_register_os_if_callbacks() - API to register os if callbacks with
+ *  QMI component
+ * @psoc: PSOC handle
+ * @cb_obj: callback object
+ *
+ * Return: None
+ */
+void ucfg_qmi_register_os_if_callbacks(struct wlan_objmgr_psoc *psoc,
+				       struct wlan_qmi_psoc_callbacks *cb_obj);
+#else
+static inline QDF_STATUS ucfg_qmi_init(void)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static inline QDF_STATUS ucfg_qmi_deinit(void)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static inline
+void ucfg_qmi_register_os_if_callbacks(struct wlan_objmgr_psoc *psoc,
+				       struct wlan_qmi_psoc_callbacks *cb_obj)
+{
+}
+#endif
+#endif

components/qmi/dispatcher/src/wlan_qmi_ucfg_api.c

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: wlan_qmi_ucfg_api.c
+ *
+ * QMI component north bound interface definitions
+ */
+
+#include "wlan_qmi_ucfg_api.h"
+#include "wlan_qmi_main.h"
+#include "wlan_qmi_objmgr.h"
+#include "wlan_objmgr_global_obj.h"
+#include "wlan_cmn.h"
+
+QDF_STATUS ucfg_qmi_init(void)
+{
+	QDF_STATUS status;
+
+	status = wlan_objmgr_register_psoc_create_handler(
+			WLAN_UMAC_COMP_QMI,
+			qmi_psoc_obj_create_notification, NULL);
+	if (QDF_IS_STATUS_ERROR(status)) {
+		qmi_err("Failed to register psoc create handler for QMI");
+		return status;
+	}
+
+	status = wlan_objmgr_register_psoc_destroy_handler(
+			WLAN_UMAC_COMP_QMI,
+			qmi_psoc_obj_destroy_notification, NULL);
+	if (QDF_IS_STATUS_ERROR(status)) {
+		qmi_err("Failed to register psoc destroy handler for QMI");
+		goto fail_destroy_psoc;
+	}
+
+	return status;
+
+fail_destroy_psoc:
+	wlan_objmgr_unregister_psoc_create_handler(
+				WLAN_UMAC_COMP_QMI,
+				qmi_psoc_obj_create_notification, NULL);
+
+	return status;
+}
+
+QDF_STATUS ucfg_qmi_deinit(void)
+{
+	QDF_STATUS status;
+
+	qmi_debug("QMI module dispatcher deinit");
+
+	status = wlan_objmgr_unregister_psoc_destroy_handler(
+				WLAN_UMAC_COMP_QMI,
+				qmi_psoc_obj_destroy_notification, NULL);
+	if (QDF_IS_STATUS_ERROR(status))
+		qmi_err("Failed to unregister QMI psoc delete handle:%d",
+			status);
+
+	status = wlan_objmgr_unregister_psoc_create_handler(
+				WLAN_UMAC_COMP_QMI,
+				qmi_psoc_obj_create_notification, NULL);
+	if (QDF_IS_STATUS_ERROR(status))
+		qmi_err("Failed to unregister QMI psoc create handle:%d",
+			status);
+
+	return status;
+}
+
+void ucfg_qmi_register_os_if_callbacks(struct wlan_objmgr_psoc *psoc,
+				       struct wlan_qmi_psoc_callbacks *cb_obj)
+{
+	struct wlan_qmi_psoc_context *qmi_ctx = qmi_psoc_get_priv(psoc);
+
+	if (!qmi_ctx) {
+		qmi_err("QMI context is NULL");
+		return;
+	}
+}

core/hdd/src/wlan_hdd_main.c

@@ -237,6 +237,8 @@
 #include "os_if_dp.h"
 #include <wlan_dp_ucfg_api.h>
 #include "wlan_psoc_mlme_ucfg_api.h"
+#include "os_if_qmi.h"
+#include "wlan_qmi_ucfg_api.h"
 
 #ifdef MULTI_CLIENT_LL_SUPPORT
 #define WLAM_WLM_HOST_DRIVER_PORT_ID 0xFFFFFF
@@ -4200,6 +4202,19 @@ static int hdd_deconfigure_cds(struct hdd_context *hdd_ctx)
 	return ret;
 }
 
+/**
+ * hdd_qmi_register_callbacks() - Register QMI callbacks
+ * @hdd_ctx: HDD context
+ *
+ * Return: None
+ */
+static inline void hdd_qmi_register_callbacks(struct hdd_context *hdd_ctx)
+{
+	struct wlan_qmi_psoc_callbacks cb_obj;
+
+	os_if_qmi_register_callbacks(hdd_ctx->psoc, &cb_obj);
+}
+
 int hdd_wlan_start_modules(struct hdd_context *hdd_ctx, bool reinit)
 {
 	int ret = 0;
@@ -4303,6 +4318,8 @@ int hdd_wlan_start_modules(struct hdd_context *hdd_ctx, bool reinit)
 
 		hdd_dp_register_callbacks(hdd_ctx);
 
+		hdd_qmi_register_callbacks(hdd_ctx);
+
 		status = hdd_component_psoc_open(hdd_ctx->psoc);
 		if (QDF_IS_STATUS_ERROR(status)) {
 			hdd_err("Failed to Open legacy components; status: %d",
@@ -17301,8 +17318,14 @@ static QDF_STATUS hdd_component_init(void)
 	if (QDF_IS_STATUS_ERROR(status))
 		goto pre_cac_deinit;
 
+	status = ucfg_qmi_init();
+	if (QDF_IS_STATUS_ERROR(status))
+		goto dp_deinit;
+
 	return QDF_STATUS_SUCCESS;
 
+dp_deinit:
+	ucfg_dp_deinit();
 pre_cac_deinit:
 	ucfg_pre_cac_deinit();
 pkt_capture_deinit:
@@ -17351,6 +17374,7 @@ mlme_global_deinit:
 static void hdd_component_deinit(void)
 {
 	/* deinitialize non-converged components */
+	ucfg_qmi_deinit();
 	ucfg_dp_deinit();
 	ucfg_pre_cac_deinit();
 	ucfg_ftm_time_sync_deinit();

os_if/qmi/inc/os_if_qmi.h

@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: os_if_qmi.h
+ *
+ * This file contains declarations for wrapper APIs for QMI HLOS APIs
+ */
+
+#ifndef _OS_IF_QMI_H_
+#define _OS_IF_QMI_H_
+
+#include "wlan_qmi_public_struct.h"
+#include <qdf_types.h>
+#include <linux/soc/qcom/qmi.h>
+#include <linux/net.h>
+#include <linux/types.h>
+#include "wlan_cfg80211.h"
+#include "wlan_objmgr_psoc_obj.h"
+
+#ifdef QMI_COMPONENT_ENABLE
+/**
+ * os_if_qmi_handle_init() - Initialize QMI handle
+ * @qmi_hdl: QMI handle to initialize
+ * @recv_buf_size: maximum size of incoming message
+ * @ops: reference to callbacks for QRTR notifications
+ * @qmi_msg_handlers: NULL-terminated list of QMI message handlers
+ *
+ * Returns: QDF status
+ */
+QDF_STATUS
+os_if_qmi_handle_init(struct qmi_handle *qmi_hdl, qdf_size_t recv_buf_size,
+		      const struct qmi_ops *ops,
+		      const struct qmi_msg_handler *qmi_msg_handlers);
+
+/**
+ * os_if_qmi_handle_release() - Release QMI handle
+ * @qmi_hdl: QMI handle to release
+ *
+ * Returns: None
+ */
+void os_if_qmi_handle_release(struct qmi_handle *qmi_hdl);
+
+/**
+ * os_if_qmi_add_lookup() - Register a new lookup with the name service
+ * @qmi_hdl: QMI handle
+ * @service: service id of the request
+ * @instance: instance id of the request
+ * @version: version number of the request
+ *
+ * Return: QDF status
+ */
+QDF_STATUS os_if_qmi_add_lookup(struct qmi_handle *qmi_hdl,
+				unsigned int service, unsigned int version,
+				unsigned int instance);
+
+/**
+ * os_if_qmi_connect_to_svc() - Connect to QMI service
+ * @qmi_hdl: QMI handle
+ * @qmi_svc: QMI service handle
+ *
+ * Return: QDF status
+ */
+QDF_STATUS os_if_qmi_connect_to_svc(struct qmi_handle *qmi_hdl,
+				    struct qmi_service *qmi_svc);
+
+/**
+ * os_if_qmi_txn_init() - Initialize QMI transaction
+ * @qmi_hdl: QMI handle
+ * @qmi_txn: QMI transaction handle
+ * @qmi_ei: description of how to decode a matching response (optional)
+ * @resp: pointer to the object to decode the response into (optional)
+ *
+ * Return: QDF status
+ */
+QDF_STATUS os_if_qmi_txn_init(struct qmi_handle *qmi_hdl,
+			      struct qmi_txn *qmi_txn,
+			      struct qmi_elem_info *qmi_ei, void *resp);
+
+/**
+ * os_if_qmi_send_request() - Connect to QMI service
+ * @qmi_hdl: QMI handle
+ * @sq: destination sockaddr
+ * @qmi_txn: QMI transaction handle
+ * @msg_id: message id
+ * @len: max length of the QMI message
+ * @ei: QMI message description
+ * @req: message to be encoded
+ *
+ * Return: QDF status
+ */
+QDF_STATUS os_if_qmi_send_request(struct qmi_handle *qmi_hdl,
+				  struct sockaddr_qrtr *sq,
+				  struct qmi_txn *qmi_txn, int msg_id,
+				  uint32_t len, struct qmi_elem_info *ei,
+				  const void *req);
+
+/**
+ * os_if_qmi_txn_wait() - Wait for transaction response
+ * @qmi_txn: QMI transaction handle
+ * @timeout: Timeout value in jiffies
+ *
+ * Return: QDF status
+ */
+QDF_STATUS os_if_qmi_txn_wait(struct qmi_txn *qmi_txn, unsigned long timeout);
+
+/**
+ * os_if_qmi_txn_cancel() - Cancel the QMI transaction
+ * @qmi_txn: QMI transaction handle
+ *
+ * Return: None
+ */
+void os_if_qmi_txn_cancel(struct qmi_txn *qmi_txn);
+
+/**
+ * os_if_qmi_register_callbacks() - Register callback handlers
+ * @psoc: Pointer to psoc context
+ * @cb_obj: Callback object pointer
+ *
+ * Return: None
+ */
+void os_if_qmi_register_callbacks(struct wlan_objmgr_psoc *psoc,
+				  struct wlan_qmi_psoc_callbacks *cb_obj);
+#else
+static inline
+QDF_STATUS os_if_qmi_handle_init(struct qmi_handle *qmi_hdl,
+				 qdf_size_t recv_buf_size,
+				 const struct qmi_ops *ops,
+				 const struct qmi_msg_handler *qmi_msg_handlers)
+{
+	return QDF_STATUS_E_NOSUPPORT;
+}
+
+static inline
+void os_if_qmi_handle_release(struct qmi_handle *qmi_hdl)
+{
+}
+
+static inline
+QDF_STATUS os_if_qmi_add_lookup(struct qmi_handle *qmi_hdl,
+				unsigned int service, unsigned int version,
+				unsigned int instance)
+{
+	return QDF_STATUS_E_NOSUPPORT;
+}
+
+static inline
+QDF_STATUS os_if_qmi_connect_to_svc(struct qmi_handle *qmi_hdl,
+				    struct qmi_service *qmi_svc)
+{
+	return QDF_STATUS_E_NOSUPPORT;
+}
+
+static inline
+QDF_STATUS os_if_qmi_txn_init(struct qmi_handle *qmi_hdl,
+			      struct qmi_txn *qmi_txn,
+			      struct qmi_elem_info *qmi_ei, void *resp)
+{
+	return QDF_STATUS_E_NOSUPPORT;
+}
+
+static inline
+QDF_STATUS os_if_qmi_send_request(struct qmi_handle *qmi_hdl,
+				  struct sockaddr_qrtr *sq,
+				  struct qmi_txn *qmi_txn, int msg_id,
+				  uint32_t len, struct qmi_elem_info *ei,
+				  const void *req)
+{
+	return QDF_STATUS_E_NOSUPPORT;
+}
+
+static inline
+QDF_STATUS os_if_qmi_txn_wait(struct qmi_txn *qmi_txn, unsigned long timeout)
+{
+	return QDF_STATUS_E_NOSUPPORT;
+}
+
+static inline
+void os_if_qmi_txn_cancel(struct qmi_txn *qmi_txn)
+{
+}
+
+static inline
+void os_if_qmi_register_callbacks(struct wlan_objmgr_psoc *psoc,
+				  struct wlan_qmi_psoc_callbacks *cb_obj)
+{
+}
+#endif
+#endif

os_if/qmi/src/os_if_qmi.c

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: os_if_qmi.c
+ *
+ * This file contains definitions of wrapper APIs for QMI HLOS APIs
+ */
+
+#include "os_if_qmi.h"
+
+QDF_STATUS os_if_qmi_handle_init(struct qmi_handle *qmi_hdl,
+				 qdf_size_t recv_buf_size,
+				 const struct qmi_ops *ops,
+				 const struct qmi_msg_handler *qmi_msg_handlers)
+{
+	int ret;
+
+	ret = qmi_handle_init(qmi_hdl, recv_buf_size, ops, qmi_msg_handlers);
+	if (ret < 0)
+		return QDF_STATUS_QMI_HANDLE_INIT_FAILED;
+
+	return QDF_STATUS_SUCCESS;
+}
+
+void os_if_qmi_handle_release(struct qmi_handle *qmi_hdl)
+{
+	qmi_handle_release(qmi_hdl);
+}
+
+QDF_STATUS os_if_qmi_add_lookup(struct qmi_handle *qmi_hdl,
+				unsigned int service, unsigned int version,
+				unsigned int instance)
+{
+	int ret;
+
+	ret = qmi_add_lookup(qmi_hdl, service, version, instance);
+	if (ret < 0)
+		return QDF_STATUS_QMI_ADD_LOOKUP_FAILED;
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS os_if_qmi_connect_to_svc(struct qmi_handle *qmi_hdl,
+				    struct qmi_service *qmi_svc)
+{
+	struct sockaddr_qrtr sq = { 0 };
+	int ret;
+
+	osif_debug("QMI server arriving: node %u port %u", qmi_svc->node,
+		   qmi_svc->port);
+
+	sq.sq_family = AF_QIPCRTR;
+	sq.sq_node = qmi_svc->node;
+	sq.sq_port = qmi_svc->port;
+
+	ret = kernel_connect(qmi_hdl->sock, (struct sockaddr *)&sq,
+			     sizeof(sq), 0);
+	if (ret < 0) {
+		osif_err("Failed to connect to QMI remote service");
+		return QDF_STATUS_QMI_SVC_CONNECT_FAILED;
+	}
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS os_if_qmi_txn_init(struct qmi_handle *qmi_hdl,
+			      struct qmi_txn *qmi_txn,
+			      struct qmi_elem_info *qmi_ei, void *resp)
+{
+	int ret;
+
+	ret = qmi_txn_init(qmi_hdl, qmi_txn, qmi_ei, resp);
+	if (ret < 0) {
+		osif_info("QMI transaction init failed");
+		return QDF_STATUS_QMI_TXN_INIT_FAILED;
+	}
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS os_if_qmi_send_request(struct qmi_handle *qmi_hdl,
+				  struct sockaddr_qrtr *sq,
+				  struct qmi_txn *qmi_txn, int msg_id,
+				  uint32_t len, struct qmi_elem_info *ei,
+				  const void *req)
+{
+	int ret;
+
+	ret = qmi_send_request(qmi_hdl, sq, qmi_txn, msg_id, len, ei, req);
+	if (ret < 0) {
+		osif_info("QMI send request failed");
+		return QDF_STATUS_QMI_SEND_REQ_FAILED;
+	}
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS os_if_qmi_txn_wait(struct qmi_txn *qmi_txn, unsigned long timeout)
+{
+	int ret;
+
+	ret = qmi_txn_wait(qmi_txn, timeout);
+	if (ret < 0) {
+		osif_info("QMI Failed to wait for response");
+		return QDF_STATUS_QMI_TXN_WAIT_FAILED;
+	}
+
+	return QDF_STATUS_SUCCESS;
+}
+
+void os_if_qmi_txn_cancel(struct qmi_txn *qmi_txn)
+{
+	qmi_txn_cancel(qmi_txn);
+}
+
+void os_if_qmi_register_callbacks(struct wlan_objmgr_psoc *psoc,
+				  struct wlan_qmi_psoc_callbacks *cb_obj)
+{
+}