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

Commit 63f5be0a authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2018-03-28' of... 

Merge tag 'iwlwifi-next-for-kalle-2018-03-28' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

iwlwifi patches for 4.14

* Fix a UBSAN warning;
* Improvement in the net-stack/driver log syncing
* An RCU lock fix in the new rate-scaling code;
* Support for new PCI IDs for the 9000 family;
* Support for a new API version;
* Initial work for supporting the new ETSI rules;
* Support for advanced dwell in scanning;
* Support for OCE in scanning;
* Some debugging improvements;
* Other small improvements and cleanups here and there.
parents 6b7d5c07 378c8931

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+3 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -19,6 +20,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -55,7 +57,7 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	36

#define IWL_22000_UCODE_API_MAX	38



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	24

drivers/net/wireless/intel/iwlwifi/cfg/9000.c

+3 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -19,6 +20,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -56,7 +58,7 @@ 
#include "fw/file.h"



/* Highest firmware API version supported */

#define IWL9000_UCODE_API_MAX	36

#define IWL9000_UCODE_API_MAX	38



/* Lowest firmware API version supported */

#define IWL9000_UCODE_API_MIN	30

drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h

+17 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -30,6 +31,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -310,6 +312,17 @@ struct iwl_mcc_update_resp_v1 { 
	__le32 channels[0];

} __packed; /* LAR_UPDATE_MCC_CMD_RESP_S_VER_1 */



/**

 * enum iwl_geo_information - geographic information.

 * @GEO_NO_INFO: no special info for this geo profile.

 * @GEO_WMM_ETSI_5GHZ_INFO: this geo profile limits the WMM params

 *	for the 5 GHz band.

 */

enum iwl_geo_information {

	GEO_NO_INFO =			0,

	GEO_WMM_ETSI_5GHZ_INFO =	BIT(0),

};



/**

 * struct iwl_mcc_update_resp - response to MCC_UPDATE_CMD.

 * Contains the new channel control profile map, if changed, and the new MCC
@@ -320,7 +333,8 @@ struct iwl_mcc_update_resp_v1 { 
 * @cap: capabilities for all channels which matches the MCC

 * @source_id: the MCC source, see iwl_mcc_source

 * @time: time elapsed from the MCC test start (in 30 seconds TU)

 * @reserved: reserved.

 * @geo_info: geographic specific profile information

 *	see &enum iwl_geo_information.

 * @n_channels: number of channels in @channels_data (may be 14, 39, 50 or 51

 *		channels, depending on platform)

 * @channels: channel control data map, DWORD for each channel. Only the first
@@ -332,10 +346,10 @@ struct iwl_mcc_update_resp { 
	u8 cap;

	u8 source_id;

	__le16 time;

	__le16 reserved;

	__le16 geo_info;

	__le32 n_channels;

	__le32 channels[0];

} __packed; /* LAR_UPDATE_MCC_CMD_RESP_S_VER_2 */

} __packed; /* LAR_UPDATE_MCC_CMD_RESP_S_VER_3 */



/**

 * struct iwl_mcc_chub_notif - chub notifies of mcc change

drivers/net/wireless/intel/iwlwifi/fw/api/scan.h

+55 −18
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -579,8 +580,23 @@ enum iwl_umac_scan_general_flags { 
	IWL_UMAC_SCAN_GEN_FLAGS_RRM_ENABLED		= BIT(8),

	IWL_UMAC_SCAN_GEN_FLAGS_MATCH			= BIT(9),

	IWL_UMAC_SCAN_GEN_FLAGS_EXTENDED_DWELL		= BIT(10),

	/* Extended dwell is obselete when adaptive dwell is used, making this

	 * bit reusable. Hence, probe request defer is used only when adaptive

	 * dwell is supported. */

	IWL_UMAC_SCAN_GEN_FLAGS_PROB_REQ_DEFER_SUPP	= BIT(10),

	IWL_UMAC_SCAN_GEN_FLAGS_LMAC2_FRAGMENTED	= BIT(11),

	IWL_UMAC_SCAN_GEN_FLAGS_ADAPTIVE_DWELL		= BIT(13),

	IWL_UMAC_SCAN_GEN_FLAGS_MAX_CHNL_TIME		= BIT(14),

	IWL_UMAC_SCAN_GEN_FLAGS_PROB_REQ_HIGH_TX_RATE	= BIT(15),

};



/**

 * enum iwl_umac_scan_general_flags2 - UMAC scan general flags #2

 * @IWL_UMAC_SCAN_GEN_FLAGS2_NOTIF_PER_CHNL: Whether to send a complete

 *	notification per channel or not.

 */

enum iwl_umac_scan_general_flags2 {

	IWL_UMAC_SCAN_GEN_FLAGS2_NOTIF_PER_CHNL	= BIT(0),

};



/**
@@ -628,6 +644,18 @@ struct iwl_scan_req_umac_tail { 
	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];

} __packed;



/**

 * struct iwl_scan_umac_chan_param

 * @flags: channel flags &enum iwl_scan_channel_flags

 * @count: num of channels in scan request

 * @reserved: for future use and alignment

 */

struct iwl_scan_umac_chan_param {

	u8 flags;

	u8 count;

	__le16 reserved;

} __packed; /*SCAN_CHANNEL_PARAMS_API_S_VER_1 */



/**

 * struct iwl_scan_req_umac

 * @flags: &enum iwl_umac_scan_flags
@@ -636,23 +664,24 @@ struct iwl_scan_req_umac_tail { 
 * @general_flags: &enum iwl_umac_scan_general_flags

 * @scan_start_mac_id: report the scan start TSF time according to this mac TSF

 * @extended_dwell: dwell time for channels 1, 6 and 11

 * @active_dwell: dwell time for active scan

 * @passive_dwell: dwell time for passive scan

 * @active_dwell: dwell time for active scan per LMAC

 * @passive_dwell: dwell time for passive scan per LMAC

 * @fragmented_dwell: dwell time for fragmented passive scan

 * @adwell_default_n_aps: for adaptive dwell the default number of APs

 *	per channel

 * @adwell_default_n_aps_social: for adaptive dwell the default

 *	number of APs per social (1,6,11) channel

 * @general_flags2: &enum iwl_umac_scan_general_flags2

 * @adwell_max_budget: for adaptive dwell the maximal budget of TU to be added

 *	to total scan time

 * @max_out_time: max out of serving channel time, per LMAC - for CDB there

 *	are 2 LMACs

 * @suspend_time: max suspend time, per LMAC - for CDB there are 2 LMACs

 * @scan_priority: scan internal prioritization &enum iwl_scan_priority

 * @channel_flags: &enum iwl_scan_channel_flags

 * @n_channels: num of channels in scan request

 * @num_of_fragments: Number of fragments needed for full coverage per band.

 *	Relevant only for fragmented scan.

 * @channel: &struct iwl_scan_umac_chan_param

 * @reserved: for future use and alignment

 * @reserved2: for future use and alignment

 * @reserved3: for future use and alignment

 * @data: &struct iwl_scan_channel_cfg_umac and

 *	&struct iwl_scan_req_umac_tail
@@ -673,10 +702,7 @@ struct iwl_scan_req_umac { 
			__le32 max_out_time;

			__le32 suspend_time;

			__le32 scan_priority;

			/* SCAN_CHANNEL_PARAMS_API_S_VER_1 */

			u8 channel_flags;

			u8 n_channels;

			__le16 reserved2;

			struct iwl_scan_umac_chan_param channel;

			u8 data[];

		} v1; /* SCAN_REQUEST_CMD_UMAC_API_S_VER_1 */

		struct {
@@ -687,10 +713,7 @@ struct iwl_scan_req_umac { 
			__le32 max_out_time[SCAN_TWO_LMACS];

			__le32 suspend_time[SCAN_TWO_LMACS];

			__le32 scan_priority;

			/* SCAN_CHANNEL_PARAMS_API_S_VER_1 */

			u8 channel_flags;

			u8 n_channels;

			__le16 reserved2;

			struct iwl_scan_umac_chan_param channel;

			u8 data[];

		} v6; /* SCAN_REQUEST_CMD_UMAC_API_S_VER_6 */

		struct {
@@ -704,16 +727,30 @@ struct iwl_scan_req_umac { 
			__le32 max_out_time[SCAN_TWO_LMACS];

			__le32 suspend_time[SCAN_TWO_LMACS];

			__le32 scan_priority;

			/* SCAN_CHANNEL_PARAMS_API_S_VER_1 */

			u8 channel_flags;

			u8 n_channels;

			__le16 reserved2;

			struct iwl_scan_umac_chan_param channel;

			u8 data[];

		} v7; /* SCAN_REQUEST_CMD_UMAC_API_S_VER_7 */

		struct {

			u8 active_dwell[SCAN_TWO_LMACS];

			u8 reserved2;

			u8 adwell_default_n_aps;

			u8 adwell_default_n_aps_social;

			u8 general_flags2;

			__le16 adwell_max_budget;

			__le32 max_out_time[SCAN_TWO_LMACS];

			__le32 suspend_time[SCAN_TWO_LMACS];

			__le32 scan_priority;

			u8 passive_dwell[SCAN_TWO_LMACS];

			u8 num_of_fragments[SCAN_TWO_LMACS];

			struct iwl_scan_umac_chan_param channel;

			u8 data[];

		} v8; /* SCAN_REQUEST_CMD_UMAC_API_S_VER_8 */

	};

} __packed;



#define IWL_SCAN_REQ_UMAC_SIZE_V7 sizeof(struct iwl_scan_req_umac)

#define IWL_SCAN_REQ_UMAC_SIZE_V8 sizeof(struct iwl_scan_req_umac)

#define IWL_SCAN_REQ_UMAC_SIZE_V7 (sizeof(struct iwl_scan_req_umac) - \

					 4 * sizeof(u8))

#define IWL_SCAN_REQ_UMAC_SIZE_V6 (sizeof(struct iwl_scan_req_umac) - \

				   2 * sizeof(u8) - sizeof(__le16))

#define IWL_SCAN_REQ_UMAC_SIZE_V1 (sizeof(struct iwl_scan_req_umac) - \

drivers/net/wireless/intel/iwlwifi/fw/dbg.c

+10 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#include "iwl-drv.h"

#include "runtime.h"

#include "dbg.h"

#include "debugfs.h"

#include "iwl-io.h"

#include "iwl-prph.h"

#include "iwl-csr.h"
@@ -1007,6 +1008,12 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt, 
{

	struct iwl_fw_dump_desc *desc;



	if (trigger && trigger->flags & IWL_FW_DBG_FORCE_RESTART) {

		IWL_WARN(fwrt, "Force restart: trigger %d fired.\n", trig);

		iwl_force_nmi(fwrt->trans);

		return 0;

	}



	desc = kzalloc(sizeof(*desc) + len, GFP_ATOMIC);

	if (!desc)

		return -ENOMEM;
@@ -1080,6 +1087,9 @@ int iwl_fw_start_dbg_conf(struct iwl_fw_runtime *fwrt, u8 conf_id) 
		IWL_WARN(fwrt, "FW already configured (%d) - re-configuring\n",

			 fwrt->dump.conf);



	/* start default config marker cmd for syncing logs */

	iwl_fw_trigger_timestamp(fwrt, 1);



	/* Send all HCMDs for configuring the FW debug */

	ptr = (void *)&fwrt->fw->dbg_conf_tlv[conf_id]->hcmd;

	for (i = 0; i < fwrt->fw->dbg_conf_tlv[conf_id]->num_of_hcmds; i++) {