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

Commit 06384f7a authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2017-08-01' of... 

Merge tag 'iwlwifi-next-for-kalle-2017-08-01' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

First batch of iwlwifi patches for 4.14

* Reorganization of the code into separate directories continues;
* A couple of new minor features;
* Fixes and cleanups here and there.
parents d28ac7be d20e30af

drivers/net/wireless/intel/iwlwifi/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ iwlwifi-$(CONFIG_IWLDVM) += cfg/1000.o cfg/2000.o cfg/5000.o cfg/6000.o 
iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/a000.o

iwlwifi-objs		+= iwl-trans.o

iwlwifi-objs		+= fw/notif-wait.o

iwlwifi-$(CONFIG_IWLMVM) += fw/paging.o fw/smem.o fw/init.o fw/dbg.o

iwlwifi-$(CONFIG_IWLMVM) += fw/common_rx.o



iwlwifi-objs += $(iwlwifi-m)

drivers/net/wireless/intel/iwlwifi/dvm/commands.h

+0 −16
Original line number Diff line number Diff line
@@ -1437,22 +1437,6 @@ struct agg_tx_status { 
	__le16 sequence;

} __packed;



/*

 * definitions for initial rate index field

 * bits [3:0] initial rate index

 * bits [6:4] rate table color, used for the initial rate

 * bit-7 invalid rate indication

 *   i.e. rate was not chosen from rate table

 *   or rate table color was changed during frame retries

 * refer tlc rate info

 */



#define IWL50_TX_RES_INIT_RATE_INDEX_POS	0

#define IWL50_TX_RES_INIT_RATE_INDEX_MSK	0x0f

#define IWL50_TX_RES_RATE_TABLE_COLOR_POS	4

#define IWL50_TX_RES_RATE_TABLE_COLOR_MSK	0x70

#define IWL50_TX_RES_INV_RATE_INDEX_MSK	0x80



/* refer to ra_tid */

#define IWLAGN_TX_RES_TID_POS	0

#define IWLAGN_TX_RES_TID_MSK	0x0f

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

0 → 100644
+206 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.

 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 *

 * 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

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * The full GNU General Public License is included in this distribution

 * in the file called COPYING.

 *

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 * BSD LICENSE

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 *  * Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *  * Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *  * Neither the name Intel Corporation nor the names of its

 *    contributors may be used to endorse or promote products derived

 *    from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 *****************************************************************************/



#ifndef __iwl_fw_api_alive_h__

#define __iwl_fw_api_alive_h__



/* alive response is_valid values */

#define ALIVE_RESP_UCODE_OK	BIT(0)

#define ALIVE_RESP_RFKILL	BIT(1)



/* alive response ver_type values */

enum {

	FW_TYPE_HW = 0,

	FW_TYPE_PROT = 1,

	FW_TYPE_AP = 2,

	FW_TYPE_WOWLAN = 3,

	FW_TYPE_TIMING = 4,

	FW_TYPE_WIPAN = 5

};



/* alive response ver_subtype values */

enum {

	FW_SUBTYPE_FULL_FEATURE = 0,

	FW_SUBTYPE_BOOTSRAP = 1, /* Not valid */

	FW_SUBTYPE_REDUCED = 2,

	FW_SUBTYPE_ALIVE_ONLY = 3,

	FW_SUBTYPE_WOWLAN = 4,

	FW_SUBTYPE_AP_SUBTYPE = 5,

	FW_SUBTYPE_WIPAN = 6,

	FW_SUBTYPE_INITIALIZE = 9

};



#define IWL_ALIVE_STATUS_ERR 0xDEAD

#define IWL_ALIVE_STATUS_OK 0xCAFE



#define IWL_ALIVE_FLG_RFKILL	BIT(0)



struct iwl_lmac_alive {

	__le32 ucode_minor;

	__le32 ucode_major;

	u8 ver_subtype;

	u8 ver_type;

	u8 mac;

	u8 opt;

	__le32 timestamp;

	__le32 error_event_table_ptr;	/* SRAM address for error log */

	__le32 log_event_table_ptr;	/* SRAM address for LMAC event log */

	__le32 cpu_register_ptr;

	__le32 dbgm_config_ptr;

	__le32 alive_counter_ptr;

	__le32 scd_base_ptr;		/* SRAM address for SCD */

	__le32 st_fwrd_addr;		/* pointer to Store and forward */

	__le32 st_fwrd_size;

} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_3 */



struct iwl_umac_alive {

	__le32 umac_minor;		/* UMAC version: minor */

	__le32 umac_major;		/* UMAC version: major */

	__le32 error_info_addr;		/* SRAM address for UMAC error log */

	__le32 dbg_print_buff_addr;

} __packed; /* UMAC_ALIVE_DATA_API_S_VER_2 */



struct mvm_alive_resp_v3 {

	__le16 status;

	__le16 flags;

	struct iwl_lmac_alive lmac_data;

	struct iwl_umac_alive umac_data;

} __packed; /* ALIVE_RES_API_S_VER_3 */



struct mvm_alive_resp {

	__le16 status;

	__le16 flags;

	struct iwl_lmac_alive lmac_data[2];

	struct iwl_umac_alive umac_data;

} __packed; /* ALIVE_RES_API_S_VER_4 */



/**

 * enum iwl_extended_cfg_flag - commands driver may send before

 *	finishing init flow

 * @IWL_INIT_DEBUG_CFG: driver is going to send debug config command

 * @IWL_INIT_NVM: driver is going to send NVM_ACCESS commands

 * @IWL_INIT_PHY: driver is going to send PHY_DB commands

 */

enum iwl_extended_cfg_flags {

	IWL_INIT_DEBUG_CFG,

	IWL_INIT_NVM,

	IWL_INIT_PHY,

};



/**

 * struct iwl_extended_cfg_cmd - mark what commands ucode should wait for

 * before finishing init flows

 * @init_flags: values from iwl_extended_cfg_flags

 */

struct iwl_init_extended_cfg_cmd {

	__le32 init_flags;

} __packed; /* INIT_EXTENDED_CFG_CMD_API_S_VER_1 */



/**

 * struct iwl_radio_version_notif - information on the radio version

 * ( RADIO_VERSION_NOTIFICATION = 0x68 )

 * @radio_flavor: radio flavor

 * @radio_step: radio version step

 * @radio_dash: radio version dash

 */

struct iwl_radio_version_notif {

	__le32 radio_flavor;

	__le32 radio_step;

	__le32 radio_dash;

} __packed; /* RADIO_VERSION_NOTOFICATION_S_VER_1 */



enum iwl_card_state_flags {

	CARD_ENABLED		= 0x00,

	HW_CARD_DISABLED	= 0x01,

	SW_CARD_DISABLED	= 0x02,

	CT_KILL_CARD_DISABLED	= 0x04,

	HALT_CARD_DISABLED	= 0x08,

	CARD_DISABLED_MSK	= 0x0f,

	CARD_IS_RX_ON		= 0x10,

};



/**

 * struct iwl_radio_version_notif - information on the card state

 * ( CARD_STATE_NOTIFICATION = 0xa1 )

 * @flags: &enum iwl_card_state_flags

 */

struct iwl_card_state_notif {

	__le32 flags;

} __packed; /* CARD_STATE_NTFY_API_S_VER_1 */



/**

 * struct iwl_fseq_ver_mismatch_nty - Notification about version

 *

 * This notification does not have a direct impact on the init flow.

 * It means that another core (not WiFi) has initiated the FSEQ flow

 * and updated the FSEQ version.  The driver only prints an error when

 * this occurs.

 *

 * @aux_read_fseq_ver: auxiliary read FSEQ version

 * @wifi_fseq_ver: FSEQ version (embedded in WiFi)

 */

struct iwl_fseq_ver_mismatch_ntf {

	__le32 aux_read_fseq_ver;

	__le32 wifi_fseq_ver;

} __packed; /* FSEQ_VER_MISMATCH_NTFY_API_S_VER_1 */



#endif /* __iwl_fw_api_alive_h__ */

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

0 → 100644
+144 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.

 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 *

 * 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

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * The full GNU General Public License is included in this distribution

 * in the file called COPYING.

 *

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 * BSD LICENSE

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 *  * Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *  * Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *  * Neither the name Intel Corporation nor the names of its

 *    contributors may be used to endorse or promote products derived

 *    from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 *****************************************************************************/



#ifndef __iwl_fw_api_binding_h__

#define __iwl_fw_api_binding_h__



#define MAX_MACS_IN_BINDING	(3)

#define MAX_BINDINGS		(4)



/**

 * struct iwl_binding_cmd_v1 - configuring bindings

 * ( BINDING_CONTEXT_CMD = 0x2b )

 * @id_and_color: ID and color of the relevant Binding,

 *	&enum iwl_ctxt_id_and_color

 * @action: action to perform, one of FW_CTXT_ACTION_*

 * @macs: array of MAC id and colors which belong to the binding,

 *	&enum iwl_ctxt_id_and_color

 * @phy: PHY id and color which belongs to the binding,

 *	&enum iwl_ctxt_id_and_color

 */

struct iwl_binding_cmd_v1 {

	/* COMMON_INDEX_HDR_API_S_VER_1 */

	__le32 id_and_color;

	__le32 action;

	/* BINDING_DATA_API_S_VER_1 */

	__le32 macs[MAX_MACS_IN_BINDING];

	__le32 phy;

} __packed; /* BINDING_CMD_API_S_VER_1 */



/**

 * struct iwl_binding_cmd - configuring bindings

 * ( BINDING_CONTEXT_CMD = 0x2b )

 * @id_and_color: ID and color of the relevant Binding,

 *	&enum iwl_ctxt_id_and_color

 * @action: action to perform, one of FW_CTXT_ACTION_*

 * @macs: array of MAC id and colors which belong to the binding

 *	&enum iwl_ctxt_id_and_color

 * @phy: PHY id and color which belongs to the binding

 *	&enum iwl_ctxt_id_and_color

 * @lmac_id: the lmac id the binding belongs to

 */

struct iwl_binding_cmd {

	/* COMMON_INDEX_HDR_API_S_VER_1 */

	__le32 id_and_color;

	__le32 action;

	/* BINDING_DATA_API_S_VER_1 */

	__le32 macs[MAX_MACS_IN_BINDING];

	__le32 phy;

	__le32 lmac_id;

} __packed; /* BINDING_CMD_API_S_VER_2 */



#define IWL_BINDING_CMD_SIZE_V1	sizeof(struct iwl_binding_cmd_v1)

#define IWL_LMAC_24G_INDEX		0

#define IWL_LMAC_5G_INDEX		1



/* The maximal number of fragments in the FW's schedule session */

#define IWL_MVM_MAX_QUOTA 128



/**

 * struct iwl_time_quota_data - configuration of time quota per binding

 * @id_and_color: ID and color of the relevant Binding,

 *	&enum iwl_ctxt_id_and_color

 * @quota: absolute time quota in TU. The scheduler will try to divide the

 *	remainig quota (after Time Events) according to this quota.

 * @max_duration: max uninterrupted context duration in TU

 */

struct iwl_time_quota_data {

	__le32 id_and_color;

	__le32 quota;

	__le32 max_duration;

} __packed; /* TIME_QUOTA_DATA_API_S_VER_1 */



/**

 * struct iwl_time_quota_cmd - configuration of time quota between bindings

 * ( TIME_QUOTA_CMD = 0x2c )

 * @quotas: allocations per binding

 * Note: on non-CDB the fourth one is the auxilary mac and is

 *	essentially zero.

 *	On CDB the fourth one is a regular binding.

 */

struct iwl_time_quota_cmd {

	struct iwl_time_quota_data quotas[MAX_BINDINGS];

} __packed; /* TIME_QUOTA_ALLOCATION_CMD_API_S_VER_1 */



#endif /* __iwl_fw_api_binding_h__ */

drivers/net/wireless/intel/iwlwifi/fw/api.h→drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h

+30 −48
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ 
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 *****************************************************************************/

#ifndef __iwl_fw_api_h__

#define __iwl_fw_api_h__

#ifndef __iwl_fw_api_cmdhdr_h__

#define __iwl_fw_api_cmdhdr_h__



/**

 * DOC: Host command section
@@ -112,15 +112,24 @@ static inline u32 iwl_cmd_id(u8 opcode, u8 groupid, u8 version) 
#define IWL_ALWAYS_LONG_GROUP	1



/**

 * struct iwl_cmd_header

 * struct iwl_cmd_header - (short) command header format

 *

 * This header format appears in the beginning of each command sent from the

 * driver, and each response/notification received from uCode.

 */

struct iwl_cmd_header {

	u8 cmd;		/* Command ID:  REPLY_RXON, etc. */

	/**

	 * @cmd: Command ID: REPLY_RXON, etc.

	 */

	u8 cmd;

	/**

	 * @group_id: group ID, for commands with groups

	 */

	u8 group_id;

	/*

	/**

	 * @sequence:

	 * Sequence number for the command.

	 *

	 * The driver sets up the sequence number to values of its choosing.

	 * uCode does not use this value, but passes it back to the driver

	 * when sending the response to each driver-originated command, so
@@ -150,6 +159,13 @@ struct iwl_cmd_header { 
 * driver, and each response/notification received from uCode.

 * this is the wide version that contains more information about the command

 * like length, version and command type

 *

 * @cmd: command ID, like in &struct iwl_cmd_header

 * @group_id: group ID, like in &struct iwl_cmd_header

 * @sequence: sequence, like in &struct iwl_cmd_header

 * @length: length of the command

 * @reserved: reserved

 * @version: command version

 */

struct iwl_cmd_header_wide {

	u8 cmd;
@@ -160,48 +176,6 @@ struct iwl_cmd_header_wide { 
	u8 version;

} __packed;



/**

 * iwl_tx_queue_cfg_actions - TXQ config options

 * @TX_QUEUE_CFG_ENABLE_QUEUE: enable a queue

 * @TX_QUEUE_CFG_TFD_SHORT_FORMAT: use short TFD format

 */

enum iwl_tx_queue_cfg_actions {

	TX_QUEUE_CFG_ENABLE_QUEUE		= BIT(0),

	TX_QUEUE_CFG_TFD_SHORT_FORMAT		= BIT(1),

};



/**

 * struct iwl_tx_queue_cfg_cmd - txq hw scheduler config command

 * @sta_id: station id

 * @tid: tid of the queue

 * @flags: see &enum iwl_tx_queue_cfg_actions

 * @cb_size: size of TFD cyclic buffer. Value is exponent - 3.

 *	Minimum value 0 (8 TFDs), maximum value 5 (256 TFDs)

 * @byte_cnt_addr: address of byte count table

 * @tfdq_addr: address of TFD circular buffer

 */

struct iwl_tx_queue_cfg_cmd {

	u8 sta_id;

	u8 tid;

	__le16 flags;

	__le32 cb_size;

	__le64 byte_cnt_addr;

	__le64 tfdq_addr;

} __packed; /* TX_QUEUE_CFG_CMD_API_S_VER_2 */



/**

 * struct iwl_tx_queue_cfg_rsp - response to txq hw scheduler config

 * @queue_number: queue number assigned to this RA -TID

 * @flags: set on failure

 * @write_pointer: initial value for write pointer

 */

struct iwl_tx_queue_cfg_rsp {

	__le16 queue_number;

	__le16 flags;

	__le16 write_pointer;

	__le16 reserved;

} __packed; /* TX_QUEUE_CFG_RSP_API_S_VER_2 */



/**

 * struct iwl_calib_res_notif_phy_db - Receive phy db chunk after calibrations

 * @type: type of the result - mostly ignored
@@ -226,4 +200,12 @@ struct iwl_phy_db_cmd { 
	u8 data[];

} __packed;



#endif /* __iwl_fw_api_h__*/
 
/**

 * struct iwl_cmd_response - generic response struct for most commands

 * @status: status of the command asked, changes for each one

 */

struct iwl_cmd_response {

	__le32 status;

};



#endif /* __iwl_fw_api_cmdhdr_h__ */