qla2xxx: fixes for 2.6.19...
Subsystems (2)
cover qla2xxx: fixes for 2.6.19...
drivers/scsi/qla2xxx/qla_attr.c | 51 +++++++++++++------- drivers/scsi/qla2xxx/qla_def.h | 4 + drivers/scsi/qla2xxx/qla_gbl.h | 2 drivers/scsi/qla2xxx/qla_init.c | 21 ++++++++ drivers/scsi/qla2xxx/qla_isr.c | 91 ++++++++++++++++++++++++++++++++----- drivers/scsi/qla2xxx/qla_os.c | 27 ++++++++-- drivers/scsi/qla2xxx/qla_version.h | 2 7 files changed, 162 insertions(+), 36 deletions(-)
commits:
- Check return value of sysfs_create_bin_file() usage.
- Workaround D3 power-management issues.
- Correct QUEUE_FULL handling.
- Update version number to 8.01.07-k3.
PATCH 1/4 qla2xxx: Check return value of sysfs_create_bin_file() usage.
--- drivers/scsi/qla2xxx/qla_attr.c | 51 ++++++++++++++++++++++++-------------- 1 files changed, 32 insertions(+), 19 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +32 -19
@@ -379,21 +379,37 @@ static struct bin_attribute sysfs_sfp_at .read = qla2x00_sysfs_read_sfp, }; +static struct sysfs_entry { +char *name; +struct bin_attribute *attr; +int is4GBp_only; +} bin_file_entries[] = { + {"fw_dump" , &sysfs_fw_dump_attr, }, + {"nvram" , &sysfs_nvram_attr, }, + {"optrom" , &sysfs_optrom_attr, }, + {"optrom_ctl" , &sysfs_optrom_ctl_attr, }, + {"vpd" , &sysfs_vpd_attr,1 }, + {"sfp" , &sysfs_sfp_attr,1 }, + {0 }, +}; +void qla2x00_alloc_sysfs_attr (scsi_qla_host_t *ha) {struct Scsi_Host *host = ha->host; +struct sysfs_entry *iter; +int ret; -sysfs_create_bin_file (&host->shost_gendev.kobj, &sysfs_fw_dump_attr); -sysfs_create_bin_file (&host->shost_gendev.kobj, &sysfs_nvram_attr); -sysfs_create_bin_file (&host->shost_gendev.kobj, &sysfs_optrom_attr); -sysfs_create_bin_file (&host->shost_gendev.kobj, - &sysfs_optrom_ctl_attr); -if (IS_QLA24XX (ha) ||IS_QLA54XX (ha)) { -sysfs_create_bin_file (&host->shost_gendev.kobj, - &sysfs_vpd_attr); -sysfs_create_bin_file (&host->shost_gendev.kobj, - &sysfs_sfp_attr); +for (iter = bin_file_entries; iter->name; iter++) { +if (iter->is4GBp_only && (!IS_QLA24XX (ha) && !IS_QLA54XX (ha))) +continue ; + + ret =sysfs_create_bin_file (&host->shost_gendev.kobj, + iter->attr); +if (ret) +qla_printk (KERN_INFO , ha, +"Unable to create sysfs %s binary attribute " +"(%d).\n" , iter->name, ret); } }
@@ -401,17 +417,14 @@ void qla2x00_free_sysfs_attr(scsi_qla_host_t *ha) {struct Scsi_Host *host = ha->host; +struct sysfs_entry *iter; + +for (iter = bin_file_entries; iter->name; iter++) { +if (iter->is4GBp_only && (!IS_QLA24XX (ha) && !IS_QLA54XX (ha))) +continue ; -sysfs_remove_bin_file (&host->shost_gendev.kobj, &sysfs_fw_dump_attr); -sysfs_remove_bin_file (&host->shost_gendev.kobj, &sysfs_nvram_attr); -sysfs_remove_bin_file (&host->shost_gendev.kobj, &sysfs_optrom_attr); -sysfs_remove_bin_file (&host->shost_gendev.kobj, - &sysfs_optrom_ctl_attr); -if (IS_QLA24XX (ha) ||IS_QLA54XX (ha)) { -sysfs_remove_bin_file (&host->shost_gendev.kobj, - &sysfs_vpd_attr);sysfs_remove_bin_file (&host->shost_gendev.kobj, - &sysfs_sfp_attr); + iter->attr); }if (ha->beacon_blink_led ==1 )
Signature · 1 line
1.4.3.rc2.g23bed
PATCH 2/4 qla2xxx: Workaround D3 power-management issues.
In reply to Andrew VasquezEarly ISP2432 parts have a known hardware issue when coming out of a D3 hot state. This issue can result in a hung PCIe link. Recent firmwares contain a workaround whereby the stop-firmware mailbox command prevents the ISP from entering the D3 hot state.
In order to ensure that the workaround succeeded the driver must verify that the stop-firmware mailbox command completes successfully. In the event of a failure, the driver attempts a shutdown-retry after resetting the ISP and re-executing firmware.
--- drivers/scsi/qla2xxx/qla_gbl.h | 1 + drivers/scsi/qla2xxx/qla_init.c | 21 +++++++++++++++++++++ drivers/scsi/qla2xxx/qla_os.c | 6 +++--- 3 files changed, 25 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_gbl.h +1 -0
@@ -48,6 +48,7 @@ extern void qla2x00_update_fcport(scsi_qextern void qla2x00_reg_remote_port (scsi_qla_host_t *,fc_port_t *);extern void qla2x00_alloc_fw_dump (scsi_qla_host_t *); +extern void qla2x00_try_to_stop_firmware (scsi_qla_host_t *);/* * Global Data in qla_os.c source file.
drivers/scsi/qla2xxx/qla_init.c +21 -0
@@ -3948,3 +3948,24 @@ qla24xx_load_risc(scsi_qla_host_t *ha, u fail_fw_integrity:return QLA_FUNCTION_FAILED ; } + +void +qla2x00_try_to_stop_firmware (scsi_qla_host_t *ha) +{ +int ret, retries; + +if (!IS_QLA24XX (ha) && !IS_QLA54XX (ha)) +return ; + + ret =qla2x00_stop_firmware (ha); +for (retries =5 ; ret !=QLA_SUCCESS && retries ; retries--) { +qla2x00_reset_chip (ha); +if (qla2x00_chip_diag (ha) !=QLA_SUCCESS ) +continue ; +if (qla2x00_setup_chip (ha) !=QLA_SUCCESS ) +continue ; +qla_printk (KERN_INFO , ha, +"Attempting retry of stop-firmware command...\n" ); + ret =qla2x00_stop_firmware (ha); + } +}
drivers/scsi/qla2xxx/qla_os.c +3 -3
@@ -1712,8 +1712,10 @@ qla2x00_free_device(scsi_qla_host_t *ha)if (ha->eft)qla2x00_trace_control (ha,TC_DISABLE ,0 ,0 ); + ha->flags.online =0 ; +/* Stop currently executing firmware. */ -qla2x00_stop_firmware (ha); +qla2x00_try_to_stop_firmware (ha);/* turn-off interrupts on the card */ if (ha->interrupts_on)
@@ -1721,8 +1723,6 @@ qla2x00_free_device(scsi_qla_host_t *ha)qla2x00_mem_free (ha); - ha->flags.online =0 ; -/* Detach interrupts */ if (ha->host->irq)free_irq (ha->host->irq, ha);
Signature · 1 line
1.4.3.rc2.g23bed
PATCH 3/4 qla2xxx: Correct QUEUE_FULL handling.
In reply to Andrew Vasquez- Drop queue-depths across all luns for a given fcport during TASK_SET_FULL statuses.
- Ramp-up I/Os after throttling.
- Consolidate completion-status handling of CS_QUEUE_FULL with CS_COMPLETE as ISP24xx firmware no longer reports CS_QUEUE_FULL.
--- drivers/scsi/qla2xxx/qla_def.h | 4 ++ drivers/scsi/qla2xxx/qla_gbl.h | 1 + drivers/scsi/qla2xxx/qla_isr.c | 91 +++++++++++++++++++++++++++++++++++----- drivers/scsi/qla2xxx/qla_os.c | 21 ++++++++- 4 files changed, 104 insertions(+), 13 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +4 -0
@@ -1545,6 +1545,9 @@ typedef struct fc_port {spinlock_t rport_lock;struct fc_rport *rport, *drport;u32 supported_classes; + +unsigned long last_queue_full; +unsigned long last_ramp_up; } fc_port_t;/*
@@ -2255,6 +2258,7 @@ #define P2P_LOOP 3uint16_t mgmt_svr_loop_id;uint32_t login_retry_count; +int max_q_depth;/* Fibre Channel Device List. */ struct list_head fcports;
drivers/scsi/qla2xxx/qla_gbl.h +1 -0
@@ -62,6 +62,7 @@ extern int ql2xloginretrycount;extern int ql2xfdmienable;extern int ql2xallocfwdump;extern int ql2xextended_error_logging; +extern int ql2xqfullrampup;extern void qla2x00_sp_compl (scsi_qla_host_t *,srb_t *);
drivers/scsi/qla2xxx/qla_isr.c +80 -11
127 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_os.c +19 -2
@@ -77,6 +77,19 @@ MODULE_PARM_DESC(ql2xfdmienable,"Enables FDMI registratons " "Default is 0 - no FDMI. 1 - perfom FDMI."); +#define MAX_Q_DEPTH 32 +static int ql2xmaxqdepth =MAX_Q_DEPTH ; +module_param (ql2xmaxqdepth, int,S_IRUGO |S_IWUSR ); +MODULE_PARM_DESC (ql2xmaxqdepth, +"Maximum queue depth to report for target devices." ); + +int ql2xqfullrampup =120 ; +module_param (ql2xqfullrampup, int,S_IRUGO |S_IWUSR ); +MODULE_PARM_DESC (ql2xqfullrampup, +"Number of seconds to wait to begin to ramp-up the queue " +"depth for a device after a queue-full condition has been " +"detected. Default is 120 seconds." ); +/* * SCSI host template entry points */
@@ -1104,9 +1117,9 @@ qla2xxx_slave_configure(struct scsi_devistruct fc_rport *rport =starget_to_rport (sdev->sdev_target);if (sdev->tagged_supported) -scsi_activate_tcq (sdev,32 ); +scsi_activate_tcq (sdev, ha->max_q_depth);else -scsi_deactivate_tcq (sdev,32 ); +scsi_deactivate_tcq (sdev, ha->max_q_depth); rport->dev_loss_tmo = ha->port_down_retry_count +5 ;
@@ -1413,6 +1426,10 @@ qla2x00_probe_one(struct pci_dev *pdev, ha->link_data_rate =PORT_SPEED_UNKNOWN ; ha->optrom_size =OPTROM_SIZE_2300 ; + ha->max_q_depth =MAX_Q_DEPTH ; +if (ql2xmaxqdepth !=0 && ql2xmaxqdepth <=0xffffU ) + ha->max_q_depth = ql2xmaxqdepth; +/* Assign ISP specific operations. */ ha->isp_ops.pci_config = qla2100_pci_config; ha->isp_ops.reset_chip = qla2x00_reset_chip;
Signature · 1 line
1.4.3.rc2.g23bed
PATCH 4/4 qla2xxx: Update version number to 8.01.07-k3.
In reply to Andrew Vasquez--- drivers/scsi/qla2xxx/qla_version.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/scsi/qla2xxx/qla_version.h +1 -1
@@ -7,7 +7,7 @@/* * Driver version */ -#define QLA2XXX_VERSION "8.01.07-k2" +#define QLA2XXX_VERSION "8.01.07-k3"#define QLA_DRIVER_MAJOR_VER 8#define QLA_DRIVER_MINOR_VER 1
Signature · 1 line
1.4.3.rc2.g23bed