c2c48ddfc8
iwlwifi 9000 and a0000 series hw contains an extra dash in firmware file name as seeen in modinfo output for kernel 4.14: firmware: iwlwifi-9260-th-b0-jf-b0--34.ucode firmware: iwlwifi-9260-th-a0-jf-a0--34.ucode firmware: iwlwifi-9000-pu-a0-jf-b0--34.ucode firmware: iwlwifi-9000-pu-a0-jf-a0--34.ucode firmware: iwlwifi-QuQnj-a0-hr-a0--34.ucode firmware: iwlwifi-QuQnj-a0-jf-b0--34.ucode firmware: iwlwifi-QuQnj-f0-hr-a0--34.ucode firmware: iwlwifi-Qu-a0-jf-b0--34.ucode firmware: iwlwifi-Qu-a0-hr-a0--34.ucode Fix that by dropping the extra adding of '"-"'. Signed-off-by: Thomas Backlund <tmb@mageia.org> Cc: stable@vger.kernel.org # 4.13 Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
216 lines
7.9 KiB
C
216 lines
7.9 KiB
C
/******************************************************************************
|
|
*
|
|
* This file is provided under a dual BSD/GPLv2 license. When using or
|
|
* redistributing this file, you may do so under either license.
|
|
*
|
|
* GPL LICENSE SUMMARY
|
|
*
|
|
* Copyright(c) 2015-2017 Intel Deutschland GmbH
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of version 2 of the GNU General Public License as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright(c) 2015-2017 Intel Deutschland GmbH
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* * Neither the name Intel Corporation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
*****************************************************************************/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/stringify.h>
|
|
#include "iwl-config.h"
|
|
#include "iwl-agn-hw.h"
|
|
|
|
/* Highest firmware API version supported */
|
|
#define IWL_A000_UCODE_API_MAX 34
|
|
|
|
/* Lowest firmware API version supported */
|
|
#define IWL_A000_UCODE_API_MIN 24
|
|
|
|
/* NVM versions */
|
|
#define IWL_A000_NVM_VERSION 0x0a1d
|
|
#define IWL_A000_TX_POWER_VERSION 0xffff /* meaningless */
|
|
|
|
/* Memory offsets and lengths */
|
|
#define IWL_A000_DCCM_OFFSET 0x800000 /* LMAC1 */
|
|
#define IWL_A000_DCCM_LEN 0x10000 /* LMAC1 */
|
|
#define IWL_A000_DCCM2_OFFSET 0x880000
|
|
#define IWL_A000_DCCM2_LEN 0x8000
|
|
#define IWL_A000_SMEM_OFFSET 0x400000
|
|
#define IWL_A000_SMEM_LEN 0xD0000
|
|
|
|
#define IWL_A000_JF_FW_PRE "iwlwifi-Qu-a0-jf-b0-"
|
|
#define IWL_A000_HR_FW_PRE "iwlwifi-Qu-a0-hr-a0-"
|
|
#define IWL_A000_HR_CDB_FW_PRE "iwlwifi-QuIcp-z0-hrcdb-a0-"
|
|
#define IWL_A000_HR_F0_FW_PRE "iwlwifi-QuQnj-f0-hr-a0-"
|
|
#define IWL_A000_JF_B0_FW_PRE "iwlwifi-QuQnj-a0-jf-b0-"
|
|
#define IWL_A000_HR_A0_FW_PRE "iwlwifi-QuQnj-a0-hr-a0-"
|
|
|
|
#define IWL_A000_HR_MODULE_FIRMWARE(api) \
|
|
IWL_A000_HR_FW_PRE __stringify(api) ".ucode"
|
|
#define IWL_A000_JF_MODULE_FIRMWARE(api) \
|
|
IWL_A000_JF_FW_PRE __stringify(api) ".ucode"
|
|
#define IWL_A000_HR_F0_QNJ_MODULE_FIRMWARE(api) \
|
|
IWL_A000_HR_F0_FW_PRE __stringify(api) ".ucode"
|
|
#define IWL_A000_JF_B0_QNJ_MODULE_FIRMWARE(api) \
|
|
IWL_A000_JF_B0_FW_PRE __stringify(api) ".ucode"
|
|
#define IWL_A000_HR_A0_QNJ_MODULE_FIRMWARE(api) \
|
|
IWL_A000_HR_A0_FW_PRE __stringify(api) ".ucode"
|
|
|
|
#define NVM_HW_SECTION_NUM_FAMILY_A000 10
|
|
|
|
static const struct iwl_base_params iwl_a000_base_params = {
|
|
.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_A000,
|
|
.num_of_queues = 512,
|
|
.shadow_ram_support = true,
|
|
.led_compensation = 57,
|
|
.wd_timeout = IWL_LONG_WD_TIMEOUT,
|
|
.max_event_log_size = 512,
|
|
.shadow_reg_enable = true,
|
|
.pcie_l1_allowed = true,
|
|
};
|
|
|
|
static const struct iwl_ht_params iwl_a000_ht_params = {
|
|
.stbc = true,
|
|
.ldpc = true,
|
|
.ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ),
|
|
};
|
|
|
|
#define IWL_DEVICE_A000 \
|
|
.ucode_api_max = IWL_A000_UCODE_API_MAX, \
|
|
.ucode_api_min = IWL_A000_UCODE_API_MIN, \
|
|
.device_family = IWL_DEVICE_FAMILY_A000, \
|
|
.max_inst_size = IWL60_RTC_INST_SIZE, \
|
|
.max_data_size = IWL60_RTC_DATA_SIZE, \
|
|
.base_params = &iwl_a000_base_params, \
|
|
.led_mode = IWL_LED_RF_STATE, \
|
|
.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_A000, \
|
|
.non_shared_ant = ANT_A, \
|
|
.dccm_offset = IWL_A000_DCCM_OFFSET, \
|
|
.dccm_len = IWL_A000_DCCM_LEN, \
|
|
.dccm2_offset = IWL_A000_DCCM2_OFFSET, \
|
|
.dccm2_len = IWL_A000_DCCM2_LEN, \
|
|
.smem_offset = IWL_A000_SMEM_OFFSET, \
|
|
.smem_len = IWL_A000_SMEM_LEN, \
|
|
.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, \
|
|
.apmg_not_supported = true, \
|
|
.mq_rx_supported = true, \
|
|
.vht_mu_mimo_supported = true, \
|
|
.mac_addr_from_csr = true, \
|
|
.use_tfh = true, \
|
|
.rf_id = true, \
|
|
.gen2 = true, \
|
|
.nvm_type = IWL_NVM_EXT, \
|
|
.dbgc_supported = true, \
|
|
.tx_cmd_queue_size = 32, \
|
|
.min_umac_error_event_table = 0x400000
|
|
|
|
const struct iwl_cfg iwla000_2ac_cfg_hr = {
|
|
.name = "Intel(R) Dual Band Wireless AC a000",
|
|
.fw_name_pre = IWL_A000_HR_FW_PRE,
|
|
IWL_DEVICE_A000,
|
|
.ht_params = &iwl_a000_ht_params,
|
|
.nvm_ver = IWL_A000_NVM_VERSION,
|
|
.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
|
|
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
|
|
};
|
|
|
|
const struct iwl_cfg iwla000_2ac_cfg_hr_cdb = {
|
|
.name = "Intel(R) Dual Band Wireless AC a000",
|
|
.fw_name_pre = IWL_A000_HR_CDB_FW_PRE,
|
|
IWL_DEVICE_A000,
|
|
.ht_params = &iwl_a000_ht_params,
|
|
.nvm_ver = IWL_A000_NVM_VERSION,
|
|
.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
|
|
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
|
|
.cdb = true,
|
|
};
|
|
|
|
const struct iwl_cfg iwla000_2ac_cfg_jf = {
|
|
.name = "Intel(R) Dual Band Wireless AC a000",
|
|
.fw_name_pre = IWL_A000_JF_FW_PRE,
|
|
IWL_DEVICE_A000,
|
|
.ht_params = &iwl_a000_ht_params,
|
|
.nvm_ver = IWL_A000_NVM_VERSION,
|
|
.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
|
|
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
|
|
};
|
|
|
|
const struct iwl_cfg iwla000_2ax_cfg_hr = {
|
|
.name = "Intel(R) Dual Band Wireless AX a000",
|
|
.fw_name_pre = IWL_A000_HR_FW_PRE,
|
|
IWL_DEVICE_A000,
|
|
.ht_params = &iwl_a000_ht_params,
|
|
.nvm_ver = IWL_A000_NVM_VERSION,
|
|
.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
|
|
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
|
|
};
|
|
|
|
const struct iwl_cfg iwla000_2ax_cfg_qnj_hr_f0 = {
|
|
.name = "Intel(R) Dual Band Wireless AX a000",
|
|
.fw_name_pre = IWL_A000_HR_F0_FW_PRE,
|
|
IWL_DEVICE_A000,
|
|
.ht_params = &iwl_a000_ht_params,
|
|
.nvm_ver = IWL_A000_NVM_VERSION,
|
|
.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
|
|
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
|
|
};
|
|
|
|
const struct iwl_cfg iwla000_2ax_cfg_qnj_jf_b0 = {
|
|
.name = "Intel(R) Dual Band Wireless AX a000",
|
|
.fw_name_pre = IWL_A000_JF_B0_FW_PRE,
|
|
IWL_DEVICE_A000,
|
|
.ht_params = &iwl_a000_ht_params,
|
|
.nvm_ver = IWL_A000_NVM_VERSION,
|
|
.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
|
|
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
|
|
};
|
|
|
|
const struct iwl_cfg iwla000_2ax_cfg_qnj_hr_a0 = {
|
|
.name = "Intel(R) Dual Band Wireless AX a000",
|
|
.fw_name_pre = IWL_A000_HR_A0_FW_PRE,
|
|
IWL_DEVICE_A000,
|
|
.ht_params = &iwl_a000_ht_params,
|
|
.nvm_ver = IWL_A000_NVM_VERSION,
|
|
.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
|
|
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
|
|
};
|
|
|
|
MODULE_FIRMWARE(IWL_A000_HR_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));
|
|
MODULE_FIRMWARE(IWL_A000_JF_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));
|
|
MODULE_FIRMWARE(IWL_A000_HR_F0_QNJ_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));
|
|
MODULE_FIRMWARE(IWL_A000_JF_B0_QNJ_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));
|
|
MODULE_FIRMWARE(IWL_A000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));
|