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

Commit 8f6c5b07 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2015-09-21' of... 

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

* 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;
parents e904cf6f 7c014e35

drivers/net/wireless/iwlwifi/iwl-7000.c

+3 −3
Original line number Diff line number Diff line
@@ -72,11 +72,11 @@ 
#define IWL7260_UCODE_API_MAX	17



/* Oldest version we won't warn about */

#define IWL7260_UCODE_API_OK	12

#define IWL7260_UCODE_API_OK	13

#define IWL3165_UCODE_API_OK	13



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	12

#define IWL7260_UCODE_API_MIN	13

#define IWL3165_UCODE_API_MIN	13



/* NVM versions */
@@ -113,7 +113,7 @@ 


static const struct iwl_base_params iwl7000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_7000,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_queues = 31,

	.pll_cfg_val = 0,

	.shadow_ram_support = true,

	.led_compensation = 57,

drivers/net/wireless/iwlwifi/iwl-8000.c

+3 −3
Original line number Diff line number Diff line
@@ -72,10 +72,10 @@ 
#define IWL8000_UCODE_API_MAX	17



/* Oldest version we won't warn about */

#define IWL8000_UCODE_API_OK	12

#define IWL8000_UCODE_API_OK	13



/* Lowest firmware API version supported */

#define IWL8000_UCODE_API_MIN	12

#define IWL8000_UCODE_API_MIN	13



/* NVM versions */

#define IWL8000_NVM_VERSION		0x0a1d
@@ -107,7 +107,7 @@ 


static const struct iwl_base_params iwl8000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_8000,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_queues = 31,

	.pll_cfg_val = 0,

	.shadow_ram_support = true,

	.led_compensation = 57,

drivers/net/wireless/iwlwifi/iwl-fw-file.h

+0 −13
Original line number Diff line number Diff line
@@ -247,15 +247,8 @@ typedef unsigned int __bitwise__ iwl_ucode_tlv_api_t; 
 * @IWL_UCODE_TLV_API_FRAGMENTED_SCAN: This ucode supports active dwell time

 *	longer than the passive one, which is essential for fragmented scan.

 * @IWL_UCODE_TLV_API_WIFI_MCC_UPDATE: ucode supports MCC updates with source.

 * IWL_UCODE_TLV_API_HDC_PHASE_0: ucode supports finer configuration of LTR

 * @IWL_UCODE_TLV_API_TX_POWER_DEV: new API for tx power.

 * @IWL_UCODE_TLV_API_WIDE_CMD_HDR: ucode supports wide command header

 * @IWL_UCODE_TLV_API_SCD_CFG: This firmware can configure the scheduler

 *	through the dedicated host command.

 * @IWL_UCODE_TLV_API_SINGLE_SCAN_EBS: EBS is supported for single scans too.

 * @IWL_UCODE_TLV_API_ASYNC_DTM: Async temperature notifications are supported.

 * @IWL_UCODE_TLV_API_LQ_SS_PARAMS: Configure STBC/BFER via LQ CMD ss_params

 * @IWL_UCODE_TLV_API_STATS_V10: uCode supports/uses statistics API version 10

 * @IWL_UCODE_TLV_API_NEW_VERSION: new versioning format

 * @IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY: scan APIs use 8-level priority

 *	instead of 3.
@@ -266,14 +259,8 @@ enum iwl_ucode_tlv_api { 
	IWL_UCODE_TLV_API_BT_COEX_SPLIT         = (__force iwl_ucode_tlv_api_t)3,

	IWL_UCODE_TLV_API_FRAGMENTED_SCAN	= (__force iwl_ucode_tlv_api_t)8,

	IWL_UCODE_TLV_API_WIFI_MCC_UPDATE	= (__force iwl_ucode_tlv_api_t)9,

	IWL_UCODE_TLV_API_HDC_PHASE_0		= (__force iwl_ucode_tlv_api_t)10,

	IWL_UCODE_TLV_API_TX_POWER_DEV		= (__force iwl_ucode_tlv_api_t)11,

	IWL_UCODE_TLV_API_WIDE_CMD_HDR		= (__force iwl_ucode_tlv_api_t)14,

	IWL_UCODE_TLV_API_SCD_CFG		= (__force iwl_ucode_tlv_api_t)15,

	IWL_UCODE_TLV_API_SINGLE_SCAN_EBS	= (__force iwl_ucode_tlv_api_t)16,

	IWL_UCODE_TLV_API_ASYNC_DTM		= (__force iwl_ucode_tlv_api_t)17,

	IWL_UCODE_TLV_API_LQ_SS_PARAMS		= (__force iwl_ucode_tlv_api_t)18,

	IWL_UCODE_TLV_API_STATS_V10		= (__force iwl_ucode_tlv_api_t)19,

	IWL_UCODE_TLV_API_NEW_VERSION		= (__force iwl_ucode_tlv_api_t)20,

	IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY	= (__force iwl_ucode_tlv_api_t)24,

	IWL_UCODE_TLV_API_TX_POWER_CHAIN	= (__force iwl_ucode_tlv_api_t)27,

drivers/net/wireless/iwlwifi/iwl-io.c

+23 −0
Original line number Diff line number Diff line
@@ -36,6 +36,29 @@ 
#include "iwl-prph.h"

#include "iwl-fh.h"



void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val)

{

	trace_iwlwifi_dev_iowrite8(trans->dev, ofs, val);

	iwl_trans_write8(trans, ofs, val);

}

IWL_EXPORT_SYMBOL(iwl_write8);



void iwl_write32(struct iwl_trans *trans, u32 ofs, u32 val)

{

	trace_iwlwifi_dev_iowrite32(trans->dev, ofs, val);

	iwl_trans_write32(trans, ofs, val);

}

IWL_EXPORT_SYMBOL(iwl_write32);



u32 iwl_read32(struct iwl_trans *trans, u32 ofs)

{

	u32 val = iwl_trans_read32(trans, ofs);



	trace_iwlwifi_dev_ioread32(trans->dev, ofs, val);

	return val;

}

IWL_EXPORT_SYMBOL(iwl_read32);



#define IWL_POLL_INTERVAL 10	/* microseconds */



int iwl_poll_bit(struct iwl_trans *trans, u32 addr,

drivers/net/wireless/iwlwifi/iwl-io.h

+3 −18
Original line number Diff line number Diff line
@@ -32,24 +32,9 @@ 
#include "iwl-devtrace.h"

#include "iwl-trans.h"



static inline void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val)

{

	trace_iwlwifi_dev_iowrite8(trans->dev, ofs, val);

	iwl_trans_write8(trans, ofs, val);

}



static inline void iwl_write32(struct iwl_trans *trans, u32 ofs, u32 val)

{

	trace_iwlwifi_dev_iowrite32(trans->dev, ofs, val);

	iwl_trans_write32(trans, ofs, val);

}



static inline u32 iwl_read32(struct iwl_trans *trans, u32 ofs)

{

	u32 val = iwl_trans_read32(trans, ofs);

	trace_iwlwifi_dev_ioread32(trans->dev, ofs, val);

	return val;

}

void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val);

void iwl_write32(struct iwl_trans *trans, u32 ofs, u32 val);

u32 iwl_read32(struct iwl_trans *trans, u32 ofs);



static inline void iwl_set_bit(struct iwl_trans *trans, u32 reg, u32 mask)

{