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

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

Merge tag 'wireless-drivers-next-for-davem-2015-10-09' of... 

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



Kalle Valo says:

====================
Major changes:

iwlwifi

* some debugfs improvements
* fix signedness in beacon statistics
* deinline some functions to reduce size when device tracing is enabled
* filter beacons out in AP mode when no stations are associated
* deprecate firmwares version -12
* fix a runtime PM vs. legacy suspend race
* one-liner fix for a ToF bug
* clean-ups in the rx code
* small debugging improvement
* fix WoWLAN with new firmware versions
* more clean-ups towards multiple RX queues;
* some rate scaling fixes and improvements;
* some time-of-flight fixes;
* other generic improvements and clean-ups;

brcmfmac

* rework code dealing with multiple interfaces
* allow logging firmware console using debug level
* support for BCM4350, BCM4365, and BCM4366 PCIE devices
* fixed for legacy P2P and P2P device handling
* correct set and get tx-power

ath9k

* add support for Outside Context of a BSS (OCB) mode

mwifiex

* add USB multichannel feature
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e2ca690b 7e64e5e6

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5546,7 +5546,7 @@ F: drivers/net/wireless/iwlegacy/ 
INTEL WIRELESS WIFI LINK (iwlwifi)

M:	Johannes Berg <johannes.berg@intel.com>

M:	Emmanuel Grumbach <emmanuel.grumbach@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

M:	Intel Linux Wireless <linuxwifi@intel.com>

L:	linux-wireless@vger.kernel.org

W:	http://intellinuxwireless.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git

drivers/bcma/main.c

+2 −7
Original line number Diff line number Diff line
@@ -436,13 +436,8 @@ int bcma_bus_register(struct bcma_bus *bus) 
	}



	dev = bcma_bus_get_host_dev(bus);

	/* TODO: remove check for IS_BUILTIN(CONFIG_BCMA) check when

	 * of_default_bus_match_table is exported or in some other way

	 * accessible. This is just a temporary workaround.

	 */

	if (IS_BUILTIN(CONFIG_BCMA) && dev) {

		of_platform_populate(dev->of_node, of_default_bus_match_table,

				     NULL, dev);

	if (dev) {

		of_platform_default_populate(dev->of_node, NULL, dev);

	}



	/* Cores providing flash access go before SPROM init */

drivers/net/wireless/airo.c

+40 −24
Original line number Diff line number Diff line
@@ -1237,6 +1237,7 @@ struct airo_info { 


	int			wep_capable;

	int			max_wep_idx;

	int			last_auth;



	/* WPA-related stuff */

	unsigned int bssListFirst;
@@ -3266,6 +3267,7 @@ static void airo_handle_link(struct airo_info *ai) 
			wake_up_interruptible(&ai->thr_wait);

		} else

			airo_send_event(ai->dev);

		netif_carrier_on(ai->dev);

	} else if (!scan_forceloss) {

		if (auto_wep && !ai->expires) {

			ai->expires = RUN_AT(3*HZ);
@@ -3276,6 +3278,9 @@ static void airo_handle_link(struct airo_info *ai) 
		eth_zero_addr(wrqu.ap_addr.sa_data);

		wrqu.ap_addr.sa_family = ARPHRD_ETHER;

		wireless_send_event(ai->dev, SIOCGIWAP, &wrqu, NULL);

		netif_carrier_off(ai->dev);

	} else {

		netif_carrier_off(ai->dev);

	}

}
@@ -3612,6 +3617,7 @@ static void disable_MAC( struct airo_info *ai, int lock ) { 
		return;



	if (test_bit(FLAG_ENABLED, &ai->flags)) {

		netif_carrier_off(ai->dev);

		memset(&cmd, 0, sizeof(cmd));

		cmd.cmd = MAC_DISABLE; // disable in case already enabled

		issuecommand(ai, &cmd, &rsp);
@@ -3786,6 +3792,16 @@ badrx: 
	}

}



static inline void set_auth_type(struct airo_info *local, int auth_type)

{

	local->config.authType = auth_type;

	/* Cache the last auth type used (of AUTH_OPEN and AUTH_ENCRYPT).

	 * Used by airo_set_auth()

	 */

	if (auth_type == AUTH_OPEN || auth_type == AUTH_ENCRYPT)

		local->last_auth = auth_type;

}



static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)

{

	Cmd cmd;
@@ -3862,7 +3878,7 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock) 
						"level scale");

		}

		ai->config.opmode = adhoc ? MODE_STA_IBSS : MODE_STA_ESS;

		ai->config.authType = AUTH_OPEN;

		set_auth_type(ai, AUTH_OPEN);

		ai->config.modulation = MOD_CCK;



		if (le16_to_cpu(cap_rid.len) >= sizeof(cap_rid) &&
@@ -4880,13 +4896,13 @@ static void proc_config_on_close(struct inode *inode, struct file *file) 
			line += 5;

			switch( line[0] ) {

			case 's':

				ai->config.authType = AUTH_SHAREDKEY;

				set_auth_type(ai, AUTH_SHAREDKEY);

				break;

			case 'e':

				ai->config.authType = AUTH_ENCRYPT;

				set_auth_type(ai, AUTH_ENCRYPT);

				break;

			default:

				ai->config.authType = AUTH_OPEN;

				set_auth_type(ai, AUTH_OPEN);

				break;

			}

			set_bit (FLAG_COMMIT, &ai->flags);
@@ -6368,9 +6384,8 @@ static int airo_set_encode(struct net_device *dev, 
		 * should be enabled (user may turn it off later)

		 * This is also how "iwconfig ethX key on" works */

		if((index == current_index) && (key.len > 0) &&

		   (local->config.authType == AUTH_OPEN)) {

			local->config.authType = AUTH_ENCRYPT;

		}

		   (local->config.authType == AUTH_OPEN))

			set_auth_type(local, AUTH_ENCRYPT);

	} else {

		/* Do we want to just set the transmit key index ? */

		int index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
@@ -6390,11 +6405,11 @@ static int airo_set_encode(struct net_device *dev, 
	}

	/* Read the flags */

	if (dwrq->flags & IW_ENCODE_DISABLED)

		local->config.authType = AUTH_OPEN;	// disable encryption

		set_auth_type(local, AUTH_OPEN);	/* disable encryption */

	if(dwrq->flags & IW_ENCODE_RESTRICTED)

		local->config.authType = AUTH_SHAREDKEY;	// Only Both

		set_auth_type(local, AUTH_SHAREDKEY);	/* Only Both */

	if (dwrq->flags & IW_ENCODE_OPEN)

		local->config.authType = AUTH_ENCRYPT;	// Only Wep

		set_auth_type(local, AUTH_ENCRYPT);	/* Only Wep */

	/* Commit the changes to flags if needed */

	if (local->config.authType != currentAuthType)

		set_bit (FLAG_COMMIT, &local->flags);
@@ -6550,11 +6565,11 @@ static int airo_set_encodeext(struct net_device *dev, 


	/* Read the flags */

	if (encoding->flags & IW_ENCODE_DISABLED)

		local->config.authType = AUTH_OPEN;	// disable encryption

		set_auth_type(local, AUTH_OPEN);	/* disable encryption */

	if(encoding->flags & IW_ENCODE_RESTRICTED)

		local->config.authType = AUTH_SHAREDKEY;	// Only Both

		set_auth_type(local, AUTH_SHAREDKEY);	/* Only Both */

	if (encoding->flags & IW_ENCODE_OPEN)

		local->config.authType = AUTH_ENCRYPT;	// Only Wep

		set_auth_type(local, AUTH_ENCRYPT);

	/* Commit the changes to flags if needed */

	if (local->config.authType != currentAuthType)

		set_bit (FLAG_COMMIT, &local->flags);
@@ -6659,9 +6674,9 @@ static int airo_set_auth(struct net_device *dev, 
		if (param->value) {

			/* Only change auth type if unencrypted */

			if (currentAuthType == AUTH_OPEN)

				local->config.authType = AUTH_ENCRYPT;

				set_auth_type(local, AUTH_ENCRYPT);

		} else {

			local->config.authType = AUTH_OPEN;

			set_auth_type(local, AUTH_OPEN);

		}



		/* Commit the changes to flags if needed */
@@ -6670,13 +6685,14 @@ static int airo_set_auth(struct net_device *dev, 
		break;



	case IW_AUTH_80211_AUTH_ALG: {

			/* FIXME: What about AUTH_OPEN?  This API seems to

			 * disallow setting our auth to AUTH_OPEN.

			 */

			if (param->value & IW_AUTH_ALG_SHARED_KEY) {

				local->config.authType = AUTH_SHAREDKEY;

				set_auth_type(local, AUTH_SHAREDKEY);

			} else if (param->value & IW_AUTH_ALG_OPEN_SYSTEM) {

				local->config.authType = AUTH_ENCRYPT;

				/* We don't know here if WEP open system or

				 * unencrypted mode was requested - so use the

				 * last mode (of these two) used last time

				 */

				set_auth_type(local, local->last_auth);

			} else

				return -EINVAL;

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

+23 −0
Original line number Diff line number Diff line
@@ -34,16 +34,19 @@ unsigned int ath10k_debug_mask; 
static unsigned int ath10k_cryptmode_param;

static bool uart_print;

static bool skip_otp;

static bool rawmode;



module_param_named(debug_mask, ath10k_debug_mask, uint, 0644);

module_param_named(cryptmode, ath10k_cryptmode_param, uint, 0644);

module_param(uart_print, bool, 0644);

module_param(skip_otp, bool, 0644);

module_param(rawmode, bool, 0644);



MODULE_PARM_DESC(debug_mask, "Debugging mask");

MODULE_PARM_DESC(uart_print, "Uart target debugging");

MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");

MODULE_PARM_DESC(cryptmode, "Crypto mode: 0-hardware, 1-software");

MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");



static const struct ath10k_hw_params ath10k_hw_params_list[] = {

	{
@@ -54,6 +57,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.has_shifted_cc_wraparound = true,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,

		.fw = {

			.dir = QCA988X_HW_2_0_FW_DIR,

			.fw = QCA988X_HW_2_0_FW_FILE,
@@ -70,6 +74,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.uart_pin = 6,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,

		.fw = {

			.dir = QCA6174_HW_2_1_FW_DIR,

			.fw = QCA6174_HW_2_1_FW_FILE,
@@ -86,6 +91,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.uart_pin = 6,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,

		.fw = {

			.dir = QCA6174_HW_3_0_FW_DIR,

			.fw = QCA6174_HW_3_0_FW_FILE,
@@ -102,6 +108,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.uart_pin = 6,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,

		.fw = {

			/* uses same binaries as hw3.0 */

			.dir = QCA6174_HW_3_0_FW_DIR,
@@ -120,6 +127,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.otp_exe_param = 0x00000700,

		.continuous_frag_desc = true,

		.channel_counters_freq_hz = 150000,

		.max_probe_resp_desc_thres = 24,

		.fw = {

			.dir = QCA99X0_HW_2_0_FW_DIR,

			.fw = QCA99X0_HW_2_0_FW_FILE,
@@ -142,12 +150,17 @@ static const char *const ath10k_core_fw_feature_str[] = { 
	[ATH10K_FW_FEATURE_IGNORE_OTP_RESULT] = "ignore-otp",

	[ATH10K_FW_FEATURE_NO_NWIFI_DECAP_4ADDR_PADDING] = "no-4addr-pad",

	[ATH10K_FW_FEATURE_SUPPORTS_SKIP_CLOCK_INIT] = "skip-clock-init",

	[ATH10K_FW_FEATURE_RAW_MODE_SUPPORT] = "raw-mode",

};



static unsigned int ath10k_core_get_fw_feature_str(char *buf,

						   size_t buf_len,

						   enum ath10k_fw_features feat)

{

	/* make sure that ath10k_core_fw_feature_str[] gets updated */

	BUILD_BUG_ON(ARRAY_SIZE(ath10k_core_fw_feature_str) !=

		     ATH10K_FW_FEATURE_COUNT);



	if (feat >= ARRAY_SIZE(ath10k_core_fw_feature_str) ||

	    WARN_ON(!ath10k_core_fw_feature_str[feat])) {

		return scnprintf(buf, buf_len, "bit%d", feat);
@@ -1117,6 +1130,15 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
	ar->htt.max_num_amsdu = ATH10K_HTT_MAX_NUM_AMSDU_DEFAULT;

	ar->htt.max_num_ampdu = ATH10K_HTT_MAX_NUM_AMPDU_DEFAULT;



	if (rawmode) {

		if (!test_bit(ATH10K_FW_FEATURE_RAW_MODE_SUPPORT,

			      ar->fw_features)) {

			ath10k_err(ar, "rawmode = 1 requires support from firmware");

			return -EINVAL;

		}

		set_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags);

	}



	if (test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) {

		ar->wmi.rx_decap_mode = ATH10K_HW_TXRX_RAW;
@@ -1714,6 +1736,7 @@ void ath10k_core_destroy(struct ath10k *ar) 
	destroy_workqueue(ar->workqueue_aux);



	ath10k_debug_destroy(ar);

	ath10k_wmi_free_host_mem(ar);

	ath10k_mac_destroy(ar);

}

EXPORT_SYMBOL(ath10k_core_destroy);

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

+5 −0
Original line number Diff line number Diff line
@@ -612,6 +612,11 @@ struct ath10k { 


		u32 channel_counters_freq_hz;



		/* Mgmt tx descriptors threshold for limiting probe response

		 * frames.

		 */

		u32 max_probe_resp_desc_thres;



		struct ath10k_hw_params_fw {

			const char *dir;

			const char *fw;