[PATCH 0/1] qla2xxx: fix for 2.6.33-rcX

[PATCH 0/1] qla2xxx: fix for 2.6.33-rcX

[giridhar.malavali]

From: Giridhar Malavali <giridhar.malavali@qlogic.com>

Hi Greg,

Please find the patch which applies fine with stable kernel 2.6.32-8.

Anirban Chakraborty (1):
  qla2xxx: Obtain proper host structure during response-queue
    processing.

 drivers/scsi/qla2xxx/qla_gbl.h |    1 -
 drivers/scsi/qla2xxx/qla_isr.c |   29 +----------------------------
 drivers/scsi/qla2xxx/qla_mid.c |    6 +++++-
 3 files changed, 6 insertions(+), 30 deletions(-)

[PATCH 1/1] qla2xxx: Obtain proper host structure during response-queue processing.

[giridhar.malavali]

From: Anirban Chakraborty <anirban.chakraborty@qlogic.com>

Original code incorrectly assumed only status-type-0
IOCBs would be queued to the response-queue, and thus all
entries would safely reference a VHA from the IOCB
'handle.'
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
---
 drivers/scsi/qla2xxx/qla_gbl.h |    1 -
 drivers/scsi/qla2xxx/qla_isr.c |   29 +----------------------------
 drivers/scsi/qla2xxx/qla_mid.c |    6 +++++-
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index f3d1d1a..65ef03c 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -453,6 +453,5 @@ extern void qla24xx_wrt_req_reg(struct qla_hw_data *, uint16_t, uint16_t);
 extern void qla25xx_wrt_req_reg(struct qla_hw_data *, uint16_t, uint16_t);
 extern void qla25xx_wrt_rsp_reg(struct qla_hw_data *, uint16_t, uint16_t);
 extern void qla24xx_wrt_rsp_reg(struct qla_hw_data *, uint16_t, uint16_t);
-extern struct scsi_qla_host * qla25xx_get_host(struct rsp_que *);
 
 #endif /* _QLA_GBL_H */
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index b20a716..b79481e 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2018,7 +2018,7 @@ qla24xx_msix_rsp_q(int irq, void *dev_id)
 
 	spin_lock_irq(&ha->hardware_lock);
 
-	vha = qla25xx_get_host(rsp);
+	vha = pci_get_drvdata(ha->pdev);
 	qla24xx_process_response_queue(vha, rsp);
 	if (!ha->mqenable) {
 		WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
@@ -2357,30 +2357,3 @@ int qla25xx_request_irq(struct rsp_que *rsp)
 	msix->rsp = rsp;
 	return ret;
 }
-
-struct scsi_qla_host *
-qla25xx_get_host(struct rsp_que *rsp)
-{
-	srb_t *sp;
-	struct qla_hw_data *ha = rsp->hw;
-	struct scsi_qla_host *vha = NULL;
-	struct sts_entry_24xx *pkt;
-	struct req_que *req;
-	uint16_t que;
-	uint32_t handle;
-
-	pkt = (struct sts_entry_24xx *) rsp->ring_ptr;
-	que = MSW(pkt->handle);
-	handle = (uint32_t) LSW(pkt->handle);
-	req = ha->req_q_map[que];
-	if (handle < MAX_OUTSTANDING_COMMANDS) {
-		sp = req->outstanding_cmds[handle];
-		if (sp)
-			return  sp->fcport->vha;
-		else
-			goto base_que;
-	}
-base_que:
-	vha = pci_get_drvdata(ha->pdev);
-	return vha;
-}
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index e07b361..4a69cc8 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -638,11 +638,15 @@ failed:
 
 static void qla_do_work(struct work_struct *work)
 {
+	unsigned long flags;
 	struct rsp_que *rsp = container_of(work, struct rsp_que, q_work);
 	struct scsi_qla_host *vha;
+	struct qla_hw_data *ha = rsp->hw;
 
-	vha = qla25xx_get_host(rsp);
+	spin_lock_irqsave(&rsp->hw->hardware_lock, flags);
+	vha = pci_get_drvdata(ha->pdev);
 	qla24xx_process_response_queue(vha, rsp);
+	spin_unlock_irqrestore(&rsp->hw->hardware_lock, flags);
 }
 
 /* create response queue */
-- 
1.6.2.rc1.30.gd43c

Re: [stable] [PATCH 0/1] qla2xxx: fix for 2.6.33-rcX

[Greg KH]

On Mon, Feb 15, 2010 at 04:42:08PM -0800, giridhar.malavali@qlogic.com wrote:
> From: Giridhar Malavali <giridhar.malavali@qlogic.com>
> 
> Hi Greg,
> 
> Please find the patch which applies fine with stable kernel 2.6.32-8.

Now applied, thanks for doing this.

greg k-h

[PATCH 0/1] qla2xxx: fix for 2.6.33-rcX

[giridhar.malavali]

From: Giridhar Malavali <giridhar.malavali@qlogic.com>

James,

Can you please apply this patch. This is a critical fix which can cause
panic issues (found on PPC). This needs to be back ported to stable kernel.

Andrew Vasquez (1):
  qla2xxx: Obtain proper host structure during response-queue
    processing.

 drivers/scsi/qla2xxx/qla_isr.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Re: [stable] [PATCH 0/1] qla2xxx: fix for 2.6.33-rcX

[Greg KH]

On Tue, Feb 02, 2010 at 07:48:32PM -0800, giridhar.malavali@qlogic.com wrote:
> From: Giridhar Malavali <giridhar.malavali@qlogic.com>
> 
> James,
> 
> Can you please apply this patch. This is a critical fix which can cause
> panic issues (found on PPC). This needs to be back ported to stable kernel.

This patch is now in Linus's tree, yet it does not apply to the
2.6.32-stable kernel.  Can you please send a version that does to the
stable@kernel.org address so that I can apply it?

thanks,

greg k-h

Re: [stable] [PATCH 0/1] qla2xxx: fix for 2.6.33-rcX

[Giridhar Malavali]

Greg,

Sure. Will send the patch. 

Thanks,
Giridhar Malavali

On Feb 12, 2010, at 12:26 PM, Greg KH wrote:

> On Tue, Feb 02, 2010 at 07:48:32PM -0800, giridhar.malavali@qlogic.com wrote:
>> From: Giridhar Malavali <giridhar.malavali@qlogic.com>
>> 
>> James,
>> 
>> Can you please apply this patch. This is a critical fix which can cause
>> panic issues (found on PPC). This needs to be back ported to stable kernel.
> 
> This patch is now in Linus's tree, yet it does not apply to the
> 2.6.32-stable kernel.  Can you please send a version that does to the
> stable@kernel.org address so that I can apply it?
> 
> thanks,
> 
> greg k-h