Skip to content

Commit 003322b

Browse files
jmberg-inteljmberg-intel
committed
Miri Korenblit says: ==================== iwlwifi features, notably - cleanup of unsupported APIs - add a API range per RF - transport layer cleanups - a few small fixes ==================== Signed-off-by: Johannes Berg <[email protected]>
2 parents 9a44b5e + 24bc49d commit 003322b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+792
-1217
lines changed

‎drivers/net/wireless/intel/iwlwifi/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o
2222
# MAC configurations
2323
iwlwifi-$(CONFIG_IWLMVM) += cfg/9000.o cfg/22000.o
2424
iwlwifi-$(CONFIG_IWLMVM) += cfg/ax210.o
25+
iwlwifi-$(CONFIG_IWLMVM) += cfg/bz.o cfg/sc.o
2526
iwlwifi-$(CONFIG_IWLMLD) += cfg/bz.o cfg/sc.o cfg/dr.o
2627
# RF configurations
2728
iwlwifi-$(CONFIG_IWLMVM) += cfg/rf-jf.o cfg/rf-hr.o cfg/rf-gf.o

‎drivers/net/wireless/intel/iwlwifi/cfg/22000.c

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,8 @@
1919
#define IWL_22000_SMEM_OFFSET 0x400000
2020
#define IWL_22000_SMEM_LEN 0xD0000
2121

22-
#define IWL_QU_B_HR_B_FW_PRE "iwlwifi-Qu-b0-hr-b0"
23-
#define IWL_QU_C_HR_B_FW_PRE "iwlwifi-Qu-c0-hr-b0"
24-
#define IWL_QU_B_JF_B_FW_PRE "iwlwifi-Qu-b0-jf-b0"
25-
#define IWL_QU_C_JF_B_FW_PRE "iwlwifi-Qu-c0-jf-b0"
26-
#define IWL_QUZ_A_HR_B_FW_PRE "iwlwifi-QuZ-a0-hr-b0"
27-
#define IWL_QUZ_A_JF_B_FW_PRE "iwlwifi-QuZ-a0-jf-b0"
2822
#define IWL_CC_A_FW_PRE "iwlwifi-cc-a0"
2923

30-
#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \
31-
IWL_QU_B_HR_B_FW_PRE "-" __stringify(api) ".ucode"
32-
#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \
33-
IWL_QUZ_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"
34-
#define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \
35-
IWL_QUZ_A_JF_B_FW_PRE "-" __stringify(api) ".ucode"
36-
#define IWL_QU_C_HR_B_MODULE_FIRMWARE(api) \
37-
IWL_QU_C_HR_B_FW_PRE "-" __stringify(api) ".ucode"
38-
#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \
39-
IWL_QU_B_JF_B_FW_PRE "-" __stringify(api) ".ucode"
40-
#define IWL_QU_C_JF_B_MODULE_FIRMWARE(api) \
41-
IWL_QU_C_JF_B_FW_PRE "-" __stringify(api) ".ucode"
4224
#define IWL_CC_A_MODULE_FIRMWARE(api) \
4325
IWL_CC_A_FW_PRE "-" __stringify(api) ".ucode"
4426

@@ -132,10 +114,4 @@ const char iwl_ax201_killer_1650s_name[] =
132114
const char iwl_ax201_killer_1650i_name[] =
133115
"Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)";
134116

135-
MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
136-
MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
137-
MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
138-
MODULE_FIRMWARE(IWL_QU_C_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
139-
MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
140-
MODULE_FIRMWARE(IWL_QUZ_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
141117
MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

‎drivers/net/wireless/intel/iwlwifi/cfg/ax210.c

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,12 @@
1313
#define IWL_AX210_UCODE_API_MAX 89
1414

1515
/* Lowest firmware API version supported */
16-
#define IWL_AX210_UCODE_API_MIN 77
16+
#define IWL_AX210_UCODE_API_MIN 89
1717

1818
/* Memory offsets and lengths */
1919
#define IWL_AX210_SMEM_OFFSET 0x400000
2020
#define IWL_AX210_SMEM_LEN 0xD0000
2121

22-
#define IWL_SO_A_JF_B_FW_PRE "iwlwifi-so-a0-jf-b0"
23-
#define IWL_SO_A_HR_B_FW_PRE "iwlwifi-so-a0-hr-b0"
24-
#define IWL_SO_A_GF_A_FW_PRE "iwlwifi-so-a0-gf-a0"
25-
#define IWL_TY_A_GF_A_FW_PRE "iwlwifi-ty-a0-gf-a0"
26-
#define IWL_SO_A_GF4_A_FW_PRE "iwlwifi-so-a0-gf4-a0"
27-
#define IWL_MA_A_HR_B_FW_PRE "iwlwifi-ma-a0-hr-b0"
28-
#define IWL_MA_A_GF_A_FW_PRE "iwlwifi-ma-a0-gf-a0"
29-
#define IWL_MA_A_GF4_A_FW_PRE "iwlwifi-ma-a0-gf4-a0"
30-
#define IWL_MA_B_HR_B_FW_PRE "iwlwifi-ma-b0-hr-b0"
31-
#define IWL_MA_B_GF_A_FW_PRE "iwlwifi-ma-b0-gf-a0"
32-
#define IWL_MA_B_GF4_A_FW_PRE "iwlwifi-ma-b0-gf4-a0"
33-
34-
#define IWL_SO_A_JF_B_MODULE_FIRMWARE(api) \
35-
IWL_SO_A_JF_B_FW_PRE "-" __stringify(api) ".ucode"
36-
#define IWL_SO_A_HR_B_MODULE_FIRMWARE(api) \
37-
IWL_SO_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"
38-
#define IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(api) \
39-
IWL_MA_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"
40-
#define IWL_MA_B_HR_B_FW_MODULE_FIRMWARE(api) \
41-
IWL_MA_B_HR_B_FW_PRE "-" __stringify(api) ".ucode"
42-
4322
static const struct iwl_family_base_params iwl_ax210_base = {
4423
.num_of_queues = 512,
4524
.max_tfd_queue_size = 65536,
@@ -143,14 +122,3 @@ const struct iwl_mac_cfg iwl_ma_mac_cfg = {
143122
.integrated = true,
144123
.umac_prph_offset = 0x300000
145124
};
146-
147-
MODULE_FIRMWARE(IWL_SO_A_JF_B_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
148-
MODULE_FIRMWARE(IWL_SO_A_HR_B_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
149-
IWL_FW_AND_PNVM(IWL_SO_A_GF_A_FW_PRE, IWL_AX210_UCODE_API_MAX);
150-
IWL_FW_AND_PNVM(IWL_TY_A_GF_A_FW_PRE, IWL_AX210_UCODE_API_MAX);
151-
MODULE_FIRMWARE(IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
152-
IWL_FW_AND_PNVM(IWL_MA_A_GF_A_FW_PRE, IWL_AX210_UCODE_API_MAX);
153-
IWL_FW_AND_PNVM(IWL_MA_A_GF4_A_FW_PRE, IWL_AX210_UCODE_API_MAX);
154-
MODULE_FIRMWARE(IWL_MA_B_HR_B_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
155-
IWL_FW_AND_PNVM(IWL_MA_B_GF_A_FW_PRE, IWL_AX210_UCODE_API_MAX);
156-
IWL_FW_AND_PNVM(IWL_MA_B_GF4_A_FW_PRE, IWL_AX210_UCODE_API_MAX);

‎drivers/net/wireless/intel/iwlwifi/cfg/bz.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,12 @@
1919
#define IWL_BZ_SMEM_OFFSET 0x400000
2020
#define IWL_BZ_SMEM_LEN 0xD0000
2121

22-
#define IWL_BZ_A_HR_B_FW_PRE "iwlwifi-bz-a0-hr-b0"
23-
#define IWL_BZ_A_GF_A_FW_PRE "iwlwifi-bz-a0-gf-a0"
24-
#define IWL_BZ_A_GF4_A_FW_PRE "iwlwifi-bz-a0-gf4-a0"
2522
#define IWL_BZ_A_FM_B_FW_PRE "iwlwifi-bz-a0-fm-b0"
2623
#define IWL_BZ_A_FM_C_FW_PRE "iwlwifi-bz-a0-fm-c0"
2724
#define IWL_BZ_A_FM4_B_FW_PRE "iwlwifi-bz-a0-fm4-b0"
2825
#define IWL_GL_B_FM_B_FW_PRE "iwlwifi-gl-b0-fm-b0"
2926
#define IWL_GL_C_FM_C_FW_PRE "iwlwifi-gl-c0-fm-c0"
3027

31-
#define IWL_BZ_A_HR_B_MODULE_FIRMWARE(api) \
32-
IWL_BZ_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"
33-
3428
static const struct iwl_family_base_params iwl_bz_base = {
3529
.num_of_queues = 512,
3630
.max_tfd_queue_size = 65536,
@@ -107,9 +101,6 @@ const struct iwl_mac_cfg iwl_gl_mac_cfg = {
107101
.low_latency_xtal = true,
108102
};
109103

110-
MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));
111-
IWL_FW_AND_PNVM(IWL_BZ_A_GF_A_FW_PRE, IWL_BZ_UCODE_API_MAX);
112-
IWL_FW_AND_PNVM(IWL_BZ_A_GF4_A_FW_PRE, IWL_BZ_UCODE_API_MAX);
113104
IWL_FW_AND_PNVM(IWL_BZ_A_FM_B_FW_PRE, IWL_BZ_UCODE_API_MAX);
114105
IWL_FW_AND_PNVM(IWL_BZ_A_FM_C_FW_PRE, IWL_BZ_UCODE_API_MAX);
115106
IWL_FW_AND_PNVM(IWL_BZ_A_FM4_B_FW_PRE, IWL_BZ_UCODE_API_MAX);

‎drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@
55
*/
66
#include "iwl-config.h"
77

8+
/* Highest firmware API version supported */
9+
#define IWL_GF_UCODE_API_MAX 100
10+
11+
/* Lowest firmware API version supported */
12+
#define IWL_GF_UCODE_API_MIN 98
13+
14+
#define IWL_SO_A_GF_A_FW_PRE "iwlwifi-so-a0-gf-a0"
15+
#define IWL_TY_A_GF_A_FW_PRE "iwlwifi-ty-a0-gf-a0"
16+
#define IWL_MA_A_GF_A_FW_PRE "iwlwifi-ma-a0-gf-a0"
17+
#define IWL_MA_B_GF_A_FW_PRE "iwlwifi-ma-b0-gf-a0"
18+
#define IWL_SO_A_GF4_A_FW_PRE "iwlwifi-so-a0-gf4-a0"
19+
#define IWL_MA_A_GF4_A_FW_PRE "iwlwifi-ma-a0-gf4-a0"
20+
#define IWL_MA_B_GF4_A_FW_PRE "iwlwifi-ma-b0-gf4-a0"
21+
#define IWL_BZ_A_GF_A_FW_PRE "iwlwifi-bz-a0-gf-a0"
22+
#define IWL_BZ_A_GF4_A_FW_PRE "iwlwifi-bz-a0-gf4-a0"
23+
#define IWL_SC_A_GF_A_FW_PRE "iwlwifi-sc-a0-gf-a0"
24+
#define IWL_SC_A_GF4_A_FW_PRE "iwlwifi-sc-a0-gf4-a0"
25+
826
/* NVM versions */
927
#define IWL_GF_NVM_VERSION 0x0a1d
1028

@@ -22,6 +40,8 @@ const struct iwl_rf_cfg iwl_rf_gf = {
2240
.nvm_ver = IWL_GF_NVM_VERSION,
2341
.nvm_type = IWL_NVM_EXT,
2442
.num_rbds = IWL_NUM_RBDS_HE,
43+
.ucode_api_min = IWL_GF_UCODE_API_MIN,
44+
.ucode_api_max = IWL_GF_UCODE_API_MAX,
2545
};
2646

2747
const char iwl_ax210_killer_1675w_name[] =
@@ -40,3 +60,14 @@ const char iwl_ax411_killer_1690i_name[] =
4060
const char iwl_ax210_name[] = "Intel(R) Wi-Fi 6E AX210 160MHz";
4161
const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6E AX211 160MHz";
4262
const char iwl_ax411_name[] = "Intel(R) Wi-Fi 6E AX411 160MHz";
63+
64+
IWL_FW_AND_PNVM(IWL_SO_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);
65+
IWL_FW_AND_PNVM(IWL_TY_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);
66+
IWL_FW_AND_PNVM(IWL_MA_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);
67+
IWL_FW_AND_PNVM(IWL_MA_B_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);
68+
IWL_FW_AND_PNVM(IWL_MA_A_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX);
69+
IWL_FW_AND_PNVM(IWL_MA_B_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX);
70+
IWL_FW_AND_PNVM(IWL_BZ_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);
71+
IWL_FW_AND_PNVM(IWL_BZ_A_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX);
72+
IWL_FW_AND_PNVM(IWL_SC_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX);
73+
IWL_FW_AND_PNVM(IWL_SC_A_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX);

‎drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,41 @@
55
*/
66
#include "iwl-config.h"
77

8+
/* Highest firmware API version supported */
9+
#define IWL_HR_UCODE_API_MAX 100
10+
11+
/* Lowest firmware API version supported */
12+
#define IWL_HR_UCODE_API_MIN 98
13+
14+
#define IWL_QU_B_HR_B_FW_PRE "iwlwifi-Qu-b0-hr-b0"
15+
#define IWL_QU_C_HR_B_FW_PRE "iwlwifi-Qu-c0-hr-b0"
16+
#define IWL_QUZ_A_HR_B_FW_PRE "iwlwifi-QuZ-a0-hr-b0"
17+
#define IWL_SO_A_HR_B_FW_PRE "iwlwifi-so-a0-hr-b0"
18+
#define IWL_MA_A_HR_B_FW_PRE "iwlwifi-ma-a0-hr-b0"
19+
#define IWL_MA_B_HR_B_FW_PRE "iwlwifi-ma-b0-hr-b0"
20+
#define IWL_BZ_A_HR_B_FW_PRE "iwlwifi-bz-a0-hr-b0"
21+
#define IWL_SC_A_HR_A_FW_PRE "iwlwifi-sc-a0-hr-b0"
22+
#define IWL_SC_A_HR_B_FW_PRE "iwlwifi-sc-a0-hr-b0"
23+
24+
#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \
25+
IWL_QU_B_HR_B_FW_PRE "-" __stringify(api) ".ucode"
26+
#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \
27+
IWL_QUZ_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"
28+
#define IWL_QU_C_HR_B_MODULE_FIRMWARE(api) \
29+
IWL_QU_C_HR_B_FW_PRE "-" __stringify(api) ".ucode"
30+
#define IWL_SO_A_HR_B_MODULE_FIRMWARE(api) \
31+
IWL_SO_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"
32+
#define IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(api) \
33+
IWL_MA_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"
34+
#define IWL_MA_B_HR_B_FW_MODULE_FIRMWARE(api) \
35+
IWL_MA_B_HR_B_FW_PRE "-" __stringify(api) ".ucode"
36+
#define IWL_BZ_A_HR_B_MODULE_FIRMWARE(api) \
37+
IWL_BZ_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"
38+
#define IWL_SC_A_HR_A_FW_MODULE_FIRMWARE(api) \
39+
IWL_SC_A_HR_A_FW_PRE "-" __stringify(api) ".ucode"
40+
#define IWL_SC_A_HR_B_FW_MODULE_FIRMWARE(api) \
41+
IWL_SC_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"
42+
843
/* NVM versions */
944
#define IWL_HR_NVM_VERSION 0x0a1d
1045

@@ -20,7 +55,9 @@
2055
}, \
2156
.num_rbds = IWL_NUM_RBDS_HE, \
2257
.nvm_ver = IWL_HR_NVM_VERSION, \
23-
.nvm_type = IWL_NVM_EXT
58+
.nvm_type = IWL_NVM_EXT, \
59+
.ucode_api_min = IWL_HR_UCODE_API_MIN, \
60+
.ucode_api_max = IWL_HR_UCODE_API_MAX
2461

2562
const struct iwl_rf_cfg iwl_rf_hr1 = {
2663
IWL_DEVICE_HR,
@@ -40,3 +77,13 @@ const char iwl_ax101_name[] = "Intel(R) Wi-Fi 6 AX101";
4077
const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz";
4178
const char iwl_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz";
4279
const char iwl_ax203_name[] = "Intel(R) Wi-Fi 6 AX203";
80+
81+
MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));
82+
MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));
83+
MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));
84+
MODULE_FIRMWARE(IWL_SO_A_HR_B_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));
85+
MODULE_FIRMWARE(IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));
86+
MODULE_FIRMWARE(IWL_MA_B_HR_B_FW_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));
87+
MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));
88+
MODULE_FIRMWARE(IWL_SC_A_HR_A_FW_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));
89+
MODULE_FIRMWARE(IWL_SC_A_HR_B_FW_MODULE_FIRMWARE(IWL_HR_UCODE_API_MAX));

‎drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,26 @@
55
*/
66
#include "iwl-config.h"
77

8+
/* Highest firmware API version supported */
9+
#define IWL_JF_UCODE_API_MAX 77
10+
11+
/* Lowest firmware API version supported */
12+
#define IWL_JF_UCODE_API_MIN 77
13+
14+
#define IWL_QU_B_JF_B_FW_PRE "iwlwifi-Qu-b0-jf-b0"
15+
#define IWL_QU_C_JF_B_FW_PRE "iwlwifi-Qu-c0-jf-b0"
16+
#define IWL_QUZ_A_JF_B_FW_PRE "iwlwifi-QuZ-a0-jf-b0"
17+
#define IWL_SO_A_JF_B_FW_PRE "iwlwifi-so-a0-jf-b0"
18+
19+
#define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \
20+
IWL_QUZ_A_JF_B_FW_PRE "-" __stringify(api) ".ucode"
21+
#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \
22+
IWL_QU_B_JF_B_FW_PRE "-" __stringify(api) ".ucode"
23+
#define IWL_QU_C_JF_B_MODULE_FIRMWARE(api) \
24+
IWL_QU_C_JF_B_FW_PRE "-" __stringify(api) ".ucode"
25+
#define IWL_SO_A_JF_B_MODULE_FIRMWARE(api) \
26+
IWL_SO_A_JF_B_FW_PRE "-" __stringify(api) ".ucode"
27+
828
/* NVM versions */
929
#define IWL_JF_NVM_VERSION 0x0a1d
1030

@@ -56,7 +76,9 @@ static const struct iwl_tt_params iwl_jf_tt_params = {
5676
BIT(NL80211_BAND_5GHZ), \
5777
}, \
5878
.nvm_ver = IWL_JF_NVM_VERSION, \
59-
.nvm_type = IWL_NVM_EXT
79+
.nvm_type = IWL_NVM_EXT, \
80+
.ucode_api_min = IWL_JF_UCODE_API_MIN, \
81+
.ucode_api_max = IWL_JF_UCODE_API_MAX
6082

6183
const struct iwl_rf_cfg iwl_rf_jf = {
6284
IWL_DEVICE_JF,
@@ -82,3 +104,8 @@ const char iwl9560_killer_1550i_name[] =
82104
"Killer(R) Wireless-AC 1550i Wireless Network Adapter (9560NGW) 160MHz";
83105
const char iwl9560_killer_1550s_name[] =
84106
"Killer(R) Wireless-AC 1550s Wireless Network Adapter (9560D2W) 160MHz";
107+
108+
MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_JF_UCODE_API_MAX));
109+
MODULE_FIRMWARE(IWL_QU_C_JF_B_MODULE_FIRMWARE(IWL_JF_UCODE_API_MAX));
110+
MODULE_FIRMWARE(IWL_QUZ_A_JF_B_MODULE_FIRMWARE(IWL_JF_UCODE_API_MAX));
111+
MODULE_FIRMWARE(IWL_SO_A_JF_B_MODULE_FIRMWARE(IWL_JF_UCODE_API_MAX));

‎drivers/net/wireless/intel/iwlwifi/cfg/sc.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,12 @@
2424

2525
#define IWL_SC_A_FM_B_FW_PRE "iwlwifi-sc-a0-fm-b0"
2626
#define IWL_SC_A_FM_C_FW_PRE "iwlwifi-sc-a0-fm-c0"
27-
#define IWL_SC_A_HR_A_FW_PRE "iwlwifi-sc-a0-hr-b0"
28-
#define IWL_SC_A_HR_B_FW_PRE "iwlwifi-sc-a0-hr-b0"
29-
#define IWL_SC_A_GF_A_FW_PRE "iwlwifi-sc-a0-gf-a0"
30-
#define IWL_SC_A_GF4_A_FW_PRE "iwlwifi-sc-a0-gf4-a0"
3127
#define IWL_SC_A_WH_A_FW_PRE "iwlwifi-sc-a0-wh-a0"
3228
#define IWL_SC2_A_FM_C_FW_PRE "iwlwifi-sc2-a0-fm-c0"
3329
#define IWL_SC2_A_WH_A_FW_PRE "iwlwifi-sc2-a0-wh-a0"
3430
#define IWL_SC2F_A_FM_C_FW_PRE "iwlwifi-sc2f-a0-fm-c0"
3531
#define IWL_SC2F_A_WH_A_FW_PRE "iwlwifi-sc2f-a0-wh-a0"
3632

37-
#define IWL_SC_A_HR_A_FW_MODULE_FIRMWARE(api) \
38-
IWL_SC_A_HR_A_FW_PRE "-" __stringify(api) ".ucode"
39-
#define IWL_SC_A_HR_B_FW_MODULE_FIRMWARE(api) \
40-
IWL_SC_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"
41-
4233
static const struct iwl_family_base_params iwl_sc_base = {
4334
.num_of_queues = 512,
4435
.max_tfd_queue_size = 65536,
@@ -107,10 +98,6 @@ const struct iwl_mac_cfg iwl_sc_mac_cfg = {
10798

10899
IWL_FW_AND_PNVM(IWL_SC_A_FM_B_FW_PRE, IWL_SC_UCODE_API_MAX);
109100
IWL_FW_AND_PNVM(IWL_SC_A_FM_C_FW_PRE, IWL_SC_UCODE_API_MAX);
110-
MODULE_FIRMWARE(IWL_SC_A_HR_A_FW_MODULE_FIRMWARE(IWL_SC_UCODE_API_MAX));
111-
MODULE_FIRMWARE(IWL_SC_A_HR_B_FW_MODULE_FIRMWARE(IWL_SC_UCODE_API_MAX));
112-
IWL_FW_AND_PNVM(IWL_SC_A_GF_A_FW_PRE, IWL_SC_UCODE_API_MAX);
113-
IWL_FW_AND_PNVM(IWL_SC_A_GF4_A_FW_PRE, IWL_SC_UCODE_API_MAX);
114101
IWL_FW_AND_PNVM(IWL_SC_A_WH_A_FW_PRE, IWL_SC_UCODE_API_MAX);
115102
IWL_FW_AND_PNVM(IWL_SC2_A_FM_C_FW_PRE, IWL_SC_UCODE_API_MAX);
116103
IWL_FW_AND_PNVM(IWL_SC2_A_WH_A_FW_PRE, IWL_SC_UCODE_API_MAX);

‎drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -679,11 +679,11 @@ static int iwl_eeprom_acquire_semaphore(struct iwl_trans *trans)
679679
ret = iwl_poll_bits(trans, CSR_HW_IF_CONFIG_REG,
680680
CSR_HW_IF_CONFIG_REG_EEPROM_OWN_SEM,
681681
IWL_EEPROM_SEM_TIMEOUT);
682-
if (ret >= 0) {
682+
if (!ret) {
683683
IWL_DEBUG_EEPROM(trans->dev,
684684
"Acquired semaphore after %d tries.\n",
685685
count+1);
686-
return ret;
686+
return 0;
687687
}
688688
}
689689

@@ -799,7 +799,7 @@ static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,
799799
ret = iwl_poll_bits(trans, CSR_EEPROM_REG,
800800
CSR_EEPROM_REG_READ_VALID_MSK,
801801
IWL_EEPROM_ACCESS_TIMEOUT);
802-
if (ret < 0) {
802+
if (ret) {
803803
IWL_ERR(trans, "Time out reading OTP[%d]\n", addr);
804804
return ret;
805805
}
@@ -941,14 +941,14 @@ int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size)
941941
return -ENOMEM;
942942

943943
ret = iwl_eeprom_verify_signature(trans, nvm_is_otp);
944-
if (ret < 0) {
944+
if (ret) {
945945
IWL_ERR(trans, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);
946946
goto err_free;
947947
}
948948

949949
/* Make sure driver (instead of uCode) is allowed to read EEPROM */
950950
ret = iwl_eeprom_acquire_semaphore(trans);
951-
if (ret < 0) {
951+
if (ret) {
952952
IWL_ERR(trans, "Failed to acquire EEPROM semaphore.\n");
953953
goto err_free;
954954
}
@@ -994,7 +994,7 @@ int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size)
994994
ret = iwl_poll_bits(trans, CSR_EEPROM_REG,
995995
CSR_EEPROM_REG_READ_VALID_MSK,
996996
IWL_EEPROM_ACCESS_TIMEOUT);
997-
if (ret < 0) {
997+
if (ret) {
998998
IWL_ERR(trans,
999999
"Time out reading EEPROM[%d]\n", addr);
10001000
goto err_unlock;

‎drivers/net/wireless/intel/iwlwifi/fw/api/alive.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,6 @@ struct iwl_alive_ntf_v3 {
8282
struct iwl_umac_alive umac_data;
8383
} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_3 */
8484

85-
struct iwl_alive_ntf_v4 {
86-
__le16 status;
87-
__le16 flags;
88-
struct iwl_lmac_alive lmac_data[2];
89-
struct iwl_umac_alive umac_data;
90-
} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_4 */
91-
92-
struct iwl_alive_ntf_v5 {
93-
__le16 status;
94-
__le16 flags;
95-
struct iwl_lmac_alive lmac_data[2];
96-
struct iwl_umac_alive umac_data;
97-
struct iwl_sku_id sku_id;
98-
} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_5 */
99-
10085
struct iwl_imr_alive_info {
10186
__le64 base_addr;
10287
__le32 size;

0 commit comments

Comments
 (0)