| .. | .. |
|---|
| 8 | 8 | * Copyright(c) 2014 Intel Corporation. All rights reserved. |
|---|
| 9 | 9 | * Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH |
|---|
| 10 | 10 | * Copyright(c) 2016 Intel Deutschland GmbH |
|---|
| 11 | | - * Copyright(c) 2018 Intel Corporation |
|---|
| 11 | + * Copyright(c) 2018 - 2019 Intel Corporation |
|---|
| 12 | 12 | * |
|---|
| 13 | 13 | * This program is free software; you can redistribute it and/or modify |
|---|
| 14 | 14 | * it under the terms of version 2 of the GNU General Public License as |
|---|
| .. | .. |
|---|
| 18 | 18 | * WITHOUT ANY WARRANTY; without even the implied warranty of |
|---|
| 19 | 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|---|
| 20 | 20 | * General Public License for more details. |
|---|
| 21 | | - * |
|---|
| 22 | | - * You should have received a copy of the GNU General Public License |
|---|
| 23 | | - * along with this program; if not, write to the Free Software |
|---|
| 24 | | - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, |
|---|
| 25 | | - * USA |
|---|
| 26 | 21 | * |
|---|
| 27 | 22 | * The full GNU General Public License is included in this distribution |
|---|
| 28 | 23 | * in the file called COPYING. |
|---|
| .. | .. |
|---|
| 35 | 30 | * |
|---|
| 36 | 31 | * Copyright(c) 2014 Intel Corporation. All rights reserved. |
|---|
| 37 | 32 | * Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH |
|---|
| 38 | | - * Copyright(c) 2018 Intel Corporation |
|---|
| 33 | + * Copyright(c) 2018 - 2019 Intel Corporation |
|---|
| 39 | 34 | * All rights reserved. |
|---|
| 40 | 35 | * |
|---|
| 41 | 36 | * Redistribution and use in source and binary forms, with or without |
|---|
| .. | .. |
|---|
| 80 | 75 | |
|---|
| 81 | 76 | /* NVM versions */ |
|---|
| 82 | 77 | #define IWL8000_NVM_VERSION 0x0a1d |
|---|
| 83 | | -#define IWL8000_TX_POWER_VERSION 0xffff /* meaningless */ |
|---|
| 84 | 78 | |
|---|
| 85 | 79 | /* Memory offsets and lengths */ |
|---|
| 86 | 80 | #define IWL8260_DCCM_OFFSET 0x800000 |
|---|
| .. | .. |
|---|
| 98 | 92 | #define IWL8265_MODULE_FIRMWARE(api) \ |
|---|
| 99 | 93 | IWL8265_FW_PRE __stringify(api) ".ucode" |
|---|
| 100 | 94 | |
|---|
| 101 | | -#define NVM_HW_SECTION_NUM_FAMILY_8000 10 |
|---|
| 102 | 95 | #define DEFAULT_NVM_FILE_FAMILY_8000C "nvmData-8000C" |
|---|
| 103 | 96 | |
|---|
| 104 | 97 | static const struct iwl_base_params iwl8000_base_params = { |
|---|
| 105 | | - .eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_8000, |
|---|
| 98 | + .eeprom_size = OTP_LOW_IMAGE_SIZE_32K, |
|---|
| 106 | 99 | .num_of_queues = 31, |
|---|
| 107 | 100 | .max_tfd_queue_size = 256, |
|---|
| 108 | 101 | .shadow_ram_support = true, |
|---|
| .. | .. |
|---|
| 141 | 134 | }; |
|---|
| 142 | 135 | |
|---|
| 143 | 136 | #define IWL_DEVICE_8000_COMMON \ |
|---|
| 144 | | - .device_family = IWL_DEVICE_FAMILY_8000, \ |
|---|
| 145 | | - .base_params = &iwl8000_base_params, \ |
|---|
| 137 | + .trans.device_family = IWL_DEVICE_FAMILY_8000, \ |
|---|
| 138 | + .trans.base_params = &iwl8000_base_params, \ |
|---|
| 146 | 139 | .led_mode = IWL_LED_RF_STATE, \ |
|---|
| 147 | | - .nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_8000, \ |
|---|
| 140 | + .nvm_hw_section_num = 10, \ |
|---|
| 148 | 141 | .features = NETIF_F_RXCSUM, \ |
|---|
| 149 | 142 | .non_shared_ant = ANT_A, \ |
|---|
| 150 | 143 | .dccm_offset = IWL8260_DCCM_OFFSET, \ |
|---|
| .. | .. |
|---|
| 158 | 151 | .apmg_not_supported = true, \ |
|---|
| 159 | 152 | .nvm_type = IWL_NVM_EXT, \ |
|---|
| 160 | 153 | .dbgc_supported = true, \ |
|---|
| 161 | | - .min_umac_error_event_table = 0x800000, \ |
|---|
| 162 | | - .csr = &iwl_csr_v1 |
|---|
| 154 | + .min_umac_error_event_table = 0x800000 |
|---|
| 163 | 155 | |
|---|
| 164 | 156 | #define IWL_DEVICE_8000 \ |
|---|
| 165 | 157 | IWL_DEVICE_8000_COMMON, \ |
|---|
| .. | .. |
|---|
| 182 | 174 | IWL_DEVICE_8260, |
|---|
| 183 | 175 | .ht_params = &iwl8000_ht_params, |
|---|
| 184 | 176 | .nvm_ver = IWL8000_NVM_VERSION, |
|---|
| 185 | | - .nvm_calib_ver = IWL8000_TX_POWER_VERSION, |
|---|
| 186 | 177 | }; |
|---|
| 187 | 178 | |
|---|
| 188 | 179 | const struct iwl_cfg iwl8260_2ac_cfg = { |
|---|
| .. | .. |
|---|
| 191 | 182 | IWL_DEVICE_8260, |
|---|
| 192 | 183 | .ht_params = &iwl8000_ht_params, |
|---|
| 193 | 184 | .nvm_ver = IWL8000_NVM_VERSION, |
|---|
| 194 | | - .nvm_calib_ver = IWL8000_TX_POWER_VERSION, |
|---|
| 195 | 185 | .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, |
|---|
| 196 | 186 | }; |
|---|
| 197 | 187 | |
|---|
| .. | .. |
|---|
| 201 | 191 | IWL_DEVICE_8265, |
|---|
| 202 | 192 | .ht_params = &iwl8000_ht_params, |
|---|
| 203 | 193 | .nvm_ver = IWL8000_NVM_VERSION, |
|---|
| 204 | | - .nvm_calib_ver = IWL8000_TX_POWER_VERSION, |
|---|
| 205 | 194 | .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, |
|---|
| 206 | 195 | .vht_mu_mimo_supported = true, |
|---|
| 207 | 196 | }; |
|---|
| .. | .. |
|---|
| 212 | 201 | IWL_DEVICE_8265, |
|---|
| 213 | 202 | .ht_params = &iwl8000_ht_params, |
|---|
| 214 | 203 | .nvm_ver = IWL8000_NVM_VERSION, |
|---|
| 215 | | - .nvm_calib_ver = IWL8000_TX_POWER_VERSION, |
|---|
| 216 | 204 | .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, |
|---|
| 217 | 205 | .vht_mu_mimo_supported = true, |
|---|
| 218 | 206 | }; |
|---|
| .. | .. |
|---|
| 223 | 211 | IWL_DEVICE_8000, |
|---|
| 224 | 212 | .ht_params = &iwl8000_ht_params, |
|---|
| 225 | 213 | .nvm_ver = IWL8000_NVM_VERSION, |
|---|
| 226 | | - .nvm_calib_ver = IWL8000_TX_POWER_VERSION, |
|---|
| 227 | 214 | .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, |
|---|
| 228 | 215 | }; |
|---|
| 229 | 216 | |
|---|