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

Commit 08b0109e authored by Kalle Valo's avatar Kalle Valo
Browse files

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

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

Second set of iwlwifi patches for 4.20

* TKIP implementation in new devices;
* Fix for the shared antenna setting in 22000 series;
* Report that we set the RU offset in HE code;
* Fix some register addresses in 22000 series;
* Fix one FW feature TLV that had a conflict with another value;
* A couple of fixes for SoftAP mode;
* Work continues for new 22560 hardware;
* Some fixes in the datapath;
* Some debugging and other general fixes;
* Some cleanups, small improvements and other general fixes;
parents 297fab13 6f3df8c1

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

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.ucode_api_min = IWL_22000_UCODE_API_MIN,			\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_22000,		\

	.non_shared_ant = ANT_A,					\

	.non_shared_ant = ANT_B,					\

	.dccm_offset = IWL_22000_DCCM_OFFSET,				\

	.dccm_len = IWL_22000_DCCM_LEN,					\

	.dccm2_offset = IWL_22000_DCCM2_OFFSET,				\

drivers/net/wireless/intel/iwlwifi/dvm/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 *

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

 * Copyright(c) 2015 Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 *

 * Portions of this file are derived from the ipw3945 project, as well

 * as portions of the ieee80211 subsystem header files.
@@ -1647,7 +1648,6 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv) 
			priv->status, table.valid);

	}



	trace_iwlwifi_dev_ucode_error(trans->dev, &table, 0, table.brd_ver);

	IWL_ERR(priv, "0x%08X | %-28s\n", table.error_id,

		desc_lookup(table.error_id));

	IWL_ERR(priv, "0x%08X | uPc\n", table.pc);

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

+5 −0
Original line number Diff line number Diff line
@@ -99,6 +99,11 @@ enum iwl_data_path_subcmd_ids { 
	 */

	TLC_MNG_CONFIG_CMD = 0xF,



	/**

	 * @HE_AIR_SNIFFER_CONFIG_CMD: &struct iwl_he_monitor_cmd

	 */

	HE_AIR_SNIFFER_CONFIG_CMD = 0x13,



	/**

	 * @TLC_MNG_UPDATE_NOTIF: &struct iwl_tlc_update_notif

	 */

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

+32 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright(c) 2007 - 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) 2005 - 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
@@ -336,6 +338,9 @@ struct iwl_dbg_mem_access_rsp { 
#define CONT_REC_COMMAND_SIZE	80

#define ENABLE_CONT_RECORDING	0x15

#define DISABLE_CONT_RECORDING	0x16

#define BUFFER_ALLOCATION	0x27

#define START_DEBUG_RECORDING	0x29

#define STOP_DEBUG_RECORDING	0x2A



/*

 * struct iwl_continuous_record_mode - recording mode
@@ -353,4 +358,31 @@ struct iwl_continuous_record_cmd { 
		sizeof(struct iwl_continuous_record_mode)];

} __packed;



/* maximum fragments to be allocated per target of allocationId */

#define IWL_BUFFER_LOCATION_MAX_FRAGS	2



/**

 * struct iwl_fragment_data single fragment structure

 * @address: 64bit start address

 * @size: size in bytes

 */

struct iwl_fragment_data {

	__le64 address;

	__le32 size;

} __packed; /* FRAGMENT_STRUCTURE_API_S_VER_1 */



/**

 * struct iwl_buffer_allocation_cmd - buffer allocation command structure

 * @allocation_id: id of the allocation

 * @buffer_location: location of the buffer

 * @num_frags: number of fragments

 * @fragments: memory fragments

 */

struct iwl_buffer_allocation_cmd {

	__le32 allocation_id;

	__le32 buffer_location;

	__le32 num_frags;

	struct iwl_fragment_data fragments[IWL_BUFFER_LOCATION_MAX_FRAGS];

} __packed; /* BUFFER_ALLOCATION_CMD_API_S_VER_1 */



#endif /* __iwl_fw_api_debug_h__ */

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

+14 −0
Original line number Diff line number Diff line
@@ -578,4 +578,18 @@ struct iwl_he_sta_context_cmd { 
	struct iwl_he_backoff_conf trig_based_txf[AC_NUM];

} __packed; /* STA_CONTEXT_DOT11AX_API_S */



/**

 * struct iwl_he_monitor_cmd - configure air sniffer for HE

 * @bssid: the BSSID to sniff for

 * @reserved1: reserved for dword alignment

 * @aid: the AID to track on for HE MU

 * @reserved2: reserved for future use

 */

struct iwl_he_monitor_cmd {

	u8 bssid[6];

	__le16 reserved1;

	__le16 aid;

	u8 reserved2[6];

} __packed; /* HE_AIR_SNIFFER_CONFIG_CMD_API_S_VER_1 */



#endif /* __iwl_fw_api_mac_h__ */