qla2xxx: update qla2xxx driver.
Subsystems (3)
cover qla2xxx: update qla2xxx driver.
James,
Here's an updated patcheset for qla2xxx which hopefully addresses the feedback received from the previous submission. Please queue for post-2.6.14 inclusion.
With the exception of the rather large firmware image updates (direct pointer to bzip'd patch listed -- noted below with '*'), subsequent messages will contain inlined patches.
This patchset is based off of the linux-2.6.git tree with scsi-misc-2.6.git merged, plus the recent rport work submitted by James S:
[PATCH - repost] update fc_transport for removal of block/unblock functions
http://marc.theaimsgroup.com/?l=linux-scsi&m=112965152011520&w=2
Summary of patches:
Correct issue where fcport is prematurely marked DEAD. Add support to dynamically enable/disable ZIO.
Use midlayer's int_to_scsilun() function.
Update license.
* Resync with latest released ISP23xx/63xx firmware -- 3.03.18.
All patches can be found at the following URL:
ftp://ftp.qlogic.com/outgoing/linux/patches/8.x/8.01.02k/
Regards,
Andrew Vasquez
QLogic Corporation
Signature · 1 line
Andrew Vasquez
PATCH 1/5 qla2xxx: Correct issue where fcport is prematurely marked DEAD.
The non-handled failure cases of the Fabric Login mailbox command handling logic would incorrectly mark the fcport as dead and not allow the standard port-down-retry-count logic to manage the transition.
---
drivers/scsi/qla2xxx/qla_init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
043751053f799d81e39ce8a5874957a607b9bcbd
drivers/scsi/qla2xxx/qla_init.c +1 -1
@@ -2878,7 +2878,7 @@ qla2x00_fabric_login(scsi_qla_host_t *ha fcport->d_id.b.domain, fcport->d_id.b.area, fcport->d_id.b.al_pa); fcport->loop_id =FC_NO_LOOP_ID ; -atomic_set (&fcport->state,FCS_DEVICE_DEAD ); + fcport->login_retry =0 ; rval =3 ;break ;
Signature · 1 line
Andrew Vasquez
PATCH 2/5 qla2xxx: Add support to dynamically enable/disable ZIO.
In reply to Andrew VasquezISP23xx and ISP24xx chips have support for an adaptive method of posting SCSI command completions for multiple SCSI commands during a single system interrupt.
SCSI commands are placed on the system response queue without interrupting the host until 1) a delay timer expires; or 2) a SCSI command completes with an error.
As long as the host software (qla2xxx) services the response queue for completions (this polling is done during queuecommand()) within the 'delay timer' period, the firmware will not generate system interrupt.
---
drivers/scsi/qla2xxx/qla_attr.c | 83 +++++++++++++++++++++++++++++++++++++++ drivers/scsi/qla2xxx/qla_def.h | 8 ++++ drivers/scsi/qla2xxx/qla_gbl.h | 3 - drivers/scsi/qla2xxx/qla_init.c | 53 +++++++++++++++++++------ drivers/scsi/qla2xxx/qla_iocb.c | 10 +++++ drivers/scsi/qla2xxx/qla_isr.c | 7 ++- drivers/scsi/qla2xxx/qla_os.c | 23 ----------- 7 files changed, 146 insertions(+), 41 deletions(-)
13c93a518a4cd938f27130eae70e3012a3b7ab65
drivers/scsi/qla2xxx/qla_attr.c +83 -0
@@ -319,6 +319,83 @@ qla2x00_state_show(struct class_device *return len; } +static ssize_t +qla2x00_zio_show (struct class_device *cdev,char *buf) +{ +scsi_qla_host_t *ha =to_qla_host (class_to_shost (cdev)); +int len =0 ; + +switch (ha->zio_mode) { +case QLA_ZIO_MODE_5 : + len +=snprintf (buf + len,PAGE_SIZE -len,"Mode 5\n" ); +break ; +case QLA_ZIO_MODE_6 : + len +=snprintf (buf + len,PAGE_SIZE -len,"Mode 6\n" ); +break ; +case QLA_ZIO_DISABLED : + len +=snprintf (buf + len,PAGE_SIZE -len,"Disabled\n" ); +break ; + } +return len; +} + +static ssize_t +qla2x00_zio_store (struct class_device *cdev,const char *buf,size_t count) +{ +scsi_qla_host_t *ha =to_qla_host (class_to_shost (cdev)); +int val =0 ; +uint16_t zio_mode; + +if (sscanf (buf,"%d" , &val) !=1 ) +return -EINVAL ; + +switch (val) { +case 1 : + zio_mode =QLA_ZIO_MODE_5 ; +break ; +case 2 : + zio_mode =QLA_ZIO_MODE_6 ; +break ; +default : + zio_mode =QLA_ZIO_DISABLED ; +break ; + } + +/* Update per-hba values and queue a reset. */ +if (zio_mode !=QLA_ZIO_DISABLED || ha->zio_mode !=QLA_ZIO_DISABLED ) { + ha->zio_mode = zio_mode; +set_bit (ISP_ABORT_NEEDED , &ha->dpc_flags); + } +return strlen (buf); +} + +static ssize_t +qla2x00_zio_timer_show (struct class_device *cdev,char *buf) +{ +scsi_qla_host_t *ha =to_qla_host (class_to_shost (cdev)); + +return snprintf (buf,PAGE_SIZE ,"%d us\n" , ha->zio_timer *100 ); +} + +static ssize_t +qla2x00_zio_timer_store (struct class_device *cdev,const char *buf, +size_t count) +{ +scsi_qla_host_t *ha =to_qla_host (class_to_shost (cdev)); +int val =0 ; +uint16_t zio_timer; + +if (sscanf (buf,"%d" , &val) !=1 ) +return -EINVAL ; +if (val >25500 || val <100 ) +return -ERANGE ; + + zio_timer = (uint16_t )(val /100 ); + ha->zio_timer = zio_timer; + +return strlen (buf); +} + static CLASS_DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_drvr_version_show, NULL); static CLASS_DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL);
@@ -329,6 +406,10 @@ static CLASS_DEVICE_ATTR(model_name, S_I static CLASS_DEVICE_ATTR(model_desc, S_IRUGO, qla2x00_model_desc_show, NULL); static CLASS_DEVICE_ATTR(pci_info, S_IRUGO, qla2x00_pci_info_show, NULL); static CLASS_DEVICE_ATTR(state, S_IRUGO, qla2x00_state_show, NULL); +static CLASS_DEVICE_ATTR(zio, S_IRUGO | S_IWUSR, qla2x00_zio_show, + qla2x00_zio_store); +static CLASS_DEVICE_ATTR(zio_timer, S_IRUGO | S_IWUSR, qla2x00_zio_timer_show, + qla2x00_zio_timer_store);struct class_device_attribute *qla2x00_host_attrs[] = { &class_device_attr_driver_version,
@@ -340,6 +421,8 @@ struct class_device_attribute *qla2x00_h &class_device_attr_model_desc, &class_device_attr_pci_info, &class_device_attr_state, + &class_device_attr_zio, + &class_device_attr_zio_timer, NULL, };
drivers/scsi/qla2xxx/qla_def.h +8 -0
@@ -824,6 +824,11 @@ typedef struct {#define PD_STATE_WAIT_PORT_LOGOUT_ACK 11 +#define QLA_ZIO_MODE_5 (BIT_2 | BIT_0) +#define QLA_ZIO_MODE_6 (BIT_2 | BIT_1) +#define QLA_ZIO_DISABLED 0 +#define QLA_ZIO_DEFAULT_TIMER 2 +/* * ISP Initialization Control Block. * Little endian except where noted.
@@ -2473,6 +2478,9 @@ typedef struct scsi_qla_host {/* Needed for BEACON */ uint16_t beacon_blink_led;uint16_t beacon_green_on; + +uint16_t zio_mode; +uint16_t zio_timer; } scsi_qla_host_t;
drivers/scsi/qla2xxx/qla_gbl.h +1 -2
@@ -76,8 +76,6 @@ extern char qla2x00_version_str[];extern int ql2xlogintimeout;extern int qlport_down_retry;extern int ql2xplogiabsentdevice; -extern int ql2xenablezio; -extern int ql2xintrdelaytimer;extern int ql2xloginretrycount;extern int ql2xfdmienable;
@@ -223,6 +221,7 @@ extern irqreturn_t qla2100_intr_handler(extern irqreturn_t qla2300_intr_handler (int ,void *,struct pt_regs *);extern irqreturn_t qla24xx_intr_handler (int ,void *,struct pt_regs *);extern void qla2x00_process_response_queue (struct scsi_qla_host *); +extern void qla24xx_process_response_queue (struct scsi_qla_host *);/* * Global Function Prototypes in qla_sup.c source file.
drivers/scsi/qla2xxx/qla_init.c +40 -13
75 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_iocb.c +10 -0
@@ -440,6 +440,11 @@ qla2x00_start_scsi(srb_t *sp)WRT_REG_WORD (ISP_REQ_Q_IN (ha, reg), ha->req_ring_index);RD_REG_WORD_RELAXED (ISP_REQ_Q_IN (ha, reg));/* PCI Posting. */ +/* Manage unprocessed RIO/ZIO commands in response queue. */ +if (ha->flags.process_response_queue && + ha->response_ring_ptr->signature !=RESPONSE_PROCESSED ) +qla2x00_process_response_queue (ha); +spin_unlock_irqrestore (&ha->hardware_lock, flags);return (QLA_SUCCESS );
@@ -877,6 +882,11 @@ qla24xx_start_scsi(srb_t *sp)WRT_REG_DWORD (®->req_q_in, ha->req_ring_index);RD_REG_DWORD_RELAXED (®->req_q_in);/* PCI Posting. */ +/* Manage unprocessed RIO/ZIO commands in response queue. */ +if (ha->flags.process_response_queue && + ha->response_ring_ptr->signature !=RESPONSE_PROCESSED ) +qla24xx_process_response_queue (ha); +spin_unlock_irqrestore (&ha->hardware_lock, flags);return QLA_SUCCESS ;
drivers/scsi/qla2xxx/qla_isr.c +4 -3
@@ -21,13 +21,11 @@static void qla2x00_mbx_completion (scsi_qla_host_t *,uint16_t );static void qla2x00_async_event (scsi_qla_host_t *,uint16_t *);static void qla2x00_process_completed_request (struct scsi_qla_host *,uint32_t ); -void qla2x00_process_response_queue (struct scsi_qla_host *);static void qla2x00_status_entry (scsi_qla_host_t *,void *);static void qla2x00_status_cont_entry (scsi_qla_host_t *,sts_cont_entry_t *);static void qla2x00_error_entry (scsi_qla_host_t *,sts_entry_t *);static void qla2x00_ms_entry (scsi_qla_host_t *,ms_iocb_entry_t *); -void qla24xx_process_response_queue (scsi_qla_host_t *);static void qla24xx_ms_entry (scsi_qla_host_t *,struct ct_entry_24xx *);/**
@@ -651,7 +649,10 @@ qla2x00_async_event(scsi_qla_host_t *ha,"scsi(%ld): [R|Z]IO update completion.\n" , ha->host_no)); -qla2x00_process_response_queue (ha); +if (IS_QLA24XX (ha) ||IS_QLA25XX (ha)) +qla24xx_process_response_queue (ha); +else +qla2x00_process_response_queue (ha);break ;case MBA_DISCARD_RND_FRAME :
drivers/scsi/qla2xxx/qla_os.c +0 -23
@@ -61,19 +61,6 @@ MODULE_PARM_DESC(ql2xplogiabsentdevice,"a Fabric scan. This is needed for several broken switches." "Default is 0 - no PLOGI. 1 - perfom PLOGI."); -int ql2xenablezio =0 ; -module_param (ql2xenablezio, int,S_IRUGO |S_IRUSR ); -MODULE_PARM_DESC (ql2xenablezio, -"Option to enable ZIO:If 1 then enable it otherwise" -" use the default set in the NVRAM." -" Default is 0 : disabled" ); - -int ql2xintrdelaytimer =10 ; -module_param (ql2xintrdelaytimer, int,S_IRUGO |S_IRUSR ); -MODULE_PARM_DESC (ql2xintrdelaytimer, -"ZIO: Waiting time for Firmware before it generates an " -"interrupt to the host to notify completion of request." ); -int ql2xloginretrycount =0 ;module_param (ql2xloginretrycount, int,S_IRUGO |S_IRUSR ); MODULE_PARM_DESC(ql2xloginretrycount,
@@ -402,16 +389,6 @@ qla2x00_queuecommand(struct scsi_cmnd *cif (rval !=QLA_SUCCESS ) goto qc_host_busy_free_sp; -/* Manage unprocessed RIO/ZIO commands in response queue. */ -if (ha->flags.online && ha->flags.process_response_queue && - ha->response_ring_ptr->signature !=RESPONSE_PROCESSED ) { -unsigned long flags; - -spin_lock_irqsave (&ha->hardware_lock, flags); -qla2x00_process_response_queue (ha); -spin_unlock_irqrestore (&ha->hardware_lock, flags); - } -spin_lock_irq (ha->host->host_lock);return 0 ;
Signature · 1 line
Andrew Vasquez
PATCH 3/5 qla2xxx: Use midlayer's int_to_scsilun() function.
In reply to Andrew VasquezWhile populating command type 6 and 7 IOCBs.
---
drivers/scsi/qla2xxx/qla_fw.h | 4 ++-- drivers/scsi/qla2xxx/qla_iocb.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-)
a6b14e7f53b17482369d3e1c030b1f3df57983d0
drivers/scsi/qla2xxx/qla_fw.h +2 -2
@@ -394,7 +394,7 @@ struct cmd_type_6 {uint16_t fcp_rsp_dsd_len;/* FCP_RSP DSD length. */ -uint8_t lun[8 ];/* FCP LUN (BE). */ +struct scsi_lun lun;/* FCP LUN (BE). */ uint16_t control_flags;/* Control flags. */ #define CF_DATA_SEG_DESCR_ENABLE BIT_2
@@ -432,7 +432,7 @@ struct cmd_type_7 {uint16_t dseg_count;/* Data segment count. */ uint16_t reserved_1; -uint8_t lun[8 ];/* FCP LUN (BE). */ +struct scsi_lun lun;/* FCP LUN (BE). */ uint16_t task_mgmt_flags;/* Task management flags. */ #define TMF_CLEAR_ACA BIT_14
drivers/scsi/qla2xxx/qla_iocb.c +1 -2
@@ -839,8 +839,7 @@ qla24xx_start_scsi(srb_t *sp) cmd_pkt->port_id[1 ] = sp->fcport->d_id.b.area; cmd_pkt->port_id[2 ] = sp->fcport->d_id.b.domain; - cmd_pkt->lun[1 ] =LSB (sp->cmd->device->lun); - cmd_pkt->lun[2 ] =MSB (sp->cmd->device->lun); +int_to_scsilun (sp->cmd->device->lun, &cmd_pkt->lun);/* Update tagged queuing modifier -- default is TSK_SIMPLE (0). */ if (scsi_populate_tag_msg (cmd, tag)) {
Signature · 1 line
Andrew Vasquez
PATCH 4/5 qla2xxx: Update license.
In reply to Andrew Vasquez---
Documentation/scsi/LICENSE.qla2xxx | 45 +++++++++++++++++++++++++++++++++++ drivers/scsi/qla2xxx/ql2100.c | 9 +++---- drivers/scsi/qla2xxx/ql2100_fw.c | 22 ++++------------- drivers/scsi/qla2xxx/ql2200.c | 9 +++---- drivers/scsi/qla2xxx/ql2200_fw.c | 22 ++++------------- drivers/scsi/qla2xxx/ql2300.c | 9 +++---- drivers/scsi/qla2xxx/ql2300_fw.c | 22 ++++------------- drivers/scsi/qla2xxx/ql2322.c | 7 ++--- drivers/scsi/qla2xxx/ql2322_fw.c | 22 ++++------------- drivers/scsi/qla2xxx/ql6312.c | 7 ++--- drivers/scsi/qla2xxx/ql6312_fw.c | 22 ++++------------- drivers/scsi/qla2xxx/qla_attr.c | 18 ++------------ drivers/scsi/qla2xxx/qla_dbg.c | 18 ++------------ drivers/scsi/qla2xxx/qla_dbg.h | 23 ++++-------------- drivers/scsi/qla2xxx/qla_def.h | 25 +++++-------------- drivers/scsi/qla2xxx/qla_fw.h | 26 +++++--------------- drivers/scsi/qla2xxx/qla_gbl.h | 28 +++++----------------- drivers/scsi/qla2xxx/qla_gs.c | 18 ++------------ drivers/scsi/qla2xxx/qla_init.c | 18 ++------------ drivers/scsi/qla2xxx/qla_inline.h | 19 ++------------- drivers/scsi/qla2xxx/qla_iocb.c | 23 ++++-------------- drivers/scsi/qla2xxx/qla_isr.c | 18 ++------------ drivers/scsi/qla2xxx/qla_mbx.c | 18 ++------------ drivers/scsi/qla2xxx/qla_os.c | 18 ++------------ drivers/scsi/qla2xxx/qla_rscn.c | 18 ++------------ drivers/scsi/qla2xxx/qla_settings.h | 22 ++++------------- drivers/scsi/qla2xxx/qla_sup.c | 23 ++++-------------- drivers/scsi/qla2xxx/qla_version.h | 22 ++++------------- 28 files changed, 158 insertions(+), 393 deletions(-) create mode 100644 Documentation/scsi/LICENSE.qla2xxx
9ddcb37481c2780bea2189d7e4bec913eeea8c58
Documentation/scsi/LICENSE.qla2xxx new file +45 -0
@@ -0,0 +1,45 @@ +Copyright (c) 2003-2005 QLogic Corporation +QLogic Linux Fibre Channel HBA Driver + +This program includes a device driver for Linux 2.6 that may be +distributed with QLogic hardware specific firmware binary file. +You may modify and redistribute the device driver code under the +GNU General Public License as published by the Free Software +Foundation (version 2 or a later version). + +You may redistribute the hardware specific firmware binary file +under the following terms: + + 1. Redistribution of source code (only if applicable), + must retain the above copyright notice, this list of + conditions and the following disclaimer. + + 2. Redistribution in binary form must reproduce the above + copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + + 3. The name of QLogic Corporation may not be used to + endorse or promote products derived from this software + without specific prior written permission + +REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE, +THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT +CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR +OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT, +TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN +ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN +COMBINATION WITH THIS PROGRAM.
drivers/scsi/qla2xxx/ql2100.c +4 -5
@@ -1,11 +1,10 @@/* -* QLogic ISP2100 device driver for Linux 2.6.x -* Copyright (C) 2003 Christoph Hellwig. -* Copyright (C) 2003-2005 QLogic Corporation (www.qlogic.com) +* QLogic Fibre Channel HBA Driver +* Copyright (C) 2003 Christoph Hellwig. +* Copyright (c) 2003-2005 QLogic Corporation * -* Released under GPL v2. +* See LICENSE.qla2xxx for copyright and licensing details. */ -#include <linux/init.h> #include <linux/module.h> #include <linux/pci.h>
drivers/scsi/qla2xxx/ql2100_fw.c +5 -17
@@ -1,21 +1,9 @@ -/****************************************************************************** -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +/* +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * -*************************************************************************/ +* See LICENSE.qla2xxx for copyright and licensing details. +*/ /* * Firmware Version 1.19.25 (13:12 Dec 10, 2003)
drivers/scsi/qla2xxx/ql2200.c +4 -5
@@ -1,11 +1,10 @@/* -* QLogic ISP2200 device driver for Linux 2.6.x -* Copyright (C) 2003 Christoph Hellwig. -* Copyright (C) 2003-2005 QLogic Corporation (www.qlogic.com) +* QLogic Fibre Channel HBA Driver +* Copyright (C) 2003 Christoph Hellwig. +* Copyright (c) 2003-2005 QLogic Corporation * -* Released under GPL v2. +* See LICENSE.qla2xxx for copyright and licensing details. */ -#include <linux/init.h> #include <linux/module.h> #include <linux/pci.h>
drivers/scsi/qla2xxx/ql2200_fw.c +5 -17
@@ -1,21 +1,9 @@ -/****************************************************************************** -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +/* +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * -*************************************************************************/ +* See LICENSE.qla2xxx for copyright and licensing details. +*/ /* * Firmware Version 2.02.08 (17:06 Mar 22, 2005)
drivers/scsi/qla2xxx/ql2300.c +4 -5
@@ -1,11 +1,10 @@/* -* QLogic ISP2300 device driver for Linux 2.6.x -* Copyright (C) 2003 Christoph Hellwig. -* Copyright (C) 2003-2005 QLogic Corporation (www.qlogic.com) +* QLogic Fibre Channel HBA Driver +* Copyright (C) 2003 Christoph Hellwig. +* Copyright (c) 2003-2005 QLogic Corporation * -* Released under GPL v2. +* See LICENSE.qla2xxx for copyright and licensing details. */ -#include <linux/init.h> #include <linux/module.h> #include <linux/pci.h>
drivers/scsi/qla2xxx/ql2300_fw.c +5 -17
@@ -1,21 +1,9 @@ -/****************************************************************************** -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +/* +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * -******************************************************************************/ +* See LICENSE.qla2xxx for copyright and licensing details. +*/ /* * Firmware Version 3.03.15 (10:03 May 26, 2005)
drivers/scsi/qla2xxx/ql2322.c +3 -4
@@ -1,10 +1,9 @@/* -* QLogic ISP2322 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation (www.qlogic.com) +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * -* Released under GPL v2. +* See LICENSE.qla2xxx for copyright and licensing details. */ -#include <linux/init.h> #include <linux/module.h> #include <linux/pci.h>
drivers/scsi/qla2xxx/ql2322_fw.c +5 -17
@@ -1,21 +1,9 @@ -/****************************************************************************** -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +/* +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * -******************************************************************************/ +* See LICENSE.qla2xxx for copyright and licensing details. +*/ /* * Firmware Version 3.03.15 (10:09 May 26, 2005)
drivers/scsi/qla2xxx/ql6312.c +3 -4
@@ -1,10 +1,9 @@/* -* QLogic ISP6312 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation (www.qlogic.com) +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * -* Released under GPL v2. +* See LICENSE.qla2xxx for copyright and licensing details. */ -#include <linux/init.h> #include <linux/module.h> #include <linux/pci.h>
drivers/scsi/qla2xxx/ql6312_fw.c +5 -17
@@ -1,21 +1,9 @@ -/****************************************************************************** -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +/* +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * -******************************************************************************/ +* See LICENSE.qla2xxx for copyright and licensing details. +*/ /* * Firmware Version 3.03.15 (10:00 May 26, 2005)
drivers/scsi/qla2xxx/qla_attr.c +3 -15
@@ -1,20 +1,8 @@/* -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * +* See LICENSE.qla2xxx for copyright and licensing details. */ #include "qla_def.h"
drivers/scsi/qla2xxx/qla_dbg.c +3 -15
@@ -1,20 +1,8 @@/* -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * +* See LICENSE.qla2xxx for copyright and licensing details. */ #include "qla_def.h"
drivers/scsi/qla2xxx/qla_dbg.h +5 -18
@@ -1,22 +1,9 @@ -/****************************************************************************** -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +/* +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * -******************************************************************************/ - +* See LICENSE.qla2xxx for copyright and licensing details. +*/ /* * Driver debug definitions. */
drivers/scsi/qla2xxx/qla_def.h +6 -19
@@ -1,22 +1,9 @@ -/******************************************************************************** -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -** -******************************************************************************/ - +/* +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation +* +* See LICENSE.qla2xxx for copyright and licensing details. +*/ #ifndef __QLA_DEF_H#define __QLA_DEF_H
drivers/scsi/qla2xxx/qla_fw.h +6 -20
@@ -1,23 +1,9 @@ - -/******************************************************************************** -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -** -******************************************************************************/ - +/* +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation +* +* See LICENSE.qla2xxx for copyright and licensing details. +*/ #ifndef __QLA_FW_H#define __QLA_FW_H
drivers/scsi/qla2xxx/qla_gbl.h +6 -22
@@ -1,25 +1,9 @@ -/******************************************************************************** -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -****************************************************************************** -* Global include file. -******************************************************************************/ - - +/* +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation +* +* See LICENSE.qla2xxx for copyright and licensing details. +*/ #ifndef __QLA_GBL_H#define __QLA_GBL_H
drivers/scsi/qla2xxx/qla_gs.c +3 -15
@@ -1,20 +1,8 @@/* -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * +* See LICENSE.qla2xxx for copyright and licensing details. */ #include "qla_def.h"
drivers/scsi/qla2xxx/qla_init.c +3 -15
@@ -1,20 +1,8 @@/* -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * +* See LICENSE.qla2xxx for copyright and licensing details. */ #include "qla_def.h"
drivers/scsi/qla2xxx/qla_inline.h +3 -16
@@ -1,23 +1,10 @@/* -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * +* See LICENSE.qla2xxx for copyright and licensing details. */ -static __inline__uint16_t qla2x00_debounce_register (volatile uint16_t __iomem *);/* * qla2x00_debounce_register
drivers/scsi/qla2xxx/qla_iocb.c +5 -18
@@ -1,22 +1,9 @@ -/****************************************************************************** -* QLOGIC LINUX SOFTWARE +/* +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -******************************************************************************/ - +* See LICENSE.qla2xxx for copyright and licensing details. +*/ #include "qla_def.h" #include <linux/blkdev.h>
drivers/scsi/qla2xxx/qla_isr.c +3 -15
@@ -1,20 +1,8 @@/* -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * +* See LICENSE.qla2xxx for copyright and licensing details. */ #include "qla_def.h"
drivers/scsi/qla2xxx/qla_mbx.c +3 -15
@@ -1,20 +1,8 @@/* -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * +* See LICENSE.qla2xxx for copyright and licensing details. */ #include "qla_def.h"
drivers/scsi/qla2xxx/qla_os.c +3 -15
@@ -1,20 +1,8 @@/* -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * +* See LICENSE.qla2xxx for copyright and licensing details. */ #include "qla_def.h"
drivers/scsi/qla2xxx/qla_rscn.c +3 -15
@@ -1,20 +1,8 @@/* -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * +* See LICENSE.qla2xxx for copyright and licensing details. */ #include "qla_def.h"
drivers/scsi/qla2xxx/qla_settings.h +5 -17
@@ -1,21 +1,9 @@ -/****************************************************************************** -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +/* +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * -******************************************************************************/ +* See LICENSE.qla2xxx for copyright and licensing details. +*/ /* * Compile time Options: * 0 - Disable and 1 - Enable
drivers/scsi/qla2xxx/qla_sup.c +5 -18
@@ -1,22 +1,9 @@ -/****************************************************************************** -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +/* +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * -******************************************************************************/ - +* See LICENSE.qla2xxx for copyright and licensing details. +*/ #include "qla_def.h" #include <linux/delay.h>
drivers/scsi/qla2xxx/qla_version.h +5 -17
@@ -1,21 +1,9 @@ -/****************************************************************************** -* QLOGIC LINUX SOFTWARE -* -* QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2005 QLogic Corporation -* (www.qlogic.com) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the -* Free Software Foundation; either version 2, or (at your option) any -* later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +/* +* QLogic Fibre Channel HBA Driver +* Copyright (c) 2003-2005 QLogic Corporation * -******************************************************************************/ +* See LICENSE.qla2xxx for copyright and licensing details. +*/ /* * Driver version */
Signature · 1 line
Andrew Vasquez
PATCH 5/5 qla2xxx: Resync with latest released ISP23xx/63xx firmware -- 3.03.18.
In reply to Andrew Vasquez---
This patch is too large for an inline patch, please download the bzip'd patch from:
ftp://ftp.qlogic.com/outgoing/linux/patches/8.x/8.01.02k/2005-Resync-with-latest-released-ISP23xx-63xx-firmware-3.03.18.diff.bz2
Signature · 1 line
Andrew Vasquez