diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2009-11-23 22:33:27 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-28 15:04:40 -0500 |
commit | 902b6667d3d17ac53ec62c036cd2bcf713c29d86 (patch) | |
tree | 95f6d93fc8b0b3f9f021aadc493db27aa3ca0948 /drivers/net/wireless | |
parent | f6cd53c6a4204a3d4a274546449a70a766a99b6e (diff) |
iwmc3200wifi: Parse HT channels EEPROM entries
The fat channels eeprom entries let us know if 11n is enabled or not. We
update our wiphy supported bands based on that.
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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/eeprom.c | 30 | ||||
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/eeprom.h | 28 | ||||
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/main.c | 6 |
3 files changed, 56 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/eeprom.c b/drivers/net/wireless/iwmc3200wifi/eeprom.c index 365910fbe01e..c574f58dfb20 100644 --- a/drivers/net/wireless/iwmc3200wifi/eeprom.c +++ b/drivers/net/wireless/iwmc3200wifi/eeprom.c | |||
@@ -66,6 +66,10 @@ static struct iwm_eeprom_entry eeprom_map[] = { | |||
66 | [IWM_EEPROM_SKU_CAP] = | 66 | [IWM_EEPROM_SKU_CAP] = |
67 | {"SKU capabilities", IWM_EEPROM_SKU_CAP_OFF, IWM_EEPROM_SKU_CAP_LEN}, | 67 | {"SKU capabilities", IWM_EEPROM_SKU_CAP_OFF, IWM_EEPROM_SKU_CAP_LEN}, |
68 | 68 | ||
69 | [IWM_EEPROM_FAT_CHANNELS_CAP] = | ||
70 | {"HT channels capabilities", IWM_EEPROM_FAT_CHANNELS_CAP_OFF, | ||
71 | IWM_EEPROM_FAT_CHANNELS_CAP_LEN}, | ||
72 | |||
69 | [IWM_EEPROM_CALIB_RXIQ_OFFSET] = | 73 | [IWM_EEPROM_CALIB_RXIQ_OFFSET] = |
70 | {"RX IQ offset", IWM_EEPROM_CALIB_RXIQ_OFF, IWM_EEPROM_INDIRECT_LEN}, | 74 | {"RX IQ offset", IWM_EEPROM_CALIB_RXIQ_OFF, IWM_EEPROM_INDIRECT_LEN}, |
71 | 75 | ||
@@ -146,6 +150,32 @@ u8 *iwm_eeprom_access(struct iwm_priv *iwm, u8 eeprom_id) | |||
146 | return iwm->eeprom + eeprom_map[eeprom_id].offset; | 150 | return iwm->eeprom + eeprom_map[eeprom_id].offset; |
147 | } | 151 | } |
148 | 152 | ||
153 | int iwm_eeprom_fat_channels(struct iwm_priv *iwm) | ||
154 | { | ||
155 | struct wiphy *wiphy = iwm_to_wiphy(iwm); | ||
156 | struct ieee80211_supported_band *band; | ||
157 | u16 *channels, i; | ||
158 | |||
159 | channels = (u16 *)iwm_eeprom_access(iwm, IWM_EEPROM_FAT_CHANNELS_CAP); | ||
160 | if (IS_ERR(channels)) | ||
161 | return PTR_ERR(channels); | ||
162 | |||
163 | band = wiphy->bands[IEEE80211_BAND_2GHZ]; | ||
164 | band->ht_cap.ht_supported = true; | ||
165 | |||
166 | for (i = 0; i < IWM_EEPROM_FAT_CHANNELS_24; i++) | ||
167 | if (!(channels[i] & IWM_EEPROM_FAT_CHANNEL_ENABLED)) | ||
168 | band->ht_cap.ht_supported = false; | ||
169 | |||
170 | band = wiphy->bands[IEEE80211_BAND_5GHZ]; | ||
171 | band->ht_cap.ht_supported = true; | ||
172 | for (i = IWM_EEPROM_FAT_CHANNELS_24; i < IWM_EEPROM_FAT_CHANNELS; i++) | ||
173 | if (!(channels[i] & IWM_EEPROM_FAT_CHANNEL_ENABLED)) | ||
174 | band->ht_cap.ht_supported = false; | ||
175 | |||
176 | return 0; | ||
177 | } | ||
178 | |||
149 | int iwm_eeprom_init(struct iwm_priv *iwm) | 179 | int iwm_eeprom_init(struct iwm_priv *iwm) |
150 | { | 180 | { |
151 | int i, ret = 0; | 181 | int i, ret = 0; |
diff --git a/drivers/net/wireless/iwmc3200wifi/eeprom.h b/drivers/net/wireless/iwmc3200wifi/eeprom.h index cdb31a6a1f5f..0f7f226916cf 100644 --- a/drivers/net/wireless/iwmc3200wifi/eeprom.h +++ b/drivers/net/wireless/iwmc3200wifi/eeprom.h | |||
@@ -48,6 +48,7 @@ enum { | |||
48 | IWM_EEPROM_CARD_ID, | 48 | IWM_EEPROM_CARD_ID, |
49 | IWM_EEPROM_RADIO_CONF, | 49 | IWM_EEPROM_RADIO_CONF, |
50 | IWM_EEPROM_SKU_CAP, | 50 | IWM_EEPROM_SKU_CAP, |
51 | IWM_EEPROM_FAT_CHANNELS_CAP, | ||
51 | 52 | ||
52 | IWM_EEPROM_INDIRECT_OFFSET, | 53 | IWM_EEPROM_INDIRECT_OFFSET, |
53 | IWM_EEPROM_CALIB_RXIQ_OFFSET = IWM_EEPROM_INDIRECT_OFFSET, | 54 | IWM_EEPROM_CALIB_RXIQ_OFFSET = IWM_EEPROM_INDIRECT_OFFSET, |
@@ -58,14 +59,15 @@ enum { | |||
58 | IWM_EEPROM_LAST, | 59 | IWM_EEPROM_LAST, |
59 | }; | 60 | }; |
60 | 61 | ||
61 | #define IWM_EEPROM_SIG_OFF 0x00 | 62 | #define IWM_EEPROM_SIG_OFF 0x00 |
62 | #define IWM_EEPROM_VERSION_OFF (0x54 << 1) | 63 | #define IWM_EEPROM_VERSION_OFF (0x54 << 1) |
63 | #define IWM_EEPROM_OEM_HW_VERSION_OFF (0x56 << 1) | 64 | #define IWM_EEPROM_OEM_HW_VERSION_OFF (0x56 << 1) |
64 | #define IWM_EEPROM_MAC_VERSION_OFF (0x30 << 1) | 65 | #define IWM_EEPROM_MAC_VERSION_OFF (0x30 << 1) |
65 | #define IWM_EEPROM_CARD_ID_OFF (0x5d << 1) | 66 | #define IWM_EEPROM_CARD_ID_OFF (0x5d << 1) |
66 | #define IWM_EEPROM_RADIO_CONF_OFF (0x58 << 1) | 67 | #define IWM_EEPROM_RADIO_CONF_OFF (0x58 << 1) |
67 | #define IWM_EEPROM_SKU_CAP_OFF (0x55 << 1) | 68 | #define IWM_EEPROM_SKU_CAP_OFF (0x55 << 1) |
68 | #define IWM_EEPROM_CALIB_CONFIG_OFF (0x7c << 1) | 69 | #define IWM_EEPROM_CALIB_CONFIG_OFF (0x7c << 1) |
70 | #define IWM_EEPROM_FAT_CHANNELS_CAP_OFF (0xde << 1) | ||
69 | 71 | ||
70 | #define IWM_EEPROM_SIG_LEN 4 | 72 | #define IWM_EEPROM_SIG_LEN 4 |
71 | #define IWM_EEPROM_VERSION_LEN 2 | 73 | #define IWM_EEPROM_VERSION_LEN 2 |
@@ -74,6 +76,7 @@ enum { | |||
74 | #define IWM_EEPROM_CARD_ID_LEN 2 | 76 | #define IWM_EEPROM_CARD_ID_LEN 2 |
75 | #define IWM_EEPROM_RADIO_CONF_LEN 2 | 77 | #define IWM_EEPROM_RADIO_CONF_LEN 2 |
76 | #define IWM_EEPROM_SKU_CAP_LEN 2 | 78 | #define IWM_EEPROM_SKU_CAP_LEN 2 |
79 | #define IWM_EEPROM_FAT_CHANNELS_CAP_LEN 40 | ||
77 | #define IWM_EEPROM_INDIRECT_LEN 2 | 80 | #define IWM_EEPROM_INDIRECT_LEN 2 |
78 | 81 | ||
79 | #define IWM_MAX_EEPROM_DATA_LEN 240 | 82 | #define IWM_MAX_EEPROM_DATA_LEN 240 |
@@ -87,6 +90,14 @@ enum { | |||
87 | #define IWM_EEPROM_SKU_CAP_BAND_52GHZ (1 << 5) | 90 | #define IWM_EEPROM_SKU_CAP_BAND_52GHZ (1 << 5) |
88 | #define IWM_EEPROM_SKU_CAP_11N_ENABLE (1 << 6) | 91 | #define IWM_EEPROM_SKU_CAP_11N_ENABLE (1 << 6) |
89 | 92 | ||
93 | #define IWM_EEPROM_FAT_CHANNELS 20 | ||
94 | /* 2.4 gHz FAT primary channels: 1, 2, 3, 4, 5, 6, 7, 8, 9 */ | ||
95 | #define IWM_EEPROM_FAT_CHANNELS_24 9 | ||
96 | /* 5.2 gHz FAT primary channels: 36,44,52,60,100,108,116,124,132,149,157 */ | ||
97 | #define IWM_EEPROM_FAT_CHANNELS_52 11 | ||
98 | |||
99 | #define IWM_EEPROM_FAT_CHANNEL_ENABLED (1 << 0) | ||
100 | |||
90 | enum { | 101 | enum { |
91 | IWM_EEPROM_CALIB_CAL_HDR, | 102 | IWM_EEPROM_CALIB_CAL_HDR, |
92 | IWM_EEPROM_CALIB_TX_POWER, | 103 | IWM_EEPROM_CALIB_TX_POWER, |
@@ -110,5 +121,6 @@ struct iwm_eeprom_entry { | |||
110 | int iwm_eeprom_init(struct iwm_priv *iwm); | 121 | int iwm_eeprom_init(struct iwm_priv *iwm); |
111 | void iwm_eeprom_exit(struct iwm_priv *iwm); | 122 | void iwm_eeprom_exit(struct iwm_priv *iwm); |
112 | u8 *iwm_eeprom_access(struct iwm_priv *iwm, u8 eeprom_id); | 123 | u8 *iwm_eeprom_access(struct iwm_priv *iwm, u8 eeprom_id); |
124 | int iwm_eeprom_fat_channels(struct iwm_priv *iwm); | ||
113 | 125 | ||
114 | #endif | 126 | #endif |
diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c index 75f105a59543..365f3fc37d25 100644 --- a/drivers/net/wireless/iwmc3200wifi/main.c +++ b/drivers/net/wireless/iwmc3200wifi/main.c | |||
@@ -691,6 +691,12 @@ static int __iwm_up(struct iwm_priv *iwm) | |||
691 | goto err_disable; | 691 | goto err_disable; |
692 | } | 692 | } |
693 | 693 | ||
694 | ret = iwm_eeprom_fat_channels(iwm); | ||
695 | if (ret) { | ||
696 | IWM_ERR(iwm, "Couldnt read HT channels EEPROM entries\n"); | ||
697 | goto err_fw; | ||
698 | } | ||
699 | |||
694 | snprintf(wiphy->fw_version, sizeof(wiphy->fw_version), "L%s_U%s", | 700 | snprintf(wiphy->fw_version, sizeof(wiphy->fw_version), "L%s_U%s", |
695 | iwm->lmac_version, iwm->umac_version); | 701 | iwm->lmac_version, iwm->umac_version); |
696 | 702 | ||