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

Commit e80972da authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "UPSTREAM: ath10k: add QMI message handshake for wcn3990 client"

parents 96b71fe3 fffbdb8d

drivers/net/wireless/ath/ath10k/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ config ATH10K_SNOC 
	tristate "Qualcomm ath10k SNOC support (EXPERIMENTAL)"

	depends on ATH10K

	depends on ARCH_QCOM || COMPILE_TEST

	select QCOM_QMI_HELPERS

	---help---

	  This module adds support for integrated WCN3990 chip connected

	  to system NOC(SNOC). Currently work in progress and will not

drivers/net/wireless/ath/ath10k/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -36,7 +36,9 @@ obj-$(CONFIG_ATH10K_USB) += ath10k_usb.o 
ath10k_usb-y += usb.o



obj-$(CONFIG_ATH10K_SNOC) += ath10k_snoc.o

ath10k_snoc-y += snoc.o

ath10k_snoc-y += qmi.o \

		 qmi_wlfw_v01.o \

		 snoc.o



# for tracing framework to find trace.h

CFLAGS_trace.o := -I$(src)

drivers/net/wireless/ath/ath10k/core.c

+4 −2
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ static int ath10k_download_fw(struct ath10k *ar) 
	return ret;

}



static void ath10k_core_free_board_files(struct ath10k *ar)

void ath10k_core_free_board_files(struct ath10k *ar)

{

	if (!IS_ERR(ar->normal_mode_fw.board))

		release_firmware(ar->normal_mode_fw.board);
@@ -896,6 +896,7 @@ static void ath10k_core_free_board_files(struct ath10k *ar) 
	ar->normal_mode_fw.ext_board_data = NULL;

	ar->normal_mode_fw.ext_board_len = 0;

}

EXPORT_SYMBOL(ath10k_core_free_board_files);



static void ath10k_core_free_firmware_files(struct ath10k *ar)

{
@@ -1259,7 +1260,7 @@ static int ath10k_core_create_eboard_name(struct ath10k *ar, char *name, 
	return -1;

}



static int ath10k_core_fetch_board_file(struct ath10k *ar, int bd_ie_type)

int ath10k_core_fetch_board_file(struct ath10k *ar, int bd_ie_type)

{

	char boardname[100], fallback_boardname[100];

	int ret;
@@ -1307,6 +1308,7 @@ static int ath10k_core_fetch_board_file(struct ath10k *ar, int bd_ie_type) 
	ath10k_dbg(ar, ATH10K_DBG_BOOT, "using board api %d\n", ar->bd_api);

	return 0;

}

EXPORT_SYMBOL(ath10k_core_fetch_board_file);



static int ath10k_core_get_ext_board_id_from_otp(struct ath10k *ar)

{

drivers/net/wireless/ath/ath10k/core.h

+2 −0
Original line number Diff line number Diff line
@@ -1070,5 +1070,7 @@ void ath10k_core_stop(struct ath10k *ar); 
int ath10k_core_register(struct ath10k *ar,

			 const struct ath10k_bus_params *bus_params);

void ath10k_core_unregister(struct ath10k *ar);

int ath10k_core_fetch_board_file(struct ath10k *ar, int bd_ie_type);

void ath10k_core_free_board_files(struct ath10k *ar);



#endif /* _CORE_H_ */

drivers/net/wireless/ath/ath10k/debug.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ enum ath10k_debug_mask { 
	ATH10K_DBG_USB		= 0x00040000,

	ATH10K_DBG_USB_BULK	= 0x00080000,

	ATH10K_DBG_SNOC		= 0x00100000,

	ATH10K_DBG_QMI		= 0x00200000,

	ATH10K_DBG_ANY		= 0xffffffff,

};