* [PATCH 0/2] qla2xxx: Bug Fixes for qla2xxx driver @ 2017-03-31 21:37 Himanshu Madhani 2017-03-31 21:37 ` [PATCH 1/2] qla2xxx: Add fix to read correct register value for ISP82xx Himanshu Madhani 2017-03-31 21:37 ` [PATCH 2/2] qla2xxx: Fix typo in driver Himanshu Madhani 0 siblings, 2 replies; 5+ messages in thread From: Himanshu Madhani @ 2017-03-31 21:37 UTC (permalink / raw) To: James.Bottomley, martin.petersen; +Cc: himanshu.madhani, linux-scsi Hi Martin, Couple bug fixes for the scsi-fixes branch please apply to 4.11/scsi-fixes. Thanks, Himanshu Milan P Gandhi (1): qla2xxx: Fix typo in driver Sawan Chandak (1): qla2xxx: Add fix to read correct register value for ISP82xx. drivers/scsi/qla2xxx/qla_attr.c | 2 +- drivers/scsi/qla2xxx/qla_bsg.c | 2 +- drivers/scsi/qla2xxx/qla_gs.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 2 +- drivers/scsi/qla2xxx/qla_isr.c | 6 +++--- drivers/scsi/qla2xxx/qla_os.c | 7 ++++++- 6 files changed, 13 insertions(+), 8 deletions(-) -- 2.12.0 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] qla2xxx: Add fix to read correct register value for ISP82xx. 2017-03-31 21:37 [PATCH 0/2] qla2xxx: Bug Fixes for qla2xxx driver Himanshu Madhani @ 2017-03-31 21:37 ` Himanshu Madhani 2017-04-05 0:14 ` Martin K. Petersen 2017-03-31 21:37 ` [PATCH 2/2] qla2xxx: Fix typo in driver Himanshu Madhani 1 sibling, 1 reply; 5+ messages in thread From: Himanshu Madhani @ 2017-03-31 21:37 UTC (permalink / raw) To: James.Bottomley, martin.petersen; +Cc: himanshu.madhani, linux-scsi From: Sawan Chandak <sawan.chandak@cavium.com> Add fix to read correct register value for ISP82xx, during check for register disconnect.ISP82xx has different base register. Fixes: a465537ad1a4 ("qla2xxx: Disable the adapter and skip error recovery in case of register disconnect") Signed-off-by: Sawan Chandak <sawan.chandak@cavium.com> Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> Cc: <stable@vger.kernel.org> --- drivers/scsi/qla2xxx/qla_os.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 3e7011757c82..83d61d2142e9 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -1160,8 +1160,13 @@ static inline uint32_t qla2x00_isp_reg_stat(struct qla_hw_data *ha) { struct device_reg_24xx __iomem *reg = &ha->iobase->isp24; + struct device_reg_82xx __iomem *reg82 = &ha->iobase->isp82; - return ((RD_REG_DWORD(®->host_status)) == ISP_REG_DISCONNECT); + if (IS_P3P_TYPE(ha)) + return ((RD_REG_DWORD(®82->host_int)) == ISP_REG_DISCONNECT); + else + return ((RD_REG_DWORD(®->host_status)) == + ISP_REG_DISCONNECT); } /************************************************************************** -- 2.12.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] qla2xxx: Add fix to read correct register value for ISP82xx. 2017-03-31 21:37 ` [PATCH 1/2] qla2xxx: Add fix to read correct register value for ISP82xx Himanshu Madhani @ 2017-04-05 0:14 ` Martin K. Petersen 0 siblings, 0 replies; 5+ messages in thread From: Martin K. Petersen @ 2017-04-05 0:14 UTC (permalink / raw) To: Himanshu Madhani; +Cc: James.Bottomley, martin.petersen, linux-scsi Himanshu Madhani <himanshu.madhani@cavium.com> writes: > Add fix to read correct register value for ISP82xx, during check for > register disconnect.ISP82xx has different base register. Applied to 4.11/scsi-fixes. -- Martin K. Petersen Oracle Linux Engineering ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] qla2xxx: Fix typo in driver 2017-03-31 21:37 [PATCH 0/2] qla2xxx: Bug Fixes for qla2xxx driver Himanshu Madhani 2017-03-31 21:37 ` [PATCH 1/2] qla2xxx: Add fix to read correct register value for ISP82xx Himanshu Madhani @ 2017-03-31 21:37 ` Himanshu Madhani 2017-04-05 0:14 ` Martin K. Petersen 1 sibling, 1 reply; 5+ messages in thread From: Himanshu Madhani @ 2017-03-31 21:37 UTC (permalink / raw) To: James.Bottomley, martin.petersen; +Cc: himanshu.madhani, linux-scsi From: Milan P Gandhi <mgandhi@redhat.com> Signed-off-by: Milan P Gandhi <mgandhi@redhat.com> Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> --- drivers/scsi/qla2xxx/qla_attr.c | 2 +- drivers/scsi/qla2xxx/qla_bsg.c | 2 +- drivers/scsi/qla2xxx/qla_gs.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 2 +- drivers/scsi/qla2xxx/qla_isr.c | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index 435ff7fd6384..7c8d6c54ab70 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c @@ -695,7 +695,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj, case 0x2025e: if (!IS_P3P_TYPE(ha) || vha != base_vha) { ql_log(ql_log_info, vha, 0x7071, - "FCoE ctx reset no supported.\n"); + "FCoE ctx reset not supported.\n"); return -EPERM; } diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c index 84c9098cc089..069104fed267 100644 --- a/drivers/scsi/qla2xxx/qla_bsg.c +++ b/drivers/scsi/qla2xxx/qla_bsg.c @@ -1822,7 +1822,7 @@ qla24xx_process_bidir_cmd(struct bsg_job *bsg_job) /* Check if operating mode is P2P */ if (ha->operating_mode != P2P) { ql_log(ql_log_warn, vha, 0x70a4, - "Host is operating mode is not P2p\n"); + "Host operating mode is not P2p\n"); rval = EXT_STATUS_INVALID_CFG; goto done; } diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index ab0f873fd6a1..9bc9aa9e164a 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -144,7 +144,7 @@ qla2x00_chk_ms_status(scsi_qla_host_t *vha, ms_iocb_entry_t *ms_pkt, if (ct_rsp->header.response != cpu_to_be16(CT_ACCEPT_RESPONSE)) { ql_dbg(ql_dbg_disc + ql_dbg_buffer, vha, 0x2077, - "%s failed rejected request on port_id: %02x%02x%02x Compeltion status 0x%x, response 0x%x\n", + "%s failed rejected request on port_id: %02x%02x%02x Completion status 0x%x, response 0x%x\n", routine, vha->d_id.b.domain, vha->d_id.b.area, vha->d_id.b.al_pa, comp_status, ct_rsp->header.response); diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index f9d2fe7b1ade..034743309ada 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -2289,7 +2289,7 @@ qla2x00_chip_diag(scsi_qla_host_t *vha) goto chip_diag_failed; /* Check product ID of chip */ - ql_dbg(ql_dbg_init, vha, 0x007d, "Checking product Id of chip.\n"); + ql_dbg(ql_dbg_init, vha, 0x007d, "Checking product ID of chip.\n"); mb[1] = RD_MAILBOX_REG(ha, reg, 1); mb[2] = RD_MAILBOX_REG(ha, reg, 2); diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 3203367a4f42..aac03504d9a3 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -2100,14 +2100,14 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt, case CS_DATA_OVERRUN: ql_dbg(ql_dbg_user, vha, 0x70b1, - "Command completed with date overrun thread_id=%d\n", + "Command completed with data overrun thread_id=%d\n", thread_id); rval = EXT_STATUS_DATA_OVERRUN; break; case CS_DATA_UNDERRUN: ql_dbg(ql_dbg_user, vha, 0x70b2, - "Command completed with date underrun thread_id=%d\n", + "Command completed with data underrun thread_id=%d\n", thread_id); rval = EXT_STATUS_DATA_UNDERRUN; break; @@ -2134,7 +2134,7 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt, case CS_BIDIR_RD_UNDERRUN: ql_dbg(ql_dbg_user, vha, 0x70b6, - "Command completed with read data data underrun " + "Command completed with read data underrun " "thread_id=%d\n", thread_id); rval = EXT_STATUS_DATA_UNDERRUN; break; -- 2.12.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] qla2xxx: Fix typo in driver 2017-03-31 21:37 ` [PATCH 2/2] qla2xxx: Fix typo in driver Himanshu Madhani @ 2017-04-05 0:14 ` Martin K. Petersen 0 siblings, 0 replies; 5+ messages in thread From: Martin K. Petersen @ 2017-04-05 0:14 UTC (permalink / raw) To: Himanshu Madhani; +Cc: James.Bottomley, martin.petersen, linux-scsi Himanshu Madhani <himanshu.madhani@cavium.com> writes: > From: Milan P Gandhi <mgandhi@redhat.com> > > Signed-off-by: Milan P Gandhi <mgandhi@redhat.com> > Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> Applied to 4.12/scsi-queue. -- Martin K. Petersen Oracle Linux Engineering ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-05 0:15 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-03-31 21:37 [PATCH 0/2] qla2xxx: Bug Fixes for qla2xxx driver Himanshu Madhani 2017-03-31 21:37 ` [PATCH 1/2] qla2xxx: Add fix to read correct register value for ISP82xx Himanshu Madhani 2017-04-05 0:14 ` Martin K. Petersen 2017-03-31 21:37 ` [PATCH 2/2] qla2xxx: Fix typo in driver Himanshu Madhani 2017-04-05 0:14 ` Martin K. Petersen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox