qla2xxx: Add ISP24xx support.
Subsystems (3)
cover qla2xxx: Add ISP24xx support.
James,
What follows is a series of patches (against the latest scsi-misc-2.6 git tree) to add support for a new familiy of 4Gb ISP chips. The firmware images to support these new ISPs will reside on the boards themselves and therefore not require a large firmware-blob be compiled into the driver.
A summary of the patches can be found towards the end of this message.
With the exception of the rather large firmware image update (direct pointer to bzip'd patch listed), subsequent messages will contain inlined patches.
All patches can be found at the following URL:
ftp://ftp.qlogic.com/outgoing/linux/patches/8.x/8.01.00b5k/
Hopefully this patch-set addresses the issues voiced against the earlier 4gb submission.
Regards,
Andrew Vasquez
QLogic Corporation
commit cb2ccfbc4f91e62e69d2f84992a45a557c02230d
Author: Andrew Vasquez <[email protected]> Date: Wed Jul 6 09:25:46 2005 -0700
Update version number to 8.01.00b5-k.
commit 900dd480ecb76a28cf910f53d1757264b6911c0b
Author: Andrew Vasquez <[email protected]> Date: Wed Jul 6 09:16:53 2005 -0700
Correct maximum supported lun and target-id definitions.
The driver uses command-IOCBs which support a maximum lun value of 0xffff -- correct #define to reflect the change. Also, remove superfluous MAX_TARGET definition.
commit e18ad1fc29d37527f1a6425f7b7122957c4ed5d7
Author: Andrew Vasquez <[email protected]> Date: Wed Jul 6 08:11:05 2005 -0700
Update copyright banner.
commit 2e043de4bf0f528bb650e6b6d4011c9edc084639
Author: Andrew Vasquez <[email protected]> Date: Wed Jul 6 08:04:31 2005 -0700
Firmware updates.
Resync with latest 21xx firmware -- 1.19.25.
Resync with latest 22xx firmware -- 2.02.08.
Resync with latest 23xx/63xx firmware -- 3.03.15.
commit 590ae1880589da532026c35812c9931dd34996c0
Author: Andrew Vasquez <[email protected]> Date: Wed Jul 6 08:02:11 2005 -0700
Code scrubbing.
- Remove trailing whitespace from driver files.
- Remove unused #defines and inlines.
- Standardize on C comments (// -> /* */)
commit 1012645cc42fff24d030366fd5a0c4944def6c8f
Author: Andrew Vasquez <[email protected]> Date: Wed Jul 6 07:42:39 2005 -0700
NVRAM id-list updates.
Resync with latest NVRAM subsystem ID list.
commit 0b1a41ae2af18d81cd1dc9ea8bce669097f5411a
Author: Andrew Vasquez <[email protected]> Date: Wed Jul 6 07:13:54 2005 -0700
Add OS initialization codes for ISP24xx recognition.
commit 0fa8d6c80a75c92805ff55eb87287fd53dd239bc
Author: Andrew Vasquez <[email protected]> Date: Wed Jul 6 07:12:14 2005 -0700
Add ISP24xx initialization routines.
commit ba7eb57c9c230482353fded648e9e88bc3d146d3
Author: Andrew Vasquez <[email protected]> Date: Wed Jul 6 07:10:42 2005 -0700
Add ISP24xx ISR routines.
Add appropriate glue-code for ISP24xx support -- this included generalizing some of the core handling routines (qla2x00_async_event() [pull-up retrieval of mailbox values] and qla2x00_status_entry()]. Fixup 2100/2300 ISRs to handle the new conventions.
commit ea9b892ded10bf99b1e155426ddce745cb865d1f
Author: Andrew Vasquez <[email protected]> Date: Wed Jul 6 07:10:16 2005 -0700
Add ISP24xx IOCB manipulation routines.
Add appropriate glue-code for ISP24xx support while manipulting IOCB packets. Add an ISP24xx specific 'start_scsi' routine due to command-type-7 layout changes.
commit a5cc5a472bddbd65222ae021adad6cbfdce259fb
Author: Andrew Vasquez <[email protected]> Date: Wed Jul 6 07:09:23 2005 -0700
Add ISP24xx flash-manipulation routines.
Add read/write flash manipulation routines for the ISP24xx. Update sysfs NVRAM objects to use generalized accessor functions.
commit ec7266d75bdacf5afc0f07a2ceacde8ea6a69d1d
Author: Andrew Vasquez <[email protected]> Date: Wed Jul 6 07:08:56 2005 -0700
Add MBX command routines for ISP24xx support.
Generalize several routines [qla2x00_load_ram_ext(), qla2x00_execute_fw(), qla2x00_verify_checksum()] to handle larger addressing space.
commit da11a5f4bce50e1db314b57ba5871e6efa538f33
Author: Andrew Vasquez <[email protected]> Date: Wed Jul 6 07:06:53 2005 -0700
Generalize SNS generic-services routines.
Consolidate completion-status checking while adding support for the ISP24xx.
commit 0bd26ce5768df74af2a01f14d40bfc3767d3508c
Author: Andrew Vasquez <[email protected]> Date: Tue Jul 5 11:28:37 2005 -0700
Add ISP24xx diagnostic routines.
Add function and structure definitions for the ISP24xx diagnostic firmware dump routines.
commit 27bc708984e326687ad90e9defb83e5720818de3
Author: Andrew Vasquez <[email protected]> Date: Tue Jul 5 11:28:17 2005 -0700
Add ISP24xx definitions.
Add requisite structure definitions and #define's for ISP24xx support. Also drop volatile modifiers from device_reg_* register layouts as the members are never really accessed, only their offsets within the layout are used during reads and writes.
commit a74cc9d57ef985838b6fb9d07c3983e221d364d5
Author: Andrew Vasquez <[email protected]> Date: Tue Jul 5 11:27:33 2005 -0700
Add pci ids for new ISP types.
Move old definitions in local qla_def.h file to pci_ids.h as well.
commit cbb4eeb0e8f2b44b671834ce8ba67fec8b624cff
Author: Andrew Vasquez <[email protected]> Date: Tue Jul 5 11:27:03 2005 -0700
Factor-out ISP specific functions to method-based call tables.
In anticipation of ISP24xx/ISP25xx support, factor-out ISP specific functions into a method-based call table.
Signature · 1 line
Andrew Vasquez
PATCH 1/17 qla2xxx: Factor-out ISP specific functions to method-based call tables.
Factor-out ISP specific functions to method-based call tables.
In anticipation of ISP24xx/ISP25xx support, factor-out ISP specific functions into a method-based call table.
---
drivers/scsi/qla2xxx/qla_attr.c | 5 - drivers/scsi/qla2xxx/qla_dbg.c | 4 - drivers/scsi/qla2xxx/qla_def.h | 46 ++++++- drivers/scsi/qla2xxx/qla_gbl.h | 13 ++ drivers/scsi/qla2xxx/qla_gs.c | 5 - drivers/scsi/qla2xxx/qla_init.c | 252 ++++++++++++++++++++----------------- drivers/scsi/qla2xxx/qla_inline.h | 39 ------ drivers/scsi/qla2xxx/qla_iocb.c | 4 - drivers/scsi/qla2xxx/qla_isr.c | 5 - drivers/scsi/qla2xxx/qla_os.c | 101 +++++++++++---- 10 files changed, 275 insertions(+), 199 deletions(-)
cbb4eeb0e8f2b44b671834ce8ba67fec8b624cff
drivers/scsi/qla2xxx/qla_attr.c +1 -4
@@ -93,10 +93,7 @@ qla2x00_sysfs_write_fw_dump(struct kobje"Firmware dump ready for read on (%ld).\n" , ha->host_no);memset (ha->fw_dump_buffer,0 , dump_size); -if (IS_QLA2100 (ha) ||IS_QLA2200 (ha)) -qla2100_ascii_fw_dump (ha); -else -qla2300_ascii_fw_dump (ha); + ha->isp_ops.ascii_fw_dump (ha); ha->fw_dump_buffer_len =strlen (ha->fw_dump_buffer); }break ;
drivers/scsi/qla2xxx/qla_dbg.c +2 -2
@@ -405,7 +405,7 @@ qla2300_ascii_fw_dump(scsi_qla_host_t *h fw = ha->fw_dump;qla_uprintf (&uiter,"%s Firmware Version %s\n" , ha->model_number, -qla2x00_get_fw_version_str (ha, fw_info)); + ha->isp_ops.fw_version_str (ha, fw_info));qla_uprintf (&uiter,"\n[==>BEG]\n" );
@@ -819,7 +819,7 @@ qla2100_ascii_fw_dump(scsi_qla_host_t *h fw = ha->fw_dump;qla_uprintf (&uiter,"%s Firmware Version %s\n" , ha->model_number, -qla2x00_get_fw_version_str (ha, fw_info)); + ha->isp_ops.fw_version_str (ha, fw_info));qla_uprintf (&uiter,"\n[==>BEG]\n" );
drivers/scsi/qla2xxx/qla_def.h +44 -2
70 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_gbl.h +13 -0
@@ -32,6 +32,17 @@ extern int qla2x00_probe_one(struct pci_* Global Function Prototypes in qla_init.c source file. */ extern int qla2x00_initialize_adapter (scsi_qla_host_t *); + +extern int qla2100_pci_config (struct scsi_qla_host *); +extern int qla2300_pci_config (struct scsi_qla_host *); +extern void qla2x00_reset_chip (struct scsi_qla_host *); +extern int qla2x00_chip_diag (struct scsi_qla_host *); +extern void qla2x00_config_rings (struct scsi_qla_host *); +extern void qla2x00_reset_adapter (struct scsi_qla_host *); +extern int qla2x00_nvram_config (struct scsi_qla_host *); +extern void qla2x00_update_fw_options (struct scsi_qla_host *); +extern int qla2x00_load_risc (struct scsi_qla_host *,uint32_t *); +extern fc_port_t *qla2x00_alloc_fcport (scsi_qla_host_t *,int );extern int qla2x00_loop_resync (scsi_qla_host_t *);
@@ -205,6 +216,8 @@ extern void qla2x00_print_scsi_cmd(struc/* * Global Function Prototypes in qla_gs.c source file. */ +extern ms_iocb_entry_t *qla2x00_prep_ms_iocb (scsi_qla_host_t *,uint32_t , +uint32_t );extern int qla2x00_ga_nxt (scsi_qla_host_t *,fc_port_t *);extern int qla2x00_gid_pt (scsi_qla_host_t *,sw_info_t *);extern int qla2x00_gpn_id (scsi_qla_host_t *,sw_info_t *);
drivers/scsi/qla2xxx/qla_gs.c +1 -4
@@ -18,9 +18,6 @@*/ #include "qla_def.h" -static inline ms_iocb_entry_t * -qla2x00_prep_ms_iocb (scsi_qla_host_t *,uint32_t ,uint32_t ); -static inline struct ct_sns_req *qla2x00_prep_ct_req (struct ct_sns_req *,uint16_t ,uint16_t );
@@ -42,7 +39,7 @@ static int qla2x00_sns_rnn_id(scsi_qla_h* * Returns a pointer to the @ha's ms_iocb. */ -static inline ms_iocb_entry_t * +ms_iocb_entry_t *qla2x00_prep_ms_iocb (scsi_qla_host_t *ha,uint32_t req_size,uint32_t rsp_size) {ms_iocb_entry_t *ms_pkt;
drivers/scsi/qla2xxx/qla_init.c +135 -117
486 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_inline.h +1 -38
@@ -117,46 +117,9 @@ static __inline__ void qla2x00_poll(scsistatic inline void qla2x00_poll (scsi_qla_host_t *ha) { -if (IS_QLA2100 (ha) ||IS_QLA2200 (ha)) -qla2100_intr_handler (0 , ha,NULL ); -else -qla2300_intr_handler (0 , ha,NULL ); + ha->isp_ops.intr_handler (0 , ha,NULL ); } - -static __inline__void qla2x00_enable_intrs (scsi_qla_host_t *); -static __inline__void qla2x00_disable_intrs (scsi_qla_host_t *); - -static inline void -qla2x00_enable_intrs (scsi_qla_host_t *ha) -{ -unsigned long flags =0 ; -device_reg_t __iomem *reg = ha->iobase; - -spin_lock_irqsave (&ha->hardware_lock, flags); - ha->interrupts_on =1 ; -/* enable risc and host interrupts */ -WRT_REG_WORD (®->ictrl,ICR_EN_INT |ICR_EN_RISC ); -RD_REG_WORD (®->ictrl); -spin_unlock_irqrestore (&ha->hardware_lock, flags); - -} - -static inline void -qla2x00_disable_intrs (scsi_qla_host_t *ha) -{ -unsigned long flags =0 ; -device_reg_t __iomem *reg = ha->iobase; - -spin_lock_irqsave (&ha->hardware_lock, flags); - ha->interrupts_on =0 ; -/* disable risc and host interrupts */ -WRT_REG_WORD (®->ictrl,0 ); -RD_REG_WORD (®->ictrl); -spin_unlock_irqrestore (&ha->hardware_lock, flags); -} - -static __inline__int qla2x00_is_wwn_zero (uint8_t *);/*
drivers/scsi/qla2xxx/qla_iocb.c +2 -2
@@ -369,7 +369,7 @@ qla2x00_start_scsi(srb_t *sp) }/* Calculate the number of request entries needed. */ - req_cnt = (ha->calc_request_entries)(tot_dsds); + req_cnt = ha->isp_ops.calc_req_entries (tot_dsds);if (ha->req_q_cnt < (req_cnt +2 )) { cnt =RD_REG_WORD_RELAXED (ISP_REQ_Q_OUT (ha, reg));if (ha->req_ring_index < cnt)
@@ -419,7 +419,7 @@ qla2x00_start_scsi(srb_t *sp) cmd_pkt->byte_count =cpu_to_le32 ((uint32_t )cmd->request_bufflen);/* Build IOCB segments */ - (ha->build_scsi_iocbs)(sp, cmd_pkt, tot_dsds); + ha->isp_ops.build_iocbs (sp, cmd_pkt, tot_dsds);/* Set total data segment count. */ cmd_pkt->entry_count = (uint8_t )req_cnt;
drivers/scsi/qla2xxx/qla_isr.c +1 -4
@@ -356,10 +356,7 @@ qla2x00_async_event(scsi_qla_host_t *ha,"ISP System Error - mbx1=%xh mbx2=%xh mbx3=%xh.\n" , mb[1], mb[2], mb[3]); -if (IS_QLA2100 (ha) ||IS_QLA2200 (ha)) -qla2100_fw_dump (ha,1 ); -else -qla2300_fw_dump (ha,1 ); + ha->isp_ops.fw_dump (ha,1 );if (mb[1 ] ==0 ) { qla_printk(KERN_INFO, ha,
drivers/scsi/qla2xxx/qla_os.c +75 -26
216 lines not on this page · raw message
Signature · 1 line
Andrew Vasquez
PATCH 2/17 qla2xxx: Add pci ids for new ISP types.
In reply to Andrew VasquezAdd pci ids for new ISP types.
Move old definitions in local qla_def.h file to pci_ids.h as well.
---
drivers/scsi/qla2xxx/qla_def.h | 21 --------------------- include/linux/pci_ids.h | 9 +++++++++ 2 files changed, 9 insertions(+), 21 deletions(-)
a74cc9d57ef985838b6fb9d07c3983e221d364d5
drivers/scsi/qla2xxx/qla_def.h +0 -21
@@ -41,27 +41,6 @@#include <scsi/scsi_device.h> #include <scsi/scsi_cmnd.h> -/* XXX(hch): move to pci_ids.h */ -#ifndef PCI_DEVICE_ID_QLOGIC_ISP2300 -#define PCI_DEVICE_ID_QLOGIC_ISP2300 0x2300 -#endif - -#ifndef PCI_DEVICE_ID_QLOGIC_ISP2312 -#define PCI_DEVICE_ID_QLOGIC_ISP2312 0x2312 -#endif - -#ifndef PCI_DEVICE_ID_QLOGIC_ISP2322 -#define PCI_DEVICE_ID_QLOGIC_ISP2322 0x2322 -#endif - -#ifndef PCI_DEVICE_ID_QLOGIC_ISP6312 -#define PCI_DEVICE_ID_QLOGIC_ISP6312 0x6312 -#endif - -#ifndef PCI_DEVICE_ID_QLOGIC_ISP6322 -#define PCI_DEVICE_ID_QLOGIC_ISP6322 0x6322 -#endif -#if defined(CONFIG_SCSI_QLA21XX ) || defined(CONFIG_SCSI_QLA21XX_MODULE )#define IS_QLA2100 (ha) ((ha)->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2100)#else
include/linux/pci_ids.h +9 -0
@@ -908,6 +908,15 @@#define PCI_DEVICE_ID_QLOGIC_ISP1022 0x1022#define PCI_DEVICE_ID_QLOGIC_ISP2100 0x2100#define PCI_DEVICE_ID_QLOGIC_ISP2200 0x2200 +#define PCI_DEVICE_ID_QLOGIC_ISP2300 0x2300 +#define PCI_DEVICE_ID_QLOGIC_ISP2312 0x2312 +#define PCI_DEVICE_ID_QLOGIC_ISP2322 0x2322 +#define PCI_DEVICE_ID_QLOGIC_ISP6312 0x6312 +#define PCI_DEVICE_ID_QLOGIC_ISP6322 0x6322 +#define PCI_DEVICE_ID_QLOGIC_ISP2422 0x2422 +#define PCI_DEVICE_ID_QLOGIC_ISP2432 0x2432 +#define PCI_DEVICE_ID_QLOGIC_ISP2512 0x2512 +#define PCI_DEVICE_ID_QLOGIC_ISP2522 0x2522#define PCI_VENDOR_ID_CYRIX 0x1078#define PCI_DEVICE_ID_CYRIX_5510 0x0000
Signature · 1 line
Andrew Vasquez
PATCH 3/17 qla2xxx: Add ISP24xx definitions.
In reply to Andrew VasquezAdd ISP24xx definitions.
Add requisite structure definitions and #define's for ISP24xx support. Also drop volatile modifiers from device_reg_* register layouts as the members are never really accessed, only their offsets within the layout are used during reads and writes.
---
drivers/scsi/qla2xxx/qla_dbg.c | 6 drivers/scsi/qla2xxx/qla_def.h | 278 ++++++---- drivers/scsi/qla2xxx/qla_fw.h | 1076 +++++++++++++++++++++++++++++++++++++ drivers/scsi/qla2xxx/qla_init.c | 49 +- drivers/scsi/qla2xxx/qla_inline.h | 11 drivers/scsi/qla2xxx/qla_iocb.c | 8 drivers/scsi/qla2xxx/qla_isr.c | 14 drivers/scsi/qla2xxx/qla_mbx.c | 2 drivers/scsi/qla2xxx/qla_os.c | 8 drivers/scsi/qla2xxx/qla_rscn.c | 2 drivers/scsi/qla2xxx/qla_sup.c | 16 - 11 files changed, 1318 insertions(+), 152 deletions(-) create mode 100644 drivers/scsi/qla2xxx/qla_fw.h
27bc708984e326687ad90e9defb83e5720818de3
drivers/scsi/qla2xxx/qla_dbg.c +3 -3
@@ -36,7 +36,7 @@ qla2300_fw_dump(scsi_qla_host_t *ha, intuint16_t mb0, mb2;uint32_t stat; -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;uint16_t __iomem *dmp_reg;unsigned long flags;struct qla2300_fw_dump *fw;
@@ -587,7 +587,7 @@ qla2100_fw_dump(scsi_qla_host_t *ha, intuint32_t cnt, timer;uint16_t risc_address;uint16_t mb0, mb2; -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;uint16_t __iomem *dmp_reg;unsigned long flags;struct qla2100_fw_dump *fw;
@@ -984,7 +984,7 @@ qla_uprintf(char **uiter, char *fmt, ...void qla2x00_dump_regs (scsi_qla_host_t *ha) { -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;printk ("Mailbox registers:\n" ); printk("scsi(%ld): mbox 0 0x%04x \n",
drivers/scsi/qla2xxx/qla_def.h +181 -97
480 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_fw.h new file +1076 -0
1,076 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_init.c +23 -26
162 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_inline.h +11 -0
@@ -236,3 +236,14 @@ qla2x00_delete_timer_from_cmd(srb_t *sp) } } + +static inline int qla2x00_is_reserved_id (scsi_qla_host_t *,uint16_t ); +static inline int +qla2x00_is_reserved_id (scsi_qla_host_t *ha,uint16_t loop_id) +{ +if (IS_QLA24XX (ha) ||IS_QLA25XX (ha)) +return (loop_id >NPH_LAST_HANDLE ); + +return ((loop_id > ha->last_loop_id && loop_id <SNS_FIRST_LOOP_ID ) || + loop_id ==MANAGEMENT_SERVER || loop_id ==BROADCAST ); +};
drivers/scsi/qla2xxx/qla_iocb.c +4 -4
@@ -315,13 +315,13 @@ qla2x00_start_scsi(srb_t *sp)uint16_t cnt;uint16_t req_cnt;uint16_t tot_dsds; -device_reg_t __iomem *reg; +struct device_reg_2xxx __iomem *reg;char tag[2 ];/* Setup device pointers. */ ret =0 ; ha = sp->ha; - reg = ha->iobase; + reg = &ha->iobase->isp; cmd = sp->cmd;/* So we know we haven't pci_map'ed anything yet */ tot_dsds =0 ;
@@ -521,7 +521,7 @@ qla2x00_marker(scsi_qla_host_t *ha, uintstatic request_t *qla2x00_req_pkt (scsi_qla_host_t *ha) { -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;request_t *pkt =NULL ;uint16_t cnt;uint32_t *dword_ptr;
@@ -586,7 +586,7 @@ qla2x00_req_pkt(scsi_qla_host_t *ha)void qla2x00_isp_cmd (scsi_qla_host_t *ha) { -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;DEBUG5 (printk ("%s(): IOCB data:\n" , __func__)); DEBUG5(qla2x00_dump_buffer(
drivers/scsi/qla2xxx/qla_isr.c +7 -7
@@ -41,7 +41,7 @@ irqreturn_t qla2100_intr_handler(int irq, void *dev_id, struct pt_regs *regs) { scsi_qla_host_t *ha; -device_reg_t __iomem *reg; +struct device_reg_2xxx __iomem *reg;int status;unsigned long flags;unsigned long iter;
@@ -54,7 +54,7 @@ qla2100_intr_handler(int irq, void *dev_return (IRQ_NONE ); } - reg = ha->iobase; + reg = &ha->iobase->isp; status =0 ;spin_lock_irqsave (&ha->hardware_lock, flags);
@@ -118,7 +118,7 @@ irqreturn_t qla2300_intr_handler(int irq, void *dev_id, struct pt_regs *regs) { scsi_qla_host_t *ha; -device_reg_t __iomem *reg; +struct device_reg_2xxx __iomem *reg;int status;unsigned long flags;unsigned long iter;
@@ -133,7 +133,7 @@ qla2300_intr_handler(int irq, void *dev_return (IRQ_NONE ); } - reg = ha->iobase; + reg = &ha->iobase->isp; status =0 ;spin_lock_irqsave (&ha->hardware_lock, flags);
@@ -220,7 +220,7 @@ qla2x00_mbx_completion(scsi_qla_host_t * {uint16_t cnt;uint16_t __iomem *wptr; -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;/* Load return mailbox registers. */ ha->flags.mbox_int =1 ;
@@ -261,7 +261,7 @@ qla2x00_async_event(scsi_qla_host_t *ha,uint16_t handle_cnt;uint16_t cnt;uint32_t handles[5 ]; -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;uint32_t rscn_entry, host_pid;uint8_t rscn_queue_index;
@@ -707,7 +707,7 @@ qla2x00_process_completed_request(structvoid qla2x00_process_response_queue (struct scsi_qla_host *ha) { -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;sts_entry_t *pkt;uint16_t handle_cnt;uint16_t cnt;
drivers/scsi/qla2xxx/qla_mbx.c +1 -1
@@ -58,7 +58,7 @@ qla2x00_mailbox_command(scsi_qla_host_t {int rval;unsigned long flags =0 ; -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;struct timer_list tmp_intr_timer;uint8_t abort_active =test_bit (ABORT_ISP_ACTIVE , &ha->dpc_flags);uint8_t io_lock_on = ha->flags.init_done;
drivers/scsi/qla2xxx/qla_os.c +4 -4
@@ -1089,7 +1089,7 @@ static void qla2x00_enable_intrs(scsi_qla_host_t *ha) {unsigned long flags =0 ; -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;spin_lock_irqsave (&ha->hardware_lock, flags); ha->interrupts_on =1 ;
@@ -1104,7 +1104,7 @@ static void qla2x00_disable_intrs(scsi_qla_host_t *ha) {unsigned long flags =0 ; -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;spin_lock_irqsave (&ha->hardware_lock, flags); ha->interrupts_on =0 ;
@@ -1120,7 +1120,7 @@ qla2x00_disable_intrs(scsi_qla_host_t *hint qla2x00_probe_one (struct pci_dev *pdev,struct qla_board_info *brd_info) {int ret = -ENODEV ; -device_reg_t __iomem *reg; +struct device_reg_2xxx __iomem *reg;struct Scsi_Host *host;scsi_qla_host_t *ha;unsigned long flags =0 ;
@@ -1300,7 +1300,7 @@ int qla2x00_probe_one(struct pci_dev *pdDEBUG2 (printk ("DEBUG: detect hba %ld at address = %p\n" , ha->host_no, ha)); - reg = ha->iobase; + reg = &ha->iobase->isp; ha->isp_ops.disable_intrs (ha);
drivers/scsi/qla2xxx/qla_rscn.c +1 -1
@@ -348,7 +348,7 @@ static inline struct mbx_entry * qla2x00_get_mbx_iocb_entry(scsi_qla_host_t *ha, uint32_t handle) {uint16_t cnt; -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;struct mbx_entry *mbxentry; mbxentry =NULL ;
drivers/scsi/qla2xxx/qla_sup.c +7 -9
@@ -38,7 +38,7 @@ void qla2x00_lock_nvram_access(scsi_qla_host_t *ha) {uint16_t data; -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;if (!IS_QLA2100 (ha) && !IS_QLA2200 (ha) && !IS_QLA2300 (ha)) { data =RD_REG_WORD (®->nvram);
@@ -70,7 +70,7 @@ qla2x00_lock_nvram_access(scsi_qla_host_void qla2x00_unlock_nvram_access (scsi_qla_host_t *ha) { -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;if (!IS_QLA2100 (ha) && !IS_QLA2200 (ha) && !IS_QLA2300 (ha)) {WRT_REG_WORD (®->u.isp2300.host_semaphore,0 );
@@ -85,11 +85,9 @@ qla2x00_unlock_nvram_access(scsi_qla_hosvoid qla2x00_release_nvram_protection (scsi_qla_host_t *ha) { -device_reg_t __iomem *reg; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;uint32_t word; - reg = ha->iobase; -/* Release NVRAM write protection. */ if (IS_QLA2322 (ha) ||IS_QLA6322 (ha)) {/* Write enable. */
@@ -161,7 +159,7 @@ qla2x00_write_nvram_word(scsi_qla_host_tint count;uint16_t word;uint32_t nv_cmd; -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;qla2x00_nv_write (ha,NVR_DATA_OUT );qla2x00_nv_write (ha,0 );
@@ -223,7 +221,7 @@ static uint16_t qla2x00_nvram_request(scsi_qla_host_t *ha, uint32_t nv_cmd) {uint8_t cnt; -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;uint16_t data =0 ;uint16_t reg_data;
@@ -265,7 +263,7 @@ qla2x00_nvram_request(scsi_qla_host_t *hstatic void qla2x00_nv_deselect (scsi_qla_host_t *ha) { -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;WRT_REG_WORD (®->nvram,NVR_DESELECT );RD_REG_WORD (®->nvram);/* PCI Posting. */
@@ -280,7 +278,7 @@ qla2x00_nv_deselect(scsi_qla_host_t *ha)static void qla2x00_nv_write (scsi_qla_host_t *ha,uint16_t data) { -device_reg_t __iomem *reg = ha->iobase; +struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;WRT_REG_WORD (®->nvram, data |NVR_SELECT |NVR_WRT_ENABLE );RD_REG_WORD (®->nvram);/* PCI Posting. */
Signature · 1 line
Andrew Vasquez
PATCH 4/17 qla2xxx: Add ISP24xx diagnostic routines.
In reply to Andrew VasquezAdd ISP24xx diagnostic routines.
Add function and structure definitions for the ISP24xx diagnostic firmware dump routines.
---
drivers/scsi/qla2xxx/qla_dbg.c | 949 ++++++++++++++++++++++++++++++++++++++++ drivers/scsi/qla2xxx/qla_dbg.h | 32 + drivers/scsi/qla2xxx/qla_gbl.h | 3 3 files changed, 983 insertions(+), 1 deletions(-)
0bd26ce5768df74af2a01f14d40bfc3767d3508c
drivers/scsi/qla2xxx/qla_dbg.c +948 -1
@@ -975,7 +975,939 @@ qla_uprintf(char **uiter, char *fmt, ...return (len); } -//FIXME + +void +qla24xx_fw_dump (scsi_qla_host_t *ha,int hardware_locked) +{ +int rval; +uint32_t cnt, timer; +uint32_t risc_address; +uint16_t mb[4 ]; + +uint32_t stat; +struct device_reg_24xx __iomem *reg = &ha->iobase->isp24; +uint32_t __iomem *dmp_reg; +uint32_t *iter_reg; +uint16_t __iomem *mbx_reg; +unsigned long flags; +struct qla24xx_fw_dump *fw; +uint32_t ext_mem_cnt; + + risc_address = ext_mem_cnt =0 ; +memset (mb,0 ,sizeof (mb)); + flags =0 ; + +if (!hardware_locked) +spin_lock_irqsave (&ha->hardware_lock, flags); + +if (!ha->fw_dump24) { +qla_printk (KERN_WARNING , ha, +"No buffer available for dump!!!\n" ); + goto qla24xx_fw_dump_failed; + } + +if (ha->fw_dumped) { +qla_printk (KERN_WARNING , ha, +"Firmware has been previously dumped (%p) -- ignoring " +"request...\n" , ha->fw_dump24); + goto qla24xx_fw_dump_failed; + } + fw = (struct qla24xx_fw_dump *) ha->fw_dump24; + + rval =QLA_SUCCESS ; + fw->hccr =RD_REG_DWORD (®->hccr); + +/* Pause RISC. */ +if ((fw->hccr &HCCRX_RISC_PAUSE ) ==0 ) { +WRT_REG_DWORD (®->hccr,HCCRX_SET_RISC_RESET | +HCCRX_CLR_HOST_INT ); +RD_REG_DWORD (®->hccr);/* PCI Posting. */ +WRT_REG_DWORD (®->hccr,HCCRX_SET_RISC_PAUSE ); +for (cnt =30000 ; + (RD_REG_DWORD (®->hccr) &HCCRX_RISC_PAUSE ) ==0 && + rval ==QLA_SUCCESS ; cnt--) { +if (cnt) +udelay (100 ); +else + rval =QLA_FUNCTION_TIMEOUT ; + } + } + +/* Disable interrupts. */ +WRT_REG_DWORD (®->ictrl,0 ); +RD_REG_DWORD (®->ictrl); + +if (rval ==QLA_SUCCESS ) { +/* Host interface registers. */ + dmp_reg = (uint32_t __iomem *)(reg +0 ); +for (cnt =0 ; cnt <sizeof (fw->host_reg) /4 ; cnt++) + fw->host_reg[cnt] =RD_REG_DWORD (dmp_reg++); + +/* Mailbox registers. */ + mbx_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); +for (cnt =0 ; cnt <sizeof (fw->mailbox_reg) /2 ; cnt++) + fw->mailbox_reg[cnt] =RD_REG_WORD (mbx_reg++); + +/* Transfer sequence registers. */ + iter_reg = fw->xseq_gp_reg; +WRT_REG_DWORD (®->iobase_addr,0xBF00 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xBF10 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xBF20 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xBF30 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xBF40 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xBF50 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xBF60 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xBF70 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xBFE0 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <sizeof (fw->xseq_0_reg) /4 ; cnt++) + fw->xseq_0_reg[cnt] =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xBFF0 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <sizeof (fw->xseq_1_reg) /4 ; cnt++) + fw->xseq_1_reg[cnt] =RD_REG_DWORD (dmp_reg++); + +/* Receive sequence registers. */ + iter_reg = fw->rseq_gp_reg; +WRT_REG_DWORD (®->iobase_addr,0xFF00 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xFF10 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xFF20 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xFF30 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xFF40 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xFF50 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xFF60 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xFF70 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xFFD0 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <sizeof (fw->rseq_0_reg) /4 ; cnt++) + fw->rseq_0_reg[cnt] =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xFFE0 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <sizeof (fw->rseq_1_reg) /4 ; cnt++) + fw->rseq_1_reg[cnt] =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0xFFF0 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <sizeof (fw->rseq_2_reg) /4 ; cnt++) + fw->rseq_2_reg[cnt] =RD_REG_DWORD (dmp_reg++); + +/* Command DMA registers. */ +WRT_REG_DWORD (®->iobase_addr,0x7100 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <sizeof (fw->cmd_dma_reg) /4 ; cnt++) + fw->cmd_dma_reg[cnt] =RD_REG_DWORD (dmp_reg++); + +/* Queues. */ + iter_reg = fw->req0_dma_reg; +WRT_REG_DWORD (®->iobase_addr,0x7200 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <8 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xE4 ); +for (cnt =0 ; cnt <7 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + + iter_reg = fw->resp0_dma_reg; +WRT_REG_DWORD (®->iobase_addr,0x7300 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <8 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xE4 ); +for (cnt =0 ; cnt <7 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + + iter_reg = fw->req1_dma_reg; +WRT_REG_DWORD (®->iobase_addr,0x7400 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <8 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xE4 ); +for (cnt =0 ; cnt <7 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +/* Transmit DMA registers. */ + iter_reg = fw->xmt0_dma_reg; +WRT_REG_DWORD (®->iobase_addr,0x7600 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x7610 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + + iter_reg = fw->xmt1_dma_reg; +WRT_REG_DWORD (®->iobase_addr,0x7620 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x7630 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + + iter_reg = fw->xmt2_dma_reg; +WRT_REG_DWORD (®->iobase_addr,0x7640 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x7650 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + + iter_reg = fw->xmt3_dma_reg; +WRT_REG_DWORD (®->iobase_addr,0x7660 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x7670 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + + iter_reg = fw->xmt4_dma_reg; +WRT_REG_DWORD (®->iobase_addr,0x7680 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x7690 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x76A0 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <sizeof (fw->xmt_data_dma_reg) /4 ; cnt++) + fw->xmt_data_dma_reg[cnt] =RD_REG_DWORD (dmp_reg++); + +/* Receive DMA registers. */ + iter_reg = fw->rcvt0_data_dma_reg; +WRT_REG_DWORD (®->iobase_addr,0x7700 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x7710 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + + iter_reg = fw->rcvt1_data_dma_reg; +WRT_REG_DWORD (®->iobase_addr,0x7720 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x7730 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +/* RISC registers. */ + iter_reg = fw->risc_gp_reg; +WRT_REG_DWORD (®->iobase_addr,0x0F00 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x0F10 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x0F20 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x0F30 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x0F40 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x0F50 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x0F60 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x0F70 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x0F70 ); +RD_REG_DWORD (®->iobase_addr); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xF0 ); +WRT_REG_DWORD (dmp_reg,0xB0000000 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xFC ); + fw->shadow_reg[0 ] =RD_REG_DWORD (dmp_reg); + + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xF0 ); +WRT_REG_DWORD (dmp_reg,0xB0100000 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xFC ); + fw->shadow_reg[1 ] =RD_REG_DWORD (dmp_reg); + + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xF0 ); +WRT_REG_DWORD (dmp_reg,0xB0200000 ); + dmp_reg = (uint32_t *)((uint8_t *)reg +0xFC ); + fw->shadow_reg[2 ] =RD_REG_DWORD (dmp_reg); + + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xF0 ); +WRT_REG_DWORD (dmp_reg,0xB0300000 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xFC ); + fw->shadow_reg[3 ] =RD_REG_DWORD (dmp_reg); + + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xF0 ); +WRT_REG_DWORD (dmp_reg,0xB0400000 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xFC ); + fw->shadow_reg[4 ] =RD_REG_DWORD (dmp_reg); + + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xF0 ); +WRT_REG_DWORD (dmp_reg,0xB0500000 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xFC ); + fw->shadow_reg[5 ] =RD_REG_DWORD (dmp_reg); + + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xF0 ); +WRT_REG_DWORD (dmp_reg,0xB0600000 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xFC ); + fw->shadow_reg[6 ] =RD_REG_DWORD (dmp_reg); + +/* Local memory controller registers. */ + iter_reg = fw->lmc_reg; +WRT_REG_DWORD (®->iobase_addr,0x3000 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x3010 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x3020 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x3030 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x3040 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x3050 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x3060 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +/* Fibre Protocol Module registers. */ + iter_reg = fw->fpm_hdw_reg; +WRT_REG_DWORD (®->iobase_addr,0x4000 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x4010 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x4020 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x4030 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x4040 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x4050 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x4060 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x4070 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x4080 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x4090 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x40A0 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x40B0 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +/* Frame Buffer registers. */ + iter_reg = fw->fb_hdw_reg; +WRT_REG_DWORD (®->iobase_addr,0x6000 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x6010 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x6020 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x6030 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x6040 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x6100 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x6130 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x6150 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x6170 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x6190 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +WRT_REG_DWORD (®->iobase_addr,0x61B0 ); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg +0xC0 ); +for (cnt =0 ; cnt <16 ; cnt++) + *iter_reg++ =RD_REG_DWORD (dmp_reg++); + +/* Reset RISC. */ +WRT_REG_DWORD (®->ctrl_status, +CSRX_DMA_SHUTDOWN |MWB_4096_BYTES ); +for (cnt =0 ; cnt <30000 ; cnt++) { +if ((RD_REG_DWORD (®->ctrl_status) & +CSRX_DMA_ACTIVE ) ==0 ) +break ; + +udelay (10 ); + } + +WRT_REG_DWORD (®->ctrl_status, +CSRX_ISP_SOFT_RESET |CSRX_DMA_SHUTDOWN |MWB_4096_BYTES ); +udelay (20 ); +for (cnt =0 ; cnt <30000 ; cnt++) { +if ((RD_REG_DWORD (®->ctrl_status) & +CSRX_ISP_SOFT_RESET ) ==0 ) +break ; + +udelay (10 ); + } +WRT_REG_DWORD (®->hccr,HCCRX_CLR_RISC_RESET ); +RD_REG_DWORD (®->hccr);/* PCI Posting. */ + } + +for (cnt =30000 ;RD_REG_WORD (®->mailbox0) !=0 && + rval ==QLA_SUCCESS ; cnt--) { +if (cnt) +udelay (100 ); +else + rval =QLA_FUNCTION_TIMEOUT ; + } + +/* Memory. */ +if (rval ==QLA_SUCCESS ) { +/* Code RAM. */ + risc_address =0x20000 ; +WRT_REG_WORD (®->mailbox0,MBC_READ_RAM_EXTENDED ); +clear_bit (MBX_INTERRUPT , &ha->mbx_cmd_flags); + } +for (cnt =0 ; cnt <sizeof (fw->code_ram) /4 && rval ==QLA_SUCCESS ; + cnt++, risc_address++) { +WRT_REG_WORD (®->mailbox1,LSW (risc_address)); +WRT_REG_WORD (®->mailbox8,MSW (risc_address)); +RD_REG_WORD (®->mailbox8); +WRT_REG_DWORD (®->hccr,HCCRX_SET_HOST_INT ); + +for (timer =6000000 ; timer; timer--) { +/* Check for pending interrupts. */ + stat =RD_REG_DWORD (®->host_status); +if (stat &HSRX_RISC_INT ) { + stat &=0xff ; + +if (stat ==0x1 || stat ==0x2 || + stat ==0x10 || stat ==0x11 ) { +set_bit (MBX_INTERRUPT , + &ha->mbx_cmd_flags); + + mb[0 ] =RD_REG_WORD (®->mailbox0); + mb[2 ] =RD_REG_WORD (®->mailbox2); + mb[3 ] =RD_REG_WORD (®->mailbox3); + +WRT_REG_DWORD (®->hccr, +HCCRX_CLR_RISC_INT ); +RD_REG_DWORD (®->hccr); +break ; + } + +/* Clear this intr; it wasn't a mailbox intr */ +WRT_REG_DWORD (®->hccr,HCCRX_CLR_RISC_INT ); +RD_REG_DWORD (®->hccr); + } +udelay (5 ); + } + +if (test_and_clear_bit (MBX_INTERRUPT , &ha->mbx_cmd_flags)) { + rval = mb[0 ] &MBS_MASK ; + fw->code_ram[cnt] = (mb[3 ] <<16 ) | mb[2 ]; + }else { + rval =QLA_FUNCTION_FAILED ; + } + } + +if (rval ==QLA_SUCCESS ) { +/* External Memory. */ + risc_address =0x100000 ; + ext_mem_cnt = ha->fw_memory_size -0x100000 +1 ; +WRT_REG_WORD (®->mailbox0,MBC_READ_RAM_EXTENDED ); +clear_bit (MBX_INTERRUPT , &ha->mbx_cmd_flags); + } +for (cnt =0 ; cnt < ext_mem_cnt && rval ==QLA_SUCCESS ; + cnt++, risc_address++) { +WRT_REG_WORD (®->mailbox1,LSW (risc_address)); +WRT_REG_WORD (®->mailbox8,MSW (risc_address)); +RD_REG_WORD (®->mailbox8); +WRT_REG_DWORD (®->hccr,HCCRX_SET_HOST_INT ); + +for (timer =6000000 ; timer; timer--) { +/* Check for pending interrupts. */ + stat =RD_REG_DWORD (®->host_status); +if (stat &HSRX_RISC_INT ) { + stat &=0xff ; + +if (stat ==0x1 || stat ==0x2 || + stat ==0x10 || stat ==0x11 ) { +set_bit (MBX_INTERRUPT , + &ha->mbx_cmd_flags); + + mb[0 ] =RD_REG_WORD (®->mailbox0); + mb[2 ] =RD_REG_WORD (®->mailbox2); + mb[3 ] =RD_REG_WORD (®->mailbox3); + +WRT_REG_DWORD (®->hccr, +HCCRX_CLR_RISC_INT ); +RD_REG_DWORD (®->hccr); +break ; + } + +/* Clear this intr; it wasn't a mailbox intr */ +WRT_REG_DWORD (®->hccr,HCCRX_CLR_RISC_INT ); +RD_REG_DWORD (®->hccr); + } +udelay (5 ); + } + +if (test_and_clear_bit (MBX_INTERRUPT , &ha->mbx_cmd_flags)) { + rval = mb[0 ] &MBS_MASK ; + fw->ext_mem[cnt] = (mb[3 ] <<16 ) | mb[2 ]; + }else { + rval =QLA_FUNCTION_FAILED ; + } + } + +if (rval !=QLA_SUCCESS ) { +qla_printk (KERN_WARNING , ha, +"Failed to dump firmware (%x)!!!\n" , rval); + ha->fw_dumped =0 ; + + }else { +qla_printk (KERN_INFO , ha, +"Firmware dump saved to temp buffer (%ld/%p).\n" , + ha->host_no, ha->fw_dump24); + ha->fw_dumped =1 ; + } + +qla24xx_fw_dump_failed: +if (!hardware_locked) +spin_unlock_irqrestore (&ha->hardware_lock, flags); +} + +void +qla24xx_ascii_fw_dump (scsi_qla_host_t *ha) +{ +uint32_t cnt; +char *uiter; +struct qla24xx_fw_dump *fw; +uint32_t ext_mem_cnt; + + uiter = ha->fw_dump_buffer; + fw = ha->fw_dump24; + +qla_uprintf (&uiter,"ISP FW Version %d.%02d.%02d Attributes %04x\n" , + ha->fw_major_version, ha->fw_minor_version, + ha->fw_subminor_version, ha->fw_attributes); + +qla_uprintf (&uiter,"\nHCCR Register\n%04x\n" , fw->hccr); + +qla_uprintf (&uiter,"\nHost Interface Registers" ); +for (cnt =0 ; cnt <sizeof (fw->host_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->host_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nMailbox Registers" ); +for (cnt =0 ; cnt <sizeof (fw->mailbox_reg) /2 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->mailbox_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nXSEQ GP Registers" ); +for (cnt =0 ; cnt <sizeof (fw->xseq_gp_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->xseq_gp_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nXSEQ-0 Registers" ); +for (cnt =0 ; cnt <sizeof (fw->xseq_0_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->xseq_0_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nXSEQ-1 Registers" ); +for (cnt =0 ; cnt <sizeof (fw->xseq_1_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->xseq_1_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nRSEQ GP Registers" ); +for (cnt =0 ; cnt <sizeof (fw->rseq_gp_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->rseq_gp_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nRSEQ-0 Registers" ); +for (cnt =0 ; cnt <sizeof (fw->rseq_0_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->rseq_0_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nRSEQ-1 Registers" ); +for (cnt =0 ; cnt <sizeof (fw->rseq_1_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->rseq_1_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nRSEQ-2 Registers" ); +for (cnt =0 ; cnt <sizeof (fw->rseq_2_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->rseq_2_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nCommand DMA Registers" ); +for (cnt =0 ; cnt <sizeof (fw->cmd_dma_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->cmd_dma_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nRequest0 Queue DMA Channel Registers" ); +for (cnt =0 ; cnt <sizeof (fw->req0_dma_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->req0_dma_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nResponse0 Queue DMA Channel Registers" ); +for (cnt =0 ; cnt <sizeof (fw->resp0_dma_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->resp0_dma_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nRequest1 Queue DMA Channel Registers" ); +for (cnt =0 ; cnt <sizeof (fw->req1_dma_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->req1_dma_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nXMT0 Data DMA Registers" ); +for (cnt =0 ; cnt <sizeof (fw->xmt0_dma_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->xmt0_dma_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nXMT1 Data DMA Registers" ); +for (cnt =0 ; cnt <sizeof (fw->xmt1_dma_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->xmt1_dma_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nXMT2 Data DMA Registers" ); +for (cnt =0 ; cnt <sizeof (fw->xmt2_dma_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->xmt2_dma_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nXMT3 Data DMA Registers" ); +for (cnt =0 ; cnt <sizeof (fw->xmt3_dma_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->xmt3_dma_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nXMT4 Data DMA Registers" ); +for (cnt =0 ; cnt <sizeof (fw->xmt4_dma_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->xmt4_dma_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nXMT Data DMA Common Registers" ); +for (cnt =0 ; cnt <sizeof (fw->xmt_data_dma_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->xmt_data_dma_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nRCV Thread 0 Data DMA Registers" ); +for (cnt =0 ; cnt <sizeof (fw->rcvt0_data_dma_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->rcvt0_data_dma_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nRCV Thread 1 Data DMA Registers" ); +for (cnt =0 ; cnt <sizeof (fw->rcvt1_data_dma_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->rcvt1_data_dma_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nRISC GP Registers" ); +for (cnt =0 ; cnt <sizeof (fw->risc_gp_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->risc_gp_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nShadow Registers" ); +for (cnt =0 ; cnt <sizeof (fw->shadow_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->shadow_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nLMC Registers" ); +for (cnt =0 ; cnt <sizeof (fw->lmc_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->lmc_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nFPM Hardware Registers" ); +for (cnt =0 ; cnt <sizeof (fw->fpm_hdw_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->fpm_hdw_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nFB Hardware Registers" ); +for (cnt =0 ; cnt <sizeof (fw->fb_hdw_reg) /4 ; cnt++) { +if (cnt %8 ==0 ) +qla_uprintf (&uiter,"\n" ); + +qla_uprintf (&uiter,"%08x " , fw->fb_hdw_reg[cnt]); + } + +qla_uprintf (&uiter,"\n\nCode RAM" ); +for (cnt =0 ; cnt <sizeof (fw->code_ram) /4 ; cnt++) { +if (cnt %8 ==0 ) { +qla_uprintf (&uiter,"\n%08x: " , cnt +0x20000 ); + } +qla_uprintf (&uiter,"%08x " , fw->code_ram[cnt]); + } + +qla_uprintf (&uiter,"\n\nExternal Memory" ); + ext_mem_cnt = ha->fw_memory_size -0x100000 +1 ; +for (cnt =0 ; cnt < ext_mem_cnt; cnt++) { +if (cnt %8 ==0 ) { +qla_uprintf (&uiter,"\n%08x: " , cnt +0x100000 ); + } +qla_uprintf (&uiter,"%08x " , fw->ext_mem[cnt]); + } + +qla_uprintf (&uiter,"\n[<==END] ISP Debug Dump" ); +} +/****************************************************************************/ /* Driver Debug Functions. */
@@ -1066,6 +1998,21 @@ qla2x00_print_scsi_cmd(struct scsi_cmndprintk (" state=%d\n" , sp->state); } +void +qla2x00_dump_pkt (void *pkt) +{ +uint32_t i; +uint8_t *data = (uint8_t *) pkt; + +for (i =0 ; i <64 ; i++) { +if (!(i %4 )) +printk ("\n%02x: " , i); + +printk ("%02x " , data[i]); + } +printk ("\n" ); +} +#if defined(QL_DEBUG_ROUTINES )/* * qla2x00_formatted_dump_buffer
drivers/scsi/qla2xxx/qla_dbg.h +32 -0
@@ -230,4 +230,36 @@ struct qla2100_fw_dump {uint16_t risc_ram[0xf000 ]; }; +#define FW_DUMP_SIZE_24XX 0x2B0000 +struct qla24xx_fw_dump { +uint32_t hccr; +uint32_t host_reg[32 ]; +uint16_t mailbox_reg[32 ]; +uint32_t xseq_gp_reg[128 ]; +uint32_t xseq_0_reg[16 ]; +uint32_t xseq_1_reg[16 ]; +uint32_t rseq_gp_reg[128 ]; +uint32_t rseq_0_reg[16 ]; +uint32_t rseq_1_reg[16 ]; +uint32_t rseq_2_reg[16 ]; +uint32_t cmd_dma_reg[16 ]; +uint32_t req0_dma_reg[15 ]; +uint32_t resp0_dma_reg[15 ]; +uint32_t req1_dma_reg[15 ]; +uint32_t xmt0_dma_reg[32 ]; +uint32_t xmt1_dma_reg[32 ]; +uint32_t xmt2_dma_reg[32 ]; +uint32_t xmt3_dma_reg[32 ]; +uint32_t xmt4_dma_reg[32 ]; +uint32_t xmt_data_dma_reg[16 ]; +uint32_t rcvt0_data_dma_reg[32 ]; +uint32_t rcvt1_data_dma_reg[32 ]; +uint32_t risc_gp_reg[128 ]; +uint32_t shadow_reg[7 ]; +uint32_t lmc_reg[112 ]; +uint32_t fpm_hdw_reg[192 ]; +uint32_t fb_hdw_reg[176 ]; +uint32_t code_ram[0x2000 ]; +uint32_t ext_mem[1 ]; +};
drivers/scsi/qla2xxx/qla_gbl.h +3 -0
@@ -207,11 +207,14 @@ extern void qla2x00_write_nvram_word(scs*/ extern void qla2100_fw_dump (scsi_qla_host_t *,int );extern void qla2300_fw_dump (scsi_qla_host_t *,int ); +extern void qla24xx_fw_dump (scsi_qla_host_t *,int );extern void qla2100_ascii_fw_dump (scsi_qla_host_t *);extern void qla2300_ascii_fw_dump (scsi_qla_host_t *); +extern void qla24xx_ascii_fw_dump (scsi_qla_host_t *);extern void qla2x00_dump_regs (scsi_qla_host_t *);extern void qla2x00_dump_buffer (uint8_t *,uint32_t );extern void qla2x00_print_scsi_cmd (struct scsi_cmnd *); +extern void qla2x00_dump_pkt (void *);/* * Global Function Prototypes in qla_gs.c source file.
Signature · 1 line
Andrew Vasquez
PATCH 5/17 qla2xxx: Generalize SNS generic-services routines.
In reply to Andrew VasquezGeneralize SNS generic-services routines.
Consolidate completion-status checking while adding support for the ISP24xx.
---
drivers/scsi/qla2xxx/qla_def.h | 3 - drivers/scsi/qla2xxx/qla_gbl.h | 4 - drivers/scsi/qla2xxx/qla_gs.c | 181 +++++++++++++++++++++++++--------------- drivers/scsi/qla2xxx/qla_mbx.c | 6 + 4 files changed, 121 insertions(+), 73 deletions(-)
da11a5f4bce50e1db314b57ba5871e6efa538f33
drivers/scsi/qla2xxx/qla_def.h +1 -2
@@ -2032,8 +2032,7 @@ struct isp_operations {uint16_t (*calc_req_entries) (uint16_t );void (*build_iocbs) (srb_t *,cmd_entry_t *,uint16_t ); -ms_iocb_entry_t * (*prep_ms_iocb) (struct scsi_qla_host *,uint32_t , -uint32_t ); +void * (*prep_ms_iocb) (struct scsi_qla_host *,uint32_t ,uint32_t );uint8_t * (*read_nvram) (struct scsi_qla_host *,uint8_t *,uint32_t ,uint32_t );
drivers/scsi/qla2xxx/qla_gbl.h +2 -2
@@ -219,8 +219,8 @@ extern void qla2x00_dump_pkt(void *);/* * Global Function Prototypes in qla_gs.c source file. */ -extern ms_iocb_entry_t *qla2x00_prep_ms_iocb (scsi_qla_host_t *,uint32_t , -uint32_t ); +extern void *qla2x00_prep_ms_iocb (scsi_qla_host_t *,uint32_t ,uint32_t ); +extern void *qla24xx_prep_ms_iocb (scsi_qla_host_t *,uint32_t ,uint32_t );extern int qla2x00_ga_nxt (scsi_qla_host_t *,fc_port_t *);extern int qla2x00_gid_pt (scsi_qla_host_t *,sw_info_t *);extern int qla2x00_gpn_id (scsi_qla_host_t *,sw_info_t *);
drivers/scsi/qla2xxx/qla_gs.c +113 -68
319 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_mbx.c +5 -1
@@ -822,7 +822,11 @@ qla2x00_issue_iocb(scsi_qla_host_t *ha,DEBUG2 (printk ("qla2x00_issue_iocb(%ld): failed rval 0x%x" , ha->host_no,rval);) }else { -/*EMPTY*/ +sts_entry_t *sts_entry = (sts_entry_t *) buffer; + +/* Mask reserved bits. */ + sts_entry->entry_status &= +IS_QLA24XX (ha) ||IS_QLA25XX (ha) ?RF_MASK_24XX :RF_MASK ; }return rval;
Signature · 1 line
Andrew Vasquez
PATCH 6/17 qla2xxx: Add MBX command routines for ISP24xx support.
In reply to Andrew VasquezAdd MBX command routines for ISP24xx support.
Generalize several routines [qla2x00_load_ram_ext(), qla2x00_execute_fw(), qla2x00_verify_checksum()] to handle larger addressing space.
---
drivers/scsi/qla2xxx/qla_def.h | 3 drivers/scsi/qla2xxx/qla_gbl.h | 28 + drivers/scsi/qla2xxx/qla_init.c | 33 + drivers/scsi/qla2xxx/qla_mbx.c | 988 ++++++++++++++++++++++++++++++--------- drivers/scsi/qla2xxx/qla_os.c | 5 5 files changed, 811 insertions(+), 246 deletions(-)
ec7266d75bdacf5afc0f07a2ceacde8ea6a69d1d
drivers/scsi/qla2xxx/qla_def.h +2 -1
@@ -2028,7 +2028,8 @@ struct isp_operations {int (*abort_target) (struct fc_port *);int (*fabric_login) (struct scsi_qla_host *,uint16_t ,uint8_t ,uint8_t ,uint8_t ,uint16_t *,uint8_t ); -int (*fabric_logout) (struct scsi_qla_host *,uint16_t ); +int (*fabric_logout) (struct scsi_qla_host *,uint16_t ,uint8_t , +uint8_t ,uint8_t );uint16_t (*calc_req_entries) (uint16_t );void (*build_iocbs) (srb_t *,cmd_entry_t *,uint16_t );
drivers/scsi/qla2xxx/qla_gbl.h +23 -5
@@ -104,10 +104,10 @@ extern int qla2x00_load_ram(scsi_qla_host_t *, dma_addr_t, uint16_t, uint16_t);extern int -qla2x00_load_ram_ext (scsi_qla_host_t *,dma_addr_t ,uint32_t ,uint16_t ); +qla2x00_load_ram_ext (scsi_qla_host_t *,dma_addr_t ,uint32_t ,uint32_t );extern int -qla2x00_execute_fw (scsi_qla_host_t *); +qla2x00_execute_fw (scsi_qla_host_t *,uint32_t ); extern void qla2x00_get_fw_version(scsi_qla_host_t *, uint16_t *,
@@ -123,7 +123,7 @@ extern intqla2x00_mbx_reg_test (scsi_qla_host_t *);extern int -qla2x00_verify_checksum (scsi_qla_host_t *); +qla2x00_verify_checksum (scsi_qla_host_t *,uint32_t );extern int qla2x00_issue_iocb (scsi_qla_host_t *,void *,dma_addr_t ,size_t );
@@ -133,7 +133,7 @@ qla2x00_abort_command(scsi_qla_host_t *,#if USE_ABORT_TGT extern int -qla2x00_abort_target (fc_port_t *fcport); +qla2x00_abort_target (fc_port_t *);#endif extern int
@@ -167,12 +167,18 @@ qla2x00_send_sns(scsi_qla_host_t *, dma_extern int qla2x00_login_fabric (scsi_qla_host_t *,uint16_t ,uint8_t ,uint8_t ,uint8_t ,uint16_t *,uint8_t ); +extern int +qla24xx_login_fabric (scsi_qla_host_t *,uint16_t ,uint8_t ,uint8_t ,uint8_t , +uint16_t *,uint8_t );extern int qla2x00_login_local_device (scsi_qla_host_t *,uint16_t ,uint16_t *,uint8_t );extern int -qla2x00_fabric_logout (scsi_qla_host_t *ha,uint16_t loop_id); +qla2x00_fabric_logout (scsi_qla_host_t *,uint16_t ,uint8_t ,uint8_t ,uint8_t ); + +extern int +qla24xx_fabric_logout (scsi_qla_host_t *,uint16_t ,uint8_t ,uint8_t ,uint8_t );extern int qla2x00_full_login_lip (scsi_qla_host_t *ha);
@@ -187,6 +193,18 @@ qla2x00_get_resource_cnts(scsi_qla_host_extern int qla2x00_get_fcal_position_map (scsi_qla_host_t *ha,char *pos_map); +extern int qla24xx_abort_command (scsi_qla_host_t *,srb_t *); +extern int qla24xx_abort_target (fc_port_t *); + +extern int qla2x00_system_error (scsi_qla_host_t *); + +extern int +qla2x00_get_serdes_params (scsi_qla_host_t *,uint16_t *,uint16_t *, +uint16_t *); + +extern int +qla2x00_set_serdes_params (scsi_qla_host_t *,uint16_t ,uint16_t ,uint16_t ); +/* * Global Function Prototypes in qla_isr.c source file. */
drivers/scsi/qla2xxx/qla_init.c +25 -8
@@ -331,7 +331,9 @@ qla2x00_isp_firmware(scsi_qla_host_t *haqla_printk (KERN_INFO , ha,"RISC CODE NOT loaded\n" );/* Verify checksum of loaded RISC code. */ - rval =qla2x00_verify_checksum (ha); + rval =qla2x00_verify_checksum (ha, +IS_QLA24XX (ha) ||IS_QLA25XX (ha) ?RISC_SADDRESS : + *ha->brd_info->fw_info[0 ].fwstart); }if (rval) {
@@ -756,13 +758,17 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)DEBUG (printk ("scsi(%ld): Verifying Checksum of loaded RISC " "code.\n" , ha->host_no)); - rval =qla2x00_verify_checksum (ha); + rval =qla2x00_verify_checksum (ha, +IS_QLA24XX (ha) ||IS_QLA25XX (ha) ?RISC_SADDRESS : + *ha->brd_info->fw_info[0 ].fwstart);if (rval ==QLA_SUCCESS ) {/* Start firmware execution. */ DEBUG (printk ("scsi(%ld): Checksum OK, start " "firmware.\n" , ha->host_no)); - rval =qla2x00_execute_fw (ha); + rval =qla2x00_execute_fw (ha, +IS_QLA24XX (ha) ||IS_QLA25XX (ha) ?RISC_SADDRESS : + *ha->brd_info->fw_info[0 ].fwstart);/* Retrieve firmware information. */ if (rval ==QLA_SUCCESS && ha->fw_major_version ==0 ) { qla2x00_get_fw_version(ha,
@@ -2011,7 +2017,10 @@ qla2x00_configure_fabric(scsi_qla_host_t fcport->port_type != FCT_BROADCAST) { ha->isp_ops.fabric_logout (ha, - fcport->loop_id); + fcport->loop_id, + fcport->d_id.b.domain, + fcport->d_id.b.area, + fcport->d_id.b.al_pa); fcport->loop_id =FC_NO_LOOP_ID ; } }
@@ -2256,7 +2265,9 @@ qla2x00_find_all_fabric_devs(scsi_qla_ho (fcport->flags &FCF_TAPE_PRESENT ) ==0 && fcport->port_type !=FCT_INITIATOR && fcport->port_type != FCT_BROADCAST) { - ha->isp_ops.fabric_logout (ha, fcport->loop_id); + ha->isp_ops.fabric_logout(ha, fcport->loop_id, + fcport->d_id.b.domain, fcport->d_id.b.area, + fcport->d_id.b.al_pa); fcport->loop_id =FC_NO_LOOP_ID ; }
@@ -2515,7 +2526,9 @@ qla2x00_fabric_dev_login(scsi_qla_host_tif (rval ==QLA_SUCCESS ) { rval =qla2x00_get_port_database (ha, fcport,0 );if (rval !=QLA_SUCCESS ) { - ha->isp_ops.fabric_logout (ha, fcport->loop_id); + ha->isp_ops.fabric_logout (ha, fcport->loop_id, + fcport->d_id.b.domain, fcport->d_id.b.area, + fcport->d_id.b.al_pa); }else {qla2x00_update_fcport (ha, fcport); }
@@ -2620,7 +2633,9 @@ qla2x00_fabric_login(scsi_qla_host_t *ha* dead. */ *next_loopid = fcport->loop_id; - ha->isp_ops.fabric_logout (ha, fcport->loop_id); + ha->isp_ops.fabric_logout (ha, fcport->loop_id, + fcport->d_id.b.domain, fcport->d_id.b.area, + fcport->d_id.b.al_pa);qla2x00_mark_device_lost (ha, fcport,1 ); rval =1 ;
@@ -2636,7 +2651,9 @@ qla2x00_fabric_login(scsi_qla_host_t *ha fcport->d_id.b.al_pa, fcport->loop_id, jiffies)); *next_loopid = fcport->loop_id; - ha->isp_ops.fabric_logout (ha, fcport->loop_id); + ha->isp_ops.fabric_logout (ha, fcport->loop_id, + 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 );
drivers/scsi/qla2xxx/qla_mbx.c +757 -231
1,334 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_os.c +4 -1
@@ -2002,7 +2002,10 @@ qla2x00_do_dpc(void *data)if (fcport->flags &FCF_TAPE_PRESENT ) ha->isp_ops.fabric_logout ( - ha, fcport->loop_id); + ha, fcport->loop_id, + fcport->d_id.b.domain, + fcport->d_id.b.area, + fcport->d_id.b.al_pa); status =qla2x00_fabric_login ( ha, fcport, &next_loopid); }else
Signature · 1 line
Andrew Vasquez
PATCH 7/17 qla2xxx: Add ISP24xx flash-manipulation routines.
In reply to Andrew VasquezAdd ISP24xx flash-manipulation routines.
Add read/write flash manipulation routines for the ISP24xx. Update sysfs NVRAM objects to use generalized accessor functions.
---
drivers/scsi/qla2xxx/qla_attr.c | 59 ++-- drivers/scsi/qla2xxx/qla_gbl.h | 11 + drivers/scsi/qla2xxx/qla_os.c | 2 drivers/scsi/qla2xxx/qla_sup.c | 538 ++++++++++++++++++++++++++++++++++++--- 4 files changed, 531 insertions(+), 79 deletions(-)
a5cc5a472bddbd65222ae021adad6cbfdce259fb
drivers/scsi/qla2xxx/qla_attr.c +28 -31
@@ -118,23 +118,15 @@ qla2x00_sysfs_read_nvram(struct kobject {struct scsi_qla_host *ha =to_qla_host (dev_to_shost (container_of (kobj, struct device, kobj))); -uint16_t *witer;unsigned long flags; -uint16_t cnt; -if (!capable (CAP_SYS_ADMIN ) || off !=0 || count !=sizeof (nvram_t)) +if (!capable (CAP_SYS_ADMIN ) || off !=0 || count != ha->nvram_size)return 0 ;/* Read NVRAM. */ spin_lock_irqsave (&ha->hardware_lock, flags); -qla2x00_lock_nvram_access (ha); - witer = (uint16_t *)buf; -for (cnt =0 ; cnt < count /2 ; cnt++) { - *witer =cpu_to_le16 (qla2x00_get_nvram_word (ha, - cnt+ha->nvram_base)); - witer++; - } -qla2x00_unlock_nvram_access (ha); + ha->isp_ops.read_nvram (ha, (uint8_t *)buf, ha->nvram_base, + ha->nvram_size);spin_unlock_irqrestore (&ha->hardware_lock, flags);return (count);
@@ -146,34 +138,38 @@ qla2x00_sysfs_write_nvram(struct kobject {struct scsi_qla_host *ha =to_qla_host (dev_to_shost (container_of (kobj, struct device, kobj))); -uint8_t *iter; -uint16_t *witer;unsigned long flags;uint16_t cnt; -uint8_t chksum; -if (!capable (CAP_SYS_ADMIN ) || off !=0 || count !=sizeof (nvram_t)) +if (!capable (CAP_SYS_ADMIN ) || off !=0 || count != ha->nvram_size)return 0 ;/* Checksum NVRAM. */ - iter = (uint8_t *)buf; - chksum =0 ; -for (cnt =0 ; cnt < count -1 ; cnt++) - chksum += *iter++; - chksum = ~chksum +1 ; - *iter = chksum; +if (IS_QLA24XX (ha) ||IS_QLA25XX (ha)) { +uint32_t *iter; +uint32_t chksum; + + iter = (uint32_t *)buf; + chksum =0 ; +for (cnt =0 ; cnt < ((count >>2 ) -1 ); cnt++) + chksum +=le32_to_cpu (*iter++); + chksum = ~chksum +1 ; + *iter =cpu_to_le32 (chksum); + }else { +uint8_t *iter; +uint8_t chksum; + + iter = (uint8_t *)buf; + chksum =0 ; +for (cnt =0 ; cnt < count -1 ; cnt++) + chksum += *iter++; + chksum = ~chksum +1 ; + *iter = chksum; + }/* Write NVRAM. */ spin_lock_irqsave (&ha->hardware_lock, flags); -qla2x00_lock_nvram_access (ha); -qla2x00_release_nvram_protection (ha); - witer = (uint16_t *)buf; -for (cnt =0 ; cnt < count /2 ; cnt++) { -qla2x00_write_nvram_word (ha, cnt+ha->nvram_base, -cpu_to_le16 (*witer)); - witer++; - } -qla2x00_unlock_nvram_access (ha); + ha->isp_ops.write_nvram (ha, (uint8_t *)buf, ha->nvram_base, count);spin_unlock_irqrestore (&ha->hardware_lock, flags);return (count);
@@ -185,7 +181,7 @@ static struct bin_attribute sysfs_nvram_ .mode = S_IRUSR | S_IWUSR, .owner = THIS_MODULE, }, - .size = sizeof(nvram_t), + .size = 0, .read = qla2x00_sysfs_read_nvram, .write = qla2x00_sysfs_write_nvram, };
@@ -196,6 +192,7 @@ qla2x00_alloc_sysfs_attr(scsi_qla_host_tstruct Scsi_Host *host = ha->host;sysfs_create_bin_file (&host->shost_gendev.kobj, &sysfs_fw_dump_attr); + sysfs_nvram_attr.size = ha->nvram_size;sysfs_create_bin_file (&host->shost_gendev.kobj, &sysfs_nvram_attr); }
drivers/scsi/qla2xxx/qla_gbl.h +11 -0
@@ -220,6 +220,17 @@ extern void qla2x00_unlock_nvram_access(extern void qla2x00_release_nvram_protection (scsi_qla_host_t *);extern uint16_t qla2x00_get_nvram_word (scsi_qla_host_t *,uint32_t );extern void qla2x00_write_nvram_word (scsi_qla_host_t *,uint32_t ,uint16_t ); +extern uint32_t *qla24xx_read_flash_data (scsi_qla_host_t *,uint32_t *, +uint32_t ,uint32_t ); +extern uint8_t *qla2x00_read_nvram_data (scsi_qla_host_t *,uint8_t *,uint32_t , +uint32_t ); +extern uint8_t *qla24xx_read_nvram_data (scsi_qla_host_t *,uint8_t *,uint32_t , +uint32_t ); +extern int qla2x00_write_nvram_data (scsi_qla_host_t *,uint8_t *,uint32_t , +uint32_t ); +extern int qla24xx_write_nvram_data (scsi_qla_host_t *,uint8_t *,uint32_t , +uint32_t ); +/* * Global Function Prototypes in qla_dbg.c source file. */
drivers/scsi/qla2xxx/qla_os.c +2 -0
@@ -1187,6 +1187,8 @@ int qla2x00_probe_one(struct pci_dev *pd ha->isp_ops.calc_req_entries = qla2x00_calc_iocbs_32; ha->isp_ops.build_iocbs = qla2x00_build_scsi_iocbs_32; ha->isp_ops.prep_ms_iocb = qla2x00_prep_ms_iocb; + ha->isp_ops.read_nvram = qla2x00_read_nvram_data; + ha->isp_ops.write_nvram = qla2x00_write_nvram_data; ha->isp_ops.fw_dump = qla2100_fw_dump; ha->isp_ops.ascii_fw_dump = qla2100_ascii_fw_dump;if (IS_QLA2100 (ha)) {
drivers/scsi/qla2xxx/qla_sup.c +490 -48
553 lines not on this page · raw message
Signature · 1 line
Andrew Vasquez
PATCH 8/17 qla2xxx: Add ISP24xx IOCB manipulation routines.
In reply to Andrew VasquezAdd ISP24xx IOCB manipulation routines.
Add appropriate glue-code for ISP24xx support while manipulting IOCB packets. Add an ISP24xx specific 'start_scsi' routine due to command-type-7 layout changes.
---
drivers/scsi/qla2xxx/qla_gbl.h | 1 drivers/scsi/qla2xxx/qla_inline.h | 13 + drivers/scsi/qla2xxx/qla_iocb.c | 325 +++++++++++++++++++++++++++++++++++-- 3 files changed, 323 insertions(+), 16 deletions(-)
ea9b892ded10bf99b1e155426ddce745cb865d1f
drivers/scsi/qla2xxx/qla_gbl.h +1 -0
@@ -94,6 +94,7 @@ extern uint16_t qla2x00_calc_iocbs_64(uiextern void qla2x00_build_scsi_iocbs_32 (srb_t *,cmd_entry_t *,uint16_t );extern void qla2x00_build_scsi_iocbs_64 (srb_t *,cmd_entry_t *,uint16_t );extern int qla2x00_start_scsi (srb_t *sp); +extern int qla24xx_start_scsi (srb_t *sp);int qla2x00_marker (scsi_qla_host_t *,uint16_t ,uint16_t ,uint8_t );int __qla2x00_marker (scsi_qla_host_t *,uint16_t ,uint16_t ,uint8_t );
drivers/scsi/qla2xxx/qla_inline.h +13 -0
@@ -236,6 +236,19 @@ qla2x00_delete_timer_from_cmd(srb_t *sp) } } +static inline uint8_t *host_to_fcp_swap (uint8_t *,uint32_t ); +static inline uint8_t * +host_to_fcp_swap (uint8_t *fcp,uint32_t bsize) +{ +uint32_t *ifcp = (uint32_t *) fcp; +uint32_t *ofcp = (uint32_t *) fcp; +uint32_t iter = bsize >>2 ; + +for (; iter ; iter--) + *ofcp++ =swab32 (*ifcp++); + +return fcp; +}static inline int qla2x00_is_reserved_id (scsi_qla_host_t *,uint16_t ); static inline int
drivers/scsi/qla2xxx/qla_iocb.c +309 -16
365 lines not on this page · raw message
Signature · 1 line
Andrew Vasquez
PATCH 9/17 qla2xxx: Add ISP24xx ISR routines.
In reply to Andrew VasquezAdd ISP24xx ISR routines.
Add appropriate glue-code for ISP24xx support -- this included generalizing some of the core handling routines (qla2x00_async_event() [pull-up retrieval of mailbox values] and qla2x00_status_entry()]. Fixup 2100/2300 ISRs to handle the new conventions.
---
drivers/scsi/qla2xxx/qla_gbl.h | 1 drivers/scsi/qla2xxx/qla_isr.c | 582 +++++++++++++++++++++++++++++----------- 2 files changed, 419 insertions(+), 164 deletions(-)
ba7eb57c9c230482353fded648e9e88bc3d146d3
drivers/scsi/qla2xxx/qla_gbl.h +1 -0
@@ -211,6 +211,7 @@ qla2x00_set_serdes_params(scsi_qla_host_*/ extern irqreturn_t qla2100_intr_handler (int ,void *,struct pt_regs *);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 *);/*
drivers/scsi/qla2xxx/qla_isr.c +418 -164
946 lines not on this page · raw message
Signature · 1 line
Andrew Vasquez
PATCH 10/17 qla2xxx: Add ISP24xx initialization routines.
In reply to Andrew VasquezAdd ISP24xx initialization routines.
---
drivers/scsi/qla2xxx/qla_gbl.h | 9 drivers/scsi/qla2xxx/qla_init.c | 973 ++++++++++++++++++++++++++++++++++----- drivers/scsi/qla2xxx/qla_os.c | 1 3 files changed, 848 insertions(+), 135 deletions(-)
0fa8d6c80a75c92805ff55eb87287fd53dd239bc
drivers/scsi/qla2xxx/qla_gbl.h +9 -0
@@ -35,13 +35,22 @@ extern int qla2x00_initialize_adapter(scextern int qla2100_pci_config (struct scsi_qla_host *);extern int qla2300_pci_config (struct scsi_qla_host *); +extern int qla24xx_pci_config (scsi_qla_host_t *);extern void qla2x00_reset_chip (struct scsi_qla_host *); +extern void qla24xx_reset_chip (struct scsi_qla_host *);extern int qla2x00_chip_diag (struct scsi_qla_host *); +extern int qla24xx_chip_diag (struct scsi_qla_host *);extern void qla2x00_config_rings (struct scsi_qla_host *); +extern void qla24xx_config_rings (struct scsi_qla_host *);extern void qla2x00_reset_adapter (struct scsi_qla_host *); +extern void qla24xx_reset_adapter (struct scsi_qla_host *);extern int qla2x00_nvram_config (struct scsi_qla_host *); +extern int qla24xx_nvram_config (struct scsi_qla_host *);extern void qla2x00_update_fw_options (struct scsi_qla_host *); +extern void qla24xx_update_fw_options (scsi_qla_host_t *);extern int qla2x00_load_risc (struct scsi_qla_host *,uint32_t *); +extern int qla24xx_load_risc_flash (scsi_qla_host_t *,uint32_t *); +extern int qla24xx_load_risc_hotplug (scsi_qla_host_t *,uint32_t *);extern fc_port_t *qla2x00_alloc_fcport (scsi_qla_host_t *,int );
drivers/scsi/qla2xxx/qla_init.c +838 -135
1,211 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_os.c +1 -0
@@ -1175,6 +1175,7 @@ int qla2x00_probe_one(struct pci_dev *pd ha->isp_ops.reset_adapter = qla2x00_reset_adapter; ha->isp_ops.nvram_config = qla2x00_nvram_config; ha->isp_ops.update_fw_options = qla2x00_update_fw_options; + ha->isp_ops.load_risc = qla2x00_load_risc; ha->isp_ops.pci_info_str = qla2x00_pci_info_str; ha->isp_ops.fw_version_str = qla2x00_fw_version_str; ha->isp_ops.intr_handler = qla2100_intr_handler;
Signature · 1 line
Andrew Vasquez
PATCH 11/17 qla2xxx: Add OS initialization codes for ISP24xx recognition.
In reply to Andrew VasquezAdd OS initialization codes for ISP24xx recognition.
---
drivers/scsi/qla2xxx/Makefile | 3 drivers/scsi/qla2xxx/qla_attr.c | 22 +- drivers/scsi/qla2xxx/qla_def.h | 3 drivers/scsi/qla2xxx/qla_os.c | 417 +++++++++++++++++++++++++++++++-------- 4 files changed, 350 insertions(+), 95 deletions(-)
0b1a41ae2af18d81cd1dc9ea8bce669097f5411a
drivers/scsi/qla2xxx/Makefile +3 -0
@@ -1,4 +1,6 @@ EXTRA_CFLAGS += -DUNIQUE_FW_NAME +CONFIG_SCSI_QLA24XX=m +EXTRA_CFLAGS += -DCONFIG_SCSI_QLA24XX -DCONFIG_SCSI_QLA24XX_MODULE qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \ qla_dbg.o qla_sup.o qla_rscn.o qla_attr.o
@@ -14,3 +16,4 @@ obj-$(CONFIG_SCSI_QLA22XX) += qla2xxx.o obj-$(CONFIG_SCSI_QLA2300) += qla2xxx.o qla2300.o obj-$(CONFIG_SCSI_QLA2322) += qla2xxx.o qla2322.o obj-$(CONFIG_SCSI_QLA6312) += qla2xxx.o qla6312.o +obj-$(CONFIG_SCSI_QLA24XX) += qla2xxx.o
drivers/scsi/qla2xxx/qla_attr.c +14 -8
@@ -63,23 +63,29 @@ qla2x00_sysfs_write_fw_dump(struct kobje ha->host_no);vfree (ha->fw_dump_buffer); -free_pages ((unsigned long )ha->fw_dump, - ha->fw_dump_order); +if (!IS_QLA24XX (ha) && !IS_QLA25XX (ha)) +free_pages ((unsigned long )ha->fw_dump, + ha->fw_dump_order); ha->fw_dump_reading =0 ; ha->fw_dump_buffer =NULL ; ha->fw_dump =NULL ; + ha->fw_dumped =0 ; }break ;case 1 : -if (ha->fw_dump !=NULL && !ha->fw_dump_reading) { +if ((ha->fw_dump || ha->fw_dumped) && !ha->fw_dump_reading) { ha->fw_dump_reading =1 ; - dump_size =FW_DUMP_SIZE_1M ; -if (ha->fw_memory_size <0x20000 ) - dump_size =FW_DUMP_SIZE_128K ; -else if (ha->fw_memory_size <0x80000 ) - dump_size =FW_DUMP_SIZE_512K ; +if (IS_QLA24XX (ha) ||IS_QLA25XX (ha)) + dump_size =FW_DUMP_SIZE_24XX ; +else { + dump_size =FW_DUMP_SIZE_1M ; +if (ha->fw_memory_size <0x20000 ) + dump_size =FW_DUMP_SIZE_128K ; +else if (ha->fw_memory_size <0x80000 ) + dump_size =FW_DUMP_SIZE_512K ; + } ha->fw_dump_buffer = (char *)vmalloc (dump_size);if (ha->fw_dump_buffer ==NULL ) { qla_printk(KERN_WARNING, ha,
drivers/scsi/qla2xxx/qla_def.h +2 -1
@@ -1989,7 +1989,8 @@ struct qla_board_info {char isp_name[8 ];struct qla_fw_info *fw_info; -char *fw_fname;; +char *fw_fname; +struct scsi_host_template *sht; };/* Return data from MBC_GET_ID_LIST call. */
drivers/scsi/qla2xxx/qla_os.c +331 -86
616 lines not on this page · raw message
Signature · 1 line
Andrew Vasquez
PATCH 12/17 qla2xxx: NVRAM id-list updates.
In reply to Andrew VasquezNVRAM id-list updates.
Resync with latest NVRAM subsystem ID list.
---
drivers/scsi/qla2xxx/qla_devtbl.h | 46 +++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 5 deletions(-)
1012645cc42fff24d030366fd5a0c4944def6c8f
drivers/scsi/qla2xxx/qla_devtbl.h +41 -5
@@ -1,4 +1,4 @@ -#define QLA_MODEL_NAMES 0x32 +#define QLA_MODEL_NAMES 0x44/* * Adapter model names.
@@ -53,7 +53,25 @@ static char *qla2x00_model_name[QLA_MODE" " ,/* 0x12e */ "QLA210" ,/* 0x12f */ "EMC 250" ,/* 0x130 */ -"HP A7538A" /* 0x131 */ +"HP A7538A" ,/* 0x131 */ +"QLA210" ,/* 0x132 */ +"QLA2460" ,/* 0x133 */ +"QLA2462" ,/* 0x134 */ +"QMC2462" ,/* 0x135 */ +"QMC2462S" ,/* 0x136 */ +"QLE2460" ,/* 0x137 */ +"QLE2462" ,/* 0x138 */ +"QME2462" ,/* 0x139 */ +"QLA2440" ,/* 0x13a */ +"QLA2442" ,/* 0x13b */ +"QSM2442" ,/* 0x13c */ +"QSM2462" ,/* 0x13d */ +"QLE210" ,/* 0x13e */ +"QLE220" ,/* 0x13f */ +"QLA2460" ,/* 0x140 */ +"QLA2462" ,/* 0x141 */ +"QLE2460" ,/* 0x142 */ +"QLE2462" /* 0x143 */ }; static char *qla2x00_model_desc[QLA_MODEL_NAMES] = {
@@ -78,8 +96,8 @@ static char *qla2x00_model_desc[QLA_MODE" " ,/* 0x112 */ " " ,/* 0x113 */ " " ,/* 0x114 */ -"133MHz PCI-X to 2Gb FC Single Channel" ,/* 0x115 */ -"133MHz PCI-X to 2Gb FC Dual Channel" ,/* 0x116 */ +"133MHz PCI-X to 2Gb FC, Single Channel" ,/* 0x115 */ +"133MHz PCI-X to 2Gb FC, Dual Channel" ,/* 0x116 */ "PCI-Express to 2Gb FC, Single Channel" ,/* 0x117 */ "PCI-Express to 2Gb FC, Dual Channel" ,/* 0x118 */ "133MHz PCI-X to 2Gb FC Optical", /* 0x119 */
@@ -106,5 +124,23 @@ static char *qla2x00_model_desc[QLA_MODE" " ,/* 0x12e */ "133MHz PCI-X to 2Gb FC SFF" ,/* 0x12f */ "133MHz PCI-X to 2Gb FC SFF" ,/* 0x130 */ - "HP 1p2g QLA2340" /* 0x131 */ +"HP 1p2g QLA2340" ,/* 0x131 */ +"133MHz PCI-X to 2Gb FC, Single Channel" ,/* 0x132 */ +"PCI-X 2.0 to 4Gb FC, Single Channel" ,/* 0x133 */ +"PCI-X 2.0 to 4Gb FC, Dual Channel" ,/* 0x134 */ +"IBM eServer BC 4Gb FC Expansion Card" ,/* 0x135 */ +"IBM eServer BC 4Gb FC Expansion Card SFF" ,/* 0x136 */ +"PCI-Express to 4Gb FC, Single Channel" ,/* 0x137 */ +"PCI-Express to 4Gb FC, Dual Channel" ,/* 0x138 */ +"Dell PCI-Express to 4Gb FC, Dual Channel" ,/* 0x139 */ +"PCI-X 1.0 to 4Gb FC, Single Channel" ,/* 0x13a */ +"PCI-X 1.0 to 4Gb FC, Dual Channel" ,/* 0x13b */ +"Server I/O Module 4Gb FC, Single Channel" ,/* 0x13c */ +"Server I/O Module 4Gb FC, Single Channel" ,/* 0x13d */ +"PCI-Express to 2Gb FC, Single Channel" ,/* 0x13e */ +"PCI-Express to 4Gb FC, Single Channel" ,/* 0x13f */ +"Sun PCI-X 2.0 to 4Gb FC, Single Channel" ,/* 0x140 */ +"Sun PCI-X 2.0 to 4Gb FC, Dual Channel" ,/* 0x141 */ +"Sun PCI-Express to 2Gb FC, Single Channel" ,/* 0x142 */ +"Sun PCI-Express to 4Gb FC, Single Channel" /* 0x143 */ };
Signature · 1 line
Andrew Vasquez
PATCH 13/17 qla2xxx: Code scrubbing.
In reply to Andrew VasquezCode scrubbing.
- Remove trailing whitespace from driver files.
- Remove unused #defines and inlines.
- Standardize on C comments (// -> /* */)
---
drivers/scsi/qla2xxx/qla_dbg.c | 130 ++++++++++++++++++----------------- drivers/scsi/qla2xxx/qla_def.h | 42 ++++++----- drivers/scsi/qla2xxx/qla_fw.h | 3 - drivers/scsi/qla2xxx/qla_gs.c | 6 +- drivers/scsi/qla2xxx/qla_init.c | 56 ++++++++------- drivers/scsi/qla2xxx/qla_inline.h | 86 +---------------------- drivers/scsi/qla2xxx/qla_iocb.c | 4 + drivers/scsi/qla2xxx/qla_isr.c | 21 +++--- drivers/scsi/qla2xxx/qla_mbx.c | 12 ++- drivers/scsi/qla2xxx/qla_os.c | 78 +++++++++++---------- drivers/scsi/qla2xxx/qla_rscn.c | 30 ++++---- drivers/scsi/qla2xxx/qla_settings.h | 25 ------- drivers/scsi/qla2xxx/qla_sup.c | 10 +-- drivers/scsi/qla2xxx/qla_version.h | 2 - 14 files changed, 199 insertions(+), 306 deletions(-)
590ae1880589da532026c35812c9931dd34996c0
drivers/scsi/qla2xxx/qla_dbg.c +65 -65
@@ -74,7 +74,7 @@ qla2300_fw_dump(scsi_qla_host_t *ha, int fw->hccr =RD_REG_WORD (®->hccr);/* Pause RISC. */ -WRT_REG_WORD (®->hccr,HCCR_PAUSE_RISC ); +WRT_REG_WORD (®->hccr,HCCR_PAUSE_RISC );if (IS_QLA2300 (ha)) { for (cnt = 30000; (RD_REG_WORD(®->hccr) & HCCR_RISC_PAUSE) == 0 &&
@@ -91,85 +91,85 @@ qla2300_fw_dump(scsi_qla_host_t *ha, intif (rval ==QLA_SUCCESS ) { dmp_reg = (uint16_t __iomem *)(reg +0 ); -for (cnt =0 ; cnt <sizeof (fw->pbiu_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->pbiu_reg) /2 ; cnt++) fw->pbiu_reg[cnt] =RD_REG_WORD (dmp_reg++); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x10 ); -for (cnt =0 ; cnt <sizeof (fw->risc_host_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_host_reg) /2 ; cnt++) fw->risc_host_reg[cnt] =RD_REG_WORD (dmp_reg++); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x40 ); -for (cnt =0 ; cnt <sizeof (fw->mailbox_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->mailbox_reg) /2 ; cnt++) fw->mailbox_reg[cnt] =RD_REG_WORD (dmp_reg++);WRT_REG_WORD (®->ctrl_status,0x40 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->resp_dma_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->resp_dma_reg) /2 ; cnt++) fw->resp_dma_reg[cnt] =RD_REG_WORD (dmp_reg++);WRT_REG_WORD (®->ctrl_status,0x50 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->dma_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->dma_reg) /2 ; cnt++) fw->dma_reg[cnt] =RD_REG_WORD (dmp_reg++);WRT_REG_WORD (®->ctrl_status,0x00 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0xA0 ); -for (cnt =0 ; cnt <sizeof (fw->risc_hdw_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_hdw_reg) /2 ; cnt++) fw->risc_hdw_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2000 ); +WRT_REG_WORD (®->pcr,0x2000 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp0_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp0_reg) /2 ; cnt++) fw->risc_gp0_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2200 ); +WRT_REG_WORD (®->pcr,0x2200 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp1_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp1_reg) /2 ; cnt++) fw->risc_gp1_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2400 ); +WRT_REG_WORD (®->pcr,0x2400 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp2_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp2_reg) /2 ; cnt++) fw->risc_gp2_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2600 ); +WRT_REG_WORD (®->pcr,0x2600 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp3_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp3_reg) /2 ; cnt++) fw->risc_gp3_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2800 ); +WRT_REG_WORD (®->pcr,0x2800 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp4_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp4_reg) /2 ; cnt++) fw->risc_gp4_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2A00 ); +WRT_REG_WORD (®->pcr,0x2A00 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp5_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp5_reg) /2 ; cnt++) fw->risc_gp5_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2C00 ); +WRT_REG_WORD (®->pcr,0x2C00 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp6_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp6_reg) /2 ; cnt++) fw->risc_gp6_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2E00 ); +WRT_REG_WORD (®->pcr,0x2E00 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp7_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp7_reg) /2 ; cnt++) fw->risc_gp7_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->ctrl_status,0x10 ); +WRT_REG_WORD (®->ctrl_status,0x10 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->frame_buf_hdw_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->frame_buf_hdw_reg) /2 ; cnt++) fw->frame_buf_hdw_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->ctrl_status,0x20 ); +WRT_REG_WORD (®->ctrl_status,0x20 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->fpm_b0_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->fpm_b0_reg) /2 ; cnt++) fw->fpm_b0_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->ctrl_status,0x30 ); +WRT_REG_WORD (®->ctrl_status,0x30 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->fpm_b1_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->fpm_b1_reg) /2 ; cnt++) fw->fpm_b1_reg[cnt] =RD_REG_WORD (dmp_reg++);/* Reset RISC. */
@@ -622,7 +622,7 @@ qla2100_fw_dump(scsi_qla_host_t *ha, int fw->hccr =RD_REG_WORD (®->hccr);/* Pause RISC. */ -WRT_REG_WORD (®->hccr,HCCR_PAUSE_RISC ); +WRT_REG_WORD (®->hccr,HCCR_PAUSE_RISC );for (cnt =30000 ; (RD_REG_WORD (®->hccr) &HCCR_RISC_PAUSE ) ==0 && rval ==QLA_SUCCESS ; cnt--) {if (cnt)
@@ -632,7 +632,7 @@ qla2100_fw_dump(scsi_qla_host_t *ha, int }if (rval ==QLA_SUCCESS ) { dmp_reg = (uint16_t __iomem *)(reg +0 ); -for (cnt =0 ; cnt <sizeof (fw->pbiu_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->pbiu_reg) /2 ; cnt++) fw->pbiu_reg[cnt] =RD_REG_WORD (dmp_reg++); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x10 );
@@ -644,67 +644,67 @@ qla2100_fw_dump(scsi_qla_host_t *ha, int } dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x20 ); -for (cnt =0 ; cnt <sizeof (fw->dma_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->dma_reg) /2 ; cnt++) fw->dma_reg[cnt] =RD_REG_WORD (dmp_reg++);WRT_REG_WORD (®->ctrl_status,0x00 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0xA0 ); -for (cnt =0 ; cnt <sizeof (fw->risc_hdw_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_hdw_reg) /2 ; cnt++) fw->risc_hdw_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2000 ); +WRT_REG_WORD (®->pcr,0x2000 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp0_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp0_reg) /2 ; cnt++) fw->risc_gp0_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2100 ); +WRT_REG_WORD (®->pcr,0x2100 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp1_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp1_reg) /2 ; cnt++) fw->risc_gp1_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2200 ); +WRT_REG_WORD (®->pcr,0x2200 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp2_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp2_reg) /2 ; cnt++) fw->risc_gp2_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2300 ); +WRT_REG_WORD (®->pcr,0x2300 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp3_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp3_reg) /2 ; cnt++) fw->risc_gp3_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2400 ); +WRT_REG_WORD (®->pcr,0x2400 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp4_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp4_reg) /2 ; cnt++) fw->risc_gp4_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2500 ); +WRT_REG_WORD (®->pcr,0x2500 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp5_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp5_reg) /2 ; cnt++) fw->risc_gp5_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2600 ); +WRT_REG_WORD (®->pcr,0x2600 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp6_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp6_reg) /2 ; cnt++) fw->risc_gp6_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->pcr,0x2700 ); +WRT_REG_WORD (®->pcr,0x2700 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->risc_gp7_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->risc_gp7_reg) /2 ; cnt++) fw->risc_gp7_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->ctrl_status,0x10 ); +WRT_REG_WORD (®->ctrl_status,0x10 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->frame_buf_hdw_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->frame_buf_hdw_reg) /2 ; cnt++) fw->frame_buf_hdw_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->ctrl_status,0x20 ); +WRT_REG_WORD (®->ctrl_status,0x20 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->fpm_b0_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->fpm_b0_reg) /2 ; cnt++) fw->fpm_b0_reg[cnt] =RD_REG_WORD (dmp_reg++); -WRT_REG_WORD (®->ctrl_status,0x30 ); +WRT_REG_WORD (®->ctrl_status,0x30 ); dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg +0x80 ); -for (cnt =0 ; cnt <sizeof (fw->fpm_b1_reg) /2 ; cnt++) +for (cnt =0 ; cnt <sizeof (fw->fpm_b1_reg) /2 ; cnt++) fw->fpm_b1_reg[cnt] =RD_REG_WORD (dmp_reg++);/* Reset the ISP. */
@@ -723,7 +723,7 @@ qla2100_fw_dump(scsi_qla_host_t *ha, intif (rval ==QLA_SUCCESS && (IS_QLA2200 (ha) || (IS_QLA2100 (ha) && (RD_REG_WORD (®->mctr) & (BIT_1 |BIT_0 )) !=0 ))) { -WRT_REG_WORD (®->hccr,HCCR_PAUSE_RISC ); +WRT_REG_WORD (®->hccr,HCCR_PAUSE_RISC );for (cnt =30000 ; (RD_REG_WORD (®->hccr) &HCCR_RISC_PAUSE ) ==0 && rval ==QLA_SUCCESS ; cnt--) {
@@ -964,7 +964,7 @@ qla_uprintf(char **uiter, char *fmt, ...int iter, len;char buf[128 ];va_list args; - +va_start (args, fmt); len =vsprintf (buf, fmt, args);va_end (args);
@@ -1913,8 +1913,8 @@ qla24xx_ascii_fw_dump(scsi_qla_host_t *h/* Driver Debug Functions. */ /****************************************************************************/ -void -qla2x00_dump_regs (scsi_qla_host_t *ha) +void +qla2x00_dump_regs (scsi_qla_host_t *ha) {struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
@@ -1935,7 +1935,7 @@ qla2x00_dump_regs(scsi_qla_host_t *ha)void -qla2x00_dump_buffer (uint8_t * b,uint32_t size) +qla2x00_dump_buffer (uint8_t * b,uint32_t size) {uint32_t cnt;uint8_t c;
@@ -1961,11 +1961,11 @@ qla2x00_dump_buffer(uint8_t * b, uint32_/************************************************************************** * qla2x00_print_scsi_cmd * Dumps out info about the scsi cmd and srb. -* Input +* Input * cmd : struct scsi_cmnd **************************************************************************/ void -qla2x00_print_scsi_cmd (struct scsi_cmnd * cmd) +qla2x00_print_scsi_cmd (struct scsi_cmnd * cmd) {int i;struct scsi_qla_host *ha;
@@ -1988,7 +1988,7 @@ qla2x00_print_scsi_cmd(struct scsi_cmnd cmd->request_buffer, cmd->request_bufflen);printk (" tag=%d, transfersize=0x%x\n" , cmd->tag, cmd->transfersize); -printk (" serial_number=%lx, SP=%p\n" , cmd->serial_number, sp); +printk (" serial_number=%lx, SP=%p\n" , cmd->serial_number, sp);printk (" data direction=%d\n" , cmd->sc_data_direction);if (!sp)
@@ -2025,8 +2025,8 @@ qla2x00_dump_pkt(void *pkt)* count = number of words. */ void -qla2x00_formatted_dump_buffer (char *string,uint8_t * buffer, -uint8_t wd_size,uint32_t count) +qla2x00_formatted_dump_buffer (char *string,uint8_t * buffer, +uint8_t wd_size,uint32_t count) {uint32_t cnt;uint16_t *buf16;
drivers/scsi/qla2xxx/qla_def.h +21 -21
154 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_fw.h +0 -3
@@ -21,8 +21,6 @@#ifndef __QLA_FW_H#define __QLA_FW_H -// ISP24xx -#define RISC_SADDRESS 0x100000#define MBS_CHECKSUM_ERROR 0x4010
@@ -60,7 +58,6 @@ struct port_database_24xx {#define PDS_PORT_UNAVAILABLE 0x07#define PDS_PRLO_PENDING 0x09#define PDS_LOGO_PENDING 0x11 -//FIXME #define PDS_PRLI2_PENDING 0x12uint8_t hard_address[3 ];
drivers/scsi/qla2xxx/qla_gs.c +3 -3
@@ -317,7 +317,7 @@ qla2x00_gid_pt(scsi_qla_host_t *ha, sw_i* single call. Return a failed status, and let GA_NXT handle * the overload. */ -if (i ==MAX_FIBRE_DEVICES ) +if (i ==MAX_FIBRE_DEVICES ) rval =QLA_FUNCTION_FAILED ; }
@@ -658,7 +658,7 @@ qla2x00_rsnn_nn(scsi_qla_host_t *ha)/* Prepare CT arguments -- node_name, symbolic node_name, size */ memcpy (ct_req->req.rsnn_nn.node_name, ha->node_name,WWN_SIZE ); - +/* Prepare the Symbolic Node Name */ /* Board type */ snn = ct_req->req.rsnn_nn.sym_node_name;
@@ -863,7 +863,7 @@ qla2x00_sns_gid_pt(scsi_qla_host_t *ha,* single call. Return a failed status, and let GA_NXT handle * the overload. */ -if (i ==MAX_FIBRE_DEVICES ) +if (i ==MAX_FIBRE_DEVICES ) rval =QLA_FUNCTION_FAILED ; }
drivers/scsi/qla2xxx/qla_init.c +28 -28
200 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_inline.h +4 -82
120 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_iocb.c +2 -2
@@ -468,7 +468,7 @@ queuing_error:* * Returns non-zero if a failure occured, else zero. */ -int +int __qla2x00_marker (scsi_qla_host_t *ha,uint16_t loop_id,uint16_t lun,uint8_t type) {
@@ -504,7 +504,7 @@ __qla2x00_marker(scsi_qla_host_t *ha, uireturn (QLA_SUCCESS ); } -int +int qla2x00_marker (scsi_qla_host_t *ha,uint16_t loop_id,uint16_t lun,uint8_t type) {
drivers/scsi/qla2xxx/qla_isr.c +10 -11
@@ -240,13 +240,13 @@ qla2x00_mbx_completion(scsi_qla_host_t * wptr = (uint16_t __iomem *)MAILBOX_REG (ha, reg,1 );for (cnt =1 ; cnt < ha->mbx_count; cnt++) { -if (IS_QLA2200 (ha) && cnt ==8 ) +if (IS_QLA2200 (ha) && cnt ==8 ) wptr = (uint16_t __iomem *)MAILBOX_REG (ha, reg,8 );if (cnt ==4 || cnt ==5 ) ha->mailbox_out[cnt] =qla2x00_debounce_register (wptr);else ha->mailbox_out[cnt] =RD_REG_WORD (wptr); - + wptr++; }
@@ -514,7 +514,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, "Configuration change detected: value=%x.\n", mb[1]);if (atomic_read (&ha->loop_state) !=LOOP_DOWN ) { -atomic_set (&ha->loop_state,LOOP_DOWN ); +atomic_set (&ha->loop_state,LOOP_DOWN );if (!atomic_read (&ha->loop_down_timer))atomic_set (&ha->loop_down_timer,LOOP_DOWN_TIME );
@@ -846,7 +846,7 @@ qla2x00_status_entry(scsi_qla_host_t *haqla_printk (KERN_WARNING , ha,"Status Entry invalid handle.\n" );set_bit (ISP_ABORT_NEEDED , &ha->dpc_flags); -if (ha->dpc_wait && !ha->dpc_active) +if (ha->dpc_wait && !ha->dpc_active)up (ha->dpc_wait);return ;
@@ -969,7 +969,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha }/* -* Check to see if SCSI Status is non zero. If so report SCSI +* Check to see if SCSI Status is non zero. If so report SCSI * Status. */ if (lscsi_status !=0 ) {
@@ -991,7 +991,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha sp->request_sense_length = sense_len; sp->request_sense_ptr = cp->sense_buffer; -if (sp->request_sense_length >32 ) +if (sp->request_sense_length >32 ) sense_len =32 ;memcpy (cp->sense_buffer, sense_data, sense_len);
@@ -1096,7 +1096,7 @@ qla2x00_status_entry(scsi_qla_host_t *habreak ;case CS_ABORTED : -/* +/* * hv2.19.12 - DID_ABORT does not retry the request if we * aborted this request then abort otherwise it must be a * reset.
@@ -1137,7 +1137,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha/* SCSI Mid-Layer handles device queue full */ - cp->result =DID_OK <<16 | lscsi_status; + cp->result =DID_OK <<16 | lscsi_status;break ;
@@ -1178,7 +1178,7 @@ qla2x00_status_cont_entry(scsi_qla_host_ "sp=%p sp->state:%d\n", __func__, sp, sp->state));qla_printk (KERN_INFO , ha,"cmd is NULL: already returned to OS (sp=%p)\n" , - sp); + sp); ha->status_srb =NULL ;return ;
@@ -1223,7 +1223,7 @@ qla2x00_error_entry(scsi_qla_host_t *ha,else if (pkt->entry_status &RF_INV_E_COUNT )qla_printk (KERN_ERR , ha,"%s: Invalid Entry Count\n" , __func__);else if (pkt->entry_status &RF_INV_E_PARAM ) -qla_printk (KERN_ERR , ha, +qla_printk (KERN_ERR , ha,"%s: Invalid Entry Parameter\n" , __func__);else if (pkt->entry_status &RF_INV_E_TYPE )qla_printk (KERN_ERR , ha,"%s: Invalid Entry Type\n" , __func__);
@@ -1365,7 +1365,6 @@ qla24xx_process_response_queue(struct scDEBUG3 (printk (KERN_INFO "scsi(%ld): Process error entry.\n" , ha->host_no)); -//FIXME qla2x00_error_entry (ha, (sts_entry_t *) pkt); ((response_t *)pkt)->signature =RESPONSE_PROCESSED ;wmb ();
drivers/scsi/qla2xxx/qla_mbx.c +6 -6
@@ -294,7 +294,7 @@ qla2x00_mailbox_command(scsi_qla_host_t"Mailbox command timeout occured. Scheduling ISP " "abort.\n");set_bit (ISP_ABORT_NEEDED , &ha->dpc_flags); -if (ha->dpc_wait && !ha->dpc_active) +if (ha->dpc_wait && !ha->dpc_active)up (ha->dpc_wait); }else if (!abort_active) {
@@ -1753,18 +1753,18 @@ qla2x00_login_fabric(scsi_qla_host_t *ha/* * qla2x00_login_local_device * Issue login loop port mailbox command. -* +* * Input: * ha = adapter block pointer. * loop_id = device loop ID. * opt = command options. -* +* * Returns: * Return status code. -* +* * Context: * Kernel context. -* +* */ int qla2x00_login_local_device(scsi_qla_host_t *ha, uint16_t loop_id,
@@ -2070,7 +2070,7 @@ qla2x00_get_resource_cnts(scsi_qla_host_ }else {DEBUG11 (printk ("%s(%ld): done. mb1=%x mb2=%x mb3=%x mb6=%x " "mb7=%x mb10=%x.\n" , __func__, ha->host_no, - mcp->mb[1 ], mcp->mb[2 ], mcp->mb[3 ], mcp->mb[6 ], mcp->mb[7 ], + mcp->mb[1 ], mcp->mb[2 ], mcp->mb[3 ], mcp->mb[6 ], mcp->mb[7 ], mcp->mb[10 ]));if (cur_xchg_cnt)
drivers/scsi/qla2xxx/qla_os.c +39 -39
270 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_rscn.c +15 -15
@@ -82,7 +82,7 @@ static int qla2x00_send_login_iocb(scsi_static int qla2x00_send_login_iocb_cb (scsi_qla_host_t *,struct io_descriptor *,struct mbx_entry *); -/** +/** * Mailbox IOCB callback array. **/ static int (*iocb_function_cb_list[LAST_IOCB_CB ])
@@ -95,7 +95,7 @@ static int (*iocb_function_cb_list[LAST_ }; -/** +/** * Generic IO descriptor handle routines. **/
@@ -169,7 +169,7 @@ qla2x00_handle_to_iodesc(scsi_qla_host_t } -/** +/** * IO descriptor allocation routines. **/
@@ -248,7 +248,7 @@ qla2x00_init_io_descriptors(scsi_qla_hos } -/** +/** * IO descriptor timer routines. **/
@@ -299,7 +299,7 @@ qla2x00_add_iodesc_timer(struct io_descradd_timer (&iodesc->timer); } -/** +/** * IO descriptor support routines. **/
@@ -333,7 +333,7 @@ qla2x00_update_login_fcport(scsi_qla_hos } -/** +/** * Mailbox IOCB commands. **/
@@ -383,7 +383,7 @@ qla2x00_get_mbx_iocb_entry(scsi_qla_host* Returns QLA_SUCCESS if the IOCB was issued. */ static int -qla2x00_send_abort_iocb (scsi_qla_host_t *ha,struct io_descriptor *iodesc, +qla2x00_send_abort_iocb (scsi_qla_host_t *ha,struct io_descriptor *iodesc,uint32_t handle_to_abort,int ha_locked) {unsigned long flags =0 ;
@@ -720,7 +720,7 @@ qla2x00_send_login_iocb_cb(scsi_qla_host/* Only process the last command. */ if (remote_fcport->iodesc_idx_sent != iodesc->idx) {DEBUG14 (printk ("scsi(%ld): Login IOCB -- ignoring, sent to " -"[%02x%02x%02x], expected %x, received %x.\n" , +"[%02x%02x%02x], expected %x, received %x.\n" , ha->host_no, iodesc->d_id.b.domain, iodesc->d_id.b.area, iodesc->d_id.b.al_pa, remote_fcport->iodesc_idx_sent, iodesc->idx));
@@ -754,9 +754,9 @@ qla2x00_send_login_iocb_cb(scsi_qla_hostDEBUG14 (printk ("scsi(%ld): Login IOCB -- status=%x mb1=%x pn=" "%02x%02x%02x%02x%02x%02x%02x%02x.\n" , ha->host_no, status, - mb[1 ], mbxstat->port_name[0 ], mbxstat->port_name[1 ], - mbxstat->port_name[2 ], mbxstat->port_name[3 ], - mbxstat->port_name[4 ], mbxstat->port_name[5 ], + mb[1 ], mbxstat->port_name[0 ], mbxstat->port_name[1 ], + mbxstat->port_name[2 ], mbxstat->port_name[3 ], + mbxstat->port_name[4 ], mbxstat->port_name[5 ], mbxstat->port_name[6 ], mbxstat->port_name[7 ]));memcpy (remote_fcport->node_name, mbxstat->node_name,WWN_SIZE );
@@ -1052,7 +1052,7 @@ qla2x00_send_login_iocb_cb(scsi_qla_host } -/** +/** * IO descriptor processing routines. **/
@@ -1136,7 +1136,7 @@ qla2x00_handle_port_rscn(scsi_qla_host_t remote_fcport = rscn_fcport; } -/* +/* * If the port is already in our fcport list and online, send an ADISC * to see if it's still alive. Issue login if a new fcport or the known * fcport is currently offline.
@@ -1191,7 +1191,7 @@ qla2x00_handle_port_rscn(scsi_qla_host_t }return (QLA_SUCCESS ); } - +/* Send ADISC if the fcport is online */ if (atomic_read (&remote_fcport->state) ==FCS_ONLINE || remote_fcport->iodesc_idx_sent ==IODESC_ADISC_NEEDED ) {
@@ -1229,7 +1229,7 @@ qla2x00_handle_port_rscn(scsi_qla_host_t* abort. */ uint32_t handle_to_abort; - + iodesc = &ha->io_descriptors[ remote_fcport->iodesc_idx_sent];qla2x00_remove_iodesc_timer (iodesc);
drivers/scsi/qla2xxx/qla_settings.h +0 -25
@@ -22,33 +22,8 @@*/ #define DEBUG_QLA2100 0/* For Debug of qla2x00 */ -#define STOP_ON_RESET 0#define USE_ABORT_TGT 1/* Use Abort Target mbx cmd */ -#define VSA 0/* Volume Set Addressing */ - -/* Failover options */ -#define MAX_RECOVERYTIME 10/* -* Max suspend time for a lun recovery -* time -*/ -#define MAX_FAILBACKTIME 5/* Max suspend time before fail back */ - -#define QLA_CMD_TIMER_DELTA 3 - -/* -* When a lun is suspended for the "Not Ready" condition then it will suspend -* the lun for increments of 6 sec delays. SUSPEND_COUNT is that count. -*/ -#define SUSPEND_COUNT 10/* 6 secs * 10 retries = 60 secs */ - -/* -* Defines the time in seconds that the driver extends the command timeout to -* get around the problem where the mid-layer only allows 5 retries for -* commands that return BUS_BUSY -*/ -#define EXTEND_CMD_TIMEOUT 60 -#define MAX_RETRIES_OF_ISP_ABORT 5/* Max time to wait for the loop to be in LOOP_READY state */
drivers/scsi/qla2xxx/qla_sup.c +5 -5
@@ -31,7 +31,7 @@ static void qla2x00_nv_write(scsi_qla_ho*/ /** -* qla2x00_lock_nvram_access() - +* qla2x00_lock_nvram_access() - * @ha: HA context */ void
@@ -64,7 +64,7 @@ qla2x00_lock_nvram_access(scsi_qla_host_ }/** -* qla2x00_unlock_nvram_access() - +* qla2x00_unlock_nvram_access() - * @ha: HA context */ void
@@ -542,18 +542,18 @@ qla24xx_write_flash_data(scsi_qla_host_t conf_addr =flash_conf_to_access_addr (0x03d8 );switch (man_id) { -case 0xbf :// STT flash +case 0xbf :/* STT flash. */ rest_addr =0x1fff ; sec_mask =0x3e000 ;if (flash_id ==0x80 ) conf_addr =flash_conf_to_access_addr (0x0352 );break ; -case 0x13 :// ST M25P80 +case 0x13 :/* ST M25P80. */ rest_addr =0x3fff ; sec_mask =0x3c000 ;break ;default : -// Default to 64 kb sector size +/* Default to 64 kb sector size. */ rest_addr =0x3fff ; sec_mask =0x3c000 ;break ;
drivers/scsi/qla2xxx/qla_version.h +1 -1
@@ -17,7 +17,7 @@* ******************************************************************************/ /* -* Driver version +* Driver version */ #define QLA2XXX_VERSION "8.00.02b5-k"
Signature · 1 line
Andrew Vasquez
PATCH 14/17 qla2xxx: Firmware updates.
In reply to Andrew VasquezFirmware updates.
Resync with latest 21xx firmware -- 1.19.25.
Resync with latest 22xx firmware -- 2.02.08.
Resync with latest 23xx/63xx firmware -- 3.03.15.
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.00b5k/0014-Firmware-updates.diff.bz2
Signature · 1 line
Andrew Vasquez
PATCH 15/17 qla2xxx: Update copyright banner.
In reply to Andrew VasquezUpdate copyright banner.
---
drivers/scsi/qla2xxx/ql2100.c | 2 +- drivers/scsi/qla2xxx/ql2200.c | 2 +- drivers/scsi/qla2xxx/ql2300.c | 2 +- drivers/scsi/qla2xxx/ql2322.c | 2 +- drivers/scsi/qla2xxx/ql6312.c | 2 +- drivers/scsi/qla2xxx/qla_dbg.c | 2 +- drivers/scsi/qla2xxx/qla_dbg.h | 2 +- drivers/scsi/qla2xxx/qla_def.h | 2 +- drivers/scsi/qla2xxx/qla_fw.h | 2 +- drivers/scsi/qla2xxx/qla_gbl.h | 2 +- drivers/scsi/qla2xxx/qla_gs.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 2 +- drivers/scsi/qla2xxx/qla_inline.h | 2 +- drivers/scsi/qla2xxx/qla_iocb.c | 2 +- drivers/scsi/qla2xxx/qla_isr.c | 2 +- drivers/scsi/qla2xxx/qla_mbx.c | 2 +- drivers/scsi/qla2xxx/qla_os.c | 2 +- drivers/scsi/qla2xxx/qla_rscn.c | 2 +- drivers/scsi/qla2xxx/qla_settings.h | 2 +- drivers/scsi/qla2xxx/qla_sup.c | 2 +- drivers/scsi/qla2xxx/qla_version.h | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-)
e18ad1fc29d37527f1a6425f7b7122957c4ed5d7
drivers/scsi/qla2xxx/ql2100.c +1 -1
@@ -1,7 +1,7 @@/* * QLogic ISP2100 device driver for Linux 2.6.x * Copyright (C) 2003 Christoph Hellwig. -* Copyright (C) 2003-2004 QLogic Corporation (www.qlogic.com) +* Copyright (C) 2003-2005 QLogic Corporation (www.qlogic.com) * * Released under GPL v2. */
drivers/scsi/qla2xxx/ql2200.c +1 -1
@@ -1,7 +1,7 @@/* * QLogic ISP2200 device driver for Linux 2.6.x * Copyright (C) 2003 Christoph Hellwig. -* Copyright (C) 2003-2004 QLogic Corporation (www.qlogic.com) +* Copyright (C) 2003-2005 QLogic Corporation (www.qlogic.com) * * Released under GPL v2. */
drivers/scsi/qla2xxx/ql2300.c +1 -1
@@ -1,7 +1,7 @@/* * QLogic ISP2300 device driver for Linux 2.6.x * Copyright (C) 2003 Christoph Hellwig. -* Copyright (C) 2003-2004 QLogic Corporation (www.qlogic.com) +* Copyright (C) 2003-2005 QLogic Corporation (www.qlogic.com) * * Released under GPL v2. */
drivers/scsi/qla2xxx/ql2322.c +1 -1
@@ -1,6 +1,6 @@/* * QLogic ISP2322 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation (www.qlogic.com) +* Copyright (C) 2003-2005 QLogic Corporation (www.qlogic.com) * * Released under GPL v2. */
drivers/scsi/qla2xxx/ql6312.c +1 -1
@@ -1,6 +1,6 @@/* * QLogic ISP6312 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation (www.qlogic.com) +* Copyright (C) 2003-2005 QLogic Corporation (www.qlogic.com) * * Released under GPL v2. */
drivers/scsi/qla2xxx/qla_dbg.c +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_dbg.h +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_def.h +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_fw.h +1 -1
@@ -3,7 +3,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_gbl.h +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_gs.c +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_init.c +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_inline.h +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_iocb.c +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_isr.c +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_mbx.c +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_os.c +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_rscn.c +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_settings.h +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_sup.c +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
drivers/scsi/qla2xxx/qla_version.h +1 -1
@@ -2,7 +2,7 @@* QLOGIC LINUX SOFTWARE * * QLogic ISP2x00 device driver for Linux 2.6.x -* Copyright (C) 2003-2004 QLogic Corporation +* Copyright (C) 2003-2005 QLogic Corporation * (www.qlogic.com) * * This program is free software; you can redistribute it and/or modify it
Signature · 1 line
Andrew Vasquez
PATCH 16/17 qla2xxx: Correct maximum supported lun and target-id definitions.
In reply to Andrew VasquezCorrect maximum supported lun and target-id definitions.
The driver uses command-IOCBs which support a maximum lun value of 0xffff -- correct #define to reflect the change. Also, remove superfluous MAX_TARGET definition.
---
drivers/scsi/qla2xxx/qla_def.h | 3 +-- drivers/scsi/qla2xxx/qla_init.c | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-)
900dd480ecb76a28cf910f53d1757264b6911c0b
drivers/scsi/qla2xxx/qla_def.h +1 -2
@@ -181,7 +181,7 @@*/ #define WWN_SIZE 8/* Size of WWPN, WWN & WWNN */ #define MAX_FIBRE_DEVICES 512 -#define MAX_FIBRE_LUNS 256 +#define MAX_FIBRE_LUNS 0xFFFF#define MAX_RSCN_COUNT 32#define MAX_HOST_COUNT 16
@@ -191,7 +191,6 @@#define MAX_BUSES 1/* We only have one bus today */ #define MAX_TARGETS_2100 MAX_FIBRE_DEVICES#define MAX_TARGETS_2200 MAX_FIBRE_DEVICES -#define MAX_TARGETS MAX_FIBRE_DEVICES#define MIN_LUNS 8#define MAX_LUNS MAX_FIBRE_LUNS#define MAX_CMDS_PER_LUN 255
drivers/scsi/qla2xxx/qla_init.c +2 -1
@@ -2094,7 +2094,8 @@ qla2x00_reg_remote_port(scsi_qla_host_tqla_printk (KERN_WARNING , ha,"Unable to allocate fc remote port!\n" ); -if (rport->scsi_target_id !=-1 && rport->scsi_target_id <MAX_TARGETS ) +if (rport->scsi_target_id !=-1 && + rport->scsi_target_id < ha->host->max_id) fcport->os_target_id = rport->scsi_target_id; rport->dd_data = fcport;
Signature · 1 line
Andrew Vasquez
PATCH 17/17 qla2xxx: Update version number to 8.01.00b5-k.
In reply to Andrew VasquezUpdate version number to 8.01.00b5-k.
---
drivers/scsi/qla2xxx/qla_version.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
cb2ccfbc4f91e62e69d2f84992a45a557c02230d
drivers/scsi/qla2xxx/qla_version.h +3 -3
@@ -19,9 +19,9 @@/* * Driver version */ -#define QLA2XXX_VERSION "8.00.02b5-k" +#define QLA2XXX_VERSION "8.01.00b5-k"#define QLA_DRIVER_MAJOR_VER 8 -#define QLA_DRIVER_MINOR_VER 0 -#define QLA_DRIVER_PATCH_VER 2 +#define QLA_DRIVER_MINOR_VER 1 +#define QLA_DRIVER_PATCH_VER 0#define QLA_DRIVER_BETA_VER 5
Signature · 1 line
Andrew Vasquez
James,
Here's three small patches which fix-up several issues found since my original patchset.
Should apply cleanly to a scsi-misc-2.6 tree with the previous patch set applied.
Thanks,
Andrew Vasquez
PATCH 1/1 qla2xxx: Add firmware version number to qla24xx_fw_version_str().
Add firmware version number to qla24xx_fw_version_str().
Original code was accidently trimmed during port.
---
drivers/scsi/qla2xxx/qla_os.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
21fad7fa5cb535355f128fc0459a2de79f1975be
drivers/scsi/qla2xxx/qla_os.c +4 -1
@@ -317,6 +317,10 @@ qla2x00_fw_version_str(struct scsi_qla_hchar *qla24xx_fw_version_str (struct scsi_qla_host *ha,char *str) { +sprintf (str,"%d.%02d.%02d " , ha->fw_major_version, + ha->fw_minor_version, + ha->fw_subminor_version); +if (ha->fw_attributes &BIT_0 )strcat (str,"[Class 2] " );if (ha->fw_attributes &BIT_1 )
@@ -326,7 +330,6 @@ qla24xx_fw_version_str(struct scsi_qla_hif (ha->fw_attributes &BIT_13 )strcat (str,"[Experimental]" );return str; - } static inline srb_t *
------------
PATCH 1/1 qla2xxx: Consolidate ISP24xx chip reset logic.
In reply to Andrew VasquezConsolidate ISP24xx chip reset logic.
Consolidate near-duplicate RISC reset logic from qla24xx_reset_chip() and qla24xx_chip_diag(). Also, after initiating a soft-reset, insure the firmware has completed all NVRAM accesses before continuing.
---
drivers/scsi/qla2xxx/qla_dbg.c | 11 ++++++ drivers/scsi/qla2xxx/qla_init.c | 78 ++++++++++++++++----------------------- 2 files changed, 42 insertions(+), 47 deletions(-)
644a5b0d24ceadbc1ea50ddd494e2386eec97004
drivers/scsi/qla2xxx/qla_dbg.c +11 -0
@@ -1526,6 +1526,17 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, intWRT_REG_DWORD (®->ctrl_status,CSRX_ISP_SOFT_RESET |CSRX_DMA_SHUTDOWN |MWB_4096_BYTES ); +RD_REG_DWORD (®->ctrl_status); + +/* Wait for firmware to complete NVRAM accesses. */ +udelay (5 ); + mb[0 ] = (uint32_t )RD_REG_WORD (®->mailbox0); +for (cnt =10000 ; cnt && mb[0 ]; cnt--) { +udelay (5 ); + mb[0 ] = (uint32_t )RD_REG_WORD (®->mailbox0); +barrier (); + } +udelay (20 );for (cnt =0 ; cnt <30000 ; cnt++) { if ((RD_REG_DWORD(®->ctrl_status) &
drivers/scsi/qla2xxx/qla_init.c +31 -47
112 lines not on this page · raw message
------------
PATCH 1/1 qla2xxx: Cleanup FC remote port registration.
In reply to Andrew VasquezCleanup FC remote port registration.
Due to the inherent behaviour (an immediate scan) of adding a 'target'-role-capable rport via fc_remote_port_add(), split the registration into two steps -- addition as unknown-type role, then use fc_remote_port_rolchg() with appropriate role (based on PLOGI/PRLI bits). This allows for a more cleaner rport->dd_data management as can be seen with the simplified qla2xxx_slave_alloc() function.
---
drivers/scsi/qla2xxx/qla_init.c | 17 ++++++++++------- drivers/scsi/qla2xxx/qla_os.c | 16 +--------------- 2 files changed, 11 insertions(+), 22 deletions(-)
d2b87ba88e4ddfd08931ce2e0d836a2dd1e68ca4
drivers/scsi/qla2xxx/qla_init.c +10 -7
@@ -2068,21 +2068,24 @@ qla2x00_reg_remote_port(scsi_qla_host_t rport_ids.port_id = fcport->d_id.b.domain <<16 | fcport->d_id.b.area <<8 | fcport->d_id.b.al_pa; rport_ids.roles =FC_RPORT_ROLE_UNKNOWN ; + fcport->rport = rport =fc_remote_port_add (ha->host,0 , &rport_ids); +if (!rport) { +qla_printk (KERN_WARNING , ha, +"Unable to allocate fc remote port!\n" ); +return ; + } + rport->dd_data = fcport; + + rport_ids.roles =FC_RPORT_ROLE_UNKNOWN ;if (fcport->port_type ==FCT_INITIATOR ) rport_ids.roles |=FC_RPORT_ROLE_FCP_INITIATOR ;if (fcport->port_type ==FCT_TARGET ) rport_ids.roles |=FC_RPORT_ROLE_FCP_TARGET ; - - fcport->rport = rport =fc_remote_port_add (ha->host,0 , &rport_ids); -if (!rport) -qla_printk (KERN_WARNING , ha, -"Unable to allocate fc remote port!\n" ); +fc_remote_port_rolechg (rport, rport_ids.roles);if (rport->scsi_target_id !=-1 && rport->scsi_target_id < ha->host->max_id) fcport->os_target_id = rport->scsi_target_id; - - rport->dd_data = fcport; }/*
drivers/scsi/qla2xxx/qla_os.c +1 -15
@@ -1071,26 +1071,12 @@ qla2x00_device_reset(scsi_qla_host_t *hastatic int qla2xxx_slave_alloc (struct scsi_device *sdev) { -scsi_qla_host_t *ha =to_qla_host (sdev->host);struct fc_rport *rport =starget_to_rport (scsi_target (sdev)); -fc_port_t *fcport; -int found;if (!rport)return -ENXIO ; - found =0 ; -list_for_each_entry (fcport, &ha->fcports, list) { -if (rport->port_name == -be64_to_cpu (*(uint64_t *)fcport->port_name)) { - found++; -break ; - } - } -if (!found) -return -ENXIO ; - - sdev->hostdata = fcport; + sdev->hostdata = rport->dd_data;return 0 ; }
------------