Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc5e25bf authored by Naman Padhiar's avatar Naman Padhiar Committed by Gerrit - the friendly Code Review server
Browse files

cnss-utils: Compile firmware service file independently 



Wlan firmware service file need to compile independently and
linked to other modules to avoid error of compiling same file
twice.

Change-Id: I1900940225c0c8a66b4cc9d8315d5800c7577e6a
Signed-off-by: default avatarNaman Padhiar <npadhiar@codeaurora.org>
parent d63aafbd

drivers/net/wireless/cnss2/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ config CNSS2_DEBUG 


config CNSS2_QMI

	bool "CNSS2 Platform Driver QMI support"

	select CNSS_QMI_SVC

	depends on CNSS2

	help

	  CNSS2 platform driver uses QMI framework to communicate with WLAN

drivers/net/wireless/cnss2/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,10 +2,11 @@ 


obj-$(CONFIG_CNSS2) += cnss2.o



ccflags-y += -I$(srctree)/drivers/net/wireless/cnss_utils/

cnss2-y := main.o

cnss2-y += bus.o

cnss2-y += debug.o

cnss2-y += pci.o

cnss2-y += power.o

cnss2-$(CONFIG_CNSS2_DEBUG) += genl.o

cnss2-$(CONFIG_CNSS2_QMI) += qmi.o wlan_firmware_service_v01.o coexistence_service_v01.o ip_multimedia_subsystem_private_service_v01.o
 
cnss2-$(CONFIG_CNSS2_QMI) += qmi.o coexistence_service_v01.o ip_multimedia_subsystem_private_service_v01.o

drivers/net/wireless/cnss_utils/Kconfig

+9 −1
Original line number Diff line number Diff line
@@ -6,3 +6,11 @@ config CNSS_UTILS 
	  Add CNSS utilities support for the WLAN driver module.

	  This feature enable wlan driver to use CNSS utilities APIs to set

	  and get wlan related information.



config CNSS_QMI_SVC

	bool "CNSS QMI SVC support"

	help

	  Add CNSS QMI SVC support for the WLAN driver module.

	  This feature enable wlan driver to use CNSS QMI service APIs to set

	  and get wlan related information.

drivers/net/wireless/cnss_utils/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



obj-$(CONFIG_CNSS_UTILS) += cnss_utils.o

obj-$(CONFIG_CNSS_QMI_SVC) += wlan_firmware_service_v01.o

drivers/net/wireless/cnss2/wlan_firmware_service_v01.c→drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.c

+153 −90
Original line number Diff line number Diff line
@@ -3766,3 +3766,66 @@ struct qmi_elem_info wlfw_respond_get_info_ind_msg_v01_ei[] = { 
		.tlv_type       = QMI_COMMON_TLV_TYPE,

	},

};



struct qmi_elem_info wlfw_device_info_req_msg_v01_ei[] = {

	{

		.data_type      = QMI_EOTI,

		.array_type       = NO_ARRAY,

		.tlv_type       = QMI_COMMON_TLV_TYPE,

	},

};



struct qmi_elem_info 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 wlfw_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 wlfw_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 wlfw_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 wlfw_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 wlfw_device_info_resp_msg_v01,

					   bar_size),

	},

	{

		.data_type      = QMI_EOTI,

		.array_type       = NO_ARRAY,

		.tlv_type       = QMI_COMMON_TLV_TYPE,

	},

};