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

Commit 921060cc authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-for-davem-2018-10-14' of... 

Merge tag 'wireless-drivers-next-for-davem-2018-10-14' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for 4.20

Third set of patches for 4.20. Most notable is finalising ath10k
wcn3990 support, all components should be implemented now.

Major changes:

ath10k

* support NET_DETECT WoWLAN feature

* wcn3990 basic functionality now working after we got QMI support

mt76

* mt76x0e improvements (should be usable now)

* more mt76x0/mt76x2 unification work

brcmsmac

* fix a problem on AP mode with clients using power save mode

iwlwifi

* support for a new scan type: fast balance
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d864991b f95cd524

Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt

+6 −0
Original line number Diff line number Diff line
@@ -56,6 +56,11 @@ Optional properties: 
				     the length can vary between hw versions.

- <supply-name>-supply: handle to the regulator device tree node

			   optional "supply-name" is "vdd-0.8-cx-mx".

- memory-region:

	Usage: optional

	Value type: <phandle>

	Definition: reference to the reserved-memory for the msa region

		    used by the wifi firmware running in Q6.



Example (to supply the calibration data alone):
@@ -149,4 +154,5 @@ wifi@18000000 { 
			   <0 140 0 /* CE10 */ >,

			   <0 141 0 /* CE11 */ >;

		vdd-0.8-cx-mx-supply = <&pm8998_l5>;

		memory-region = <&wifi_msa_mem>;

};

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

+12 −2
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ static int ath10k_download_fw(struct ath10k *ar) 
					data, data_len);

}



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);
@@ -1004,6 +1004,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)

{
@@ -1331,6 +1332,14 @@ static int ath10k_core_create_board_name(struct ath10k *ar, char *name, 
		goto out;

	}



	if (ar->id.qmi_ids_valid) {

		scnprintf(name, name_len,

			  "bus=%s,qmi-board-id=%x",

			  ath10k_bus_str(ar->hif.bus),

			  ar->id.qmi_board_id);

		goto out;

	}



	scnprintf(name, name_len,

		  "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x%s",

		  ath10k_bus_str(ar->hif.bus),
@@ -1359,7 +1368,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;
@@ -1407,6 +1416,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

+5 −0
Original line number Diff line number Diff line
@@ -951,6 +951,7 @@ struct ath10k { 
	/* protected by conf_mutex */

	u8 ps_state_enable;



	bool nlo_enabled;

	bool p2p;



	struct {
@@ -988,6 +989,8 @@ struct ath10k { 
		u32 subsystem_device;



		bool bmi_ids_valid;

		bool qmi_ids_valid;

		u32 qmi_board_id;

		u8 bmi_board_id;

		u8 bmi_eboard_id;

		u8 bmi_chip_id;
@@ -1215,5 +1218,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_ */