Commit f4bfdc5e authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Luca Coelho
Browse files

iwlwifi: mvm: stop supporting swcrypto and bt_coex_active module parameters 



Leave them active for iwldvm. We do not test this configuration
and there is no reason nowadays to allow this.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20200424182644.674a325b008b.Ifc925ca84500fb76c7b6f926a24a34ca777b4192@changeid
parent f092e4e3

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

+3 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014, 2018 - 2020 Intel Corporation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014, 2018 - 2020 Intel Corporation. All rights reserved.

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

 * All rights reserved.

 *
@@ -216,8 +216,7 @@ int iwl_mvm_send_bt_init_conf(struct iwl_mvm *mvm) 
		goto send_cmd;

	}



	mode = iwlwifi_mod_params.bt_coex_active ? BT_COEX_NW : BT_COEX_DISABLE;

	bt_cmd.mode = cpu_to_le32(mode);

	bt_cmd.mode = cpu_to_le32(BT_COEX_NW);



	if (IWL_MVM_BT_COEX_SYNC2SCO)

		bt_cmd.enabled_modules |=

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

+12 −19
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2012 - 2014, 2018 - 2020 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 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
@@ -28,10 +27,9 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2012 - 2014, 2018 - 2020 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -80,9 +78,6 @@ void iwl_mvm_set_rekey_data(struct ieee80211_hw *hw, 
	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);



	if (iwlwifi_mod_params.swcrypto)

		return;



	mutex_lock(&mvm->mutex);



	memcpy(mvmvif->rekey_data.kek, data->kek, NL80211_KEK_LEN);
@@ -843,7 +838,6 @@ iwl_mvm_wowlan_config(struct iwl_mvm *mvm, 
			return ret;

	}



	if (!iwlwifi_mod_params.swcrypto) {

	/*

	 * This needs to be unlocked due to lock ordering

	 * constraints. Since we're in the suspend path
@@ -854,7 +848,6 @@ iwl_mvm_wowlan_config(struct iwl_mvm *mvm, 
	mutex_lock(&mvm->mutex);

	if (ret)

		return ret;

	}



	ret = iwl_mvm_send_cmd_pdu(mvm, WOWLAN_CONFIGURATION, 0,

				   sizeof(*wowlan_config_cmd),

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

+18 −24
Original line number Diff line number Diff line
@@ -475,14 +475,15 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		hw->wiphy->n_cipher_suites++;

	}



	/* Enable 11w if software crypto is not enabled (as the

	 * firmware will interpret some mgmt packets, so enabling it

	 * with software crypto isn't safe).

	 */

	if (!iwlwifi_mod_params.swcrypto) {

	if (iwlwifi_mod_params.swcrypto)

		IWL_ERR(mvm,

			"iwlmvm doesn't allow to disable HW crypto, check swcrypto module parameter\n");

	if (!iwlwifi_mod_params.bt_coex_active)

		IWL_ERR(mvm,

			"iwlmvm doesn't allow to disable BT Coex, check bt_coex_active module parameter\n");



	ieee80211_hw_set(hw, MFP_CAPABLE);

		mvm->ciphers[hw->wiphy->n_cipher_suites] =

			WLAN_CIPHER_SUITE_AES_CMAC;

	mvm->ciphers[hw->wiphy->n_cipher_suites] = WLAN_CIPHER_SUITE_AES_CMAC;

	hw->wiphy->n_cipher_suites++;

	if (iwl_mvm_has_new_rx_api(mvm)) {

		mvm->ciphers[hw->wiphy->n_cipher_suites] =
@@ -492,7 +493,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
			WLAN_CIPHER_SUITE_BIP_GMAC_256;

		hw->wiphy->n_cipher_suites++;

	}

	}



	/* currently FW API supports only one optional cipher scheme */

	if (mvm->fw->cs[0].cipher) {
@@ -697,7 +697,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
				     WIPHY_WOWLAN_EAP_IDENTITY_REQ |

				     WIPHY_WOWLAN_RFKILL_RELEASE |

				     WIPHY_WOWLAN_NET_DETECT;

		if (!iwlwifi_mod_params.swcrypto)

		mvm->wowlan.flags |= WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |

				     WIPHY_WOWLAN_GTK_REKEY_FAILURE |

				     WIPHY_WOWLAN_4WAY_HANDSHAKE;
@@ -3366,11 +3365,6 @@ static int __iwl_mvm_mac_set_key(struct ieee80211_hw *hw, 
	int ret, i;

	u8 key_offset;



	if (iwlwifi_mod_params.swcrypto) {

		IWL_DEBUG_MAC80211(mvm, "leave - hwcrypto disabled\n");

		return -EOPNOTSUPP;

	}



	switch (key->cipher) {

	case WLAN_CIPHER_SUITE_TKIP:

		if (!mvm->trans->trans_cfg->gen2) {