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

Commit 559afaa2 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2018-11-23' of... 

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

second batch of iwlwifi patches intended for v4.21

* New FW debugging infrastructure;
* Some more work on 802.11ax;
* Improve support for multiple RF modules with 22000 devices;
* Remove an unused FW parameter;
* Other debugging improvements;
parents 12d56175 520229e4

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ iwlwifi-objs += pcie/ctxt-info.o pcie/ctxt-info-gen3.o 
iwlwifi-objs		+= pcie/trans-gen2.o pcie/tx-gen2.o

iwlwifi-objs		+= pcie/trans-gen2.o pcie/tx-gen2.o

iwlwifi-$(CONFIG_IWLDVM) += cfg/1000.o cfg/2000.o cfg/5000.o cfg/6000.o

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/22000.o

iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/22000.o

iwlwifi-objs		+= iwl-dbg-tlv.o

iwlwifi-objs		+= iwl-trans.o

iwlwifi-objs		+= iwl-trans.o

iwlwifi-objs		+= fw/notif-wait.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/paging.o fw/smem.o fw/init.o fw/dbg.o

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -323,7 +323,6 @@ MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_B_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_B_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_JF_B0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_JF_B0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h

0 → 100644
+401 −0
Original line number Original line 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) 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

 * 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) 2018 Intel Corporation

 * 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_dbg_tlv_h__

#define __iwl_fw_dbg_tlv_h__



#include <linux/bitops.h>



/*

 * struct iwl_fw_ini_header: Common Header for all debug group TLV's structures

 * @tlv_version: version info

 * @apply_point: &enum iwl_fw_ini_apply_point

 * @data: TLV data followed

 **/

struct iwl_fw_ini_header {

	__le32 tlv_version;

	__le32 apply_point;

	u8 data[];

} __packed; /* FW_INI_HEADER_TLV_S */



/**

 * struct iwl_fw_ini_allocation_tlv - (IWL_FW_INI_TLV_TYPE_BUFFER_ALLOCATION)

 * buffer allocation TLV - for debug

 *

 * @iwl_fw_ini_header: header

 * @allocation_id: &enum iwl_fw_ini_allocation_id - to bind allocation and hcmd

 *	if needed (DBGC1/DBGC2/SDFX/...)

 * @buffer_location: type of iwl_fw_ini_buffer_location

 * @size: size in bytes

 * @max_fragments: the maximum allowed fragmentation in the desired memory

 *	allocation above

 * @min_frag_size: the minimum allowed fragmentation size in bytes

*/

struct iwl_fw_ini_allocation_tlv {

	struct iwl_fw_ini_header header;

	__le32 allocation_id;

	__le32 buffer_location;

	__le32 size;

	__le32 max_fragments;

	__le32 min_frag_size;

} __packed; /* FW_INI_BUFFER_ALLOCATION_TLV_S_VER_1 */



/**

 * struct iwl_fw_ini_hcmd (IWL_FW_INI_TLV_TYPE_HCMD)

 * Generic Host command pass through TLV

 *

 * @id: the debug configuration command type for instance: 0xf6 / 0xf5 / DHC

 * @group: the desired cmd group

 * @padding: all zeros for dword alignment

 * @data: all of the relevant command (0xf6/0xf5) to be sent

*/

struct iwl_fw_ini_hcmd {

	u8 id;

	u8 group;

	__le16 padding;

	u8 data[0];

} __packed; /* FW_INI_HCMD_S */



/**

 * struct iwl_fw_ini_hcmd_tlv

 * @header: header

 * @hcmd: a variable length host-command to be sent to apply the configuration.

 */

struct iwl_fw_ini_hcmd_tlv {

	struct iwl_fw_ini_header header;

	struct iwl_fw_ini_hcmd hcmd;

} __packed; /* FW_INI_HCMD_TLV_S_VER_1 */



/*

 * struct iwl_fw_ini_debug_flow_tlv (IWL_FW_INI_TLV_TYPE_DEBUG_FLOW)

 *

 * @header: header

 * @debug_flow_cfg: &enum iwl_fw_ini_debug_flow

 */

struct iwl_fw_ini_debug_flow_tlv {

	struct iwl_fw_ini_header header;

	__le32 debug_flow_cfg;

} __packed; /* FW_INI_DEBUG_FLOW_TLV_S_VER_1 */



#define IWL_FW_INI_MAX_REGION_ID	20

#define IWL_FW_INI_MAX_NAME		32

/**

 * struct iwl_fw_ini_region_cfg

 * @region_id: ID of this dump configuration

 * @region_type: &enum iwl_fw_ini_region_type

 * @num_regions: amount of regions in the address array.

 * @allocation_id: For DRAM type field substitutes for allocation_id.

 * @name_len: name length

 * @name: file name to use for this region

 * @size: size of the data, in bytes.(unused for IWL_FW_INI_REGION_DRAM_BUFFER)

 * @start_addr: array of addresses. (unused for IWL_FW_INI_REGION_DRAM_BUFFER)

 */

struct iwl_fw_ini_region_cfg {

	__le32 region_id;

	__le32 region_type;

	__le32 name_len;

	u8 name[IWL_FW_INI_MAX_NAME];

	union {

		__le32 num_regions;

		__le32 allocation_id;

	};

	__le32 size;

	__le32 start_addr[];

} __packed; /* FW_INI_REGION_CONFIG_S */



/**

 * struct iwl_fw_ini_region_tlv - (IWL_FW_INI_TLV_TYPE_REGION_CFG)

 * DUMP sections define IDs and triggers that use those IDs TLV

 * @header: header

 * @num_regions: how many different region section and IDs are coming next

 * @iwl_fw_ini_dump dump_config: list of dump configurations

 */

struct iwl_fw_ini_region_tlv {

	struct iwl_fw_ini_header header;

	__le32 num_regions;

	struct iwl_fw_ini_region_cfg region_config[];

} __packed; /* FW_INI_REGION_CFG_S */



/**

 * struct iwl_fw_ini_trigger - (IWL_FW_INI_TLV_TYPE_DUMP_CFG)

 * Region sections define IDs and triggers that use those IDs TLV

 *

 * @trigger_id: enum &iwl_fw_ini_tigger_id

 * @ignore_default: override FW TLV with binary TLV

 * @dump_delay: delay from trigger fire to dump, in usec

 * @occurrences: max amount of times to be fired

 * @ignore_consec: ignore consecutive triggers, in usec

 * @force_restart: force FW restart

 * @multi_dut: initiate debug dump data on several DUTs

 * @trigger_data: generic data to be utilized per trigger

 * @num_regions: number of dump regions defined for this trigger

 * @data: region IDs

 */

struct iwl_fw_ini_trigger {

	__le32 trigger_id;

	__le32 ignore_default;

	__le32 dump_delay;

	__le32 occurrences;

	__le32 ignore_consec;

	__le32 force_restart;

	__le32 multi_dut;

	__le32 trigger_data;

	__le32 num_regions;

	__le32 data[];

} __packed; /* FW_INI_TRIGGER_CONFIG_S */



/**

 * struct iwl_fw_ini_trigger_tlv - (IWL_FW_INI_TLV_TYPE_TRIGGERS_CFG)

 * DUMP sections define IDs and triggers that use those IDs TLV

 *

 * @header: header

 * @num_triggers: how many different triggers section and IDs are coming next

 * @trigger_config: list of trigger configurations

 */

struct iwl_fw_ini_trigger_tlv {

	struct iwl_fw_ini_header header;

	__le32 num_triggers;

	struct iwl_fw_ini_trigger trigger_config[];

} __packed; /* FW_INI_TRIGGER_CFG_S */



/**

 * enum iwl_fw_ini_trigger_id

 * @IWL_FW_TRIGGER_ID_FW_ASSERT: FW assert

 * @IWL_FW_TRIGGER_ID_FW_TFD_Q_HANG: TFD queue hang

 * @IWL_FW_TRIGGER_ID_FW_HW_ERROR: HW assert

 * @IWL_FW_TRIGGER_ID_FW_TRIGGER_ERROR: FW error notification

 * @IWL_FW_TRIGGER_ID_FW_TRIGGER_WARNING: FW warning notification

 * @IWL_FW_TRIGGER_ID_FW_TRIGGER_INFO: FW info notification

 * @IWL_FW_TRIGGER_ID_FW_TRIGGER_DEBUG: FW debug notification

 * @IWL_FW_TRIGGER_ID_USER_TRIGGER: User trigger

 * @IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_INACTIVITY: peer inactivity

 * @FW_DEBUG_TLV_TRIGGER_ID_HOST_DID_INITIATED_EVENT: undefined

 * @IWL_FW_TRIGGER_ID_HOST_TX_LATENCY_THRESHOLD_CROSSED: TX latency

 *	threshold was crossed

 * @IWL_FW_TRIGGER_ID_HOST_TX_RESPONSE_STATUS_FAILED: TX failed

 * @IWL_FW_TRIGGER_ID_HOST_OS_REQ_DEAUTH_PEER: Deauth initiated by host

 * @IWL_FW_TRIGGER_ID_HOST_STOP_GO_REQUEST: stop GO request

 * @IWL_FW_TRIGGER_ID_HOST_START_GO_REQUEST: start GO request

 * @IWL_FW_TRIGGER_ID_HOST_JOIN_GROUP_REQUEST: join P2P group request

 * @IWL_FW_TRIGGER_ID_HOST_SCAN_START: scan started event

 * @IWL_FW_TRIGGER_ID_HOST_SCAN_SUBMITTED: undefined

 * @IWL_FW_TRIGGER_ID_HOST_SCAN_PARAMS: undefined

 * @IWL_FW_TRIGGER_ID_HOST_CHECK_FOR_HANG: undefined

 * @IWL_FW_TRIGGER_ID_HOST_BAR_RECEIVED: BAR frame was received

 * @IWL_FW_TRIGGER_ID_HOST_AGG_TX_RESPONSE_STATUS_FAILED: agg TX failed

 * @IWL_FW_TRIGGER_ID_HOST_EAPOL_TX_RESPONSE_FAILED: EAPOL TX failed

 * @IWL_FW_TRIGGER_ID_HOST_FAKE_TX_RESPONSE_SUSPECTED: suspicious TX response

 * @IWL_FW_TRIGGER_ID_HOST_AUTH_REQ_FROM_ASSOC_CLIENT: received suspicious auth

 * @IWL_FW_TRIGGER_ID_HOST_ROAM_COMPLETE: roaming was completed

 * @IWL_FW_TRIGGER_ID_HOST_AUTH_ASSOC_FAST_FAILED: fast assoc failed

 * @IWL_FW_TRIGGER_ID_HOST_D3_START: D3 start

 * @IWL_FW_TRIGGER_ID_HOST_D3_END: D3 end

 * @IWL_FW_TRIGGER_ID_HOST_BSS_MISSED_BEACONS: missed beacon events

 * @IWL_FW_TRIGGER_ID_HOST_P2P_CLIENT_MISSED_BEACONS: P2P missed beacon events

 * @IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_TX_FAILURES:  undefined

 * @IWL_FW_TRIGGER_ID_HOST_TX_WFD_ACTION_FRAME_FAILED: undefined

 * @IWL_FW_TRIGGER_ID_HOST_AUTH_ASSOC_FAILED: authentication / association

 *	failed

 * @IWL_FW_TRIGGER_ID_HOST_SCAN_COMPLETE: scan complete event

 * @IWL_FW_TRIGGER_ID_HOST_SCAN_ABORT: scan abort complete

 * @IWL_FW_TRIGGER_ID_HOST_NIC_ALIVE: nic alive message was received

 * @IWL_FW_TRIGGER_ID_HOST_CHANNEL_SWITCH_COMPLETE: CSA was completed

 * @IWL_FW_TRIGGER_ID_NUM: number of trigger IDs

 */

enum iwl_fw_ini_trigger_id {

	/* Errors triggers */

	IWL_FW_TRIGGER_ID_FW_ASSERT				= 1,

	IWL_FW_TRIGGER_ID_FW_TFD_Q_HANG				= 2,

	IWL_FW_TRIGGER_ID_FW_HW_ERROR				= 3,

	/* Generic triggers */

	IWL_FW_TRIGGER_ID_FW_TRIGGER_ERROR			= 4,

	IWL_FW_TRIGGER_ID_FW_TRIGGER_WARNING			= 5,

	IWL_FW_TRIGGER_ID_FW_TRIGGER_INFO			= 6,

	IWL_FW_TRIGGER_ID_FW_TRIGGER_DEBUG			= 7,

	/* User Trigger */

	IWL_FW_TRIGGER_ID_USER_TRIGGER				= 8,

	/* Host triggers */

	IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_INACTIVITY		= 9,

	IWL_FW_TRIGGER_ID_HOST_DID_INITIATED_EVENT		= 10,

	IWL_FW_TRIGGER_ID_HOST_TX_LATENCY_THRESHOLD_CROSSED	= 11,

	IWL_FW_TRIGGER_ID_HOST_TX_RESPONSE_STATUS_FAILED	= 12,

	IWL_FW_TRIGGER_ID_HOST_OS_REQ_DEAUTH_PEER		= 13,

	IWL_FW_TRIGGER_ID_HOST_STOP_GO_REQUEST			= 14,

	IWL_FW_TRIGGER_ID_HOST_START_GO_REQUEST			= 15,

	IWL_FW_TRIGGER_ID_HOST_JOIN_GROUP_REQUEST		= 16,

	IWL_FW_TRIGGER_ID_HOST_SCAN_START			= 17,

	IWL_FW_TRIGGER_ID_HOST_SCAN_SUBITTED			= 18,

	IWL_FW_TRIGGER_ID_HOST_SCAN_PARAMS			= 19,

	IWL_FW_TRIGGER_ID_HOST_CHECK_FOR_HANG			= 20,

	IWL_FW_TRIGGER_ID_HOST_BAR_RECEIVED			= 21,

	IWL_FW_TRIGGER_ID_HOST_AGG_TX_RESPONSE_STATUS_FAILED	= 22,

	IWL_FW_TRIGGER_ID_HOST_EAPOL_TX_RESPONSE_FAILED		= 23,

	IWL_FW_TRIGGER_ID_HOST_FAKE_TX_RESPONSE_SUSPECTED	= 24,

	IWL_FW_TRIGGER_ID_HOST_AUTH_REQ_FROM_ASSOC_CLIENT	= 25,

	IWL_FW_TRIGGER_ID_HOST_ROAM_COMPLETE			= 26,

	IWL_FW_TRIGGER_ID_HOST_AUTH_ASSOC_FAST_FAILED		= 27,

	IWL_FW_TRIGGER_ID_HOST_D3_START				= 28,

	IWL_FW_TRIGGER_ID_HOST_D3_END				= 29,

	IWL_FW_TRIGGER_ID_HOST_BSS_MISSED_BEACONS		= 30,

	IWL_FW_TRIGGER_ID_HOST_P2P_CLIENT_MISSED_BEACONS	= 31,

	IWL_FW_TRIGGER_ID_HOST_PEER_CLIENT_TX_FAILURES		= 32,

	IWL_FW_TRIGGER_ID_HOST_TX_WFD_ACTION_FRAME_FAILED	= 33,

	IWL_FW_TRIGGER_ID_HOST_AUTH_ASSOC_FAILED		= 34,

	IWL_FW_TRIGGER_ID_HOST_SCAN_COMPLETE			= 35,

	IWL_FW_TRIGGER_ID_HOST_SCAN_ABORT			= 36,

	IWL_FW_TRIGGER_ID_HOST_NIC_ALIVE			= 37,

	IWL_FW_TRIGGER_ID_HOST_CHANNEL_SWITCH_COMPLETE          = 38,

	IWL_FW_TRIGGER_ID_NUM,

}; /* FW_INI_TRIGGER_ID_E_VER_1 */



/**

 * enum iwl_fw_ini_apply_point

 * @IWL_FW_INI_APPLY_INVALID: invalid

 * @IWL_FW_INI_APPLY_EARLY: pre loading FW

 * @IWL_FW_INI_APPLY_AFTER_ALIVE: first cmd from host after alive

 * @IWL_FW_INI_APPLY_POST_INIT: last cmd in initialization sequence

 * @IWL_FW_INI_APPLY_MISSED_BEACONS: missed beacons notification

 * @IWL_FW_INI_APPLY_SCAN_COMPLETE: scan completed

 * @IWL_FW_INI_APPLY_NUM: number of apply points

*/

enum iwl_fw_ini_apply_point {

	IWL_FW_INI_APPLY_INVALID,

	IWL_FW_INI_APPLY_EARLY,

	IWL_FW_INI_APPLY_AFTER_ALIVE,

	IWL_FW_INI_APPLY_POST_INIT,

	IWL_FW_INI_APPLY_MISSED_BEACONS,

	IWL_FW_INI_APPLY_SCAN_COMPLETE,

	IWL_FW_INI_APPLY_NUM,

}; /* FW_INI_APPLY_POINT_E_VER_1 */



/**

 * enum iwl_fw_ini_allocation_id

 * @IWL_FW_INI_ALLOCATION_INVALID: invalid

 * @IWL_FW_INI_ALLOCATION_ID_DBGC1: allocation meant for DBGC1 configuration

 * @IWL_FW_INI_ALLOCATION_ID_DBGC2: allocation meant for DBGC2 configuration

 * @IWL_FW_INI_ALLOCATION_ID_DBGC3: allocation meant for DBGC3 configuration

 * @IWL_FW_INI_ALLOCATION_ID_SDFX: for SDFX module

 * @IWL_FW_INI_ALLOCATION_ID_FW_DUMP: used for crash and runtime dumps

 * @IWL_FW_INI_ALLOCATION_ID_USER_DEFINED: for future user scenarios

*/

enum iwl_fw_ini_allocation_id {

	IWL_FW_INI_ALLOCATION_INVALID,

	IWL_FW_INI_ALLOCATION_ID_DBGC1,

	IWL_FW_INI_ALLOCATION_ID_DBGC2,

	IWL_FW_INI_ALLOCATION_ID_DBGC3,

	IWL_FW_INI_ALLOCATION_ID_SDFX,

	IWL_FW_INI_ALLOCATION_ID_FW_DUMP,

	IWL_FW_INI_ALLOCATION_ID_USER_DEFINED,

}; /* FW_INI_ALLOCATION_ID_E_VER_1 */



/**

 * enum iwl_fw_ini_buffer_location

 * @IWL_FW_INI_LOCATION_INVALID: invalid

 * @IWL_FW_INI_LOCATION_SRAM_PATH: SRAM location

 * @IWL_FW_INI_LOCATION_DRAM_PATH: DRAM location

 */

enum iwl_fw_ini_buffer_location {

	IWL_FW_INI_LOCATION_SRAM_INVALID,

	IWL_FW_INI_LOCATION_SRAM_PATH,

	IWL_FW_INI_LOCATION_DRAM_PATH,

}; /* FW_INI_BUFFER_LOCATION_E_VER_1 */



/**

 * enum iwl_fw_ini_debug_flow

 * @IWL_FW_INI_DEBUG_INVALID: invalid

 * @IWL_FW_INI_DEBUG_DBTR_FLOW: undefined

 * @IWL_FW_INI_DEBUG_TB2DTF_FLOW: undefined

 */

enum iwl_fw_ini_debug_flow {

	IWL_FW_INI_DEBUG_INVALID,

	IWL_FW_INI_DEBUG_DBTR_FLOW,

	IWL_FW_INI_DEBUG_TB2DTF_FLOW,

}; /* FW_INI_DEBUG_FLOW_E_VER_1 */



/**

 * enum iwl_fw_ini_region_type

 * @IWL_FW_INI_REGION_INVALID: invalid

 * @IWL_FW_INI_REGION_DEVICE_MEMORY: device internal memory

 * @IWL_FW_INI_REGION_PERIPHERY_MAC: periphery registers of MAC

 * @IWL_FW_INI_REGION_PERIPHERY_PHY: periphery registers of PHY

 * @IWL_FW_INI_REGION_PERIPHERY_AUX: periphery registers of AUX

 * @IWL_FW_INI_REGION_DRAM_BUFFER: DRAM buffer

 * @IWL_FW_INI_REGION_DRAM_IMR: IMR memory

 * @IWL_FW_INI_REGION_INTERNAL_BUFFER: undefined

 * @IWL_FW_INI_REGION_TXF: TX fifos

 * @IWL_FW_INI_REGION_RXF: RX fifo

 * @IWL_FW_INI_REGION_PAGING: paging memory

 * @IWL_FW_INI_REGION_CSR: CSR registers

 * @IWL_FW_INI_REGION_NUM: number of region types

 */

enum iwl_fw_ini_region_type {

	IWL_FW_INI_REGION_INVALID,

	IWL_FW_INI_REGION_DEVICE_MEMORY,

	IWL_FW_INI_REGION_PERIPHERY_MAC,

	IWL_FW_INI_REGION_PERIPHERY_PHY,

	IWL_FW_INI_REGION_PERIPHERY_AUX,

	IWL_FW_INI_REGION_DRAM_BUFFER,

	IWL_FW_INI_REGION_DRAM_IMR,

	IWL_FW_INI_REGION_INTERNAL_BUFFER,

	IWL_FW_INI_REGION_TXF,

	IWL_FW_INI_REGION_RXF,

	IWL_FW_INI_REGION_PAGING,

	IWL_FW_INI_REGION_CSR,

	IWL_FW_INI_REGION_NUM

}; /* FW_INI_REGION_TYPE_E_VER_1*/



#endif

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

+20 −19
Original line number Original line Diff line number Diff line
@@ -151,9 +151,9 @@ enum iwl_tsf_id { 
 * @beacon_time: beacon transmit time in system time

 * @beacon_time: beacon transmit time in system time

 * @beacon_tsf: beacon transmit time in TSF

 * @beacon_tsf: beacon transmit time in TSF

 * @bi: beacon interval in TU

 * @bi: beacon interval in TU

 * @bi_reciprocal: 2^32 / bi

 * @reserved1: reserved

 * @dtim_interval: dtim transmit time in TU

 * @dtim_interval: dtim transmit time in TU

 * @dtim_reciprocal: 2^32 / dtim_interval

 * @reserved2: reserved

 * @mcast_qid: queue ID for multicast traffic.

 * @mcast_qid: queue ID for multicast traffic.

 *	NOTE: obsolete from VER2 and on

 *	NOTE: obsolete from VER2 and on

 * @beacon_template: beacon template ID

 * @beacon_template: beacon template ID
@@ -162,9 +162,9 @@ struct iwl_mac_data_ap { 
	__le32 beacon_time;

	__le32 beacon_time;

	__le64 beacon_tsf;

	__le64 beacon_tsf;

	__le32 bi;

	__le32 bi;

	__le32 bi_reciprocal;

	__le32 reserved1;

	__le32 dtim_interval;

	__le32 dtim_interval;

	__le32 dtim_reciprocal;

	__le32 reserved2;

	__le32 mcast_qid;

	__le32 mcast_qid;

	__le32 beacon_template;

	__le32 beacon_template;

} __packed; /* AP_MAC_DATA_API_S_VER_2 */

} __packed; /* AP_MAC_DATA_API_S_VER_2 */
@@ -174,26 +174,34 @@ struct iwl_mac_data_ap { 
 * @beacon_time: beacon transmit time in system time

 * @beacon_time: beacon transmit time in system time

 * @beacon_tsf: beacon transmit time in TSF

 * @beacon_tsf: beacon transmit time in TSF

 * @bi: beacon interval in TU

 * @bi: beacon interval in TU

 * @bi_reciprocal: 2^32 / bi

 * @reserved: reserved

 * @beacon_template: beacon template ID

 * @beacon_template: beacon template ID

 */

 */

struct iwl_mac_data_ibss {

struct iwl_mac_data_ibss {

	__le32 beacon_time;

	__le32 beacon_time;

	__le64 beacon_tsf;

	__le64 beacon_tsf;

	__le32 bi;

	__le32 bi;

	__le32 bi_reciprocal;

	__le32 reserved;

	__le32 beacon_template;

	__le32 beacon_template;

} __packed; /* IBSS_MAC_DATA_API_S_VER_1 */

} __packed; /* IBSS_MAC_DATA_API_S_VER_1 */





/**

 * enum iwl_mac_data_policy - policy of the data path for this MAC

 * @TWT_SUPPORTED: twt is supported

 */

enum iwl_mac_data_policy {

	TWT_SUPPORTED	= BIT(0),

};



/**

/**

 * struct iwl_mac_data_sta - configuration data for station MAC context

 * struct iwl_mac_data_sta - configuration data for station MAC context

 * @is_assoc: 1 for associated state, 0 otherwise

 * @is_assoc: 1 for associated state, 0 otherwise

 * @dtim_time: DTIM arrival time in system time

 * @dtim_time: DTIM arrival time in system time

 * @dtim_tsf: DTIM arrival time in TSF

 * @dtim_tsf: DTIM arrival time in TSF

 * @bi: beacon interval in TU, applicable only when associated

 * @bi: beacon interval in TU, applicable only when associated

 * @bi_reciprocal: 2^32 / bi , applicable only when associated

 * @reserved1: reserved

 * @dtim_interval: DTIM interval in TU, applicable only when associated

 * @dtim_interval: DTIM interval in TU, applicable only when associated

 * @dtim_reciprocal: 2^32 / dtim_interval , applicable only when associated

 * @data_policy: see &enum iwl_mac_data_policy

 * @listen_interval: in beacon intervals, applicable only when associated

 * @listen_interval: in beacon intervals, applicable only when associated

 * @assoc_id: unique ID assigned by the AP during association

 * @assoc_id: unique ID assigned by the AP during association

 * @assoc_beacon_arrive_time: TSF of first beacon after association

 * @assoc_beacon_arrive_time: TSF of first beacon after association
@@ -203,13 +211,13 @@ struct iwl_mac_data_sta { 
	__le32 dtim_time;

	__le32 dtim_time;

	__le64 dtim_tsf;

	__le64 dtim_tsf;

	__le32 bi;

	__le32 bi;

	__le32 bi_reciprocal;

	__le32 reserved1;

	__le32 dtim_interval;

	__le32 dtim_interval;

	__le32 dtim_reciprocal;

	__le32 data_policy;

	__le32 listen_interval;

	__le32 listen_interval;

	__le32 assoc_id;

	__le32 assoc_id;

	__le32 assoc_beacon_arrive_time;

	__le32 assoc_beacon_arrive_time;

} __packed; /* STA_MAC_DATA_API_S_VER_1 */

} __packed; /* STA_MAC_DATA_API_S_VER_2 */





/**

/**

 * struct iwl_mac_data_go - configuration data for P2P GO MAC context

 * struct iwl_mac_data_go - configuration data for P2P GO MAC context
@@ -233,7 +241,7 @@ struct iwl_mac_data_go { 
struct iwl_mac_data_p2p_sta {

struct iwl_mac_data_p2p_sta {

	struct iwl_mac_data_sta sta;

	struct iwl_mac_data_sta sta;

	__le32 ctwin;

	__le32 ctwin;

} __packed; /* P2P_STA_MAC_DATA_API_S_VER_1 */

} __packed; /* P2P_STA_MAC_DATA_API_S_VER_2 */





/**

/**

 * struct iwl_mac_data_pibss - Pseudo IBSS config data

 * struct iwl_mac_data_pibss - Pseudo IBSS config data
@@ -378,13 +386,6 @@ struct iwl_mac_ctx_cmd { 
	};

	};

} __packed; /* MAC_CONTEXT_CMD_API_S_VER_1 */

} __packed; /* MAC_CONTEXT_CMD_API_S_VER_1 */





static inline u32 iwl_mvm_reciprocal(u32 v)

{

	if (!v)

		return 0;

	return 0xFFFFFFFF / v;

}



#define IWL_NONQOS_SEQ_GET	0x1

#define IWL_NONQOS_SEQ_GET	0x1

#define IWL_NONQOS_SEQ_SET	0x2

#define IWL_NONQOS_SEQ_SET	0x2

struct iwl_nonqos_seq_query_cmd {

struct iwl_nonqos_seq_query_cmd {

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

+262 −15

File changed.

Preview size limit exceeded, changes collapsed.