Skip to contentSkip to conversation

iwlwifi: fix firmware names for 9xxx and a0 series hw

PATCH In review Thomas Backlund 4 participants 6 messages Nov 14, 2017

Subsystems (2)
Stable branch Intel wireless wifi link (iwlwifi)
lore
Share & tools
lore

Thomas Backlund

author
#0 lore raw

PATCH 1/1 iwlwifi: fix firmware names for 9xxx and a0 series hw

iwlwifi 9xxx and a0 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 <[email protected]>
cc Luca Coelho <[email protected]>
cc [email protected]
---
 drivers/net/wireless/intel/iwlwifi/cfg/9000.c |  8 ++++----
 drivers/net/wireless/intel/iwlwifi/cfg/a000.c | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)
drivers/net/wireless/intel/iwlwifi/cfg/9000.c +4 -4
index e8b5ff42f5a8..0b3fe4971fc9 100644
@@ -77,13 +77,13 @@
 #define  IWL9260A_FW_PRE "iwlwifi-9260-th-a0-jf-a0-"
 #define  IWL9260B_FW_PRE "iwlwifi-9260-th-b0-jf-b0-"
 #define IWL9000_MODULE_FIRMWARE(api) \
-	IWL9000_FW_PRE "-" __stringify(api) ".ucode"
+	IWL9000_FW_PRE __stringify(api) ".ucode"
 #define IWL9000RFB_MODULE_FIRMWARE(api) \
-	IWL9000RFB_FW_PRE "-" __stringify(api) ".ucode"
+	IWL9000RFB_FW_PRE __stringify(api) ".ucode"
 #define IWL9260A_MODULE_FIRMWARE(api) \
-	IWL9260A_FW_PRE "-" __stringify(api) ".ucode"
+	IWL9260A_FW_PRE __stringify(api) ".ucode"
 #define IWL9260B_MODULE_FIRMWARE(api) \
-	IWL9260B_FW_PRE "-" __stringify(api) ".ucode"
+	IWL9260B_FW_PRE __stringify(api) ".ucode"
 
 #define NVM_HW_SECTION_NUM_FAMILY_9000		10
drivers/net/wireless/intel/iwlwifi/cfg/a000.c +5 -5
index a440140ed8dd..7eade165b747 100644
@@ -80,15 +80,15 @@
 #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"
+	IWL_A000_HR_FW_PRE __stringify(api) ".ucode"
 #define IWL_A000_JF_MODULE_FIRMWARE(api) \
-	IWL_A000_JF_FW_PRE "-" __stringify(api) ".ucode"
+	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"
+	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"
+	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"
+	IWL_A000_HR_A0_FW_PRE __stringify(api) ".ucode"
 
 #define NVM_HW_SECTION_NUM_FAMILY_A000		10
Signature · 1 line
2.14.3
#1 lore raw
Quoted 14 lines · Thomas Backlund

iwlwifi 9xxx and a0 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
Quoted 7 lines

Fix that by dropping the extra adding of '"-"'.

Signed-off-by Thomas Backlund <[email protected]>
cc Luca Coelho <[email protected]>
cc [email protected]

---

Looks good, thanks!

Though I'm not sure this is worth sending to stable... Why do you think it's needed?

Anyway, I'm applying it in our internal tree and it will reach the mainline following our normal upstreaming process.

--
Cheers,
Luca.

author
#2 lore raw

Den 14-11-2017 kl. 12:52, skrev Luca Coelho:

Quoted 21 lines · Thomas Backlund
Quoted 20 lines

iwlwifi 9xxx and a0 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 <[email protected]>
cc Luca Coelho <[email protected]>
cc [email protected]
Quoted 7 lines
Quoted 1 line

---

Looks good, thanks!

Though I'm not sure this is worth sending to stable... Why do you think it's needed?

As 4.14 is a -longterm kernel and afaik atleast 9xxx series hw is out there I thought it would be good to have it fixed there...

but in the end it's your call for upstream stable or not

I'll add it to the Mageia distrib kernels anyway.

Quoted 3 lines

Anyway, I'm applying it in our internal tree and it will reach the mainline following our normal upstreaming process.

Thanks.

Quoted 4 lines

--
Cheers,
Luca.

--
Thomas

#3 lore raw
Quoted 34 lines · Thomas Backlund

Den 14-11-2017 kl. 12:52, skrev Luca Coelho:

Quoted 24 lines · Thomas Backlund
Quoted 23 lines

iwlwifi 9xxx and a0 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-odJJhXpcy38dnm+yROfE0A@public

.gmane.org>
cc: Luca Coelho <[email protected] ne.org>
cc: [email protected]

Quoted 8 lines
Quoted 1 line

---

Looks good, thanks!

Though I'm not sure this is worth sending to stable... Why do you think
it's needed?

Quoted 7 lines

As 4.14 is a -longterm kernel and afaik atleast 9xxx series hw is out
there I thought it would be good to have it fixed there...

but in the end it's your call for upstream stable or not

I'll add it to the Mageia distrib kernels anyway.

Okay, fair enough. I'll add it to stable, it's a very simple and not risky fix anyway. One can claim that userspace may get confused. Actually I think some distros use those values to check which firmwares need to be installed, but I don't recall for sure now.

Thanks!

--
Luca.

#4 lore raw
Quoted 39 lines · Luciano Coelho
Quoted 38 lines · Thomas Backlund

Den 14-11-2017 kl. 12:52, skrev Luca Coelho:

Quoted 24 lines · Thomas Backlund
Quoted 23 lines

iwlwifi 9xxx and a0 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-odJJhXpcy38dnm+yROfE0A@public

.gmane.org>
cc: Luca Coelho <[email protected] ne.org>
cc: [email protected]

Quoted 8 lines
Quoted 1 line

---

Looks good, thanks!

Though I'm not sure this is worth sending to stable... Why do you think
it's needed?

As 4.14 is a -longterm kernel and afaik atleast 9xxx series hw is out
there I thought it would be good to have it fixed there...

Quoted 8 lines
Quoted 3 lines

but in the end it's your call for upstream stable or not

I'll add it to the Mageia distrib kernels anyway.

Okay, fair enough. I'll add it to stable, it's a very simple and not risky fix anyway. One can claim that userspace may get confused. Actually I think some distros use those values to check which firmwares need to be installed, but I don't recall for sure now.

The install scripts use those values, so yes, it would be good to have them be correct.

thanks,

greg k-h

#5 lore raw
Quoted 55 lines · Greg KH
Quoted 45 lines · Luciano Coelho
Quoted 44 lines · Thomas Backlund

Den 14-11-2017 kl. 12:52, skrev Luca Coelho:

Quoted 27 lines · Thomas Backlund
Quoted 26 lines

iwlwifi 9xxx and a0 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-odJJhXpcy38dnm+yROfE0A@pu

blic
.gmane.org>
cc: Luca Coelho <luciano.coelho-ral2JQCrhuEAvxtiuMwx3w@public .gma
ne.org>
cc: [email protected]

Quoted 9 lines
Quoted 1 line

---

Looks good, thanks!

Though I'm not sure this is worth sending to stable... Why do you
think
it's needed?

As 4.14 is a -longterm kernel and afaik atleast 9xxx series hw is out
there I thought it would be good to have it fixed there...

but in the end it's your call for upstream stable or not

Quoted 8 lines
Quoted 1 line

I'll add it to the Mageia distrib kernels anyway.

Okay, fair enough. I'll add it to stable, it's a very simple and not
risky fix anyway. One can claim that userspace may get confused. Actually I think some distros use those values to check which firmwares
need to be installed, but I don't recall for sure now.

Quoted 3 lines

The install scripts use those values, so yes, it would be good to have
them be correct.

Right, thanks for confirming my vague recollection. :)

I've turned that into a "Cc: [email protected] # 4.13", since that's the first version that actually supports these HW versions.

--
Cheers,
Luca.