Commit 38d84aae authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

wifi: iwlwifi: mvm: introduce PHY_CONTEXT_CMD_API_VER_5 



This command version adds two news fields:
sbb_bandwidth and sbb_ctrl_channel_loc
They will be populated later.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240123200528.82ab4140fff9.Icfba4819fe0b7ac8219ab671c632e25f5fbbaf6f@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 22d9987c

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

+14 −2
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ struct iwl_phy_context_cmd_v1 { 
 * @lmac_id: the lmac id the phy context belongs to

 * @ci: channel info

 * @rxchain_info: ???

 * @sbb_bandwidth: 0 disabled, 1 - 40Mhz ... 4 - 320MHz

 * @sbb_ctrl_channel_loc: location of the control channel

 * @dsp_cfg_flags: set to 0

 * @reserved: reserved to align to 64 bit

 */
@@ -152,9 +154,19 @@ struct iwl_phy_context_cmd { 
	/* PHY_CONTEXT_DATA_API_S_VER_3, PHY_CONTEXT_DATA_API_S_VER_4 */

	struct iwl_fw_channel_info ci;

	__le32 lmac_id;

	union {

		__le32 rxchain_info; /* reserved in _VER_4 */

		struct {             /* used for _VER_5 */

			u8 sbb_bandwidth;

			u8 sbb_ctrl_channel_loc;

			__le16 reserved;

		} v5;

	};

	__le32 dsp_cfg_flags;

	__le32 reserved;

} __packed; /* PHY_CONTEXT_CMD_API_VER_3, PHY_CONTEXT_CMD_API_VER_4 */

} __packed; /* PHY_CONTEXT_CMD_API_VER_3,

	     * PHY_CONTEXT_CMD_API_VER_4,

	     * PHY_CONTEXT_CMD_API_VER_5

	     */



#endif /* __iwl_fw_api_phy_ctxt_h__ */

drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static int iwl_mvm_phy_ctxt_apply(struct iwl_mvm *mvm, 
	int ret;

	int ver = iwl_fw_lookup_cmd_ver(mvm->fw, PHY_CONTEXT_CMD, 1);



	if (ver == 3 || ver == 4) {

	if (ver >= 3 && ver <= 5) {

		struct iwl_phy_context_cmd cmd = {};



		/* Set the command header fields */