Commit 50f067b3 authored by Erel Geron's avatar Erel Geron Committed by Luca Coelho
Browse files

iwlwifi: mvm: support Coex Schema 2 



The new coex schema requires moving to SISO only when BT AG is 4.
Adjust the SISO criteria according to the coex schema version reported
by firmware.

Signed-off-by: default avatarErel Geron <erelx.geron@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 2b3fae66

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

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 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) 2013 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -203,6 +205,7 @@ enum iwl_bt_activity_grading { 
	BT_ON_NO_CONNECTION	= 1,

	BT_LOW_TRAFFIC		= 2,

	BT_HIGH_TRAFFIC		= 3,

	BT_VERY_HIGH_TRAFFIC	= 4,



	BT_MAX_AG,

}; /* BT_COEX_BT_ACTIVITY_GRADING_API_E_VER_1 */

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

+2 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t; 
 * @IWL_UCODE_TLV_CAPA_STA_PM_NOTIF: firmware will send STA PM notification

 * @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_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
@@ -388,6 +389,7 @@ enum iwl_ucode_tlv_capa { 
	IWL_UCODE_TLV_CAPA_D0I3_END_FIRST		= (__force iwl_ucode_tlv_capa_t)41,

	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_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/coex.c

+7 −2
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac, 
	struct ieee80211_chanctx_conf *chanctx_conf;

	/* default smps_mode is AUTOMATIC - only used for client modes */

	enum ieee80211_smps_mode smps_mode = IEEE80211_SMPS_AUTOMATIC;

	u32 bt_activity_grading;

	u32 bt_activity_grading, min_ag_for_static_smps;

	int ave_rssi;



	lockdep_assert_held(&mvm->mutex);
@@ -363,8 +363,13 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac, 
		return;

	}



	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_COEX_SCHEMA_2))

		min_ag_for_static_smps = BT_VERY_HIGH_TRAFFIC;

	else

		min_ag_for_static_smps = BT_HIGH_TRAFFIC;



	bt_activity_grading = le32_to_cpu(data->notif->bt_activity_grading);

	if (bt_activity_grading >= BT_HIGH_TRAFFIC)

	if (bt_activity_grading >= min_ag_for_static_smps)

		smps_mode = IEEE80211_SMPS_STATIC;

	else if (bt_activity_grading >= BT_LOW_TRAFFIC)

		smps_mode = IEEE80211_SMPS_DYNAMIC;

CRA Git | Maintained and supported by SUSTech CRA and CCSE