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: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 18 insertions, 1 deletions

diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c
index 365f3fc37d25..e61265af92cd 100644
--- a/drivers/net/wireless/iwmc3200wifi/main.c
+++ b/drivers/net/wireless/iwmc3200wifi/main.c
@@ -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);