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

Commit 0bed08de authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

iwmc3200wifi: Update wireless_mode with eeprom values 



The iwmc3200wifi eeprom contains information about the available PHYs on
the chip. We should update our wireless_mode setting and profile according
to it.

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fe19176e

drivers/net/wireless/iwmc3200wifi/eeprom.c

+20 −0
Original line number Diff line number Diff line
@@ -176,6 +176,26 @@ int iwm_eeprom_fat_channels(struct iwm_priv *iwm) 
	return 0;

}



u32 iwm_eeprom_wireless_mode(struct iwm_priv *iwm)

{

	u16 sku_cap;

	u32 wireless_mode = 0;



	sku_cap = *((u16 *)iwm_eeprom_access(iwm, IWM_EEPROM_SKU_CAP));



	if (sku_cap & IWM_EEPROM_SKU_CAP_BAND_24GHZ)

		wireless_mode |= WIRELESS_MODE_11G;



	if (sku_cap & IWM_EEPROM_SKU_CAP_BAND_52GHZ)

		wireless_mode |= WIRELESS_MODE_11A;



	if (sku_cap & IWM_EEPROM_SKU_CAP_11N_ENABLE)

		wireless_mode |= WIRELESS_MODE_11N;



	return wireless_mode;

}





int iwm_eeprom_init(struct iwm_priv *iwm)

{

	int i, ret = 0;

drivers/net/wireless/iwmc3200wifi/eeprom.h

+1 −0
Original line number Diff line number Diff line
@@ -122,5 +122,6 @@ int iwm_eeprom_init(struct iwm_priv *iwm); 
void iwm_eeprom_exit(struct iwm_priv *iwm);

u8 *iwm_eeprom_access(struct iwm_priv *iwm, u8 eeprom_id);

int iwm_eeprom_fat_channels(struct iwm_priv *iwm);

u32 iwm_eeprom_wireless_mode(struct iwm_priv *iwm);



#endif

drivers/net/wireless/iwmc3200wifi/main.c

+18 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ static struct iwm_conf def_iwm_conf = { 


	.assoc_timeout		= 2,

	.roam_timeout		= 10,

	.wireless_mode		= WIRELESS_MODE_11A | WIRELESS_MODE_11G,

	.wireless_mode		= WIRELESS_MODE_11A | WIRELESS_MODE_11G |

				  WIRELESS_MODE_11N,

	.coexist_mode		= COEX_MODE_CM,



	/* IBSS */
@@ -630,6 +631,7 @@ static int __iwm_up(struct iwm_priv *iwm) 
	int ret;

	struct iwm_notif *notif_reboot, *notif_ack = NULL;

	struct wiphy *wiphy = iwm_to_wiphy(iwm);

	u32 wireless_mode;



	ret = iwm_bus_enable(iwm);

	if (ret) {
@@ -697,6 +699,21 @@ static int __iwm_up(struct iwm_priv *iwm) 
		goto err_fw;

	}



	/*

	 * Read our SKU capabilities.

	 * If it's valid, we overwrite the wireless mode conf entry and the

	 * current profile one.

	 */

	wireless_mode = iwm_eeprom_wireless_mode(iwm);

	if (wireless_mode) {

		iwm->conf.wireless_mode = wireless_mode;

		if (iwm->umac_profile)

			iwm->umac_profile->wireless_mode =

					iwm->conf.wireless_mode;

	} else

		IWM_ERR(iwm, "Wrong SKU capabilities: 0x%x\n",

			*((u16 *)iwm_eeprom_access(iwm, IWM_EEPROM_SKU_CAP)));



	snprintf(wiphy->fw_version, sizeof(wiphy->fw_version), "L%s_U%s",

		 iwm->lmac_version, iwm->umac_version);