Skip to content

Commit 486c96a

Browse files
OrenGivonlucacoelho
OrenGivon
authored and
lucacoelho
committed
iwlwifi: rename and reorder 9000 series configuration structs
Rename and reorder the 9000 series configuration structs: - struct containing configuration of 5165 was renamed to 9000. Signed-off-by: Oren Givon <[email protected]> Signed-off-by: Luca Coelho <[email protected]>
1 parent 19aefa4 commit 486c96a

File tree

3 files changed

+50
-51
lines changed

3 files changed

+50
-51
lines changed

‎drivers/net/wireless/intel/iwlwifi/iwl-9000.c

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@
7272
#define IWL9000_SMEM_OFFSET 0x400000
7373
#define IWL9000_SMEM_LEN 0x68000
7474

75-
#define IWL9000_FW_PRE "iwlwifi-9000-pu-a0-lc-a0-"
75+
#define IWL9000_FW_PRE "iwlwifi-9000-pu-a0-jf-a0-"
7676
#define IWL9260_FW_PRE "iwlwifi-9260-th-a0-jf-a0-"
77-
#define IWL9260LC_FW_PRE "iwlwifi-9260-th-a0-lc-a0-"
77+
#define IWL9000LC_FW_PRE "iwlwifi-9000-pu-a0-lc-a0-"
7878
#define IWL9000_MODULE_FIRMWARE(api) \
7979
IWL9000_FW_PRE "-" __stringify(api) ".ucode"
8080
#define IWL9260_MODULE_FIRMWARE(api) \
8181
IWL9260_FW_PRE "-" __stringify(api) ".ucode"
82-
#define IWL9260LC_MODULE_FIRMWARE(api) \
83-
IWL9260LC_FW_PRE "-" __stringify(api) ".ucode"
82+
#define IWL9000LC_MODULE_FIRMWARE(api) \
83+
IWL9000LC_FW_PRE "-" __stringify(api) ".ucode"
8484

8585
#define NVM_HW_SECTION_NUM_FAMILY_9000 10
8686

@@ -147,40 +147,41 @@ static const struct iwl_tt_params iwl9000_tt_params = {
147147
.rf_id = true
148148

149149
const struct iwl_cfg iwl9260_2ac_cfg = {
150-
.name = "Intel(R) Dual Band Wireless AC 9260",
151-
.fw_name_pre = IWL9260_FW_PRE,
152-
IWL_DEVICE_9000,
153-
.ht_params = &iwl9000_ht_params,
154-
.nvm_ver = IWL9000_NVM_VERSION,
155-
.nvm_calib_ver = IWL9000_TX_POWER_VERSION,
156-
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
150+
.name = "Intel(R) Dual Band Wireless AC 9260",
151+
.fw_name_pre = IWL9260_FW_PRE,
152+
IWL_DEVICE_9000,
153+
.ht_params = &iwl9000_ht_params,
154+
.nvm_ver = IWL9000_NVM_VERSION,
155+
.nvm_calib_ver = IWL9000_TX_POWER_VERSION,
156+
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
157+
};
158+
159+
const struct iwl_cfg iwl9000_2ac_cfg = {
160+
.name = "Intel(R) Dual Band Wireless AC 9000",
161+
.fw_name_pre = IWL9000_FW_PRE,
162+
IWL_DEVICE_9000,
163+
.ht_params = &iwl9000_ht_params,
164+
.nvm_ver = IWL9000_NVM_VERSION,
165+
.nvm_calib_ver = IWL9000_TX_POWER_VERSION,
166+
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
167+
.integrated = true,
157168
};
158169

159170
/*
160171
* TODO the struct below is for internal testing only this should be
161172
* removed by EO 2016~
162173
*/
163-
const struct iwl_cfg iwl9260lc_2ac_cfg = {
164-
.name = "Intel(R) Dual Band Wireless AC 9260",
165-
.fw_name_pre = IWL9260LC_FW_PRE,
166-
IWL_DEVICE_9000,
167-
.ht_params = &iwl9000_ht_params,
168-
.nvm_ver = IWL9000_NVM_VERSION,
169-
.nvm_calib_ver = IWL9000_TX_POWER_VERSION,
170-
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
171-
};
172-
173-
const struct iwl_cfg iwl5165_2ac_cfg = {
174-
.name = "Intel(R) Dual Band Wireless AC 5165",
175-
.fw_name_pre = IWL9000_FW_PRE,
176-
IWL_DEVICE_9000,
177-
.ht_params = &iwl9000_ht_params,
178-
.nvm_ver = IWL9000_NVM_VERSION,
179-
.nvm_calib_ver = IWL9000_TX_POWER_VERSION,
180-
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
181-
.integrated = true,
174+
const struct iwl_cfg iwl9000lc_2ac_cfg = {
175+
.name = "Intel(R) Dual Band Wireless AC 9000",
176+
.fw_name_pre = IWL9000LC_FW_PRE,
177+
IWL_DEVICE_9000,
178+
.ht_params = &iwl9000_ht_params,
179+
.nvm_ver = IWL9000_NVM_VERSION,
180+
.nvm_calib_ver = IWL9000_TX_POWER_VERSION,
181+
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
182+
.integrated = true,
182183
};
183184

184185
MODULE_FIRMWARE(IWL9000_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
185186
MODULE_FIRMWARE(IWL9260_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
186-
MODULE_FIRMWARE(IWL9260LC_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
187+
MODULE_FIRMWARE(IWL9000LC_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

‎drivers/net/wireless/intel/iwlwifi/iwl-config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,9 @@ extern const struct iwl_cfg iwl4165_2ac_cfg;
449449
extern const struct iwl_cfg iwl8260_2ac_sdio_cfg;
450450
extern const struct iwl_cfg iwl8265_2ac_sdio_cfg;
451451
extern const struct iwl_cfg iwl4165_2ac_sdio_cfg;
452+
extern const struct iwl_cfg iwl9000_2ac_cfg;
453+
extern const struct iwl_cfg iwl9000lc_2ac_cfg;
452454
extern const struct iwl_cfg iwl9260_2ac_cfg;
453-
extern const struct iwl_cfg iwl9260lc_2ac_cfg;
454-
extern const struct iwl_cfg iwl5165_2ac_cfg;
455455
extern const struct iwl_cfg iwla000_2ac_cfg;
456456
#endif /* CONFIG_IWLMVM */
457457

‎drivers/net/wireless/intel/iwlwifi/pcie/drv.c

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -504,18 +504,18 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
504504
/* 9000 Series */
505505
{IWL_PCI_DEVICE(0x2526, 0x0000, iwl9260_2ac_cfg)},
506506
{IWL_PCI_DEVICE(0x2526, 0x0010, iwl9260_2ac_cfg)},
507-
{IWL_PCI_DEVICE(0x9DF0, 0x0A10, iwl9260_2ac_cfg)},
508-
{IWL_PCI_DEVICE(0x9DF0, 0x0010, iwl9260_2ac_cfg)},
509-
{IWL_PCI_DEVICE(0x9DF0, 0x0210, iwl9260_2ac_cfg)},
510-
{IWL_PCI_DEVICE(0x9DF0, 0x0410, iwl9260_2ac_cfg)},
511-
{IWL_PCI_DEVICE(0x9DF0, 0x0610, iwl9260_2ac_cfg)},
512-
{IWL_PCI_DEVICE(0x9DF0, 0x0310, iwl5165_2ac_cfg)},
513-
{IWL_PCI_DEVICE(0x9DF0, 0x0000, iwl5165_2ac_cfg)},
514-
{IWL_PCI_DEVICE(0x9DF0, 0x0510, iwl5165_2ac_cfg)},
515-
{IWL_PCI_DEVICE(0x9DF0, 0x2010, iwl5165_2ac_cfg)},
516-
{IWL_PCI_DEVICE(0x2526, 0x1420, iwl5165_2ac_cfg)},
517-
{IWL_PCI_DEVICE(0x9DF0, 0x0710, iwl5165_2ac_cfg)},
518-
{IWL_PCI_DEVICE(0x9DF0, 0x2A10, iwl5165_2ac_cfg)},
507+
{IWL_PCI_DEVICE(0x9DF0, 0x0A10, iwl9000_2ac_cfg)},
508+
{IWL_PCI_DEVICE(0x9DF0, 0x0010, iwl9000_2ac_cfg)},
509+
{IWL_PCI_DEVICE(0x9DF0, 0x0210, iwl9000_2ac_cfg)},
510+
{IWL_PCI_DEVICE(0x9DF0, 0x0410, iwl9000_2ac_cfg)},
511+
{IWL_PCI_DEVICE(0x9DF0, 0x0610, iwl9000_2ac_cfg)},
512+
{IWL_PCI_DEVICE(0x9DF0, 0x0310, iwl9000_2ac_cfg)},
513+
{IWL_PCI_DEVICE(0x9DF0, 0x0000, iwl9000_2ac_cfg)},
514+
{IWL_PCI_DEVICE(0x9DF0, 0x0510, iwl9000_2ac_cfg)},
515+
{IWL_PCI_DEVICE(0x9DF0, 0x2010, iwl9000_2ac_cfg)},
516+
{IWL_PCI_DEVICE(0x2526, 0x1420, iwl9000_2ac_cfg)},
517+
{IWL_PCI_DEVICE(0x9DF0, 0x0710, iwl9000_2ac_cfg)},
518+
{IWL_PCI_DEVICE(0x9DF0, 0x2A10, iwl9000_2ac_cfg)},
519519

520520
/* a000 Series */
521521
{IWL_PCI_DEVICE(0x2720, 0x0A10, iwla000_2ac_cfg)},
@@ -608,7 +608,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
608608
{
609609
const struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
610610
const struct iwl_cfg *cfg_7265d __maybe_unused = NULL;
611-
const struct iwl_cfg *cfg_9260lc __maybe_unused = NULL;
612611
struct iwl_trans *iwl_trans;
613612
int ret;
614613

@@ -637,11 +636,10 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
637636
}
638637

639638
if (iwl_trans->cfg->rf_id) {
640-
if (cfg == &iwl9260_2ac_cfg)
641-
cfg_9260lc = &iwl9260lc_2ac_cfg;
642-
if (cfg_9260lc && iwl_trans->hw_rf_id == CSR_HW_RF_ID_TYPE_LC) {
643-
cfg = cfg_9260lc;
644-
iwl_trans->cfg = cfg_9260lc;
639+
if (cfg == &iwl9000_2ac_cfg &&
640+
iwl_trans->hw_rf_id == CSR_HW_RF_ID_TYPE_LC) {
641+
cfg = &iwl9000lc_2ac_cfg;
642+
iwl_trans->cfg = cfg;
645643
}
646644
}
647645
#endif

0 commit comments

Comments
 (0)