Merge tag 'wireless-drivers-next-for-davem-2016-06-21' of... (dc14341e) · Commits · 戴 / test

MAINTAINERS

+4 −5

Original line number	Diff line number	Diff line
		@@ -2578,12 +2578,11 @@ S: Supported
		F: drivers/net/ethernet/broadcom/tg3.*

		BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
		M: Brett Rudley <brudley@broadcom.com>
		M: Arend van Spriel <arend@broadcom.com>
		M: Franky (Zhenhui) Lin <frankyl@broadcom.com>
		M: Hante Meuleman <meuleman@broadcom.com>
		M: Arend van Spriel <arend.vanspriel@broadcom.com>
		M: Franky Lin <franky.lin@broadcom.com>
		M: Hante Meuleman <hante.meuleman@broadcom.com>
		L: linux-wireless@vger.kernel.org
		L: brcm80211-dev-list@broadcom.com
		L: brcm80211-dev-list.pdl@broadcom.com
		S: Supported
		F: drivers/net/wireless/broadcom/brcm80211/

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

+5 −6

Original line number	Diff line number	Diff line
		@@ -25,10 +25,9 @@
		#include "ahb.h"

		static const struct of_device_id ath10k_ahb_of_match[] = {
		/* TODO: enable this entry once everything in place.
		* { .compatible = "qcom,ipq4019-wifi",
		* .data = (void *)ATH10K_HW_QCA4019 },
		*/
		{ .compatible = "qcom,ipq4019-wifi",
		.data = (void *)ATH10K_HW_QCA4019
		},
		{ }
		};

		@@ -476,6 +475,7 @@ static irqreturn_t ath10k_ahb_interrupt_handler(int irq, void *arg)

		static int ath10k_ahb_request_irq_legacy(struct ath10k *ar)
		{
		struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
		struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);
		int ret;

		@@ -487,6 +487,7 @@ static int ath10k_ahb_request_irq_legacy(struct ath10k *ar)
		ar_ahb->irq, ret);
		return ret;
		}
		ar_pci->oper_irq_mode = ATH10K_PCI_IRQ_LEGACY;

		return 0;
		}
		@@ -918,8 +919,6 @@ int ath10k_ahb_init(void)
		{
		int ret;

		printk(KERN_ERR "AHB support is still work in progress\n");

		ret = platform_driver_register(&ath10k_ahb_driver);
		if (ret)
		printk(KERN_ERR "failed to register ath10k ahb driver: %d\n",

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

+101 −4

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		#include <linux/module.h>
		#include <linux/firmware.h>
		#include <linux/of.h>
		#include <asm/byteorder.h>

		#include "core.h"
		#include "mac.h"
		@@ -55,7 +56,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.name = "qca988x hw2.0",
		.patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,
		.uart_pin = 7,
		.has_shifted_cc_wraparound = true,
		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,
		.otp_exe_param = 0,
		.channel_counters_freq_hz = 88000,
		.max_probe_resp_desc_thres = 0,
		@@ -68,6 +69,25 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,
		},
		},
		{
		.id = QCA9887_HW_1_0_VERSION,
		.dev_id = QCA9887_1_0_DEVICE_ID,
		.name = "qca9887 hw1.0",
		.patch_load_addr = QCA9887_HW_1_0_PATCH_LOAD_ADDR,
		.uart_pin = 7,
		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,
		.otp_exe_param = 0,
		.channel_counters_freq_hz = 88000,
		.max_probe_resp_desc_thres = 0,
		.hw_4addr_pad = ATH10K_HW_4ADDR_PAD_AFTER,
		.cal_data_len = 2116,
		.fw = {
		.dir = QCA9887_HW_1_0_FW_DIR,
		.board = QCA9887_HW_1_0_BOARD_DATA_FILE,
		.board_size = QCA9887_BOARD_DATA_SZ,
		.board_ext_size = QCA9887_BOARD_EXT_DATA_SZ,
		},
		},
		{
		.id = QCA6174_HW_2_1_VERSION,
		.dev_id = QCA6164_2_1_DEVICE_ID,
		@@ -148,6 +168,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.uart_pin = 7,
		.otp_exe_param = 0x00000700,
		.continuous_frag_desc = true,
		.cck_rate_map_rev2 = true,
		.channel_counters_freq_hz = 150000,
		.max_probe_resp_desc_thres = 24,
		.hw_4addr_pad = ATH10K_HW_4ADDR_PAD_BEFORE,
		@@ -162,6 +183,29 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,
		},
		},
		{
		.id = QCA9984_HW_1_0_DEV_VERSION,
		.dev_id = QCA9984_1_0_DEVICE_ID,
		.name = "qca9984/qca9994 hw1.0",
		.patch_load_addr = QCA9984_HW_1_0_PATCH_LOAD_ADDR,
		.uart_pin = 7,
		.otp_exe_param = 0x00000700,
		.continuous_frag_desc = true,
		.cck_rate_map_rev2 = true,
		.channel_counters_freq_hz = 150000,
		.max_probe_resp_desc_thres = 24,
		.hw_4addr_pad = ATH10K_HW_4ADDR_PAD_BEFORE,
		.tx_chain_mask = 0xf,
		.rx_chain_mask = 0xf,
		.max_spatial_stream = 4,
		.cal_data_len = 12064,
		.fw = {
		.dir = QCA9984_HW_1_0_FW_DIR,
		.board = QCA9984_HW_1_0_BOARD_DATA_FILE,
		.board_size = QCA99X0_BOARD_DATA_SZ,
		.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,
		},
		},
		{
		.id = QCA9377_HW_1_0_DEV_VERSION,
		.dev_id = QCA9377_1_0_DEVICE_ID,
		@@ -202,9 +246,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.name = "qca4019 hw1.0",
		.patch_load_addr = QCA4019_HW_1_0_PATCH_LOAD_ADDR,
		.uart_pin = 7,
		.has_shifted_cc_wraparound = true,
		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,
		.otp_exe_param = 0x0010000,
		.continuous_frag_desc = true,
		.cck_rate_map_rev2 = true,
		.channel_counters_freq_hz = 125000,
		.max_probe_resp_desc_thres = 24,
		.hw_4addr_pad = ATH10K_HW_4ADDR_PAD_BEFORE,
		@@ -236,6 +281,7 @@ static const char *const ath10k_core_fw_feature_str[] = {
		[ATH10K_FW_FEATURE_SUPPORTS_ADAPTIVE_CCA] = "adaptive-cca",
		[ATH10K_FW_FEATURE_MFP_SUPPORT] = "mfp",
		[ATH10K_FW_FEATURE_PEER_FLOW_CONTROL] = "peer-flow-ctrl",
		[ATH10K_FW_FEATURE_BTCOEX_PARAM] = "btcoex-param",
		};

		static unsigned int ath10k_core_get_fw_feature_str(char *buf,
		@@ -531,6 +577,35 @@ out:
		return ret;
		}

		static int ath10k_download_cal_eeprom(struct ath10k *ar)
		{
		size_t data_len;
		void *data = NULL;
		int ret;

		ret = ath10k_hif_fetch_cal_eeprom(ar, &data, &data_len);
		if (ret) {
		if (ret != -EOPNOTSUPP)
		ath10k_warn(ar, "failed to read calibration data from EEPROM: %d\n",
		ret);
		goto out_free;
		}

		ret = ath10k_download_board_data(ar, data, data_len);
		if (ret) {
		ath10k_warn(ar, "failed to download calibration data from EEPROM: %d\n",
		ret);
		goto out_free;
		}

		ret = 0;

		out_free:
		kfree(data);

		return ret;
		}

		static int ath10k_core_get_board_id_from_otp(struct ath10k *ar)
		{
		u32 result, address;
		@@ -1293,7 +1368,17 @@ static int ath10k_download_cal_data(struct ath10k *ar)
		}

		ath10k_dbg(ar, ATH10K_DBG_BOOT,
		"boot did not find DT entry, try OTP next: %d\n",
		"boot did not find DT entry, try target EEPROM next: %d\n",
		ret);

		ret = ath10k_download_cal_eeprom(ar);
		if (ret == 0) {
		ar->cal_mode = ATH10K_CAL_MODE_EEPROM;
		goto done;
		}

		ath10k_dbg(ar, ATH10K_DBG_BOOT,
		"boot did not find target EEPROM entry, try OTP next: %d\n",
		ret);

		ret = ath10k_download_and_run_otp(ar);
		@@ -1733,6 +1818,16 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,
		if (test_bit(WMI_SERVICE_BSS_CHANNEL_INFO_64, ar->wmi.svc_map))
		val \|= WMI_10_4_BSS_CHANNEL_INFO_64;

		/* 10.4 firmware supports BT-Coex without reloading firmware
		* via pdev param. To support Bluetooth coexistence pdev param,
		* WMI_COEX_GPIO_SUPPORT of extended resource config should be
		* enabled always.
		*/
		if (test_bit(WMI_SERVICE_COEX_GPIO, ar->wmi.svc_map) &&
		test_bit(ATH10K_FW_FEATURE_BTCOEX_PARAM,
		ar->running_fw->fw_file.fw_features))
		val \|= WMI_10_4_COEX_GPIO_SUPPORT;

		status = ath10k_mac_ext_resource_config(ar, val);
		if (status) {
		ath10k_err(ar,
		@@ -2062,6 +2157,7 @@ struct ath10k ath10k_core_create(size_t priv_size, struct device dev,

		switch (hw_rev) {
		case ATH10K_HW_QCA988X:
		case ATH10K_HW_QCA9887:
		ar->regs = &qca988x_regs;
		ar->hw_values = &qca988x_values;
		break;
		@@ -2071,6 +2167,7 @@ struct ath10k ath10k_core_create(size_t priv_size, struct device dev,
		ar->hw_values = &qca6174_values;
		break;
		case ATH10K_HW_QCA99X0:
		case ATH10K_HW_QCA9984:
		ar->regs = &qca99x0_regs;
		ar->hw_values = &qca99x0_values;
		break;
		@@ -2159,5 +2256,5 @@ void ath10k_core_destroy(struct ath10k *ar)
		EXPORT_SYMBOL(ath10k_core_destroy);

		MODULE_AUTHOR("Qualcomm Atheros");
		MODULE_DESCRIPTION("Core module for QCA988X PCIe devices.");
		MODULE_DESCRIPTION("Core module for Qualcomm Atheros 802.11ac wireless LAN cards.");
		MODULE_LICENSE("Dual BSD/GPL");

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

+19 −5

Original line number	Diff line number	Diff line
		@@ -535,6 +535,13 @@ enum ath10k_fw_features {
		*/
		ATH10K_FW_FEATURE_PEER_FLOW_CONTROL = 13,

		/* Firmware supports BT-Coex without reloading firmware via pdev param.
		* To support Bluetooth coexistence pdev param, WMI_COEX_GPIO_SUPPORT of
		* extended resource config should be enabled always. This firmware IE
		* is used to configure WMI_COEX_GPIO_SUPPORT.
		*/
		ATH10K_FW_FEATURE_BTCOEX_PARAM = 14,

		/* keep last */
		ATH10K_FW_FEATURE_COUNT,
		};
		@@ -571,6 +578,7 @@ enum ath10k_cal_mode {
		ATH10K_CAL_MODE_DT,
		ATH10K_PRE_CAL_MODE_FILE,
		ATH10K_PRE_CAL_MODE_DT,
		ATH10K_CAL_MODE_EEPROM,
		};

		enum ath10k_crypt_mode {
		@@ -593,6 +601,8 @@ static inline const char *ath10k_cal_mode_str(enum ath10k_cal_mode mode)
		return "pre-cal-file";
		case ATH10K_PRE_CAL_MODE_DT:
		return "pre-cal-dt";
		case ATH10K_CAL_MODE_EEPROM:
		return "eeprom";
		}

		return "unknown";
		@@ -703,12 +713,10 @@ struct ath10k {
		int uart_pin;
		u32 otp_exe_param;

		/* This is true if given HW chip has a quirky Cycle Counter
		* wraparound which resets to 0x7fffffff instead of 0. All
		* other CC related counters (e.g. Rx Clear Count) are divided
		* by 2 so they never wraparound themselves.
		/* Type of hw cycle counter wraparound logic, for more info
		* refer enum ath10k_hw_cc_wraparound_type.
		*/
		bool has_shifted_cc_wraparound;
		enum ath10k_hw_cc_wraparound_type cc_wraparound_type;

		/* Some of chip expects fragment descriptor to be continuous
		* memory for any TX operation. Set continuous_frag_desc flag
		@@ -716,6 +724,12 @@ struct ath10k {
		*/
		bool continuous_frag_desc;

		/* CCK hardware rate table mapping for the newer chipsets
		* like QCA99X0, QCA4019 got revised. The CCK h/w rate values
		* are in a proper order with respect to the rate/preamble
		*/
		bool cck_rate_map_rev2;

		u32 channel_counters_freq_hz;

		/* Mgmt tx descriptors threshold for limiting probe response

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

+21 −11

Original line number	Diff line number	Diff line
		@@ -609,25 +609,23 @@ static ssize_t ath10k_write_simulate_fw_crash(struct file *file,
		char buf[32];
		int ret;

		mutex_lock(&ar->conf_mutex);

		simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);

		/* make sure that buf is null terminated */
		buf[sizeof(buf) - 1] = 0;

		/* drop the possible '\n' from the end */
		if (buf[count - 1] == '\n')
		buf[count - 1] = 0;

		mutex_lock(&ar->conf_mutex);

		if (ar->state != ATH10K_STATE_ON &&
		ar->state != ATH10K_STATE_RESTARTED) {
		ret = -ENETDOWN;
		goto exit;
		}

		/* drop the possible '\n' from the end */
		if (buf[count - 1] == '\n') {
		buf[count - 1] = 0;
		count--;
		}

		if (!strcmp(buf, "soft")) {
		ath10k_info(ar, "simulating soft firmware crash\n");
		ret = ath10k_wmi_force_fw_hang(ar, WMI_FORCE_FW_HANG_ASSERT, 0);
		@@ -2127,6 +2125,7 @@ static ssize_t ath10k_write_btcoex(struct file *file,
		size_t buf_size;
		int ret;
		bool val;
		u32 pdev_param;

		buf_size = min(count, (sizeof(buf) - 1));
		if (copy_from_user(buf, ubuf, buf_size))
		@@ -2150,14 +2149,25 @@ static ssize_t ath10k_write_btcoex(struct file *file,
		goto exit;
		}

		pdev_param = ar->wmi.pdev_param->enable_btcoex;
		if (test_bit(ATH10K_FW_FEATURE_BTCOEX_PARAM,
		ar->running_fw->fw_file.fw_features)) {
		ret = ath10k_wmi_pdev_set_param(ar, pdev_param, val);
		if (ret) {
		ath10k_warn(ar, "failed to enable btcoex: %d\n", ret);
		ret = count;
		goto exit;
		}
		} else {
		ath10k_info(ar, "restarting firmware due to btcoex change");
		queue_work(ar->workqueue, &ar->restart_work);
		}

		if (val)
		set_bit(ATH10K_FLAG_BTCOEX, &ar->dev_flags);
		else
		clear_bit(ATH10K_FLAG_BTCOEX, &ar->dev_flags);

		ath10k_info(ar, "restarting firmware due to btcoex change");

		queue_work(ar->workqueue, &ar->restart_work);
		ret = count;

		exit:

Admin message