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

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

[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

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

Signed-off-by: Thomas Backlund <tmb@mageia.org>
cc: Luca Coelho <luciano.coelho@intel.com>
cc: stable@vger.kernel.org

---
 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(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
index e8b5ff42f5a8..0b3fe4971fc9 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
@@ -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
 
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/a000.c b/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
index a440140ed8dd..7eade165b747 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
@@ -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
 
-- 
2.14.3

Re: [PATCH] iwlwifi: fix firmware names for 9xxx and a0 series hw

[Luca Coelho]

On Tue, 2017-11-14 at 12:37 +0200, Thomas Backlund wrote:
> 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@mageia.org>
> cc: Luca Coelho <luciano.coelho@intel.com>
> cc: stable@vger.kernel.org
> 
> ---

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.

Re: [PATCH] iwlwifi: fix firmware names for 9xxx and a0 series hw

[Thomas Backlund]

Den 14-11-2017 kl. 12:52, skrev Luca Coelho:
> On Tue, 2017-11-14 at 12:37 +0200, Thomas Backlund wrote:
>> 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 <luciano.coelho-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
>> cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
>>
>> ---
> 
> 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.

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

Thanks.

> --
> Cheers,
> Luca.
> 

--
Thomas

Re: [PATCH] iwlwifi: fix firmware names for 9xxx and a0 series hw

[Luciano Coelho]

On Tue, 2017-11-14 at 13:29 +0200, Thomas Backlund wrote:
> Den 14-11-2017 kl. 12:52, skrev Luca Coelho:
> > On Tue, 2017-11-14 at 12:37 +0200, Thomas Backlund wrote:
> > > 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 <luciano.coelho-ral2JQCrhuEAvxtiuMwx3w@public.gma
> > > ne.org>
> > > cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > > 
> > > ---
> > 
> > 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.

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.

Re: [PATCH] iwlwifi: fix firmware names for 9xxx and a0 series hw

[Greg KH]

On Tue, Nov 14, 2017 at 01:38:20PM +0200, Luciano Coelho wrote:
> On Tue, 2017-11-14 at 13:29 +0200, Thomas Backlund wrote:
> > Den 14-11-2017 kl. 12:52, skrev Luca Coelho:
> > > On Tue, 2017-11-14 at 12:37 +0200, Thomas Backlund wrote:
> > > > 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 <luciano.coelho-ral2JQCrhuEAvxtiuMwx3w@public.gma
> > > > ne.org>
> > > > cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > > > 
> > > > ---
> > > 
> > > 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.
> 
> 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

Re: [PATCH] iwlwifi: fix firmware names for 9xxx and a0 series hw

[Luciano Coelho]

On Tue, 2017-11-14 at 12:48 +0100, Greg KH wrote:
> On Tue, Nov 14, 2017 at 01:38:20PM +0200, Luciano Coelho wrote:
> > On Tue, 2017-11-14 at 13:29 +0200, Thomas Backlund wrote:
> > > Den 14-11-2017 kl. 12:52, skrev Luca Coelho:
> > > > On Tue, 2017-11-14 at 12:37 +0200, Thomas Backlund wrote:
> > > > > 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: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > > > > 
> > > > > ---
> > > > 
> > > > 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.
> > 
> > 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.

Right, thanks for confirming my vague recollection. :)

I've turned that into a "Cc: stable@vger.kernel.org # 4.13", since
that's the first version that actually supports these HW versions.

--
Cheers,
Luca.