Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f0d98f2 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: mvm: forbid MIMO on devices that don't support it 



There are devices that forbid MIMO by the mean of the NVM.
Detect thoses devices and forbid MIMO otherwise the firmware
would crash. STBC is still allowed on these devices.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent e7afe89f

drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

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

 * Copyright(c) 2015 Intel Mobile Communications GmbH

 *

 * 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
@@ -31,6 +32,7 @@ 
 * BSD LICENSE

 *

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

 * Copyright(c) 2015 Intel Mobile Communications GmbH

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -748,6 +750,9 @@ void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg, 
		return;

	}



	if (data->sku_cap_mimo_disabled)

		rx_chains = 1;



	ht_info->ht_supported = true;

	ht_info->cap = IEEE80211_HT_CAP_DSSSCCK40;

drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

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

 * Copyright(c) 2015 Intel Mobile Communications GmbH

 *

 * 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
@@ -31,6 +32,7 @@ 
 * BSD LICENSE

 *

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

 * Copyright(c) 2015 Intel Mobile Communications GmbH

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -84,6 +86,7 @@ struct iwl_nvm_data { 
	bool sku_cap_11ac_enable;

	bool sku_cap_amt_enable;

	bool sku_cap_ipan_enable;

	bool sku_cap_mimo_disabled;



	u16 radio_cfg_type;

	u8 radio_cfg_step;

drivers/net/wireless/iwlwifi/iwl-nvm-parse.c

+13 −6
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

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

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

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

 *

 * 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
@@ -32,7 +32,7 @@ 
 * BSD LICENSE

 *

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

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

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

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -120,6 +120,7 @@ enum nvm_sku_bits { 
	NVM_SKU_CAP_BAND_52GHZ		= BIT(1),

	NVM_SKU_CAP_11N_ENABLE		= BIT(2),

	NVM_SKU_CAP_11AC_ENABLE		= BIT(3),

	NVM_SKU_CAP_MIMO_DISABLE	= BIT(5),

};



/*
@@ -368,6 +369,11 @@ static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg, 
	if (cfg->ht_params->ldpc)

		vht_cap->cap |= IEEE80211_VHT_CAP_RXLDPC;



	if (data->sku_cap_mimo_disabled) {

		num_rx_ants = 1;

		num_tx_ants = 1;

	}



	if (num_tx_ants > 1)

		vht_cap->cap |= IEEE80211_VHT_CAP_TXSTBC;

	else
@@ -610,6 +616,7 @@ iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg, 
		data->sku_cap_11n_enable = false;

	data->sku_cap_11ac_enable = data->sku_cap_11n_enable &&

				    (sku & NVM_SKU_CAP_11AC_ENABLE);

	data->sku_cap_mimo_disabled = sku & NVM_SKU_CAP_MIMO_DISABLE;



	data->n_hw_addrs = iwl_get_n_hw_addrs(cfg, nvm_sw);

drivers/net/wireless/iwlwifi/mvm/rs.c

+3 −0
Original line number Diff line number Diff line
@@ -180,6 +180,9 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 
	if (iwl_mvm_vif_low_latency(mvmvif) && mvmsta->vif->p2p)

		return false;



	if (mvm->nvm_data->sku_cap_mimo_disabled)

		return false;



	return true;

}