Commit 3d6b2d4e authored by Kalle Valo's avatar Kalle Valo
Browse files

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

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

Sencond batch of iwlwifi patches for 4.14

* Some more code moved to a new directory;
* Fixes in LED handling;
* Some FW API updates;
* General fixes and cleanups here and there.
parents a67b133b 88c5f476

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 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-$(CONFIG_IWLMVM) += fw/common_rx.o fw/nvm.o



iwlwifi-objs += $(iwlwifi-m)

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

+14 −0
Original line number Diff line number Diff line
@@ -75,11 +75,14 @@ 
#define IWL_A000_JF_FW_PRE	"iwlwifi-Qu-a0-jf-b0-"

#define IWL_A000_HR_FW_PRE	"iwlwifi-Qu-a0-hr-a0-"

#define IWL_A000_HR_CDB_FW_PRE	"iwlwifi-QuIcp-z0-hrcdb-a0-"

#define IWL_A000_HR_F0_FW_PRE	"iwlwifi-QuQnj-f0-hr-a0-"



#define IWL_A000_HR_MODULE_FIRMWARE(api) \

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

#define IWL_A000_JF_MODULE_FIRMWARE(api) \

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

#define IWL_A000_HR_QNJ_MODULE_FIRMWARE(api) \

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



#define NVM_HW_SECTION_NUM_FAMILY_A000		10
@@ -168,5 +171,16 @@ const struct iwl_cfg iwla000_2ax_cfg_hr = { 
		.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};



const struct iwl_cfg iwla000_2ax_cfg_qnj_hr = {

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

		.fw_name_pre = IWL_A000_HR_F0_FW_PRE,

		IWL_DEVICE_A000,

		.ht_params = &iwl_a000_ht_params,

		.nvm_ver = IWL_A000_NVM_VERSION,

		.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,

		.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};



MODULE_FIRMWARE(IWL_A000_HR_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_A000_JF_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_A000_HR_QNJ_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));

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

+1 −7
Original line number Diff line number Diff line
@@ -311,11 +311,6 @@ enum { 


/**

 * rate_n_flags Tx antenna masks

 * 4965 has 2 transmitters

 * 5100 has 1 transmitter B

 * 5150 has 1 transmitter A

 * 5300 has 3 transmitters

 * 5350 has 3 transmitters

 * bit14:16

 */

#define RATE_MCS_ANT_POS	14
@@ -1230,7 +1225,6 @@ struct iwl_rx_mpdu_res_start { 
 */



/*

 * 4965 uCode updates these Tx attempt count values in host DRAM.

 * Used for managing Tx retries when expecting block-acks.

 * Driver should set these fields to 0.

 */
@@ -1540,7 +1534,7 @@ struct iwl_link_qual_general_params { 
	/* Best single antenna to use for single stream (legacy, SISO). */

	u8 single_stream_ant_msk;	/* LINK_QUAL_ANT_* */



	/* Best antennas to use for MIMO (unused for 4965, assumes both). */

	/* Best antennas to use for MIMO */

	u8 dual_stream_ant_msk;		/* LINK_QUAL_ANT_* */



	/*

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

+5 −9
Original line number Diff line number Diff line
@@ -220,12 +220,6 @@ enum iwl_bt_ci_compliance { 
	BT_CI_COMPLIANCE_BOTH		= 3,

}; /* BT_COEX_CI_COMPLIENCE_E_VER_1 */



#define IWL_COEX_IS_TTC_ON(_ttc_rrc_status, _phy_id)	\

		(_ttc_rrc_status & BIT(_phy_id))



#define IWL_COEX_IS_RRC_ON(_ttc_rrc_status, _phy_id)	\

		((_ttc_rrc_status >> 4) & BIT(_phy_id))



/**

 * struct iwl_bt_coex_profile_notif - notification about BT coex

 * @mbox_msg: message from BT to WiFi
@@ -234,7 +228,8 @@ enum iwl_bt_ci_compliance { 
 * @primary_ch_lut: LUT used for primary channel &enum iwl_bt_coex_lut_type

 * @secondary_ch_lut: LUT used for secondary channel &enum iwl_bt_coex_lut_type

 * @bt_activity_grading: the activity of BT &enum iwl_bt_activity_grading

 * @ttc_rrc_status: is TTC or RRC enabled - one bit per PHY

 * @ttc_status: is TTC enabled - one bit per PHY

 * @rrc_status: is RRC enabled - one bit per PHY

 * @reserved: reserved

 */

struct iwl_bt_coex_profile_notif {
@@ -245,8 +240,9 @@ struct iwl_bt_coex_profile_notif { 
	__le32 primary_ch_lut;

	__le32 secondary_ch_lut;

	__le32 bt_activity_grading;

	u8 ttc_rrc_status;

	u8 reserved[3];

	u8 ttc_status;

	u8 rrc_status;

	__le16 reserved;

} __packed; /* BT_COEX_PROFILE_NTFY_API_S_VER_4 */



#endif /* __iwl_fw_api_coex_h__ */

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

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

	NON_QOS_TX_COUNTER_CMD = 0x2d,



	/**

	 * @LEDS_CMD: command is &struct iwl_led_cmd

	 */

	LEDS_CMD = 0x48,



	/**

	 * @LQ_CMD: using &struct iwl_lq_cmd

	 */