diff mbox

[for-next] qla2xxx: delete references to unused firmware files

Message ID 1431776978-23510-1-git-send-email-xose.vazquez@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Xose Vazquez Perez May 16, 2015, 11:49 a.m. UTC 
There is no trace of these files in linux-firmware.git,
kernel sources, linux distributions or vendor site [1] :
ql8100_fw.bin ql8200_fw.bin ql2600_fw.bin ql8300_fw.bin ql2700_fw.bin

[1] http://ldriver.qlogic.com/firmware/

Cc: <qla2xxx-upstream@qlogic.com>
Cc: James E.J. Bottomley <JBottomley@odin.com>
Cc: <linux-scsi@vger.kernel.org>
Cc: Linux Firmware Maintainers <linux-firmware@kernel.org>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
---
 drivers/scsi/qla2xxx/Kconfig  |  3 ---
 drivers/scsi/qla2xxx/qla_os.c | 13 -------------
 2 files changed, 16 deletions(-)

Comments

Himanshu Madhani May 16, 2015, 11:26 p.m. UTC | #1 
On 5/16/15, 4:49 AM, "Xose Vazquez Perez" <xose.vazquez@gmail.com> wrote:

>There is no trace of these files in linux-firmware.git,
>kernel sources, linux distributions or vendor site [1] :
>ql8100_fw.bin ql8200_fw.bin ql2600_fw.bin ql8300_fw.bin ql2700_fw.bin
>
>[1] http://ldriver.qlogic.com/firmware/
>
>Cc: <qla2xxx-upstream@qlogic.com>
>Cc: James E.J. Bottomley <JBottomley@odin.com>
>Cc: <linux-scsi@vger.kernel.org>
>Cc: Linux Firmware Maintainers <linux-firmware@kernel.org>
>Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
>---
> drivers/scsi/qla2xxx/Kconfig  |  3 ---
> drivers/scsi/qla2xxx/qla_os.c | 13 -------------
> 2 files changed, 16 deletions(-)
>
>diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
>index 33f60c9..113e6c9 100644
>--- a/drivers/scsi/qla2xxx/Kconfig
>+++ b/drivers/scsi/qla2xxx/Kconfig
>@@ -18,9 +18,6 @@ config SCSI_QLA_FC
> 	2322, 6322        ql2322_fw.bin
> 	24xx, 54xx        ql2400_fw.bin
> 	25xx              ql2500_fw.bin
>-	2031              ql2600_fw.bin
>-	8031              ql8300_fw.bin
>-	27xx              ql2700_fw.bin
> 
> 	Upon request, the driver caches the firmware image until
> 	the driver is unloaded.
>diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
>index 7462dd7..a9d0a82 100644
>--- a/drivers/scsi/qla2xxx/qla_os.c
>+++ b/drivers/scsi/qla2xxx/qla_os.c
>@@ -5296,11 +5296,6 @@ qla2x00_timer(scsi_qla_host_t *vha)
> #define FW_FILE_ISP2322	"ql2322_fw.bin"
> #define FW_FILE_ISP24XX	"ql2400_fw.bin"
> #define FW_FILE_ISP25XX	"ql2500_fw.bin"
>-#define FW_FILE_ISP81XX	"ql8100_fw.bin"
>-#define FW_FILE_ISP82XX	"ql8200_fw.bin"
>-#define FW_FILE_ISP2031	"ql2600_fw.bin"
>-#define FW_FILE_ISP8031	"ql8300_fw.bin"
>-#define FW_FILE_ISP27XX	"ql2700_fw.bin"
> 
> 
> static DEFINE_MUTEX(qla_fw_lock);
>@@ -5312,11 +5307,6 @@ static struct fw_blob qla_fw_blobs[FW_BLOBS] = {
> 	{ .name = FW_FILE_ISP2322, .segs = { 0x800, 0x1c000, 0x1e000, 0 }, },
> 	{ .name = FW_FILE_ISP24XX, },
> 	{ .name = FW_FILE_ISP25XX, },
>-	{ .name = FW_FILE_ISP81XX, },
>-	{ .name = FW_FILE_ISP82XX, },
>-	{ .name = FW_FILE_ISP2031, },
>-	{ .name = FW_FILE_ISP8031, },
>-	{ .name = FW_FILE_ISP27XX, },
> };
> 
> struct fw_blob *
>@@ -5834,6 +5824,3 @@ MODULE_FIRMWARE(FW_FILE_ISP2300);
> MODULE_FIRMWARE(FW_FILE_ISP2322);
> MODULE_FIRMWARE(FW_FILE_ISP24XX);
> MODULE_FIRMWARE(FW_FILE_ISP25XX);
>-MODULE_FIRMWARE(FW_FILE_ISP2031);
>-MODULE_FIRMWARE(FW_FILE_ISP8031);
>-MODULE_FIRMWARE(FW_FILE_ISP27XX);
>-- 
>2.1.0
>
>--
>To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html

Please note that we will send firmware binaries soon for these files.

>
Xose Vazquez Perez May 17, 2015, 12:04 a.m. UTC | #2 
On 05/17/2015 01:26 AM, Himanshu Madhani wrote:

> Please note that we will send firmware binaries soon for these files.

What does "soon" mean ?

git blame shows:
3a03eb797 (Andrew Vasquez         2009-01-05 11:18:11 -0800 5299) #define FW_FILE_ISP81XX       "ql8100_fw.bin"
a9083016a (Giridhar Malavali      2010-04-12 17:59:55 -0700 5300) #define FW_FILE_ISP82XX       "ql8200_fw.bin"
6246b8a1d (Giridhar Malavali      2012-02-09 11:15:34 -0800 5301) #define FW_FILE_ISP2031       "ql2600_fw.bin"
6246b8a1d (Giridhar Malavali      2012-02-09 11:15:34 -0800 5302) #define FW_FILE_ISP8031       "ql8300_fw.bin"
2c5bbbb25 (Joe Carnuccio          2014-04-11 16:54:13 -0400 5303) #define FW_FILE_ISP27XX       "ql2700_fw.bin"
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Himanshu Madhani May 18, 2015, 5 p.m. UTC | #3 
On 5/16/15, 5:04 PM, "Xose Vazquez Perez" <xose.vazquez@gmail.com> wrote:

>On 05/17/2015 01:26 AM, Himanshu Madhani wrote:
>
>> Please note that we will send firmware binaries soon for these files.
>
>What does "soon" mean ?
>
>git blame shows:
>3a03eb797 (Andrew Vasquez         2009-01-05 11:18:11 -0800 5299) #define
>FW_FILE_ISP81XX       "ql8100_fw.bin"
>a9083016a (Giridhar Malavali      2010-04-12 17:59:55 -0700 5300) #define
>FW_FILE_ISP82XX       "ql8200_fw.bin"
>6246b8a1d (Giridhar Malavali      2012-02-09 11:15:34 -0800 5301) #define
>FW_FILE_ISP2031       "ql2600_fw.bin"
>6246b8a1d (Giridhar Malavali      2012-02-09 11:15:34 -0800 5302) #define
>FW_FILE_ISP8031       "ql8300_fw.bin"
>2c5bbbb25 (Joe Carnuccio          2014-04-11 16:54:13 -0400 5303) #define
>FW_FILE_ISP27XX       "ql2700_fw.bin"

Hi, 

Sorry for misleading response. The reason we would like to leave these
lines into mainline kernel is to facilitate us to debug
And triage issues which might involve firmware binaries.

Thanks
Himanshu

>
Julian Calaby May 19, 2015, 1:50 a.m. UTC | #4 
Hi Himanshu,

On Tue, May 19, 2015 at 3:00 AM, Himanshu Madhani
<himanshu.madhani@qlogic.com> wrote:
>
> On 5/16/15, 5:04 PM, "Xose Vazquez Perez" <xose.vazquez@gmail.com> wrote:
>
>>On 05/17/2015 01:26 AM, Himanshu Madhani wrote:
>>
>>> Please note that we will send firmware binaries soon for these files.
>>
>>What does "soon" mean ?
>>
>>git blame shows:
>>3a03eb797 (Andrew Vasquez         2009-01-05 11:18:11 -0800 5299) #define
>>FW_FILE_ISP81XX       "ql8100_fw.bin"
>>a9083016a (Giridhar Malavali      2010-04-12 17:59:55 -0700 5300) #define
>>FW_FILE_ISP82XX       "ql8200_fw.bin"
>>6246b8a1d (Giridhar Malavali      2012-02-09 11:15:34 -0800 5301) #define
>>FW_FILE_ISP2031       "ql2600_fw.bin"
>>6246b8a1d (Giridhar Malavali      2012-02-09 11:15:34 -0800 5302) #define
>>FW_FILE_ISP8031       "ql8300_fw.bin"
>>2c5bbbb25 (Joe Carnuccio          2014-04-11 16:54:13 -0400 5303) #define
>>FW_FILE_ISP27XX       "ql2700_fw.bin"
>
> Hi,
>
> Sorry for misleading response. The reason we would like to leave these
> lines into mainline kernel is to facilitate us to debug
> And triage issues which might involve firmware binaries.

Declaring them with MODULE_FIRMWARE() means that some distro's scripts
will check for these firmware files and warn if the files aren't
available. Consequently Debian's kernel has what appears to be this
exact patch applied.

Do the devices these firmware files are for exist and is there any
chance of the files being released?

Thanks,
Himanshu Madhani May 19, 2015, 3:51 p.m. UTC | #5 
Hi Julian,


On 5/18/15, 6:50 PM, "Julian Calaby" <julian.calaby@gmail.com> wrote:

>Hi Himanshu,
>
>On Tue, May 19, 2015 at 3:00 AM, Himanshu Madhani
><himanshu.madhani@qlogic.com> wrote:
>>
>> On 5/16/15, 5:04 PM, "Xose Vazquez Perez" <xose.vazquez@gmail.com>
>>wrote:
>>
>>>On 05/17/2015 01:26 AM, Himanshu Madhani wrote:
>>>
>>>> Please note that we will send firmware binaries soon for these files.
>>>
>>>What does "soon" mean ?
>>>
>>>git blame shows:
>>>3a03eb797 (Andrew Vasquez         2009-01-05 11:18:11 -0800 5299)
>>>#define
>>>FW_FILE_ISP81XX       "ql8100_fw.bin"
>>>a9083016a (Giridhar Malavali      2010-04-12 17:59:55 -0700 5300)
>>>#define
>>>FW_FILE_ISP82XX       "ql8200_fw.bin"
>>>6246b8a1d (Giridhar Malavali      2012-02-09 11:15:34 -0800 5301)
>>>#define
>>>FW_FILE_ISP2031       "ql2600_fw.bin"
>>>6246b8a1d (Giridhar Malavali      2012-02-09 11:15:34 -0800 5302)
>>>#define
>>>FW_FILE_ISP8031       "ql8300_fw.bin"
>>>2c5bbbb25 (Joe Carnuccio          2014-04-11 16:54:13 -0400 5303)
>>>#define
>>>FW_FILE_ISP27XX       "ql2700_fw.bin"
>>
>> Hi,
>>
>> Sorry for misleading response. The reason we would like to leave these
>> lines into mainline kernel is to facilitate us to debug
>> And triage issues which might involve firmware binaries.
>
>Declaring them with MODULE_FIRMWARE() means that some distro's scripts
>will check for these firmware files and warn if the files aren't
>available. Consequently Debian's kernel has what appears to be this
>exact patch applied.
>
>Do the devices these firmware files are for exist and is there any
>chance of the files being released?

Yes. These devices are available and we read firmware from FLASH on these
adapters. 
At times when debugging/triaging involves firmware, we use binaries that
would be useful 
for quick triaging.

>
>Thanks,
>
>-- 
>Julian Calaby
>
>Email: julian.calaby@gmail.com
>Profile: http://www.google.com/profiles/julian.calaby/

Thanks,
Himanshu

>
Xose Vazquez Perez May 21, 2015, 10:42 a.m. UTC | #6 
On 05/19/2015 05:51 PM, Himanshu Madhani wrote:

> On 5/18/15, 6:50 PM, "Julian Calaby" <julian.calaby@gmail.com> wrote:

>> Do the devices these firmware files are for exist and is there any
>> chance of the files being released?
> 
> Yes. These devices are available and we read firmware from FLASH on these
> adapters. 
> At times when debugging/triaging involves firmware, we use binaries that
> would be useful for quick triaging.

It looks like newer FW files were released on 4/29/2015 in:
http://ldriver.qlogic.com/firmware/rpms/qlogic-firmware-8.01.00-1.noarch.rpm

ql2400_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
ql2500_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
ql2600_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
ql2700_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
ql8300_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $


Could you please send meaningful files to linux-firmware.git ?
And remove irrelevant code from qla_os.c/Kconfig

-thank you-
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Xose Vazquez Perez May 21, 2015, 10:46 a.m. UTC | #7 
On 05/21/2015 12:42 PM, Xose Vazquez Perez wrote:

> ql2400_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
> ql2500_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
> ql2600_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
> ql2700_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
> ql8300_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
                                                      ^^^^^^^ wrong
Those should be:
ql2400_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
ql2500_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP25xx Firmware   Version   8.01.00  $
ql2600_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP83xx Firmware   Version   8.01.00  $
ql2700_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP27xx Firmware   Version   8.01.00  $
ql8300_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP83xx Firmware   Version   8.01.00  $
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Julian Calaby May 22, 2015, 12:03 a.m. UTC | #8 
Hi All,

On Thu, May 21, 2015 at 8:42 PM, Xose Vazquez Perez
<xose.vazquez@gmail.com> wrote:
> On 05/19/2015 05:51 PM, Himanshu Madhani wrote:
>
>> On 5/18/15, 6:50 PM, "Julian Calaby" <julian.calaby@gmail.com> wrote:
>
>>> Do the devices these firmware files are for exist and is there any
>>> chance of the files being released?
>>
>> Yes. These devices are available and we read firmware from FLASH on these
>> adapters.
>> At times when debugging/triaging involves firmware, we use binaries that
>> would be useful for quick triaging.
>
> It looks like newer FW files were released on 4/29/2015 in:
> http://ldriver.qlogic.com/firmware/rpms/qlogic-firmware-8.01.00-1.noarch.rpm
>
> ql2400_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
> ql2500_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
> ql2600_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
> ql2700_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
> ql8300_fw.bin:  COPYRIGHT 2015 QLOGIC CORPORATION   ISP24xx Firmware   Version   8.01.00  $
>
>
> Could you please send meaningful files to linux-firmware.git ?
> And remove irrelevant code from qla_os.c/Kconfig

Assuming that these files are actually sent to linux-firmware.git, the
patch I just sent will hide the stuff for the missing firmware files
behind a new Kconfig symbol, this way it's there for Qlogic, however
hidden from people who don't have access to the files.

Thanks,
diff mbox

Patch

diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index 33f60c9..113e6c9 100644
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -18,9 +18,6 @@  config SCSI_QLA_FC
 	2322, 6322        ql2322_fw.bin
 	24xx, 54xx        ql2400_fw.bin
 	25xx              ql2500_fw.bin
-	2031              ql2600_fw.bin
-	8031              ql8300_fw.bin
-	27xx              ql2700_fw.bin
 
 	Upon request, the driver caches the firmware image until
 	the driver is unloaded.
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 7462dd7..a9d0a82 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -5296,11 +5296,6 @@  qla2x00_timer(scsi_qla_host_t *vha)
 #define FW_FILE_ISP2322	"ql2322_fw.bin"
 #define FW_FILE_ISP24XX	"ql2400_fw.bin"
 #define FW_FILE_ISP25XX	"ql2500_fw.bin"
-#define FW_FILE_ISP81XX	"ql8100_fw.bin"
-#define FW_FILE_ISP82XX	"ql8200_fw.bin"
-#define FW_FILE_ISP2031	"ql2600_fw.bin"
-#define FW_FILE_ISP8031	"ql8300_fw.bin"
-#define FW_FILE_ISP27XX	"ql2700_fw.bin"
 
 
 static DEFINE_MUTEX(qla_fw_lock);
@@ -5312,11 +5307,6 @@  static struct fw_blob qla_fw_blobs[FW_BLOBS] = {
 	{ .name = FW_FILE_ISP2322, .segs = { 0x800, 0x1c000, 0x1e000, 0 }, },
 	{ .name = FW_FILE_ISP24XX, },
 	{ .name = FW_FILE_ISP25XX, },
-	{ .name = FW_FILE_ISP81XX, },
-	{ .name = FW_FILE_ISP82XX, },
-	{ .name = FW_FILE_ISP2031, },
-	{ .name = FW_FILE_ISP8031, },
-	{ .name = FW_FILE_ISP27XX, },
 };
 
 struct fw_blob *
@@ -5834,6 +5824,3 @@  MODULE_FIRMWARE(FW_FILE_ISP2300);
 MODULE_FIRMWARE(FW_FILE_ISP2322);
 MODULE_FIRMWARE(FW_FILE_ISP24XX);
 MODULE_FIRMWARE(FW_FILE_ISP25XX);
-MODULE_FIRMWARE(FW_FILE_ISP2031);
-MODULE_FIRMWARE(FW_FILE_ISP8031);
-MODULE_FIRMWARE(FW_FILE_ISP27XX);