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

Commit 90bc7dfd authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git patches for 4.14. Major changes:

ath10k

* initial UBS bus support (no full support yet)

* add tdls support for 10.4 firmware

ath9k

* add Dell Wireless 1802

wil6210

* support FW RSSI reporting
parents 1fe79d7f 4165cf7b

drivers/net/wireless/ath/ath10k/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,13 @@ config ATH10K_SDIO 
	  This module adds experimental support for SDIO/MMC bus. Currently

	  work in progress and will not fully work.



config ATH10K_USB

	tristate "Atheros ath10k USB support (EXPERIMENTAL)"

	depends on ATH10K && USB

	---help---

	  This module adds experimental support for USB bus. Currently

	  work in progress and will not fully work.



config ATH10K_DEBUG

	bool "Atheros ath10k debugging"

	depends on ATH10K

drivers/net/wireless/ath/ath10k/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -30,5 +30,8 @@ ath10k_pci-$(CONFIG_ATH10K_AHB) += ahb.o 
obj-$(CONFIG_ATH10K_SDIO) += ath10k_sdio.o

ath10k_sdio-y += sdio.o



obj-$(CONFIG_ATH10K_USB) += ath10k_usb.o

ath10k_usb-y += usb.o



# for tracing framework to find trace.h

CFLAGS_trace.o := -I$(src)

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

+10 −5
Original line number Diff line number Diff line
@@ -197,35 +197,40 @@ static int ath10k_ahb_rst_ctrl_init(struct ath10k *ar) 


	dev = &ar_ahb->pdev->dev;



	ar_ahb->core_cold_rst = devm_reset_control_get(dev, "wifi_core_cold");

	ar_ahb->core_cold_rst = devm_reset_control_get_exclusive(dev,

								 "wifi_core_cold");

	if (IS_ERR(ar_ahb->core_cold_rst)) {

		ath10k_err(ar, "failed to get core cold rst ctrl: %ld\n",

			   PTR_ERR(ar_ahb->core_cold_rst));

		return PTR_ERR(ar_ahb->core_cold_rst);

	}



	ar_ahb->radio_cold_rst = devm_reset_control_get(dev, "wifi_radio_cold");

	ar_ahb->radio_cold_rst = devm_reset_control_get_exclusive(dev,

								  "wifi_radio_cold");

	if (IS_ERR(ar_ahb->radio_cold_rst)) {

		ath10k_err(ar, "failed to get radio cold rst ctrl: %ld\n",

			   PTR_ERR(ar_ahb->radio_cold_rst));

		return PTR_ERR(ar_ahb->radio_cold_rst);

	}



	ar_ahb->radio_warm_rst = devm_reset_control_get(dev, "wifi_radio_warm");

	ar_ahb->radio_warm_rst = devm_reset_control_get_exclusive(dev,

								  "wifi_radio_warm");

	if (IS_ERR(ar_ahb->radio_warm_rst)) {

		ath10k_err(ar, "failed to get radio warm rst ctrl: %ld\n",

			   PTR_ERR(ar_ahb->radio_warm_rst));

		return PTR_ERR(ar_ahb->radio_warm_rst);

	}



	ar_ahb->radio_srif_rst = devm_reset_control_get(dev, "wifi_radio_srif");

	ar_ahb->radio_srif_rst = devm_reset_control_get_exclusive(dev,

								  "wifi_radio_srif");

	if (IS_ERR(ar_ahb->radio_srif_rst)) {

		ath10k_err(ar, "failed to get radio srif rst ctrl: %ld\n",

			   PTR_ERR(ar_ahb->radio_srif_rst));

		return PTR_ERR(ar_ahb->radio_srif_rst);

	}



	ar_ahb->cpu_init_rst = devm_reset_control_get(dev, "wifi_cpu_init");

	ar_ahb->cpu_init_rst = devm_reset_control_get_exclusive(dev,

								"wifi_cpu_init");

	if (IS_ERR(ar_ahb->cpu_init_rst)) {

		ath10k_err(ar, "failed to get cpu init rst ctrl: %ld\n",

			   PTR_ERR(ar_ahb->cpu_init_rst));

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

+10 −0
Original line number Diff line number Diff line
@@ -1454,6 +1454,7 @@ static void ath10k_core_get_fw_name(struct ath10k *ar, char *fw_name, 
{

	switch (ar->hif.bus) {

	case ATH10K_BUS_SDIO:

	case ATH10K_BUS_USB:

		scnprintf(fw_name, fw_name_len, "%s-%s-%d.bin",

			  ATH10K_FW_FILE_BASE, ath10k_bus_str(ar->hif.bus),

			  fw_api);
@@ -1885,6 +1886,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->fw_stats_req_mask = WMI_10_4_STAT_PEER |

					WMI_10_4_STAT_PEER_EXTD;

		ar->max_spatial_stream = ar->hw_params.max_spatial_stream;

		ar->max_num_tdls_vdevs = TARGET_10_4_NUM_TDLS_VDEVS;



		if (test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL,

			     fw_file->fw_features))
@@ -2123,6 +2125,14 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, 
			     ar->running_fw->fw_file.fw_features))

			val |= WMI_10_4_COEX_GPIO_SUPPORT;



		if (test_bit(WMI_SERVICE_TDLS_EXPLICIT_MODE_ONLY,

			     ar->wmi.svc_map))

			val |= WMI_10_4_TDLS_EXPLICIT_MODE_ONLY;



		if (test_bit(WMI_SERVICE_TDLS_UAPSD_BUFFER_STA,

			     ar->wmi.svc_map))

			val |= WMI_10_4_TDLS_UAPSD_BUFFER_STA;



		status = ath10k_mac_ext_resource_config(ar, val);

		if (status) {

			ath10k_err(ar,

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

+5 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ enum ath10k_bus { 
	ATH10K_BUS_PCI,

	ATH10K_BUS_AHB,

	ATH10K_BUS_SDIO,

	ATH10K_BUS_USB,

};



static inline const char *ath10k_bus_str(enum ath10k_bus bus)
@@ -103,6 +104,8 @@ static inline const char *ath10k_bus_str(enum ath10k_bus bus) 
		return "ahb";

	case ATH10K_BUS_SDIO:

		return "sdio";

	case ATH10K_BUS_USB:

		return "usb";

	}



	return "unknown";
@@ -993,6 +996,8 @@ struct ath10k { 
		u32 reg_ack_cts_timeout_orig;

	} fw_coverage;



	u32 ampdu_reference;



	void *ce_priv;



	/* must be last */