iwlwifi: updates intended for v5.7 2020-03-23
cover iwlwifi: updates intended for v5.7 2020-03-23
From: Luca Coelho <[email protected]>
Hi,
Here's the second set of patches intended for v5.7. It's the usual development, new features, cleanups and bugfixes.
The changes are:
* Refactoring of the device selection algorithms continues;
* Improvement in the initialization fo SoC-based devices;
* Support for FW scan API;
* Some additions to our FW debuggging capabilities;
* Some other small fixes and clean-ups;
As usual, I'm pushing this to a pending branch, for kbuild bot, and will send a pull-request later.
Please review.
Cheers,
Luca.
Johannes Berg (3):
iwlwifi: pass trans and NVM data to HE capability parsing
iwlwifi: mvm: rs-fw: fix some indentation
iwlwifi: mvm: enable SF also when we have HE
Luca Coelho (9):
iwlwifi: yoyo: add PCI config space region type
iwlwifi: pcie: implement read_config32
iwlwifi: remove redundant iwl9560_2ac_cfg struct
iwlwifi: move integrated, extra_phy and soc_latency to trans_cfg
iwlwifi: remove some unused extern declarations from iwl-config.h
iwlwifi: add HW step to new cfg device table
iwlwifi: convert all Qu with Jf devices to the new config table
iwlwifi: convert QnJ with Jf devices to new config table
iwlwifi: remove unnecessary cfg mangling for Qu C and QuZ with Jf
Shahar S Matityahu (2):
iwlwifi: mvm: add soc latency support
iwlwifi: scan: support scan req cmd ver 14
.../net/wireless/intel/iwlwifi/cfg/22000.c | 252 ++----- drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 32 +- .../wireless/intel/iwlwifi/fw/api/commands.h | 9 +- .../net/wireless/intel/iwlwifi/fw/api/scan.h | 52 +- .../net/wireless/intel/iwlwifi/fw/api/soc.h | 83 ++ drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 39 +- drivers/net/wireless/intel/iwlwifi/fw/file.h | 11 +- .../net/wireless/intel/iwlwifi/iwl-config.h | 57 +- .../net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 6 + .../wireless/intel/iwlwifi/iwl-nvm-parse.c | 8 +- .../net/wireless/intel/iwlwifi/iwl-trans.h | 3 + .../net/wireless/intel/iwlwifi/mvm/fw-api.h | 1 + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 35 +- .../net/wireless/intel/iwlwifi/mvm/rs-fw.c | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 129 +++- drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 8 +- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 708 +++++++++--------- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 +- .../net/wireless/intel/iwlwifi/pcie/trans.c | 10 +- 19 files changed, 815 insertions(+), 633 deletions(-) create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/soc.h
Signature · 1 line
2.25.1
PATCH 1/14 iwlwifi: mvm: add soc latency support
From: Shahar S Matityahu <[email protected]>
Some devices require longer time to stabilize the power and XTAL. This is especially true for devices integrated in the SoC. Add support for a new firmware API that allows the driver to set the latency value accordingly.
--- .../wireless/intel/iwlwifi/fw/api/commands.h | 9 +- .../net/wireless/intel/iwlwifi/fw/api/soc.h | 83 +++++++++++++++++++ drivers/net/wireless/intel/iwlwifi/fw/file.h | 11 ++- .../net/wireless/intel/iwlwifi/mvm/fw-api.h | 1 + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 32 ++++++- 5 files changed, 124 insertions(+), 12 deletions(-) create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/soc.h
drivers/net/wireless/intel/iwlwifi/fw/api/commands.h +7 -2
@@ -5,9 +5,9 @@* * GPL LICENSE SUMMARY * -* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH * Copyright(c) 2016 - 2017 Intel Deutschland GmbH +* Copyright(c) 2012 - 2014, 2020 Intel Corporation * * 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
@@ -27,9 +27,9 @@* * BSD LICENSE * -* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH * Copyright(c) 2016 - 2017 Intel Deutschland GmbH +* Copyright(c) 2012 - 2014, 2020 Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without
@@ -646,6 +646,11 @@ enum iwl_system_subcmd_ids {*/ SHARED_MEM_CFG_CMD =0x0 , +/** +* @SOC_CONFIGURATION_CMD: &struct iwl_soc_configuration_cmd +*/ + SOC_CONFIGURATION_CMD = 0x01, +/** * @INIT_EXTENDED_CFG_CMD: &struct iwl_init_extended_cfg_cmd */
drivers/net/wireless/intel/iwlwifi/fw/api/soc.h new file +83 -0
83 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/fw/file.h +5 -6
@@ -5,11 +5,9 @@* * GPL LICENSE SUMMARY * -* Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH * Copyright(c) 2016 - 2017 Intel Deutschland GmbH -* Copyright(c) 2018 Intel Corporation -* Copyright(c) 2019 Intel Corporation +* Copyright(c) 2008 - 2014, 2018 - 2020 Intel Corporation * * 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
@@ -29,11 +27,9 @@* * BSD LICENSE * -* Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH * Copyright(c) 2016 - 2017 Intel Deutschland GmbH -* Copyright(c) 2018 Intel Corporation -* Copyright(c) 2019 Intel Corporation +* Copyright(c) 2008 - 2014, 2018 - 2020 Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without
@@ -369,6 +365,8 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t;* is supported. * @IWL_UCODE_TLV_CAPA_BT_COEX_RRC: supports BT Coex RRC * @IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT: supports gscan (no longer used) +* @IWL_UCODE_TLV_CAPA_SOC_LATENCY_SUPPORT: the firmware supports setting +* stabilization latency for SoCs. * @IWL_UCODE_TLV_CAPA_STA_PM_NOTIF: firmware will send STA PM notification * @IWL_UCODE_TLV_CAPA_TLC_OFFLOAD: firmware implements rate scaling algorithm * @IWL_UCODE_TLV_CAPA_DYNAMIC_QUOTA: firmware implements quota related
@@ -437,6 +435,7 @@ enum iwl_ucode_tlv_capa {IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT = (__force iwl_ucode_tlv_capa_t )31 ,/* set 1 */ +IWL_UCODE_TLV_CAPA_SOC_LATENCY_SUPPORT = (__force iwl_ucode_tlv_capa_t )37 ,IWL_UCODE_TLV_CAPA_STA_PM_NOTIF = (__force iwl_ucode_tlv_capa_t )38 ,IWL_UCODE_TLV_CAPA_BINDING_CDB_SUPPORT = (__force iwl_ucode_tlv_capa_t )39 , IWL_UCODE_TLV_CAPA_CDB_SUPPORT = (__force iwl_ucode_tlv_capa_t)40,
drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h +1 -0
@@ -73,6 +73,7 @@#include "fw/api/datapath.h" #include "fw/api/phy.h" #include "fw/api/config.h" +#include "fw/api/soc.h" #include "fw/api/alive.h" #include "fw/api/binding.h" #include "fw/api/cmdhdr.h"
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +28 -4
@@ -5,10 +5,9 @@* * GPL LICENSE SUMMARY * -* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH * Copyright(c) 2016 - 2017 Intel Deutschland GmbH -* Copyright(c) 2018 - 2019 Intel Corporation +* Copyright(c) 2012 - 2014, 2018 - 2020 Intel Corporation * * 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
@@ -28,10 +27,9 @@* * BSD LICENSE * -* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH * Copyright(c) 2016 - 2017 Intel Deutschland GmbH -* Copyright(c) 2018 - 2019 Intel Corporation +* Copyright(c) 2012 - 2014, 2018 - 2020 Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without
@@ -89,6 +87,25 @@ struct iwl_mvm_alive_data {u32 scd_base_addr; }; +/* set device type and latency */ +static int iwl_set_soc_latency (struct iwl_mvm *mvm) +{ +struct iwl_soc_configuration_cmd cmd; +int ret; + + cmd.device_type = (mvm->trans->cfg->integrated) ? +cpu_to_le32 (SOC_CONFIG_CMD_INTEGRATED ) : +cpu_to_le32 (SOC_CONFIG_CMD_DISCRETE ); + cmd.soc_latency =cpu_to_le32 (mvm->trans->cfg->soc_latency); + + ret =iwl_mvm_send_cmd_pdu (mvm,iwl_cmd_id (SOC_CONFIGURATION_CMD , +SYSTEM_GROUP ,0 ),0 , +sizeof (cmd), &cmd); +if (ret) +IWL_ERR (mvm,"Failed to set soc latency: %d\n" , ret); +return ret; +} +static int iwl_send_tx_ant_cfg (struct iwl_mvm *mvm,u8 valid_tx_ant) {struct iwl_tx_ant_cfg_cmd tx_ant_cmd = {
@@ -1103,6 +1120,13 @@ int iwl_mvm_up(struct iwl_mvm *mvm)if (ret) goto error; +if (fw_has_capa (&mvm->fw->ucode_capa, +IWL_UCODE_TLV_CAPA_SOC_LATENCY_SUPPORT )) { + ret =iwl_set_soc_latency (mvm); +if (ret) + goto error; + } +/* Init RSS configuration */ if (mvm->trans->trans_cfg->device_family >=IWL_DEVICE_FAMILY_22000 ) { ret =iwl_configure_rxq (mvm);
Signature · 1 line
2.25.1
Re: [PATCH 01/14] iwlwifi: mvm: add soc latency support
Quoted 9 lines · Luca Coelho
From: Shahar S Matityahu <[email protected]>
Some devices require longer time to stabilize the power and XTAL. This is especially true for devices integrated in the SoC. Add support for a new firmware API that allows the driver to set the latency value accordingly.
Signed-off-by Shahar S Matityahu <[email protected]>Signed-off-by Luca Coelho <[email protected]>
[...]
drivers/net/wireless/intel/iwlwifi/fw/api/soc.h line 4
Quoted 6 lines
+++
b/drivers/net/wireless/intel/iwlwifi/fw/api/soc.hdrivers/net/wireless/intel/iwlwifi/fw/api/soc.h new file +4
-0@@ -0,0 +1,83 @@ +/****************************************************************************** +* +* This file is provided under a dual BSD/GPLv2 license. When using or +* redistributing this file, you may do so under either license.
Any chance of getting SPDX tags to iwlwifi soon? They are awesome and make life so much easier.
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 01/14] iwlwifi: mvm: add soc latency support
Quoted 14 lines · Kalle Valo
Quoted 9 lines · Luca Coelho
From: Shahar S Matityahu <[email protected]>
Some devices require longer time to stabilize the power and XTAL. This is especially true for devices integrated in the SoC. Add support for a new firmware API that allows the driver to set the latency value accordingly.
Signed-off-by Shahar S Matityahu <[email protected]>Signed-off-by Luca Coelho <[email protected]>[...]
Quoted 9 lines
drivers/net/wireless/intel/iwlwifi/fw/api/soc.h line 4
Quoted 6 lines
+++
b/drivers/net/wireless/intel/iwlwifi/fw/api/soc.hdrivers/net/wireless/intel/iwlwifi/fw/api/soc.h new file +4
-0@@ -0,0 +1,83 @@ +/****************************************************************************** +* +* This file is provided under a dual BSD/GPLv2 license. When using or +* redistributing this file, you may do so under either license. Any chance of getting SPDX tags to iwlwifi soon? They are awesome and make life so much easier.
Hmmm... Most of our files already have it. I'll add the tags to the remaining ones and send it upstream as usual.
--
Cheers,
Luca.
Re: [PATCH 01/14] iwlwifi: mvm: add soc latency support
Quoted 25 lines · Luca Coelho
Quoted 14 lines · Kalle Valo
Quoted 9 lines · Luca Coelho
From: Shahar S Matityahu <[email protected]>
Some devices require longer time to stabilize the power and XTAL. This is especially true for devices integrated in the SoC. Add support for a new firmware API that allows the driver to set the latency value accordingly.
Signed-off-by Shahar S Matityahu <[email protected]>Signed-off-by Luca Coelho <[email protected]>[...]
Quoted 9 lines
drivers/net/wireless/intel/iwlwifi/fw/api/soc.h line 4
Quoted 6 lines
+++
b/drivers/net/wireless/intel/iwlwifi/fw/api/soc.hdrivers/net/wireless/intel/iwlwifi/fw/api/soc.h new file +4
-0@@ -0,0 +1,83 @@ +/****************************************************************************** +* +* This file is provided under a dual BSD/GPLv2 license. When using or +* redistributing this file, you may do so under either license. Any chance of getting SPDX tags to iwlwifi soon? They are awesome and make life so much easier.
Quoted 1 line
Hmmm... Most of our files already have it.
Ah, I didn't notice that.
Quoted 1 line
I'll add the tags to the remaining ones and send it upstream as usual.
Great, thanks. It would be really nice to have consistency within a driver.
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 2/14 iwlwifi: yoyo: add PCI config space region type
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
Add a new region type that allows us to dump the PCI config space. This is mostly the same as dumping a memory region, but reading from the device's config space instead.
In order to make this generic and independent of the trans type, we make a function called iwl_dump_ini_config_iter() that calls a new op in the transport to read its config space.
--- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 39 ++++++++++++++++++- .../net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 6 +++ .../net/wireless/intel/iwlwifi/iwl-trans.h | 3 ++ 3 files changed, 47 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/fw/dbg.c +38 -1
@@ -1108,6 +1108,38 @@ static int iwl_dump_ini_csr_iter(struct iwl_fw_runtime *fwrt,return sizeof (*range) +le32_to_cpu (range->range_data_size); } +static int iwl_dump_ini_config_iter (struct iwl_fw_runtime *fwrt, +struct iwl_dump_ini_region_data *reg_data, +void *range_ptr,int idx) +{ +struct iwl_trans *trans = fwrt->trans; +struct iwl_fw_ini_region_tlv *reg = (void *)reg_data->reg_tlv->data; +struct iwl_fw_ini_error_dump_range *range = range_ptr; +__le32 *val = range->data; +u32 addr =le32_to_cpu (reg->addrs[idx]) + +le32_to_cpu (reg->dev_addr.offset); +int i; + +/* we shouldn't get here if the trans doesn't have read_config32 */ +if (WARN_ON_ONCE (!trans->ops->read_config32)) +return -EOPNOTSUPP ; + + range->internal_base_addr =cpu_to_le32 (addr); + range->range_data_size = reg->dev_addr.size; +for (i =0 ; i <le32_to_cpu (reg->dev_addr.size); i +=4 ) { +int ret; +u32 tmp; + + ret = trans->ops->read_config32 (trans, addr + i, &tmp); +if (ret <0 ) +return ret; + + *val++ =cpu_to_le32 (tmp); + } + +return sizeof (*range) +le32_to_cpu (range->range_data_size); +} +static int iwl_dump_ini_dev_mem_iter (struct iwl_fw_runtime *fwrt,struct iwl_dump_ini_region_data *reg_data,void *range_ptr,int idx)
@@ -2052,7 +2084,12 @@ static const struct iwl_dump_ini_mem_ops iwl_dump_ini_region_ops[] = { .fill_range = iwl_dump_ini_csr_iter, }, [IWL_FW_INI_REGION_DRAM_IMR] = {}, - [IWL_FW_INI_REGION_PCI_IOSF_CONFIG] = {}, + [IWL_FW_INI_REGION_PCI_IOSF_CONFIG ] = { + .get_num_of_ranges = iwl_dump_ini_mem_ranges, + .get_size = iwl_dump_ini_mem_get_size, + .fill_mem_hdr = iwl_dump_ini_mem_fill_header, + .fill_range = iwl_dump_ini_config_iter, + }, }; static u32 iwl_dump_ini_trigger(struct iwl_fw_runtime *fwrt,
drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +6 -0
@@ -236,6 +236,12 @@ static int iwl_dbg_tlv_alloc_region(struct iwl_trans *trans,return -EINVAL ; } +if (type ==IWL_FW_INI_REGION_PCI_IOSF_CONFIG && + !trans->ops->read_config32) { +IWL_ERR (trans,"WRT: Unsupported region type %u\n" , type); +return -EOPNOTSUPP ; + } + active_reg = &trans->dbg.active_regions[id];if (*active_reg) {IWL_WARN (trans,"WRT: Overriding region id %u\n" , id);
drivers/net/wireless/intel/iwlwifi/iwl-trans.h +3 -0
@@ -544,6 +544,8 @@ struct iwl_trans_rxq_dma_data {* @read_mem: read device's SRAM in DWORD * @write_mem: write device's SRAM in DWORD. If %buf is %NULL, then the memory * will be zeroed. +* @read_config32: read a u32 value from the device's config space at +* the given offset. * @configure: configure parameters required by the transport layer from * the op_mode. May be called several times before start_fw, can't be * called after that.
@@ -614,6 +616,7 @@ struct iwl_trans_ops { void *buf, int dwords);int (*write_mem)(struct iwl_trans *trans,u32 addr,const void *buf,int dwords); +int (*read_config32)(struct iwl_trans *trans,u32 ofs,u32 *val);void (*configure)(struct iwl_trans *trans,const struct iwl_trans_config *trans_cfg);void (*set_pmi)(struct iwl_trans *trans,bool state);
Signature · 1 line
2.25.1
PATCH 3/14 iwlwifi: pcie: implement read_config32
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
Add the read_config32 op to allow dumping the config space when needed.
--- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +8 -0
@@ -2206,6 +2206,13 @@ static int iwl_trans_pcie_write_mem(struct iwl_trans *trans, u32 addr,return ret; } +static int iwl_trans_pcie_read_config32 (struct iwl_trans *trans,u32 ofs, +u32 *val) +{ +return pci_read_config_dword (IWL_TRANS_GET_PCIE_TRANS (trans)->pci_dev, + ofs, val); +} +static void iwl_trans_pcie_freeze_txq_timer (struct iwl_trans *trans,unsigned long txqs,bool freeze)
@@ -3380,6 +3387,7 @@ static void iwl_trans_pcie_resume(struct iwl_trans *trans) .write_prph = iwl_trans_pcie_write_prph, \ .read_mem = iwl_trans_pcie_read_mem, \ .write_mem = iwl_trans_pcie_write_mem, \ + .read_config32 = iwl_trans_pcie_read_config32, \ .configure = iwl_trans_pcie_configure, \ .set_pmi = iwl_trans_pcie_set_pmi, \ .sw_reset = iwl_trans_pcie_sw_reset, \
Signature · 1 line
2.25.1
PATCH 4/14 iwlwifi: pass trans and NVM data to HE capability parsing
In reply to Luca CoelhoFrom: Johannes Berg <[email protected]>
We'll need this data in the future, pass the values.
--- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +5 -3
@@ -684,7 +684,9 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { }, }; -static void iwl_init_he_hw_capab (struct ieee80211_supported_band *sband, +static void iwl_init_he_hw_capab (struct iwl_trans *trans, +struct iwl_nvm_data *data, +struct ieee80211_supported_band *sband,u8 tx_chains,u8 rx_chains) { sband->iftype_data = iwl_he_capa;
@@ -728,7 +730,7 @@ static void iwl_init_sbands(struct iwl_trans *trans, tx_chains, rx_chains);if (data->sku_cap_11ax_enable && !iwlwifi_mod_params.disable_11ax) -iwl_init_he_hw_capab (sband, tx_chains, rx_chains); +iwl_init_he_hw_capab (trans, data, sband, tx_chains, rx_chains); sband = &data->bands[NL80211_BAND_5GHZ ]; sband->band =NL80211_BAND_5GHZ ;
@@ -743,7 +745,7 @@ static void iwl_init_sbands(struct iwl_trans *trans, tx_chains, rx_chains);if (data->sku_cap_11ax_enable && !iwlwifi_mod_params.disable_11ax) -iwl_init_he_hw_capab (sband, tx_chains, rx_chains); +iwl_init_he_hw_capab (trans, data, sband, tx_chains, rx_chains);if (n_channels != n_used) IWL_ERR_DEV(dev, "NVM: used only %d of %d channels\n",
Signature · 1 line
2.25.1
PATCH 5/14 iwlwifi: scan: support scan req cmd ver 14
In reply to Luca CoelhoFrom: Shahar S Matityahu <[email protected]>
Modify adaptive dwell number of APs override API
Instead of using channel to index mapping, add the adaptive dwell override parameters as part of the configuration per channel in the scan request command.
Support 2 different override values and use them as follows:
1. 10 APs for friendly GO channels in p2p scan.
2. 2 APs for social channels in p2p scan.
--- .../net/wireless/intel/iwlwifi/fw/api/scan.h | 52 ++++++- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 129 +++++++++++++++++- 2 files changed, 173 insertions(+), 8 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/api/scan.h +50 -2
@@ -702,13 +702,16 @@ struct iwl_scan_channel_cfg_umac {u8 channel_num;u8 iter_count;__le16 iter_interval; - } v1;/* SCAN_CHANNEL_CFG_S_VER1 */ + } v1;/* SCAN_CHANNEL_CONFIG_API_S_VER_1 */ struct {u8 channel_num;u8 band;u8 iter_count;u8 iter_interval; - } v2;/* SCAN_CHANNEL_CFG_S_VER2 */ + } v2;/* SCAN_CHANNEL_CONFIG_API_S_VER_2 +* SCAN_CHANNEL_CONFIG_API_S_VER_3 +* SCAN_CHANNEL_CONFIG_API_S_VER_4 +*/ }; } __packed;
@@ -943,6 +946,25 @@ struct iwl_scan_channel_params_v4 {u8 adwell_ch_override_bitmap[16 ]; } __packed;/* SCAN_CHANNEL_PARAMS_API_S_VER_4 also SCAN_CHANNEL_PARAMS_API_S_VER_5 */ + +/** +* struct iwl_scan_channel_params_v6 +* @flags: channel flags &enum iwl_scan_channel_flags +* @count: num of channels in scan request +* @n_aps_override: override the number of APs the FW uses to calculate dwell +* time when adaptive dwell is used. +* Channel k will use n_aps_override[i] when BIT(20 + i) is set in +* channel_config[k].flags +* @channel_config: array of explicit channel configurations +* for 2.4Ghz and 5.2Ghz bands +*/ +struct iwl_scan_channel_params_v6 { +u8 flags; +u8 count; +u8 n_aps_override[2 ]; +struct iwl_scan_channel_cfg_umac channel_config[SCAN_MAX_NUM_CHANS_V3 ]; +} __packed;/* SCAN_CHANNEL_PARAMS_API_S_VER_6 */ +/** * struct iwl_scan_general_params_v10 * @flags: &enum iwl_umac_scan_flags
@@ -1023,6 +1045,20 @@ struct iwl_scan_req_params_v13 {struct iwl_scan_probe_params_v4 probe_params; } __packed;/* SCAN_REQUEST_PARAMS_API_S_VER_13 */ +/** +* struct iwl_scan_req_params_v14 +* @general_params: &struct iwl_scan_general_params_v10 +* @channel_params: &struct iwl_scan_channel_params_v6 +* @periodic_params: &struct iwl_scan_periodic_parms_v1 +* @probe_params: &struct iwl_scan_probe_params_v4 +*/ +struct iwl_scan_req_params_v14 { +struct iwl_scan_general_params_v10 general_params; +struct iwl_scan_channel_params_v6 channel_params; +struct iwl_scan_periodic_parms_v1 periodic_params; +struct iwl_scan_probe_params_v4 probe_params; +} __packed;/* SCAN_REQUEST_PARAMS_API_S_VER_14 */ +/** * struct iwl_scan_req_umac_v12 * @uid: scan id, &enum iwl_umac_scan_uid_offsets
@@ -1047,6 +1083,18 @@ struct iwl_scan_req_umac_v13 {struct iwl_scan_req_params_v13 scan_params; } __packed;/* SCAN_REQUEST_CMD_UMAC_API_S_VER_13 */ +/** +* struct iwl_scan_req_umac_v14 +* @uid: scan id, &enum iwl_umac_scan_uid_offsets +* @ooc_priority: out of channel priority - &enum iwl_scan_priority +* @scan_params: scan parameters +*/ +struct iwl_scan_req_umac_v14 { +__le32 uid; +__le32 ooc_priority; +struct iwl_scan_req_params_v14 scan_params; +} __packed;/* SCAN_REQUEST_CMD_UMAC_API_S_VER_14 */ +/** * struct iwl_umac_scan_abort * @uid: scan id, &enum iwl_umac_scan_uid_offsets
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +123 -6
188 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 6/14 iwlwifi: mvm: rs-fw: fix some indentation
In reply to Luca CoelhoFrom: Johannes Berg <[email protected]>
That closing brace for the switch statement is misplaced, fix it.
--- drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c +1 -2
@@ -399,8 +399,7 @@ u16 rs_fw_get_max_amsdu_len(struct ieee80211_sta *sta)return IEEE80211_MAX_MPDU_LEN_VHT_7991 ;default :return IEEE80211_MAX_MPDU_LEN_VHT_3895 ; - } - + } }else if (ht_cap->ht_supported) {if (ht_cap->cap &IEEE80211_HT_CAP_MAX_AMSDU )/*
Signature · 1 line
2.25.1
PATCH 7/14 iwlwifi: remove redundant iwl9560_2ac_cfg struct
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
The iwl9560_2ac_cfg struct is used for PNJ devices and the configuration is the same as iwl9260_2ac_cfg, so we can remove the former to avoid redundancy.
--- drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 5 ----- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 12 ++++++------ 2 files changed, 6 insertions(+), 11 deletions(-)
drivers/net/wireless/intel/iwlwifi/cfg/9000.c +0 -5
@@ -200,11 +200,6 @@ const char iwl9560_killer_1550i_name[] =const char iwl9560_killer_1550s_name[] ="Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)" ; -const struct iwl_cfg iwl9560_2ac_cfg = { - .fw_name_pre =IWL9260_FW_PRE , -IWL_DEVICE_9000 , -}; -const struct iwl_cfg iwl9560_2ac_cfg_soc = { .fw_name_pre =IWL9000_FW_PRE ,IWL_DEVICE_9000 ,
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +6 -6
@@ -885,28 +885,28 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {_IWL_DEV_INFO (0x2526 ,IWL_CFG_ANY ,IWL_CFG_MAC_TYPE_PNJ ,IWL_CFG_RF_TYPE_JF1 ,IWL_CFG_RF_ID_JF1 ,IWL_CFG_160 ,IWL_CFG_CORES_BT , - iwl9560_2ac_cfg, iwl9461_160_name), + iwl9260_2ac_cfg, iwl9461_160_name),_IWL_DEV_INFO (0x2526 ,IWL_CFG_ANY ,IWL_CFG_MAC_TYPE_PNJ ,IWL_CFG_RF_TYPE_JF1 ,IWL_CFG_RF_ID_JF1 ,IWL_CFG_NO_160 ,IWL_CFG_CORES_BT , - iwl9560_2ac_cfg, iwl9461_name), + iwl9260_2ac_cfg, iwl9461_name),_IWL_DEV_INFO (0x2526 ,IWL_CFG_ANY ,IWL_CFG_MAC_TYPE_PNJ ,IWL_CFG_RF_TYPE_JF1 ,IWL_CFG_RF_ID_JF1_DIV ,IWL_CFG_160 ,IWL_CFG_CORES_BT , - iwl9560_2ac_cfg, iwl9462_160_name), + iwl9260_2ac_cfg, iwl9462_160_name),_IWL_DEV_INFO (0x2526 ,IWL_CFG_ANY ,IWL_CFG_MAC_TYPE_PNJ ,IWL_CFG_RF_TYPE_JF1 ,IWL_CFG_RF_ID_JF1_DIV ,IWL_CFG_NO_160 ,IWL_CFG_CORES_BT , - iwl9560_2ac_cfg, iwl9462_name), + iwl9260_2ac_cfg, iwl9462_name),_IWL_DEV_INFO (0x2526 ,IWL_CFG_ANY ,IWL_CFG_MAC_TYPE_PNJ ,IWL_CFG_RF_TYPE_JF2 ,IWL_CFG_RF_ID_JF ,IWL_CFG_160 ,IWL_CFG_CORES_BT , - iwl9560_2ac_cfg, iwl9560_160_name), + iwl9260_2ac_cfg, iwl9560_160_name),_IWL_DEV_INFO (0x2526 ,IWL_CFG_ANY ,IWL_CFG_MAC_TYPE_PNJ ,IWL_CFG_RF_TYPE_JF2 ,IWL_CFG_RF_ID_JF ,IWL_CFG_NO_160 ,IWL_CFG_CORES_BT , - iwl9560_2ac_cfg, iwl9560_name), + iwl9260_2ac_cfg, iwl9560_name), _IWL_DEV_INFO(0x2526, IWL_CFG_ANY, IWL_CFG_MAC_TYPE_TH, IWL_CFG_RF_TYPE_TH, IWL_CFG_ANY,
Signature · 1 line
2.25.1
PATCH 8/14 iwlwifi: mvm: enable SF also when we have HE
In reply to Luca CoelhoFrom: Johannes Berg <[email protected]>
We shouldn't do this just for HT/VHT, but be future-proof and also check for HE.
--- drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/sf.c +5 -3
@@ -7,7 +7,7 @@* * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH -* Copyright (C) 2018 Intel Corporation +* Copyright (C) 2018-2019 Intel Corporation * * 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
@@ -29,7 +29,7 @@* * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH -* Copyright (C) 2018 Intel Corporation +* Copyright (C) 2018-2019 Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without
@@ -162,7 +162,9 @@ static void iwl_mvm_fill_sf_command(struct iwl_mvm *mvm,* capabilities of the AP station, and choose the watermark accordingly. */ if (sta) { -if (sta->ht_cap.ht_supported || sta->vht_cap.vht_supported) { +if (sta->ht_cap.ht_supported || + sta->vht_cap.vht_supported || + sta->he_cap.has_he) {switch (sta->rx_nss) {case 1 : watermark =SF_W_MARK_SISO ;
Signature · 1 line
2.25.1
PATCH 9/14 iwlwifi: move integrated, extra_phy and soc_latency to trans_cfg
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
These values are selected based on the PCI device ID, so the decision to use them can be made early. By moving them to the trans_cfg, we avoid duplicating the large cfg structs for small pieces of data (sometimes a single boolean). This will also allow us to make more decisions based on, for instance, the SoC type in used.
The trans_cfg concept changes a bit, because previously it was used only to boot the device before reading further characteristics and now it also contains more data that is associated with the device ID.
--- .../net/wireless/intel/iwlwifi/cfg/22000.c | 24 +++++------ drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 31 +++++++++----- .../net/wireless/intel/iwlwifi/iwl-config.h | 21 ++++++---- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 7 ++-- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 42 ++++--------------- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 +- .../net/wireless/intel/iwlwifi/pcie/trans.c | 2 +- 7 files changed, 58 insertions(+), 71 deletions(-)
drivers/net/wireless/intel/iwlwifi/cfg/22000.c +12 -12
@@ -464,8 +464,8 @@ const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc = {* HT size; mac80211 would otherwise pick the HE max (256) by default. */ .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, - .integrated = true, - .soc_latency = 5000, + .trans.integrated = true, + .trans.xtal_latency = 5000, .num_rbds = IWL_NUM_RBDS_NON_HE, };
@@ -479,8 +479,8 @@ const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc = {* HT size; mac80211 would otherwise pick the HE max (256) by default. */ .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, - .integrated = true, - .soc_latency = 5000, + .trans.integrated = true, + .trans.xtal_latency = 5000, .num_rbds = IWL_NUM_RBDS_NON_HE, };
@@ -494,8 +494,8 @@ const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc = {* HT size; mac80211 would otherwise pick the HE max (256) by default. */ .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, - .integrated = true, - .soc_latency = 5000, + .trans.integrated = true, + .trans.xtal_latency = 5000, .num_rbds = IWL_NUM_RBDS_NON_HE, };
@@ -509,8 +509,8 @@ const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc = {* HT size; mac80211 would otherwise pick the HE max (256) by default. */ .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, - .integrated = true, - .soc_latency = 5000, + .trans.integrated = true, + .trans.xtal_latency = 5000, .num_rbds = IWL_NUM_RBDS_NON_HE, };
@@ -524,8 +524,8 @@ const struct iwl_cfg iwl9560_killer_s_2ac_cfg_quz_a0_jf_b0_soc = {* HT size; mac80211 would otherwise pick the HE max (256) by default. */ .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, - .integrated = true, - .soc_latency = 5000, + .trans.integrated = true, + .trans.xtal_latency = 5000, .num_rbds = IWL_NUM_RBDS_NON_HE, };
@@ -539,8 +539,8 @@ const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc = {* HT size; mac80211 would otherwise pick the HE max (256) by default. */ .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, - .integrated = true, - .soc_latency = 5000, + .trans.integrated = true, + .trans.xtal_latency = 5000, .num_rbds = IWL_NUM_RBDS_NON_HE, };
drivers/net/wireless/intel/iwlwifi/cfg/9000.c +20 -11
@@ -174,9 +174,23 @@ const struct iwl_cfg_trans_params iwl9000_trans_cfg = { .rf_id = true, }; -const struct iwl_cfg iwl9260_2ac_cfg = { - .fw_name_pre =IWL9260_FW_PRE , -IWL_DEVICE_9000 , +const struct iwl_cfg_trans_params iwl9560_trans_cfg = { + .device_family =IWL_DEVICE_FAMILY_9000 , + .base_params = &iwl9000_base_params, + .mq_rx_supported = true, + .rf_id = true, + .integrated = true, + .xtal_latency =5000 , +}; + +const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg = { + .device_family =IWL_DEVICE_FAMILY_9000 , + .base_params = &iwl9000_base_params, + .mq_rx_supported = true, + .rf_id = true, + .integrated = true, + .xtal_latency =5000 , + .extra_phy_cfg_flags =FW_PHY_CFG_SHARED_CLK };const char iwl9162_name[] ="Intel(R) Wireless-AC 9162" ;
@@ -200,19 +214,14 @@ const char iwl9560_killer_1550i_name[] =const char iwl9560_killer_1550s_name[] ="Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)" ; -const struct iwl_cfg iwl9560_2ac_cfg_soc = { - .fw_name_pre =IWL9000_FW_PRE , +const struct iwl_cfg iwl9260_2ac_cfg = { + .fw_name_pre =IWL9260_FW_PRE ,IWL_DEVICE_9000 , - .integrated = true, - .soc_latency =5000 , }; -const struct iwl_cfg iwl9560_2ac_cfg_shared_clk = { +const struct iwl_cfg iwl9560_2ac_cfg_soc = { .fw_name_pre =IWL9000_FW_PRE ,IWL_DEVICE_9000 , - .integrated = true, - .soc_latency =5000 , - .extra_phy_cfg_flags =FW_PHY_CFG_SHARED_CLK };MODULE_FIRMWARE (IWL9000_MODULE_FIRMWARE (IWL9000_UCODE_API_MAX ));
drivers/net/wireless/intel/iwlwifi/iwl-config.h +12 -9
@@ -287,27 +287,34 @@ struct iwl_pwr_tx_backoff {/** * struct iwl_cfg_trans - information needed to start the trans * -* These values cannot be changed when multiple configs are used for a -* single PCI ID, because they are needed before the HW REV or RFID -* can be read. +* These values are specific to the device ID and do not change when +* multiple configs are used for a single device ID. They values are +* used, among other things, to boot the NIC so that the HW REV or +* RFID can be read before deciding the remaining parameters to use. * * @base_params: pointer to basic parameters * @csr: csr flags and addresses that are different across devices * @device_family: the device family * @umac_prph_offset: offset to add to UMAC periphery address +* @xtal_latency: power up latency to get the xtal stabilized +* @extra_phy_cfg_flags: extra configuration flags to pass to the PHY * @rf_id: need to read rf_id to determine the firmware image * @use_tfh: use TFH * @gen2: 22000 and on transport operation * @mq_rx_supported: multi-queue rx support +* @integrated: discrete or integrated */ struct iwl_cfg_trans_params {const struct iwl_base_params *base_params;enum iwl_device_family device_family;u32 umac_prph_offset; +u32 xtal_latency; +u32 extra_phy_cfg_flags;u32 rf_id:1 , use_tfh:1 , gen2:1 , mq_rx_supported:1 , + integrated:1 , bisr_workaround:1 ; };
@@ -374,7 +381,6 @@ struct iwl_fw_mon_regs {* @smem_offset: offset from which the SMEM begins * @smem_len: the length of SMEM * @vht_mu_mimo_supported: VHT MU-MIMO support -* @integrated: discrete or integrated * @cdb: CDB support * @nvm_type: see &enum iwl_nvm_type * @d3_debug_data_base_addr: base address where D3 debug data is stored
@@ -413,7 +419,6 @@ struct iwl_cfg {u32 dccm2_len;u32 smem_offset;u32 smem_len; -u32 soc_latency;u16 nvm_ver;u16 nvm_calib_ver; u32 rx_with_siso_diversity:1,
@@ -427,7 +432,6 @@ struct iwl_cfg { disable_dummy_notification:1, apmg_not_supported:1, vht_mu_mimo_supported:1, - integrated:1, cdb:1, dbgc_supported:1, uhb_supported:1;
@@ -442,7 +446,6 @@ struct iwl_cfg {u8 ucode_api_min;u16 num_rbds;u32 min_umac_error_event_table; -u32 extra_phy_cfg_flags;u32 d3_debug_data_base_addr;u32 d3_debug_data_length;u32 min_txq_size;
@@ -496,6 +499,8 @@ struct iwl_dev_info {* This list declares the config structures for all devices. */ extern const struct iwl_cfg_trans_params iwl9000_trans_cfg; +extern const struct iwl_cfg_trans_params iwl9560_trans_cfg; +extern const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg;extern const struct iwl_cfg_trans_params iwl_ax200_trans_cfg;extern const char iwl9162_name[];extern const char iwl9260_name[];
@@ -586,7 +591,6 @@ extern const struct iwl_cfg iwl9260_2ac_cfg;extern const struct iwl_cfg iwl9260_2ac_160_cfg;extern const struct iwl_cfg iwl9260_killer_2ac_cfg;extern const struct iwl_cfg iwl9270_2ac_cfg; -extern const struct iwl_cfg iwl9560_2ac_cfg;extern const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
@@ -596,7 +600,6 @@ extern const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9461_2ac_cfg_shared_clk;extern const struct iwl_cfg iwl9462_2ac_cfg_shared_clk; -extern const struct iwl_cfg iwl9560_2ac_cfg_shared_clk;extern const struct iwl_cfg iwl9560_2ac_160_cfg_shared_clk;extern const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk;extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk;
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +4 -3
@@ -93,10 +93,10 @@ static int iwl_set_soc_latency(struct iwl_mvm *mvm)struct iwl_soc_configuration_cmd cmd;int ret; - cmd.device_type = (mvm->trans->cfg->integrated) ? + cmd.device_type = (mvm->trans->trans_cfg->integrated) ?cpu_to_le32 (SOC_CONFIG_CMD_INTEGRATED ) :cpu_to_le32 (SOC_CONFIG_CMD_DISCRETE ); - cmd.soc_latency =cpu_to_le32 (mvm->trans->cfg->soc_latency); + cmd.soc_latency =cpu_to_le32 (mvm->trans->trans_cfg->xtal_latency); ret = iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(SOC_CONFIGURATION_CMD, SYSTEM_GROUP, 0), 0,
@@ -561,7 +561,8 @@ static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm) phy_cfg_cmd.phy_cfg =cpu_to_le32 (iwl_mvm_get_phy_config (mvm));/* set flags extra PHY configuration flags from the device's cfg */ - phy_cfg_cmd.phy_cfg |=cpu_to_le32 (mvm->cfg->extra_phy_cfg_flags); + phy_cfg_cmd.phy_cfg |= +cpu_to_le32 (mvm->trans->trans_cfg->extra_phy_cfg_flags); phy_cfg_cmd.calib_control.event_trigger = mvm->fw->default_calib[ucode_type].event_trigger;
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +8 -34
57 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/pcie/rx.c +1 -1
@@ -1043,7 +1043,7 @@ static void iwl_pcie_rx_mq_hw_init(struct iwl_trans *trans)RFH_GEN_CFG_VAL (DEFAULT_RXQ_NUM ,0 ) |RFH_GEN_CFG_SERVICE_DMA_SNOOP |RFH_GEN_CFG_VAL (RB_CHUNK_SIZE , - trans->cfg->integrated ? + trans->trans_cfg->integrated ?RFH_GEN_CFG_RB_CHUNK_SIZE_64 : RFH_GEN_CFG_RB_CHUNK_SIZE_128));/* Enable the relevant rx queues */
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +1 -1
@@ -1817,7 +1817,7 @@ static int _iwl_trans_pcie_start_hw(struct iwl_trans *trans)iwl_trans_pcie_sw_reset (trans);if (trans->trans_cfg->device_family ==IWL_DEVICE_FAMILY_22000 && - trans->cfg->integrated) { + trans->trans_cfg->integrated) { err =iwl_pcie_gen2_force_power_gating (trans);if (err)return err;
Signature · 1 line
2.25.1
PATCH 10/14 iwlwifi: remove some unused extern declarations from iwl-config.h
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
After the refactoring, a few extern declarations were accidentally left in the iwl-config.h file. Remove them
--- drivers/net/wireless/intel/iwlwifi/iwl-config.h | 9 --------- 1 file changed, 9 deletions(-)
drivers/net/wireless/intel/iwlwifi/iwl-config.h +0 -9
@@ -588,9 +588,6 @@ extern const struct iwl_cfg iwl8265_2ac_cfg;extern const struct iwl_cfg iwl8275_2ac_cfg;extern const struct iwl_cfg iwl4165_2ac_cfg;extern const struct iwl_cfg iwl9260_2ac_cfg; -extern const struct iwl_cfg iwl9260_2ac_160_cfg; -extern const struct iwl_cfg iwl9260_killer_2ac_cfg; -extern const struct iwl_cfg iwl9270_2ac_cfg;extern const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
@@ -598,15 +595,9 @@ extern const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9560_2ac_cfg_soc;extern const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_quz_a0_jf_b0_soc; -extern const struct iwl_cfg iwl9461_2ac_cfg_shared_clk; -extern const struct iwl_cfg iwl9462_2ac_cfg_shared_clk; -extern const struct iwl_cfg iwl9560_2ac_160_cfg_shared_clk; -extern const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk; -extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk;extern const struct iwl_cfg iwl_ax101_cfg_qu_hr;extern const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0;extern const struct iwl_cfg iwl_ax101_cfg_quz_hr; -extern const struct iwl_cfg iwl22000_2ax_cfg_hr;extern const struct iwl_cfg iwl_ax200_cfg_cc;extern const struct iwl_cfg iwl_ax201_cfg_qu_hr;extern const struct iwl_cfg iwl_ax201_cfg_qu_hr;
Signature · 1 line
2.25.1
PATCH 11/14 iwlwifi: add HW step to new cfg device table
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
We need to use different firmware versions for different HW steps with certain devices. Prepare for this differentiation by adding HW step to the new device table.
--- .../net/wireless/intel/iwlwifi/iwl-config.h | 1 + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 67 +++++++++++++------ 2 files changed, 46 insertions(+), 22 deletions(-)
drivers/net/wireless/intel/iwlwifi/iwl-config.h +1 -0
@@ -488,6 +488,7 @@ struct iwl_dev_info {u16 subdevice;u16 mac_type;u16 rf_type; +u8 mac_step;u8 rf_id;u8 no_160;u8 cores;
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +45 -22
147 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 12/14 iwlwifi: convert all Qu with Jf devices to the new config table
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
Add new generic iwl_trans structures for these devices and apply the correct cfg depending on the device characteristics.
Since we have to match Qu with IWL_CONFIG_ANY, we also need to move the Hr devices to the new table, but for now we keep matching on PCI device and subsystem device IDs.
--- .../net/wireless/intel/iwlwifi/cfg/22000.c | 35 ++ .../net/wireless/intel/iwlwifi/iwl-config.h | 5 + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 493 +++++++++--------- 3 files changed, 283 insertions(+), 250 deletions(-)
drivers/net/wireless/intel/iwlwifi/cfg/22000.c +35 -0
@@ -235,6 +235,17 @@ static const struct iwl_ht_params iwl_22000_ht_params = { }, \ } +const struct iwl_cfg_trans_params iwl_qu_trans_cfg = { + .mq_rx_supported = true, + .use_tfh = true, + .rf_id = true, + .gen2 = true, + .device_family =IWL_DEVICE_FAMILY_22000 , + .base_params = &iwl_22000_base_params, + .integrated = true, + .xtal_latency =5000 , +}; +/* * If the device doesn't support HE, no need to have that many buffers. * 22000 devices can split multiple frames into a single RB, so fewer are
@@ -246,6 +257,30 @@ static const struct iwl_ht_params iwl_22000_ht_params = {#define IWL_NUM_RBDS_22000_HE 2048#define IWL_NUM_RBDS_AX210_HE 4096 +const struct iwl_cfg iwl9560_qu_b0_jf_b0_cfg = { + .fw_name_pre =IWL_QU_B_JF_B_FW_PRE , +IWL_DEVICE_22500 , + .num_rbds =IWL_NUM_RBDS_NON_HE , +}; + +const struct iwl_cfg iwl9560_qu_c0_jf_b0_cfg = { + .fw_name_pre =IWL_QU_C_JF_B_FW_PRE , +IWL_DEVICE_22500 , + .num_rbds =IWL_NUM_RBDS_NON_HE , +}; + +const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg = { + .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , + .num_rbds =IWL_NUM_RBDS_NON_HE , +}; +const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = { .device_family =IWL_DEVICE_FAMILY_22000 , .base_params = &iwl_22000_base_params,
drivers/net/wireless/intel/iwlwifi/iwl-config.h +5 -0
@@ -461,6 +461,7 @@ struct iwl_cfg {#define IWL_CFG_MAC_TYPE_PNJ 0x32#define IWL_CFG_MAC_TYPE_TH 0x32#define IWL_CFG_MAC_TYPE_QU 0x33 +#define IWL_CFG_MAC_TYPE_QUZ 0x35#define IWL_CFG_RF_TYPE_TH 0x105#define IWL_CFG_RF_TYPE_TH1 0x108
@@ -502,6 +503,7 @@ struct iwl_dev_info {extern const struct iwl_cfg_trans_params iwl9000_trans_cfg;extern const struct iwl_cfg_trans_params iwl9560_trans_cfg;extern const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg; +extern const struct iwl_cfg_trans_params iwl_qu_trans_cfg;extern const struct iwl_cfg_trans_params iwl_ax200_trans_cfg;extern const char iwl9162_name[];extern const char iwl9260_name[];
@@ -589,6 +591,9 @@ extern const struct iwl_cfg iwl8265_2ac_cfg;extern const struct iwl_cfg iwl8275_2ac_cfg;extern const struct iwl_cfg iwl4165_2ac_cfg;extern const struct iwl_cfg iwl9260_2ac_cfg; +extern const struct iwl_cfg iwl9560_qu_b0_jf_b0_cfg; +extern const struct iwl_cfg iwl9560_qu_c0_jf_b0_cfg; +extern const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg;extern const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +243 -250
560 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 13/14 iwlwifi: convert QnJ with Jf devices to new config table
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
All the QnJ devices have a similar matching to the other Qu devices, but needs a different configuration. Convert the QnJ devices to the new table accordingly.
--- .../net/wireless/intel/iwlwifi/cfg/22000.c | 78 ++++--------- .../net/wireless/intel/iwlwifi/iwl-config.h | 8 +- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 107 ++++++++++-------- 3 files changed, 86 insertions(+), 107 deletions(-)
drivers/net/wireless/intel/iwlwifi/cfg/22000.c +21 -57
@@ -246,6 +246,15 @@ const struct iwl_cfg_trans_params iwl_qu_trans_cfg = { .xtal_latency = 5000, }; +const struct iwl_cfg_trans_params iwl_qnj_trans_cfg = { + .mq_rx_supported = true, + .use_tfh = true, + .rf_id = true, + .gen2 = true, + .device_family =IWL_DEVICE_FAMILY_22000 , + .base_params = &iwl_22000_base_params, +}; +/* * If the device doesn't support HE, no need to have that many buffers. * 22000 devices can split multiple frames into a single RB, so fewer are
@@ -281,6 +290,18 @@ const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg = { .num_rbds = IWL_NUM_RBDS_NON_HE, }; +const struct iwl_cfg iwl9560_qnj_b0_jf_b0_cfg = { + .fw_name_pre =IWL_QNJ_B_JF_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , + .num_rbds =IWL_NUM_RBDS_NON_HE , +}; +const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = { .device_family =IWL_DEVICE_FAMILY_22000 , .base_params = &iwl_22000_base_params,
@@ -476,19 +497,6 @@ const struct iwl_cfg iwl9560_2ac_160_cfg_qu_c0_jf_b0 = { .num_rbds = IWL_NUM_RBDS_NON_HE, }; -const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0 = { - .name ="Intel(R) Wireless-AC 9560 160MHz" , - .fw_name_pre =IWL_QNJ_B_JF_B_FW_PRE , -IWL_DEVICE_22500 , -/* -* This device doesn't support receiving BlockAck with a large bitmap -* so we need to restrict the size of transmitted aggregation to the -* HT size; mac80211 would otherwise pick the HE max (256) by default. -*/ - .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; -const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc = { .name ="Intel(R) Wireless-AC 9560 160MHz" , .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE ,
@@ -549,50 +557,6 @@ const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc = { .num_rbds = IWL_NUM_RBDS_NON_HE, }; -const struct iwl_cfg iwl9560_killer_s_2ac_cfg_quz_a0_jf_b0_soc = { - .name ="Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)" , - .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE , -IWL_DEVICE_22500 , -/* -* This device doesn't support receiving BlockAck with a large bitmap -* so we need to restrict the size of transmitted aggregation to the -* HT size; mac80211 would otherwise pick the HE max (256) by default. -*/ - .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , - .trans.integrated = true, - .trans.xtal_latency =5000 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc = { - .name ="Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)" , - .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE , -IWL_DEVICE_22500 , -/* -* This device doesn't support receiving BlockAck with a large bitmap -* so we need to restrict the size of transmitted aggregation to the -* HT size; mac80211 would otherwise pick the HE max (256) by default. -*/ - .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , - .trans.integrated = true, - .trans.xtal_latency =5000 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0 = { - .name ="Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)" , - .fw_name_pre =IWL_QU_B_JF_B_FW_PRE , -IWL_DEVICE_22500 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg killer1550s_2ac_cfg_qu_b0_jf_b0 = { - .name ="Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)" , - .fw_name_pre =IWL_QU_B_JF_B_FW_PRE , -IWL_DEVICE_22500 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; -const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = { .name ="Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)" , .fw_name_pre =IWL_22000_QU_B_HR_B_FW_PRE ,
drivers/net/wireless/intel/iwlwifi/iwl-config.h +3 -5
@@ -462,6 +462,7 @@ struct iwl_cfg {#define IWL_CFG_MAC_TYPE_TH 0x32#define IWL_CFG_MAC_TYPE_QU 0x33#define IWL_CFG_MAC_TYPE_QUZ 0x35 +#define IWL_CFG_MAC_TYPE_QNJ 0x36#define IWL_CFG_RF_TYPE_TH 0x105#define IWL_CFG_RF_TYPE_TH1 0x108
@@ -504,6 +505,7 @@ extern const struct iwl_cfg_trans_params iwl9000_trans_cfg;extern const struct iwl_cfg_trans_params iwl9560_trans_cfg;extern const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg;extern const struct iwl_cfg_trans_params iwl_qu_trans_cfg; +extern const struct iwl_cfg_trans_params iwl_qnj_trans_cfg;extern const struct iwl_cfg_trans_params iwl_ax200_trans_cfg;extern const char iwl9162_name[];extern const char iwl9260_name[];
@@ -594,13 +596,12 @@ extern const struct iwl_cfg iwl9260_2ac_cfg;extern const struct iwl_cfg iwl9560_qu_b0_jf_b0_cfg;extern const struct iwl_cfg iwl9560_qu_c0_jf_b0_cfg;extern const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg; +extern const struct iwl_cfg iwl9560_qnj_b0_jf_b0_cfg;extern const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9560_2ac_cfg_soc; -extern const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc; -extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl_ax101_cfg_qu_hr;extern const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0;extern const struct iwl_cfg iwl_ax101_cfg_quz_hr;
@@ -625,13 +626,10 @@ extern const struct iwl_cfg iwl9461_2ac_cfg_qu_c0_jf_b0;extern const struct iwl_cfg iwl9462_2ac_cfg_qu_c0_jf_b0;extern const struct iwl_cfg iwl9560_2ac_cfg_qu_c0_jf_b0;extern const struct iwl_cfg iwl9560_2ac_160_cfg_qu_c0_jf_b0; -extern const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0; -extern const struct iwl_cfg killer1550s_2ac_cfg_qu_b0_jf_b0;extern const struct iwl_cfg iwl22000_2ax_cfg_jf;extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0_f0;extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0_f0;extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0; -extern const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0;extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0;extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0;extern const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0;
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +62 -45
134 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 14/14 iwlwifi: remove unnecessary cfg mangling for Qu C and QuZ with Jf
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
Now that we identify the correct cfgs with the new tables for Qu step C and QuZ with Jf, we can remove the mangling we do later on.
--- .../net/wireless/intel/iwlwifi/cfg/22000.c | 139 +----------------- .../net/wireless/intel/iwlwifi/iwl-config.h | 13 -- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 25 +--- 3 files changed, 8 insertions(+), 169 deletions(-)
drivers/net/wireless/intel/iwlwifi/cfg/22000.c +5 -134
@@ -266,6 +266,11 @@ const struct iwl_cfg_trans_params iwl_qnj_trans_cfg = {#define IWL_NUM_RBDS_22000_HE 2048#define IWL_NUM_RBDS_AX210_HE 4096 +/* +* All JF radio modules are part of the 9000 series, but the MAC part +* looks more like 22000. That's why this device is here, but called +* 9560 nevertheless. +*/ const struct iwl_cfg iwl9560_qu_b0_jf_b0_cfg = { .fw_name_pre =IWL_QU_B_JF_B_FW_PRE ,IWL_DEVICE_22500 ,
@@ -436,127 +441,6 @@ const struct iwl_cfg iwl_ax200_cfg_cc = { .num_rbds = IWL_NUM_RBDS_22000_HE, }; -/* -* All JF radio modules are part of the 9000 series, but the MAC part -* looks more like 22000. That's why this device is here, but called -* 9560 nevertheless. -*/ -const struct iwl_cfg iwl9461_2ac_cfg_qu_b0_jf_b0 = { - .name ="Intel(R) Wireless-AC 9461" , - .fw_name_pre =IWL_QU_B_JF_B_FW_PRE , -IWL_DEVICE_22500 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg iwl9462_2ac_cfg_qu_b0_jf_b0 = { - .name ="Intel(R) Wireless-AC 9462" , - .fw_name_pre =IWL_QU_B_JF_B_FW_PRE , -IWL_DEVICE_22500 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg iwl9560_2ac_cfg_qu_b0_jf_b0 = { - .name ="Intel(R) Wireless-AC 9560" , - .fw_name_pre =IWL_QU_B_JF_B_FW_PRE , -IWL_DEVICE_22500 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0 = { - .name ="Intel(R) Wireless-AC 9560 160MHz" , - .fw_name_pre =IWL_QU_B_JF_B_FW_PRE , -IWL_DEVICE_22500 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg iwl9461_2ac_cfg_qu_c0_jf_b0 = { - .name ="Intel(R) Wireless-AC 9461" , - .fw_name_pre =IWL_QU_C_JF_B_FW_PRE , -IWL_DEVICE_22500 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg iwl9462_2ac_cfg_qu_c0_jf_b0 = { - .name ="Intel(R) Wireless-AC 9462" , - .fw_name_pre =IWL_QU_C_JF_B_FW_PRE , -IWL_DEVICE_22500 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg iwl9560_2ac_cfg_qu_c0_jf_b0 = { - .name ="Intel(R) Wireless-AC 9560" , - .fw_name_pre =IWL_QU_C_JF_B_FW_PRE , -IWL_DEVICE_22500 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg iwl9560_2ac_160_cfg_qu_c0_jf_b0 = { - .name ="Intel(R) Wireless-AC 9560 160MHz" , - .fw_name_pre =IWL_QU_C_JF_B_FW_PRE , -IWL_DEVICE_22500 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc = { - .name ="Intel(R) Wireless-AC 9560 160MHz" , - .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE , -IWL_DEVICE_22500 , -/* -* This device doesn't support receiving BlockAck with a large bitmap -* so we need to restrict the size of transmitted aggregation to the -* HT size; mac80211 would otherwise pick the HE max (256) by default. -*/ - .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , - .trans.integrated = true, - .trans.xtal_latency =5000 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc = { - .name ="Intel(R) Wireless-AC 9560 160MHz" , - .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE , -IWL_DEVICE_22500 , -/* -* This device doesn't support receiving BlockAck with a large bitmap -* so we need to restrict the size of transmitted aggregation to the -* HT size; mac80211 would otherwise pick the HE max (256) by default. -*/ - .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , - .trans.integrated = true, - .trans.xtal_latency =5000 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc = { - .name ="Intel(R) Dual Band Wireless AC 9461" , - .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE , -IWL_DEVICE_22500 , -/* -* This device doesn't support receiving BlockAck with a large bitmap -* so we need to restrict the size of transmitted aggregation to the -* HT size; mac80211 would otherwise pick the HE max (256) by default. -*/ - .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , - .trans.integrated = true, - .trans.xtal_latency =5000 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; - -const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc = { - .name ="Intel(R) Dual Band Wireless AC 9462" , - .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE , -IWL_DEVICE_22500 , -/* -* This device doesn't support receiving BlockAck with a large bitmap -* so we need to restrict the size of transmitted aggregation to the -* HT size; mac80211 would otherwise pick the HE max (256) by default. -*/ - .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , - .trans.integrated = true, - .trans.xtal_latency =5000 , - .num_rbds =IWL_NUM_RBDS_NON_HE , -}; -const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = { .name ="Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)" , .fw_name_pre =IWL_22000_QU_B_HR_B_FW_PRE ,
@@ -609,19 +493,6 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = { .num_rbds = IWL_NUM_RBDS_22000_HE, }; -const struct iwl_cfg iwl22000_2ax_cfg_jf = { - .name ="Intel(R) Dual Band Wireless AX 22000" , - .fw_name_pre =IWL_QU_B_JF_B_FW_PRE , -IWL_DEVICE_22500 , -/* -* This device doesn't support receiving BlockAck with a large bitmap -* so we need to restrict the size of transmitted aggregation to the -* HT size; mac80211 would otherwise pick the HE max (256) by default. -*/ - .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , - .num_rbds =IWL_NUM_RBDS_22000_HE , -}; -const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0_f0 = { .name ="Intel(R) Dual Band Wireless AX 22000" , .fw_name_pre =IWL_22000_HR_A_F0_FW_PRE ,
drivers/net/wireless/intel/iwlwifi/iwl-config.h +0 -13
@@ -597,10 +597,6 @@ extern const struct iwl_cfg iwl9560_qu_b0_jf_b0_cfg;extern const struct iwl_cfg iwl9560_qu_c0_jf_b0_cfg;extern const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg;extern const struct iwl_cfg iwl9560_qnj_b0_jf_b0_cfg; -extern const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc; -extern const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc; -extern const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc; -extern const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9560_2ac_cfg_soc;extern const struct iwl_cfg iwl_ax101_cfg_qu_hr;extern const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0;
@@ -618,15 +614,6 @@ extern const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0;extern const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0;extern const struct iwl_cfg killer1650x_2ax_cfg;extern const struct iwl_cfg killer1650w_2ax_cfg; -extern const struct iwl_cfg iwl9461_2ac_cfg_qu_b0_jf_b0; -extern const struct iwl_cfg iwl9462_2ac_cfg_qu_b0_jf_b0; -extern const struct iwl_cfg iwl9560_2ac_cfg_qu_b0_jf_b0; -extern const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0; -extern const struct iwl_cfg iwl9461_2ac_cfg_qu_c0_jf_b0; -extern const struct iwl_cfg iwl9462_2ac_cfg_qu_c0_jf_b0; -extern const struct iwl_cfg iwl9560_2ac_cfg_qu_c0_jf_b0; -extern const struct iwl_cfg iwl9560_2ac_160_cfg_qu_c0_jf_b0; -extern const struct iwl_cfg iwl22000_2ax_cfg_jf;extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0_f0;extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0_f0;extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0;
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +3 -22
@@ -1057,9 +1057,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) }else if (CSR_HW_RF_ID_TYPE_CHIP_ID (iwl_trans->hw_rf_id) ==CSR_HW_RF_ID_TYPE_CHIP_ID (CSR_HW_RF_ID_TYPE_HR )) { iwl_trans->cfg = &iwl_ax101_cfg_qu_hr; - }else if (CSR_HW_RF_ID_TYPE_CHIP_ID (iwl_trans->hw_rf_id) == -CSR_HW_RF_ID_TYPE_CHIP_ID (CSR_HW_RF_ID_TYPE_JF )) { - iwl_trans->cfg = &iwl22000_2ax_cfg_jf; }else if (CSR_HW_RF_ID_TYPE_CHIP_ID (iwl_trans->hw_rf_id) ==CSR_HW_RF_ID_TYPE_CHIP_ID (CSR_HW_RF_ID_TYPE_HRCDB )) {IWL_ERR (iwl_trans,"RF ID HRCDB is not supported\n" );
@@ -1085,23 +1082,15 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)/* * This is a hack to switch from Qu B0 to Qu C0. We need to -* do this for all cfgs that use Qu B0. All this code is in -* urgent need for a refactor, but for now this is the easiest -* thing to do to support Qu C-step. +* do this for all cfgs that use Qu B0, except for those using +* Jf, which have already been moved to the new table. The +* rest must be removed once we convert Qu with Hr as well. */ if (iwl_trans->hw_rev ==CSR_HW_REV_TYPE_QU_C0 ) {if (iwl_trans->cfg == &iwl_ax101_cfg_qu_hr) iwl_trans->cfg = &iwl_ax101_cfg_qu_c0_hr_b0;else if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr) iwl_trans->cfg = &iwl_ax201_cfg_qu_c0_hr_b0; -else if (iwl_trans->cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0) - iwl_trans->cfg = &iwl9461_2ac_cfg_qu_c0_jf_b0; -else if (iwl_trans->cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0) - iwl_trans->cfg = &iwl9462_2ac_cfg_qu_c0_jf_b0; -else if (iwl_trans->cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0) - iwl_trans->cfg = &iwl9560_2ac_cfg_qu_c0_jf_b0; -else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0) - iwl_trans->cfg = &iwl9560_2ac_160_cfg_qu_c0_jf_b0;else if (iwl_trans->cfg == &killer1650s_2ax_cfg_qu_b0_hr_b0) iwl_trans->cfg = &killer1650s_2ax_cfg_qu_c0_hr_b0;else if (iwl_trans->cfg == &killer1650i_2ax_cfg_qu_b0_hr_b0)
@@ -1114,14 +1103,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) iwl_trans->cfg = &iwl_ax101_cfg_quz_hr; else if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr) iwl_trans->cfg = &iwl_ax201_cfg_quz_hr; - else if (iwl_trans->cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0) - iwl_trans->cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc; - else if (iwl_trans->cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0) - iwl_trans->cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc; - else if (iwl_trans->cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0) - iwl_trans->cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc; - else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0) - iwl_trans->cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc; }#endif
Signature · 1 line
2.25.1