SCSI fixes for 2.6.29-rc5
Subsystems (9)
James Bottomley
maintainerPATCH 1/1 SCSI fixes for 2.6.29-rc5
This is a bunch of assorted bug fixes (with several in the qlogic drivers).
The patch is available at
master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
The short changelog is:
Andrew Vasquez (3):
qla2xxx: Update version number to 8.03.00-k3.
qla2xxx: Mask out 'reserved' bits while processing FLT regions.
qla2xxx: Properly acknowledge IDC notification messages.
Anirban Chakraborty (2):
qla2xxx: Correct slab-error overwrite during vport creation and deletion.
qla2xxx: Remove interrupt request bit check in the response processing pat
Brian King (3):
ibmvfc: Increase cancel timeout
ibmvfc: Fix rport relogin
ibmvfc: Fix command timeout errors
James Smart (1):
scsi_scan: add missing interim SDEV_DEL state if slave_alloc fails
Julia Lawall (1):
lpfc: introduce missing kfree
Martin Peschke (1):
sg: fix device number in blktrace data
Mike Christie (1):
libiscsi: Fix scsi command timeout oops in iscsi_eh_timed_out
Robert Jennings (1):
ibmvscsi: Correct DMA mapping leak
[email protected] (1):
qla2xxx: fix Kernel Panic with Qlogic 2472 Card.
And the diffstat
drivers/scsi/ibmvscsi/ibmvfc.c | 15 +++++++-- drivers/scsi/ibmvscsi/ibmvfc.h | 2 - drivers/scsi/ibmvscsi/ibmvscsi.c | 1 drivers/scsi/libiscsi.c | 3 + drivers/scsi/lpfc/lpfc_els.c | 1 drivers/scsi/qla2xxx/qla_attr.c | 13 +++----- drivers/scsi/qla2xxx/qla_def.h | 5 +++ drivers/scsi/qla2xxx/qla_devtbl.h | 2 - drivers/scsi/qla2xxx/qla_fw.h | 2 + drivers/scsi/qla2xxx/qla_gbl.h | 9 +++-- drivers/scsi/qla2xxx/qla_init.c | 7 +--- drivers/scsi/qla2xxx/qla_isr.c | 58 ++++++++++++++++++++++--------------- drivers/scsi/qla2xxx/qla_mbx.c | 40 ++++++++++++++++++++----- drivers/scsi/qla2xxx/qla_mid.c | 12 +++---- drivers/scsi/qla2xxx/qla_os.c | 16 ++++++++++ drivers/scsi/qla2xxx/qla_sup.c | 2 - drivers/scsi/qla2xxx/qla_version.h | 2 - drivers/scsi/scsi_scan.c | 1 drivers/scsi/sg.c | 2 - 19 files changed, 131 insertions(+), 62 deletions(-)
The full diff is below.
James
---
drivers/scsi/ibmvscsi/ibmvfc.c +11 -4
@@ -1573,9 +1573,6 @@ static int ibmvfc_queuecommand(struct scsi_cmnd *cmnd, vfc_cmd->resp_len =sizeof (vfc_cmd->rsp); vfc_cmd->cancel_key = (unsigned long )cmnd->device->hostdata; vfc_cmd->tgt_scsi_id = rport->port_id; -if ((rport->supported_classes &FC_COS_CLASS3 ) && - (fc_host_supported_classes (vhost->host) &FC_COS_CLASS3 )) - vfc_cmd->flags =IBMVFC_CLASS_3_ERR ; vfc_cmd->iu.xfer_len =scsi_bufflen (cmnd);int_to_scsilun (cmnd->device->lun, &vfc_cmd->iu.lun);memcpy (vfc_cmd->iu.cdb, cmnd->cmnd, cmnd->cmd_len);
@@ -3266,6 +3263,7 @@ static int ibmvfc_alloc_target(struct ibmvfc_host *vhost, u64 scsi_id)return -ENOMEM ; } +memset (tgt,0 ,sizeof (*tgt)); tgt->scsi_id = scsi_id; tgt->new_scsi_id = scsi_id; tgt->vhost = vhost;
@@ -3576,9 +3574,18 @@ static void ibmvfc_log_ae(struct ibmvfc_host *vhost, int events)static void ibmvfc_tgt_add_rport (struct ibmvfc_target *tgt) {struct ibmvfc_host *vhost = tgt->vhost; -struct fc_rport *rport; +struct fc_rport *rport = tgt->rport;unsigned long flags; +if (rport) { +tgt_dbg (tgt,"Setting rport roles\n" ); +fc_remote_port_rolechg (rport, tgt->ids.roles); +spin_lock_irqsave (vhost->host->host_lock, flags); +ibmvfc_set_tgt_action (tgt,IBMVFC_TGT_ACTION_NONE ); +spin_unlock_irqrestore (vhost->host->host_lock, flags); +return ; + } +tgt_dbg (tgt,"Adding rport\n" ); rport =fc_remote_port_add (vhost->host,0 , &tgt->ids);spin_lock_irqsave (vhost->host->host_lock, flags);
drivers/scsi/ibmvscsi/ibmvfc.h +1 -1
@@ -32,7 +32,7 @@#define IBMVFC_DRIVER_VERSION "1.0.4"#define IBMVFC_DRIVER_DATE "(November 14, 2008)" -#define IBMVFC_DEFAULT_TIMEOUT 15 +#define IBMVFC_DEFAULT_TIMEOUT 60#define IBMVFC_INIT_TIMEOUT 120#define IBMVFC_MAX_REQUESTS_DEFAULT 100
drivers/scsi/ibmvscsi/ibmvscsi.c +1 -0
@@ -432,6 +432,7 @@ static int map_sg_data(struct scsi_cmnd *cmd,sdev_printk (KERN_ERR , cmd->device,"Can't allocate memory " "for indirect table\n" ); +scsi_dma_unmap (cmd);return 0 ; } }
drivers/scsi/libiscsi.c +2 -1
@@ -1998,6 +1998,8 @@ int iscsi_host_add(struct Scsi_Host *shost, struct device *pdev)if (!shost->can_queue) shost->can_queue =ISCSI_DEF_XMIT_CMDS_MAX ; +if (!shost->transportt->eh_timed_out) + shost->transportt->eh_timed_out = iscsi_eh_cmd_timed_out;return scsi_add_host (shost, pdev); }EXPORT_SYMBOL_GPL (iscsi_host_add);
@@ -2020,7 +2022,6 @@ struct Scsi_Host *iscsi_host_alloc(struct scsi_host_template *sht, shost =scsi_host_alloc (sht,sizeof (struct iscsi_host ) + dd_data_size);if (!shost)return NULL ; - shost->transportt->eh_timed_out = iscsi_eh_cmd_timed_out;if (qdepth >ISCSI_MAX_CMD_PER_LUN || qdepth <1 ) {if (qdepth !=0 )
drivers/scsi/lpfc/lpfc_els.c +1 -0
@@ -5258,6 +5258,7 @@ lpfc_send_els_event(struct lpfc_vport *vport, sizeof(struct lpfc_name));break ;default : +kfree (els_data);return ; }memcpy (els_data->wwpn, &ndlp->nlp_portname,sizeof (struct lpfc_name ));
drivers/scsi/qla2xxx/qla_attr.c +6 -7
@@ -1265,13 +1265,6 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) test_bit(FCPORT_UPDATE_NEEDED, &vha->dpc_flags))msleep (1000 ); -if (ha->mqenable) { -if (qla25xx_delete_queues (vha,0 ) !=QLA_SUCCESS ) -qla_printk (KERN_WARNING , ha, -"Queue delete failed.\n" ); - vha->req_ques[0 ] = ha->req_q_map[0 ]->id; - } -qla24xx_disable_vp (vha);fc_remove_host (vha->host);
@@ -1293,6 +1286,12 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) vha->host_no, vha->vp_idx, vha)); } +if (ha->mqenable) { +if (qla25xx_delete_queues (vha,0 ) !=QLA_SUCCESS ) +qla_printk (KERN_WARNING , ha, +"Queue delete failed.\n" ); + } +scsi_host_put (vha->host);qla_printk (KERN_INFO , ha,"vport %d deleted\n" , id);return 0 ;
drivers/scsi/qla2xxx/qla_def.h +5 -0
@@ -2135,6 +2135,7 @@ struct qla_msix_entry {/* Work events. */ enum qla_work_type {QLA_EVT_AEN , +QLA_EVT_IDC_ACK , };
@@ -2149,6 +2150,10 @@ struct qla_work_evt {enum fc_host_event_code code;u32 data; } aen; +struct { +#define QLA_IDC_ACK_REGS 7 +uint16_t mb[QLA_IDC_ACK_REGS ]; + } idc_ack; } u; };
drivers/scsi/qla2xxx/qla_devtbl.h +1 -1
@@ -72,7 +72,7 @@ static char *qla2x00_model_name[QLA_MODEL_NAMES*2] = {"QLA2462" ,"Sun PCI-X 2.0 to 4Gb FC, Dual Channel" ,/* 0x141 */ "QLE2460" ,"Sun PCI-Express to 2Gb FC, Single Channel" ,/* 0x142 */ "QLE2462" ,"Sun PCI-Express to 4Gb FC, Single Channel" ,/* 0x143 */ -"QEM2462" "Server I/O Module 4Gb FC, Dual Channel" ,/* 0x144 */ +"QEM2462" ,"Server I/O Module 4Gb FC, Dual Channel" ,/* 0x144 */ "QLE2440" ,"PCI-Express to 4Gb FC, Single Channel" ,/* 0x145 */ "QLE2464" ,"PCI-Express to 4Gb FC, Quad Channel" ,/* 0x146 */ "QLA2440", "PCI-X 2.0 to 4Gb FC, Single Channel", /* 0x147 */
drivers/scsi/qla2xxx/qla_fw.h +2 -0
@@ -1402,6 +1402,8 @@ struct access_chip_rsp_84xx {#define MBA_IDC_NOTIFY 0x8101#define MBA_IDC_TIME_EXT 0x8102 +#define MBC_IDC_ACK 0x101 +struct nvram_81xx {/* NVRAM header. */ uint8_t id[4 ];
drivers/scsi/qla2xxx/qla_gbl.h +5 -4
@@ -72,6 +72,7 @@ extern int qla2x00_loop_reset(scsi_qla_host_t *);extern void qla2x00_abort_all_cmds (scsi_qla_host_t *,int );extern int qla2x00_post_aen_work (struct scsi_qla_host *,enum fc_host_event_code ,u32 ); +extern int qla2x00_post_idc_ack_work (struct scsi_qla_host *,uint16_t *);extern void qla2x00_abort_fcport_cmds (fc_port_t *); extern struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *,
@@ -266,6 +267,8 @@ qla2x00_set_idma_speed(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t *);extern int qla84xx_verify_chip (struct scsi_qla_host *,uint16_t *); +extern int qla81xx_idc_ack (scsi_qla_host_t *,uint16_t *); +/* * Global Function Prototypes in qla_isr.c source file. */
@@ -376,10 +379,8 @@ extern int qla2x00_dfs_remove(scsi_qla_host_t *);/* Globa function prototypes for multi-q */ extern int qla25xx_request_irq (struct rsp_que *); -extern int qla25xx_init_req_que (struct scsi_qla_host *,struct req_que *, -uint8_t ); -extern int qla25xx_init_rsp_que (struct scsi_qla_host *,struct rsp_que *, -uint8_t ); +extern int qla25xx_init_req_que (struct scsi_qla_host *,struct req_que *); +extern int qla25xx_init_rsp_que (struct scsi_qla_host *,struct rsp_que *);extern int qla25xx_create_req_que (struct qla_hw_data *,uint16_t ,uint8_t ,uint16_t ,uint8_t ,uint8_t ); extern int qla25xx_create_rsp_que(struct qla_hw_data *, uint16_t, uint8_t,
drivers/scsi/qla2xxx/qla_init.c +3 -4
@@ -1226,9 +1226,8 @@ qla24xx_config_rings(struct scsi_qla_host *vha) icb->firmware_options_2 |=__constant_cpu_to_le32 (BIT_18 ); - icb->firmware_options_2 |=__constant_cpu_to_le32 (BIT_22 ); + icb->firmware_options_2 &=__constant_cpu_to_le32 (~BIT_22 ); icb->firmware_options_2 |=__constant_cpu_to_le32 (BIT_23 ); - ha->rsp_q_map[0 ]->options = icb->firmware_options_2;WRT_REG_DWORD (®->isp25mq.req_q_in,0 );WRT_REG_DWORD (®->isp25mq.req_q_out,0 );
@@ -3493,7 +3492,7 @@ qla25xx_init_queues(struct qla_hw_data *ha) rsp = ha->rsp_q_map[i];if (rsp) { rsp->options &= ~BIT_0 ; - ret =qla25xx_init_rsp_que (base_vha, rsp, rsp->options); + ret =qla25xx_init_rsp_que (base_vha, rsp);if (ret !=QLA_SUCCESS ) DEBUG2_17(printk(KERN_WARNING "%s Rsp que:%d init failed\n", __func__,
@@ -3507,7 +3506,7 @@ qla25xx_init_queues(struct qla_hw_data *ha)if (req) {/* Clear outstanding commands array. */ req->options &= ~BIT_0 ; - ret =qla25xx_init_req_que (base_vha, req, req->options); + ret =qla25xx_init_req_que (base_vha, req);if (ret !=QLA_SUCCESS ) DEBUG2_17(printk(KERN_WARNING "%s Req que:%d init failed\n", __func__,
drivers/scsi/qla2xxx/qla_isr.c +35 -23
86 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_mbx.c +32 -8
@@ -3090,8 +3090,7 @@ verify_done: }int -qla25xx_init_req_que (struct scsi_qla_host *vha,struct req_que *req, -uint8_t options) +qla25xx_init_req_que (struct scsi_qla_host *vha,struct req_que *req) {int rval;unsigned long flags;
@@ -3101,7 +3100,7 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req,struct qla_hw_data *ha = vha->hw; mcp->mb[0 ] =MBC_INITIALIZE_MULTIQ ; - mcp->mb[1 ] = options; + mcp->mb[1 ] = req->options; mcp->mb[2 ] =MSW (LSD (req->dma)); mcp->mb[3 ] =LSW (LSD (req->dma)); mcp->mb[6 ] =MSW (MSD (req->dma));
@@ -3128,7 +3127,7 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req, mcp->tov =60 ;spin_lock_irqsave (&ha->hardware_lock, flags); -if (!(options &BIT_0 )) { +if (!(req->options &BIT_0 )) {WRT_REG_DWORD (®->req_q_in,0 );WRT_REG_DWORD (®->req_q_out,0 ); }
@@ -3142,8 +3141,7 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req, }int -qla25xx_init_rsp_que (struct scsi_qla_host *vha,struct rsp_que *rsp, -uint8_t options) +qla25xx_init_rsp_que (struct scsi_qla_host *vha,struct rsp_que *rsp) {int rval;unsigned long flags;
@@ -3153,7 +3151,7 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp,struct qla_hw_data *ha = vha->hw; mcp->mb[0 ] =MBC_INITIALIZE_MULTIQ ; - mcp->mb[1 ] = options; + mcp->mb[1 ] = rsp->options; mcp->mb[2 ] =MSW (LSD (rsp->dma)); mcp->mb[3 ] =LSW (LSD (rsp->dma)); mcp->mb[6 ] =MSW (MSD (rsp->dma));
@@ -3178,7 +3176,7 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp, mcp->tov =60 ;spin_lock_irqsave (&ha->hardware_lock, flags); -if (!(options &BIT_0 )) { +if (!(rsp->options &BIT_0 )) {WRT_REG_DWORD (®->rsp_q_out,0 );WRT_REG_DWORD (®->rsp_q_in,0 ); }
@@ -3193,3 +3191,29 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp,return rval; } +int +qla81xx_idc_ack (scsi_qla_host_t *vha,uint16_t *mb) +{ +int rval; +mbx_cmd_t mc; +mbx_cmd_t *mcp = &mc; + +DEBUG11 (printk ("%s(%ld): entered.\n" , __func__, vha->host_no)); + + mcp->mb[0 ] =MBC_IDC_ACK ; +memcpy (&mcp->mb[1 ], mb,QLA_IDC_ACK_REGS *sizeof (uint16_t )); + mcp->out_mb =MBX_7 |MBX_6 |MBX_5 |MBX_4 |MBX_3 |MBX_2 |MBX_1 |MBX_0 ; + mcp->in_mb =MBX_0 ; + mcp->tov =MBX_TOV_SECONDS ; + mcp->flags =0 ; + rval =qla2x00_mailbox_command (vha, mcp); + +if (rval !=QLA_SUCCESS ) { +DEBUG2_3_11 (printk ("%s(%ld): failed=%x (%x).\n" , __func__, + vha->host_no, rval, mcp->mb[0 ])); + }else { +DEBUG11 (printk ("%s(%ld): done.\n" , __func__, vha->host_no)); + } + +return rval; +}
drivers/scsi/qla2xxx/qla_mid.c +6 -6
@@ -396,7 +396,7 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)qla2x00_start_timer (vha, qla2x00_timer,WATCH_INTERVAL ); -memset (vha->req_ques,0 ,sizeof (vha->req_ques) *QLA_MAX_HOST_QUES ); +memset (vha->req_ques,0 ,sizeof (vha->req_ques)); vha->req_ques[0 ] = ha->req_q_map[0 ]->id; host->can_queue = ha->req_q_map[0 ]->length +128 ; host->this_id =255 ;
@@ -471,7 +471,7 @@ qla25xx_delete_req_que(struct scsi_qla_host *vha, struct req_que *req)if (req) { req->options |=BIT_0 ; - ret =qla25xx_init_req_que (vha, req, req->options); + ret =qla25xx_init_req_que (vha, req); }if (ret ==QLA_SUCCESS )qla25xx_free_req_que (vha, req);
@@ -486,7 +486,7 @@ qla25xx_delete_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)if (rsp) { rsp->options |=BIT_0 ; - ret =qla25xx_init_rsp_que (vha, rsp, rsp->options); + ret =qla25xx_init_rsp_que (vha, rsp); }if (ret ==QLA_SUCCESS )qla25xx_free_rsp_que (vha, rsp);
@@ -502,7 +502,7 @@ int qla25xx_update_req_que(struct scsi_qla_host *vha, uint8_t que, uint8_t qos) req->options |=BIT_3 ; req->qos = qos; - ret =qla25xx_init_req_que (vha, req, req->options); + ret =qla25xx_init_req_que (vha, req);if (ret !=QLA_SUCCESS )DEBUG2_17 (printk (KERN_WARNING "%s failed\n" , __func__));/* restore options bit */
@@ -632,7 +632,7 @@ qla25xx_create_req_que(struct qla_hw_data *ha, uint16_t options, req->max_q_depth = ha->req_q_map[0 ]->max_q_depth;mutex_unlock (&ha->vport_lock); - ret =qla25xx_init_req_que (base_vha, req, options); + ret =qla25xx_init_req_que (base_vha, req);if (ret !=QLA_SUCCESS ) {qla_printk (KERN_WARNING , ha,"%s failed\n" , __func__);mutex_lock (&ha->vport_lock);
@@ -710,7 +710,7 @@ qla25xx_create_rsp_que(struct qla_hw_data *ha, uint16_t options,if (ret) goto que_failed; - ret =qla25xx_init_rsp_que (base_vha, rsp, options); + ret =qla25xx_init_rsp_que (base_vha, rsp);if (ret !=QLA_SUCCESS ) {qla_printk (KERN_WARNING , ha,"%s failed\n" , __func__);mutex_lock (&ha->vport_lock);
drivers/scsi/qla2xxx/qla_os.c +16 -0
@@ -2522,6 +2522,19 @@ qla2x00_post_aen_work(struct scsi_qla_host *vha, enum fc_host_event_code code,return qla2x00_post_work (vha, e,1 ); } +int +qla2x00_post_idc_ack_work (struct scsi_qla_host *vha,uint16_t *mb) +{ +struct qla_work_evt *e; + + e =qla2x00_alloc_work (vha,QLA_EVT_IDC_ACK ,1 ); +if (!e) +return QLA_FUNCTION_FAILED ; + +memcpy (e->u.idc_ack.mb, mb,QLA_IDC_ACK_REGS *sizeof (uint16_t )); +return qla2x00_post_work (vha, e,1 ); +} +static void qla2x00_do_work (struct scsi_qla_host *vha) {
@@ -2539,6 +2552,9 @@ qla2x00_do_work(struct scsi_qla_host *vha)fc_host_post_event (vha->host,fc_get_event_number (), e->u.aen.code, e->u.aen.data);break ; +case QLA_EVT_IDC_ACK : +qla81xx_idc_ack (vha, e->u.idc_ack.mb); +break ; }if (e->flags &QLA_EVT_FLAG_FREE )kfree (e);
drivers/scsi/qla2xxx/qla_sup.c +1 -1
@@ -684,7 +684,7 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)"end=0x%x size=0x%x.\n" ,le32_to_cpu (region->code), start, le32_to_cpu(region->end) >> 2, le32_to_cpu(region->size))); -switch (le32_to_cpu (region->code)) { +switch (le32_to_cpu (region->code) &0xff ) {case FLT_REG_FW : ha->flt_region_fw = start;break ;
drivers/scsi/qla2xxx/qla_version.h +1 -1
@@ -7,7 +7,7 @@/* * Driver version */ -#define QLA2XXX_VERSION "8.03.00-k2" +#define QLA2XXX_VERSION "8.03.00-k3"#define QLA_DRIVER_MAJOR_VER 8#define QLA_DRIVER_MINOR_VER 3
drivers/scsi/scsi_scan.c +1 -0
@@ -317,6 +317,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,return sdev; out_device_destroy: +scsi_device_set_state (sdev,SDEV_DEL );transport_destroy_device (&sdev->sdev_gendev);put_device (&sdev->sdev_gendev); out:
drivers/scsi/sg.c +1 -1
@@ -1078,7 +1078,7 @@ sg_ioctl(struct inode *inode, struct file *filp,case BLKTRACESETUP :return blk_trace_setup (sdp->device->request_queue, sdp->disk->disk_name, - sdp->device->sdev_gendev.devt, +MKDEV (SCSI_GENERIC_MAJOR , sdp->index), (char *)arg);case BLKTRACESTART :return blk_trace_startstop (sdp->device->request_queue,1 );
Quoted 32 lines · On Fri, 20 Feb 2009 17:02:07 -0600 James Bottomley…
This is a bunch of assorted bug fixes (with several in the qlogic drivers).
The patch is available at
master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
The short changelog is:
Andrew Vasquez (3):
qla2xxx: Update version number to 8.03.00-k3.
qla2xxx: Mask out 'reserved' bits while processing FLT regions.
qla2xxx: Properly acknowledge IDC notification messages.Anirban Chakraborty (2):
qla2xxx: Correct slab-error overwrite during vport creation and deletion.
qla2xxx: Remove interrupt request bit check in the response processing patBrian King (3):
ibmvfc: Increase cancel timeout
ibmvfc: Fix rport relogin
ibmvfc: Fix command timeout errorsJames Smart (1):
scsi_scan: add missing interimSDEV_DELstate ifslave_allocfailsJulia Lawall (1):
lpfc: introduce missing kfreeMartin Peschke (1):
sg: fix device number in blktrace data
Quoted 8 lines
Mike Christie (1):
libiscsi: Fix scsi command timeout oops iniscsi_eh_timed_outRobert Jennings (1):
ibmvscsi: Correct DMA mapping leak[email protected] (1):
qla2xxx: fix Kernel Panic with Qlogic 2472 Card.
Did the mpt-fusion MSI problems get sorted out? I think so...
I believe that "scsi: mpt: suppress debugobjects warning" is 2.6.29 material. Sent 11 Feb, no response.
Also I believe that "hptiop: add new PCI device ID" should be in 2.6.29 (and earlier), below. I can send this on if you like.
From: HighPoint Linux Team <[email protected]>
Add a new PCI device ID.
---
drivers/scsi/hptiop.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/hptiop.c renamed from drivers/scsi/hptiop.c~hptiop-add-new-pci-device-id +1 -0
@@ -1251,6 +1251,7 @@ static struct pci_device_id hptiop_id_ta { PCI_VDEVICE(TTI, 0x3530), (kernel_ulong_t)&hptiop_itl_ops }, { PCI_VDEVICE(TTI, 0x3560), (kernel_ulong_t)&hptiop_itl_ops }, { PCI_VDEVICE(TTI, 0x4322), (kernel_ulong_t)&hptiop_itl_ops }, + { PCI_VDEVICE(TTI, 0x4321), (kernel_ulong_t)&hptiop_itl_ops }, { PCI_VDEVICE(TTI, 0x4210), (kernel_ulong_t)&hptiop_itl_ops }, { PCI_VDEVICE(TTI, 0x4211), (kernel_ulong_t)&hptiop_itl_ops }, { PCI_VDEVICE(TTI, 0x4310), (kernel_ulong_t)&hptiop_itl_ops },
_
James Bottomley
maintainerQuoted 38 lines · Andrew Morton
Quoted 35 lines · On Fri, 20 Feb 2009 17:02:07 -0600 James Bottomley…
This is a bunch of assorted bug fixes (with several in the qlogic drivers).
The patch is available at
master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
The short changelog is:
Andrew Vasquez (3):
qla2xxx: Update version number to 8.03.00-k3.
qla2xxx: Mask out 'reserved' bits while processing FLT regions.
qla2xxx: Properly acknowledge IDC notification messages.Anirban Chakraborty (2):
qla2xxx: Correct slab-error overwrite during vport creation and deletion.
qla2xxx: Remove interrupt request bit check in the response processing patBrian King (3):
ibmvfc: Increase cancel timeout
ibmvfc: Fix rport relogin
ibmvfc: Fix command timeout errorsJames Smart (1):
scsi_scan: add missing interimSDEV_DELstate ifslave_allocfailsJulia Lawall (1):
lpfc: introduce missing kfreeMartin Peschke (1):
sg: fix device number in blktrace dataMike Christie (1):
libiscsi: Fix scsi command timeout oops iniscsi_eh_timed_out
Quoted 7 lines
Quoted 5 lines
Robert Jennings (1):
ibmvscsi: Correct DMA mapping leak[email protected] (1):
qla2xxx: fix Kernel Panic with Qlogic 2472 Card.Did the mpt-fusion MSI problems get sorted out? I think so...
Yes, but in the PCI tree.
Quoted 2 lines
I believe that "scsi: mpt: suppress debugobjects warning" is 2.6.29 material. Sent 11 Feb, no response.
This is http://bugzilla.kernel.org/show_bug.cgi?id=12662 which is reported fixed with no code changes.
Quoted 2 lines
Also I believe that "hptiop: add new PCI device ID" should be in 2.6.29 (and earlier), below. I can send this on if you like.
I have this marked for inclusion, I'm just sending out the fixes that have been incubating in next prior to reconstructing a new fixes tree.
James
Quoted 9 lines · On Fri, 20 Feb 2009 23:40:56 +0000 James Bottomley…
Quoted 2 lines · Andrew Morton
On Fri, 20 Feb 2009 17:02:07 -0600
James Bottomley <[email protected]> wrote:...
Quoted 1 line
Did the mpt-fusion MSI problems get sorted out? I think so...
Yes, but in the PCI tree.
OK, fingers crossed for Jesse.
Quoted 5 lines
Quoted 2 lines
I believe that "scsi: mpt: suppress debugobjects warning" is 2.6.29 material. Sent 11 Feb, no response.
This is http://bugzilla.kernel.org/show_bug.cgi?id=12662 which is reported fixed with no code changes.
I think the followup is bogus.
drivers/message/fusion/mptbase.c:GetLanConfigPages() calls mpt_config() against an on-stack CONFIGPARMS, which embeds an on-stack timer_list.
So we should still use init_timer_on_stack(). Hopefully that won't explode if mpt_config() is called with a CONFIGPARMS which _isn't_ on the stack.
argh, I'll ping Thomas again.
Quoted 5 lines
Quoted 2 lines
Also I believe that "hptiop: add new PCI device ID" should be in 2.6.29 (and earlier), below. I can send this on if you like.
I have this marked for inclusion, I'm just sending out the fixes that have been incubating in next prior to reconstructing a new fixes tree.
ok, thanks.
Quoted 35 lines · James Bottomley
This is a bunch of assorted bug fixes (with several in the qlogic drivers).
The patch is available at
master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
The short changelog is:
Andrew Vasquez (3):
qla2xxx: Update version number to 8.03.00-k3.
qla2xxx: Mask out 'reserved' bits while processing FLT regions.
qla2xxx: Properly acknowledge IDC notification messages.Anirban Chakraborty (2):
qla2xxx: Correct slab-error overwrite during vport creation and deletion.
qla2xxx: Remove interrupt request bit check in the response processing patBrian King (3):
ibmvfc: Increase cancel timeout
ibmvfc: Fix rport relogin
ibmvfc: Fix command timeout errorsJames Smart (1):
scsi_scan: add missing interimSDEV_DELstate ifslave_allocfailsJulia Lawall (1):
lpfc: introduce missing kfreeMartin Peschke (1):
sg: fix device number in blktrace dataMike Christie (1):
libiscsi: Fix scsi command timeout oops iniscsi_eh_timed_out
Quoted 9 lines
Robert Jennings (1):
ibmvscsi: Correct DMA mapping leak[email protected] (1):
qla2xxx: fix Kernel Panic with Qlogic 2472 Card.And the diffstat
<snip>
James Hello.
Please, you must include a BUG fix patch I sent to the osd_uld, that was found by users, with use of old osd-targets. (It was sitting in next for a while now) It's an obvious BUG, no point of sending it the @stable way later.
http://www.spinics.net/lists/linux-scsi/msg33243.html
Do you need that I resend it?
Thanks in advance
Boaz
Boaz Harrosh wrote:
Quoted 114 lines · Boaz Harrosh
Quoted 35 lines · James Bottomley
This is a bunch of assorted bug fixes (with several in the qlogic drivers).
The patch is available at
master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
The short changelog is:
Andrew Vasquez (3):
qla2xxx: Update version number to 8.03.00-k3.
qla2xxx: Mask out 'reserved' bits while processing FLT regions.
qla2xxx: Properly acknowledge IDC notification messages.Anirban Chakraborty (2):
qla2xxx: Correct slab-error overwrite during vport creation and deletion.
qla2xxx: Remove interrupt request bit check in the response processing patBrian King (3):
ibmvfc: Increase cancel timeout
ibmvfc: Fix rport relogin
ibmvfc: Fix command timeout errorsJames Smart (1):
scsi_scan: add missing interimSDEV_DELstate ifslave_allocfailsJulia Lawall (1):
lpfc: introduce missing kfreeMartin Peschke (1):
sg: fix device number in blktrace dataMike Christie (1):
libiscsi: Fix scsi command timeout oops iniscsi_eh_timed_outQuoted 9 lines
Robert Jennings (1):
ibmvscsi: Correct DMA mapping leak[email protected] (1):
qla2xxx: fix Kernel Panic with Qlogic 2472 Card.And the diffstat
<snip>
James Hello.
Please, you must include a BUG fix patch I sent to the
osd_uld, that was found by users, with use of old osd-targets. (It was sitting in next for a while now) It's an obvious BUG, no point of sending it the @stable way later.http://www.spinics.net/lists/linux-scsi/msg33243.html
Do you need that I resend it?
Thanks in advance
BoazQuoted 35 lines · James Bottomley
This is a bunch of assorted bug fixes (with several in the qlogic drivers).
The patch is available at
master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
The short changelog is:
Andrew Vasquez (3):
qla2xxx: Update version number to 8.03.00-k3.
qla2xxx: Mask out 'reserved' bits while processing FLT regions.
qla2xxx: Properly acknowledge IDC notification messages.Anirban Chakraborty (2):
qla2xxx: Correct slab-error overwrite during vport creation and deletion.
qla2xxx: Remove interrupt request bit check in the response processing patBrian King (3):
ibmvfc: Increase cancel timeout
ibmvfc: Fix rport relogin
ibmvfc: Fix command timeout errorsJames Smart (1):
scsi_scan: add missing interimSDEV_DELstate ifslave_allocfailsJulia Lawall (1):
lpfc: introduce missing kfreeMartin Peschke (1):
sg: fix device number in blktrace dataMike Christie (1):
libiscsi: Fix scsi command timeout oops iniscsi_eh_timed_outQuoted 9 lines
Robert Jennings (1):
ibmvscsi: Correct DMA mapping leak[email protected] (1):
qla2xxx: fix Kernel Panic with Qlogic 2472 Card.And the diffstat
<snip>
James Hello.
Please, you must include a BUG fix patch I sent to the
osd_uld, that was found by users, with use of old osd-targets. (It was sitting in next for a while now) It's an obvious BUG, no point of sending it the @stable way later.
Quoted 7 lines
http://www.spinics.net/lists/linux-scsi/msg33243.html
Do you need that I resend it?
Thanks in advance
Boaz
Please, completely ignore. Need my morning coffee. Don't know what happened to me, I did not smoke anything Friday night.
Sorry for the noise
Boaz