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

Commit d074e0b8 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2017-04-13' of... 

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

Patches intended for v4.12:

  * Some small fixes here and there;
  * The usual cleanups and small improvements;
  * Work to support A000 devices continues;
  * New FW API version;
  * Some debugging improvements;
parents 1f242a3d 87d0e1af

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ iwlwifi-objs += iwl-notif-wait.o 
iwlwifi-objs		+= iwl-eeprom-read.o iwl-eeprom-parse.o

iwlwifi-objs		+= iwl-phy-db.o iwl-nvm-parse.o

iwlwifi-objs		+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o

iwlwifi-objs		+= pcie/ctxt-info.o pcie/trans-gen2.o

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

iwlwifi-$(CONFIG_IWLMVM) += iwl-7000.o iwl-8000.o iwl-9000.o iwl-a000.o

iwlwifi-objs		+= iwl-trans.o

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

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ 
/* Highest firmware API version supported */

#define IWL7260_UCODE_API_MAX	17

#define IWL7265_UCODE_API_MAX	17

#define IWL7265D_UCODE_API_MAX	28

#define IWL3168_UCODE_API_MAX	28

#define IWL7265D_UCODE_API_MAX	30

#define IWL3168_UCODE_API_MAX	30



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	17

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

+2 −2
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL8000_UCODE_API_MAX	28

#define IWL8265_UCODE_API_MAX	28

#define IWL8000_UCODE_API_MAX	30

#define IWL8265_UCODE_API_MAX	30



/* Lowest firmware API version supported */

#define IWL8000_UCODE_API_MIN	17

drivers/net/wireless/intel/iwlwifi/iwl-9000.c

+17 −29
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2015-2016 Intel Deutschland GmbH

 * Copyright(c) 2015-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
@@ -18,7 +18,7 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2015-2016 Intel Deutschland GmbH

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * All rights reserved.

 *

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



/* Highest firmware API version supported */

#define IWL9000_UCODE_API_MAX	28

#define IWL9000_UCODE_API_MAX	30



/* Lowest firmware API version supported */

#define IWL9000_UCODE_API_MIN	17
@@ -73,14 +73,14 @@ 
#define IWL9000_SMEM_LEN		0x68000



#define  IWL9000_FW_PRE "iwlwifi-9000-pu-a0-jf-a0-"

#define  IWL9260_FW_PRE "iwlwifi-9260-th-a0-jf-a0-"

#define  IWL9000LC_FW_PRE "iwlwifi-9000-pu-a0-lc-a0-"

#define  IWL9260A_FW_PRE "iwlwifi-9260-th-a0-jf-a0-"

#define  IWL9260B_FW_PRE "iwlwifi-9260-th-b0-jf-b0-"

#define IWL9000_MODULE_FIRMWARE(api) \

	IWL9000_FW_PRE "-" __stringify(api) ".ucode"

#define IWL9260_MODULE_FIRMWARE(api) \

	IWL9260_FW_PRE "-" __stringify(api) ".ucode"

#define IWL9000LC_MODULE_FIRMWARE(api) \

	IWL9000LC_FW_PRE "-" __stringify(api) ".ucode"

#define IWL9260A_MODULE_FIRMWARE(api) \

	IWL9260A_FW_PRE "-" __stringify(api) ".ucode"

#define IWL9260B_MODULE_FIRMWARE(api) \

	IWL9260B_FW_PRE "-" __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_9000		10
@@ -148,7 +148,8 @@ static const struct iwl_tt_params iwl9000_tt_params = { 


const struct iwl_cfg iwl9160_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9160",

	.fw_name_pre = IWL9260_FW_PRE,

	.fw_name_pre = IWL9260A_FW_PRE,

	.fw_name_pre_next_step = IWL9260B_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,
@@ -158,7 +159,8 @@ const struct iwl_cfg iwl9160_2ac_cfg = { 


const struct iwl_cfg iwl9260_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9260",

	.fw_name_pre = IWL9260_FW_PRE,

	.fw_name_pre = IWL9260A_FW_PRE,

	.fw_name_pre_next_step = IWL9260B_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,
@@ -168,7 +170,8 @@ const struct iwl_cfg iwl9260_2ac_cfg = { 


const struct iwl_cfg iwl9270_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9270",

	.fw_name_pre = IWL9260_FW_PRE,

	.fw_name_pre = IWL9260A_FW_PRE,

	.fw_name_pre_next_step = IWL9260B_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,
@@ -198,21 +201,6 @@ const struct iwl_cfg iwl9560_2ac_cfg = { 
	.integrated = true,

};



/*

 * TODO the struct below is for internal testing only this should be

 * removed by EO 2016~

 */

const struct iwl_cfg iwl9000lc_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9000",

	.fw_name_pre = IWL9000LC_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,

	.nvm_calib_ver = IWL9000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

	.integrated = true,

};



MODULE_FIRMWARE(IWL9000_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL9260_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL9000LC_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
 
MODULE_FIRMWARE(IWL9260A_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL9260B_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

drivers/net/wireless/intel/iwlwifi/iwl-a000.c

+3 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL_A000_UCODE_API_MAX	28

#define IWL_A000_UCODE_API_MAX	30



/* Lowest firmware API version supported */

#define IWL_A000_UCODE_API_MIN	24
@@ -121,7 +121,8 @@ static const struct iwl_ht_params iwl_a000_ht_params = { 
	.vht_mu_mimo_supported = true,					\

	.mac_addr_from_csr = true,					\

	.use_tfh = true,						\

	.rf_id = true

	.rf_id = true,							\

	.gen2 = true



const struct iwl_cfg iwla000_2ac_cfg_hr = {

		.name = "Intel(R) Dual Band Wireless AC a000",