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

Commit 749f1fe1 authored by Eran Harary's avatar Eran Harary Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: fix the number of channels in family 8000 



Number of channels changed from 40 to 50

Signed-off-by: default avatarEran Harary <eran.harary@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 19889025

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

+14 −11
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ static const u8 iwl_nvm_channels_family_8000[] = { 
#define IWL_NUM_CHANNELS		ARRAY_SIZE(iwl_nvm_channels)

#define IWL_NUM_CHANNELS_FAMILY_8000	ARRAY_SIZE(iwl_nvm_channels_family_8000)

#define NUM_2GHZ_CHANNELS		14

#define NUM_2GHZ_CHANNELS_FAMILY_8000	13

#define FIRST_2GHZ_HT_MINUS		5

#define LAST_2GHZ_HT_PLUS		9

#define LAST_5GHZ_HT			161
@@ -202,21 +203,23 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg, 
	struct ieee80211_channel *channel;

	u16 ch_flags;

	bool is_5ghz;

	int num_of_ch;

	int num_of_ch, num_2ghz_channels;

	const u8 *nvm_chan;



	if (cfg->device_family != IWL_DEVICE_FAMILY_8000) {

		num_of_ch = IWL_NUM_CHANNELS;

		nvm_chan = &iwl_nvm_channels[0];

		num_2ghz_channels = NUM_2GHZ_CHANNELS;

	} else {

		num_of_ch = IWL_NUM_CHANNELS_FAMILY_8000;

		nvm_chan = &iwl_nvm_channels_family_8000[0];

		num_2ghz_channels = NUM_2GHZ_CHANNELS_FAMILY_8000;

	}



	for (ch_idx = 0; ch_idx < num_of_ch; ch_idx++) {

		ch_flags = __le16_to_cpup(nvm_ch_flags + ch_idx);



		if (ch_idx >= NUM_2GHZ_CHANNELS &&

		if (ch_idx >= num_2ghz_channels &&

		    !data->sku_cap_band_52GHz_enable)

			ch_flags &= ~NVM_CHANNEL_VALID;
@@ -225,7 +228,7 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg, 
					 "Ch. %d Flags %x [%sGHz] - No traffic\n",

					 nvm_chan[ch_idx],

					 ch_flags,

					 (ch_idx >= NUM_2GHZ_CHANNELS) ?

					 (ch_idx >= num_2ghz_channels) ?

					 "5.2" : "2.4");

			continue;

		}
@@ -234,7 +237,7 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg, 
		n_channels++;



		channel->hw_value = nvm_chan[ch_idx];

		channel->band = (ch_idx < NUM_2GHZ_CHANNELS) ?

		channel->band = (ch_idx < num_2ghz_channels) ?

				IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;

		channel->center_freq =

			ieee80211_channel_to_frequency(
@@ -242,7 +245,7 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg, 


		/* TODO: Need to be dependent to the NVM */

		channel->flags = IEEE80211_CHAN_NO_HT40;

		if (ch_idx < NUM_2GHZ_CHANNELS &&

		if (ch_idx < num_2ghz_channels &&

		    (ch_flags & NVM_CHANNEL_40MHZ)) {

			if (nvm_chan[ch_idx] <= LAST_2GHZ_HT_PLUS)

				channel->flags &= ~IEEE80211_CHAN_NO_HT40PLUS;
@@ -250,7 +253,7 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg, 
				channel->flags &= ~IEEE80211_CHAN_NO_HT40MINUS;

		} else if (nvm_chan[ch_idx] <= LAST_5GHZ_HT &&

			   (ch_flags & NVM_CHANNEL_40MHZ)) {

			if ((ch_idx - NUM_2GHZ_CHANNELS) % 2 == 0)

			if ((ch_idx - num_2ghz_channels) % 2 == 0)

				channel->flags &= ~IEEE80211_CHAN_NO_HT40PLUS;

			else

				channel->flags &= ~IEEE80211_CHAN_NO_HT40MINUS;

drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h

+6 −2
Original line number Diff line number Diff line
@@ -169,8 +169,12 @@ enum iwl_scan_type { 
	SCAN_TYPE_DISCOVERY_FORCED	= 6,

}; /* SCAN_ACTIVITY_TYPE_E_VER_1 */



/* Maximal number of channels to scan */

#define MAX_NUM_SCAN_CHANNELS 0x24

/**

 * Maximal number of channels to scan

 * it should be equal to:

 * max(IWL_NUM_CHANNELS, IWL_NUM_CHANNELS_FAMILY_8000)

 */

#define MAX_NUM_SCAN_CHANNELS 50



/**

 * struct iwl_scan_cmd - scan request command