* [PATCH 1/2] qla2xxx: Remove unavailable firmware files
2015-10-14 15:57 [PATCH 0/2] qla2xxx: Patches for 4.3.0-rc5+ scsi "misc" branch Himanshu Madhani
@ 2015-10-14 15:57 ` Himanshu Madhani
2015-10-14 23:33 ` Julian Calaby
2015-10-15 7:45 ` Hannes Reinecke
0 siblings, 2 replies; 4+ messages in thread
From: Himanshu Madhani @ 2015-10-14 15:57 UTC (permalink / raw)
To: jbottomley, hch
Cc: giridhar.malavali, himanshu.madhani, andrew.vasquez, linux-scsi
Remove firmware binary names for the ISPs, which
are not submitted to linux-firmware
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
---
drivers/scsi/qla2xxx/qla_os.c | 29 -----------------------------
1 files changed, 0 insertions(+), 29 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index c2dd17b..41aca16 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -5293,11 +5293,6 @@ qla2x00_timer(scsi_qla_host_t *vha)
#define FW_ISP2322 3
#define FW_ISP24XX 4
#define FW_ISP25XX 5
-#define FW_ISP81XX 6
-#define FW_ISP82XX 7
-#define FW_ISP2031 8
-#define FW_ISP8031 9
-#define FW_ISP27XX 10
#define FW_FILE_ISP21XX "ql2100_fw.bin"
#define FW_FILE_ISP22XX "ql2200_fw.bin"
@@ -5305,12 +5300,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);
@@ -5321,11 +5310,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 *
@@ -5346,16 +5330,6 @@ qla2x00_request_firmware(scsi_qla_host_t *vha)
blob = &qla_fw_blobs[FW_ISP24XX];
} else if (IS_QLA25XX(ha)) {
blob = &qla_fw_blobs[FW_ISP25XX];
- } else if (IS_QLA81XX(ha)) {
- blob = &qla_fw_blobs[FW_ISP81XX];
- } else if (IS_QLA82XX(ha)) {
- blob = &qla_fw_blobs[FW_ISP82XX];
- } else if (IS_QLA2031(ha)) {
- blob = &qla_fw_blobs[FW_ISP2031];
- } else if (IS_QLA8031(ha)) {
- blob = &qla_fw_blobs[FW_ISP8031];
- } else if (IS_QLA27XX(ha)) {
- blob = &qla_fw_blobs[FW_ISP27XX];
} else {
return NULL;
}
@@ -5844,6 +5818,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);
--
1.7.7
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] qla2xxx: Remove unavailable firmware files
2015-10-14 15:57 ` [PATCH 1/2] qla2xxx: Remove unavailable firmware files Himanshu Madhani
@ 2015-10-14 23:33 ` Julian Calaby
2015-10-15 7:45 ` Hannes Reinecke
1 sibling, 0 replies; 4+ messages in thread
From: Julian Calaby @ 2015-10-14 23:33 UTC (permalink / raw)
To: Himanshu Madhani
Cc: James Bottomley, Christoph Hellwig, Giridhar Malavali,
andrew.vasquez, linux-scsi
Hi Himanshu,
On Thu, Oct 15, 2015 at 2:57 AM, Himanshu Madhani
<himanshu.madhani@qlogic.com> wrote:
> Remove firmware binary names for the ISPs, which
> are not submitted to linux-firmware
>
> Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
For what it's worth, this looks good to me.
Thanks,
--
Julian Calaby
Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] qla2xxx: Remove unavailable firmware files
2015-10-14 15:57 ` [PATCH 1/2] qla2xxx: Remove unavailable firmware files Himanshu Madhani
2015-10-14 23:33 ` Julian Calaby
@ 2015-10-15 7:45 ` Hannes Reinecke
1 sibling, 0 replies; 4+ messages in thread
From: Hannes Reinecke @ 2015-10-15 7:45 UTC (permalink / raw)
To: Himanshu Madhani, jbottomley, hch
Cc: giridhar.malavali, andrew.vasquez, linux-scsi
On 10/14/2015 05:57 PM, Himanshu Madhani wrote:
> Remove firmware binary names for the ISPs, which
> are not submitted to linux-firmware
>
> Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> ---
> drivers/scsi/qla2xxx/qla_os.c | 29 -----------------------------
> 1 files changed, 0 insertions(+), 29 deletions(-)
>
Thank you. This has cause quite some confusion with some customers.
Reviewed-by: Hannes Reinecke <hare@suse.de>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] qla2xxx: Remove unavailable firmware files
@ 2015-11-17 21:04 Xose Vazquez Perez
0 siblings, 0 replies; 4+ messages in thread
From: Xose Vazquez Perez @ 2015-11-17 21:04 UTC (permalink / raw)
To: Himanshu Madhani, Giridhar Malavali, Qlogic internal list,
Julian Calaby, Hannes Reinecke, Martin Petersen,
James E.J. Bottomley , linux-scsi, Michal Marek
On 10/14/2015 05:57 PM, Himanshu Madhani wrote:
> Remove firmware binary names for the ISPs, which
> are not submitted to linux-firmware
>
> Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> ---
> drivers/scsi/qla2xxx/qla_os.c | 29 -----------------------------
> 1 files changed, 0 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
> index c2dd17b..41aca16 100644
> --- a/drivers/scsi/qla2xxx/qla_os.c
> +++ b/drivers/scsi/qla2xxx/qla_os.c
> @@ -5293,11 +5293,6 @@ qla2x00_timer(scsi_qla_host_t *vha)
> #define FW_ISP2322 3
> #define FW_ISP24XX 4
> #define FW_ISP25XX 5
> -#define FW_ISP81XX 6
> -#define FW_ISP82XX 7
> -#define FW_ISP2031 8
> -#define FW_ISP8031 9
> -#define FW_ISP27XX 10
>
> #define FW_FILE_ISP21XX "ql2100_fw.bin"
> #define FW_FILE_ISP22XX "ql2200_fw.bin"
> @@ -5305,12 +5300,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);
>
> @@ -5321,11 +5310,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 *
> @@ -5346,16 +5330,6 @@ qla2x00_request_firmware(scsi_qla_host_t *vha)
> blob = &qla_fw_blobs[FW_ISP24XX];
> } else if (IS_QLA25XX(ha)) {
> blob = &qla_fw_blobs[FW_ISP25XX];
> - } else if (IS_QLA81XX(ha)) {
> - blob = &qla_fw_blobs[FW_ISP81XX];
> - } else if (IS_QLA82XX(ha)) {
> - blob = &qla_fw_blobs[FW_ISP82XX];
> - } else if (IS_QLA2031(ha)) {
> - blob = &qla_fw_blobs[FW_ISP2031];
> - } else if (IS_QLA8031(ha)) {
> - blob = &qla_fw_blobs[FW_ISP8031];
> - } else if (IS_QLA27XX(ha)) {
> - blob = &qla_fw_blobs[FW_ISP27XX];
> } else {
> return NULL;
> }
> @@ -5844,6 +5818,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);
> --
> 1.7.7
You should remove this info also from Kconfig:
2031 ql2600_fw.bin
8031 ql8300_fw.bin
27xx ql2700_fw.bin
Anyway,
Reviewed-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
BTW, linux-firmware still contains release 7.03.00 of ql2400_fw.bin and ql2500_fw.bin .
SLES-11_SP4 already brings 8.00.00. And I did test 8.01.00 time ago and it worked flawlessly.
So, please *regularly* send latest FW releases to linux-firmware.git
-thanks-
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-11-17 21:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-17 21:04 [PATCH 1/2] qla2xxx: Remove unavailable firmware files Xose Vazquez Perez
-- strict thread matches above, loose matches on Subject: below --
2015-10-14 15:57 [PATCH 0/2] qla2xxx: Patches for 4.3.0-rc5+ scsi "misc" branch Himanshu Madhani
2015-10-14 15:57 ` [PATCH 1/2] qla2xxx: Remove unavailable firmware files Himanshu Madhani
2015-10-14 23:33 ` Julian Calaby
2015-10-15 7:45 ` Hannes Reinecke
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).