Commit 57e861d9 authored by David Spinadel's avatar David Spinadel Committed by Luca Coelho
Browse files

iwlwifi: mvm: Change FW channel info API 



Change iwl_fw_channel_info structure so it can have channel number
greater than 255. This is needed for 6 GHz channel numbers.
Change all relevant structs and member accesses accordingly.
The new API is indicated by a TLV capability bit.

Signed-off-by: default avatarDavid Spinadel <david.spinadel@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 5213e8a8

drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h

+41 −10
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright(c) 2012 - 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) 2012 - 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
@@ -95,17 +97,36 @@ 
#define PHY_VHT_CTRL_POS_4_ABOVE  (0x7)



/*

 * struct iwl_fw_channel_info_v1 - channel information

 *

 * @band: PHY_BAND_*

 * @channel: channel number

 * @width: PHY_[VHT|LEGACY]_CHANNEL_*

 * @ctrl channel: PHY_[VHT|LEGACY]_CTRL_*

 */

struct iwl_fw_channel_info {

struct iwl_fw_channel_info_v1 {

	u8 band;

	u8 channel;

	u8 width;

	u8 ctrl_pos;

} __packed;

} __packed; /* CHANNEL_CONFIG_API_S_VER_1 */



/*

 * struct iwl_fw_channel_info - channel information

 *

 * @channel: channel number

 * @band: PHY_BAND_*

 * @width: PHY_[VHT|LEGACY]_CHANNEL_*

 * @ctrl channel: PHY_[VHT|LEGACY]_CTRL_*

 * @reserved: for future use and alignment

 */

struct iwl_fw_channel_info {

	__le32 channel;

	u8 band;

	u8 width;

	u8 ctrl_pos;

	u8 reserved;

} __packed; /*CHANNEL_CONFIG_API_S_VER_2 */



#define PHY_RX_CHAIN_DRIVER_FORCE_POS	(0)

#define PHY_RX_CHAIN_DRIVER_FORCE_MSK \
@@ -133,6 +154,22 @@ struct iwl_fw_channel_info { 
#define NUM_PHY_CTX	3



/* TODO: complete missing documentation */

/**

 * struct iwl_phy_context_cmd_tail - tail of iwl_phy_ctx_cmd for alignment with

 *	various channel structures.

 *

 * @txchain_info: ???

 * @rxchain_info: ???

 * @acquisition_data: ???

 * @dsp_cfg_flags: set to 0

 */

struct iwl_phy_context_cmd_tail {

	__le32 txchain_info;

	__le32 rxchain_info;

	__le32 acquisition_data;

	__le32 dsp_cfg_flags;

} __packed;



/**

 * struct iwl_phy_context_cmd - config of the PHY context

 * ( PHY_CONTEXT_CMD = 0x8 )
@@ -142,10 +179,7 @@ struct iwl_fw_channel_info { 
 *	other value means apply new params after X usecs

 * @tx_param_color: ???

 * @ci: channel info

 * @txchain_info: ???

 * @rxchain_info: ???

 * @acquisition_data: ???

 * @dsp_cfg_flags: set to 0

 * @tail: command tail

 */

struct iwl_phy_context_cmd {

	/* COMMON_INDEX_HDR_API_S_VER_1 */
@@ -155,10 +189,7 @@ struct iwl_phy_context_cmd { 
	__le32 apply_time;

	__le32 tx_param_color;

	struct iwl_fw_channel_info ci;

	__le32 txchain_info;

	__le32 rxchain_info;

	__le32 acquisition_data;

	__le32 dsp_cfg_flags;

	struct iwl_phy_context_cmd_tail tail;

} __packed; /* PHY_CONTEXT_CMD_API_VER_1 */



#endif /* __iwl_fw_api_phy_ctxt_h__ */

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

+15 −4
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright(c) 2012 - 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) 2012 - 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
@@ -110,6 +112,17 @@ struct iwl_tdls_channel_switch_frame { 
	u8 data[IWL_TDLS_CH_SW_FRAME_MAX_SIZE];

} __packed; /* TDLS_STA_CHANNEL_SWITCH_FRAME_API_S_VER_1 */



/**

 * struct iwl_tdls_channel_switch_cmd_tail - tail of iwl_tdls_channel_switch_cmd

 *

 * @timing: timing related data for command

 * @frame: channel-switch request/response template, depending to switch_type

 */

struct iwl_tdls_channel_switch_cmd_tail {

	struct iwl_tdls_channel_switch_timing timing;

	struct iwl_tdls_channel_switch_frame frame;

} __packed;



/**

 * struct iwl_tdls_channel_switch_cmd - TDLS channel switch command

 *
@@ -119,15 +132,13 @@ struct iwl_tdls_channel_switch_frame { 
 * @switch_type: see &enum iwl_tdls_channel_switch_type

 * @peer_sta_id: station id of TDLS peer

 * @ci: channel we switch to

 * @timing: timing related data for command

 * @frame: channel-switch request/response template, depending to switch_type

 * @tail: command tail

 */

struct iwl_tdls_channel_switch_cmd {

	u8 switch_type;

	__le32 peer_sta_id;

	struct iwl_fw_channel_info ci;

	struct iwl_tdls_channel_switch_timing timing;

	struct iwl_tdls_channel_switch_frame frame;

	struct iwl_tdls_channel_switch_cmd_tail tail;

} __packed; /* TDLS_STA_CHANNEL_SWITCH_CMD_API_S_VER_1 */



/**

drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h

+22 −12
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright(c) 2012 - 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) 2012 - 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
@@ -317,6 +319,25 @@ struct iwl_time_event_notif { 
	__le32 status;

} __packed; /* MAC_TIME_EVENT_NTFY_API_S_VER_1 */



/*

 * struct iwl_hs20_roc_req_tail - tail of iwl_hs20_roc_req

 *

 * @node_addr: Our MAC Address

 * @reserved: reserved for alignment

 * @apply_time: GP2 value to start (should always be the current GP2 value)

 * @apply_time_max_delay: Maximum apply time delay value in TU. Defines max

 *	time by which start of the event is allowed to be postponed.

 * @duration: event duration in TU To calculate event duration:

 *	timeEventDuration = min(duration, remainingQuota)

 */

struct iwl_hs20_roc_req_tail {

	u8 node_addr[ETH_ALEN];

	__le16 reserved;

	__le32 apply_time;

	__le32 apply_time_max_delay;

	__le32 duration;

} __packed;



/*

 * Aux ROC command

 *
@@ -336,13 +357,6 @@ struct iwl_time_event_notif { 
 * @sta_id_and_color: station id and color, resumed during "Remain On Channel"

 *	activity.

 * @channel_info: channel info

 * @node_addr: Our MAC Address

 * @reserved: reserved for alignment

 * @apply_time: GP2 value to start (should always be the current GP2 value)

 * @apply_time_max_delay: Maximum apply time delay value in TU. Defines max

 *	time by which start of the event is allowed to be postponed.

 * @duration: event duration in TU To calculate event duration:

 *	timeEventDuration = min(duration, remainingQuota)

 */

struct iwl_hs20_roc_req {

	/* COMMON_INDEX_HDR_API_S_VER_1 hdr */
@@ -351,11 +365,7 @@ struct iwl_hs20_roc_req { 
	__le32 event_unique_id;

	__le32 sta_id_and_color;

	struct iwl_fw_channel_info channel_info;

	u8 node_addr[ETH_ALEN];

	__le16 reserved;

	__le32 apply_time;

	__le32 apply_time_max_delay;

	__le32 duration;

	struct iwl_hs20_roc_req_tail tail;

} __packed; /* HOT_SPOT_CMD_API_S_VER_1 */



/*

drivers/net/wireless/intel/iwlwifi/fw/file.h

+3 −0
Original line number Diff line number Diff line
@@ -333,6 +333,8 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t; 
 * @IWL_UCODE_TLV_CAPA_TLC_OFFLOAD: firmware implements rate scaling algorithm

 * @IWL_UCODE_TLV_CAPA_DYNAMIC_QUOTA: firmware implements quota related

 * @IWL_UCODE_TLV_CAPA_COEX_SCHEMA_2: firmware implements Coex Schema 2

 * @IWL_UCODE_TLV_CAPA_ULTRA_HB_CHANNELS: firmware supports ultra high band

 *	(6 GHz).

 * @IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE: extended DTS measurement

 * @IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS: supports short PM timeouts

 * @IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT: supports bt-coex Multi-priority LUT
@@ -395,6 +397,7 @@ enum iwl_ucode_tlv_capa { 
	IWL_UCODE_TLV_CAPA_TLC_OFFLOAD                  = (__force iwl_ucode_tlv_capa_t)43,

	IWL_UCODE_TLV_CAPA_DYNAMIC_QUOTA                = (__force iwl_ucode_tlv_capa_t)44,

	IWL_UCODE_TLV_CAPA_COEX_SCHEMA_2		= (__force iwl_ucode_tlv_capa_t)45,

	IWL_UCODE_TLV_CAPA_ULTRA_HB_CHANNELS		= (__force iwl_ucode_tlv_capa_t)48,

	IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE		= (__force iwl_ucode_tlv_capa_t)64,

	IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS		= (__force iwl_ucode_tlv_capa_t)65,

	IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT		= (__force iwl_ucode_tlv_capa_t)67,

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+18 −12
Original line number Diff line number Diff line
@@ -3520,14 +3520,20 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm, 
		.id_and_color =

			cpu_to_le32(FW_CMD_ID_AND_COLOR(MAC_INDEX_AUX, 0)),

		.sta_id_and_color = cpu_to_le32(mvm->aux_sta.sta_id),

	};

	struct iwl_hs20_roc_req_tail *tail = iwl_mvm_chan_info_cmd_tail(mvm,

		&aux_roc_req.channel_info);

	u16 len = sizeof(aux_roc_req) - iwl_mvm_chan_info_padding(mvm);



	/* Set the channel info data */

		.channel_info.band = (channel->band == NL80211_BAND_2GHZ) ?

	iwl_mvm_set_chan_info(mvm, &aux_roc_req.channel_info, channel->hw_value,

			      (channel->band == NL80211_BAND_2GHZ) ?

			       PHY_BAND_24 : PHY_BAND_5,

		.channel_info.channel = channel->hw_value,

		.channel_info.width = PHY_VHT_CHANNEL_MODE20,

			      PHY_VHT_CHANNEL_MODE20,

			      0);



	/* Set the time and duration */

		.apply_time = cpu_to_le32(iwl_read_prph(mvm->trans, time_reg)),

	 };

	tail->apply_time = cpu_to_le32(iwl_read_prph(mvm->trans, time_reg));



	delay = AUX_ROC_MIN_DELAY;

	req_dur = MSEC_TO_TU(duration);
@@ -3552,15 +3558,15 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm, 
		}

	}



	aux_roc_req.duration = cpu_to_le32(req_dur);

	aux_roc_req.apply_time_max_delay = cpu_to_le32(delay);

	tail->duration = cpu_to_le32(req_dur);

	tail->apply_time_max_delay = cpu_to_le32(delay);



	IWL_DEBUG_TE(mvm,

		     "ROC: Requesting to remain on channel %u for %ums (requested = %ums, max_delay = %ums, dtim_interval = %ums)\n",

		     channel->hw_value, req_dur, duration, delay,

		     dtim_interval);

	/* Set the node address */

	memcpy(aux_roc_req.node_addr, vif->addr, ETH_ALEN);

	memcpy(tail->node_addr, vif->addr, ETH_ALEN);



	lockdep_assert_held(&mvm->mutex);
@@ -3591,7 +3597,7 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm, 
				   ARRAY_SIZE(time_event_response),

				   iwl_mvm_rx_aux_roc, te_data);



	res = iwl_mvm_send_cmd_pdu(mvm, HOT_SPOT_CMD, 0, sizeof(aux_roc_req),

	res = iwl_mvm_send_cmd_pdu(mvm, HOT_SPOT_CMD, 0, len,

				   &aux_roc_req);



	if (res) {