From 8fe56a3d6d9494c9338761c7906496e3f8bd2e98 Mon Sep 17 00:00:00 2001
From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Date: Fri, 28 May 2010 15:08:28 -0700
Subject: [PATCH] --- yaml --- r: 204087 b: refs/heads/master c:
 6907869d726c04362122afd92717f86915a69f96 h: refs/heads/master i:   204085:
 fc0747f447a98a73f0fa08872310e37cf9e8dc02   204083:
 638cf90f062fea024c2adb48047a232ab48dea79   204079:
 6e187ca1fa1abbebea4a53ddd85ab2b39510e092 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/scsi/qla2xxx/qla_nx.c | 13 +++++++++----
 trunk/drivers/scsi/qla2xxx/qla_os.c |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index eecab66e22e9..877714dc0094 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba77ef53547883b6be06c0657d5dc1642ad43d0c
+refs/heads/master: 6907869d726c04362122afd92717f86915a69f96
diff --git a/trunk/drivers/scsi/qla2xxx/qla_nx.c b/trunk/drivers/scsi/qla2xxx/qla_nx.c
index ee575b4efbee..e3e3ebdfe5d9 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_nx.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_nx.c
@@ -3372,11 +3372,16 @@ qla82xx_start_iocbs(srb_t *sp)
 	dbval = 0x04 | (ha->portnum << 5);
 
 	dbval = dbval | (req->id << 8) | (req->ring_index << 16);
-	WRT_REG_DWORD((unsigned long __iomem *)ha->nxdb_wr_ptr, dbval);
-	wmb();
-	while (RD_REG_DWORD(ha->nxdb_rd_ptr) != dbval) {
-		WRT_REG_DWORD((unsigned long  __iomem *)ha->nxdb_wr_ptr, dbval);
+	if (ql2xdbwr)
+		qla82xx_wr_32(ha, ha->nxdb_wr_ptr, dbval);
+	else {
+		WRT_REG_DWORD((unsigned long __iomem *)ha->nxdb_wr_ptr, dbval);
 		wmb();
+		while (RD_REG_DWORD(ha->nxdb_rd_ptr) != dbval) {
+			WRT_REG_DWORD((unsigned long  __iomem *)ha->nxdb_wr_ptr,
+				dbval);
+			wmb();
+		}
 	}
 }
 
diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c
index bc35ecfbc28f..5be8db748964 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_os.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_os.c
@@ -140,7 +140,7 @@ MODULE_PARM_DESC(ql2xetsenable,
 		"Enables firmware ETS burst."
 		"Default is 0 - skip ETS enablement.");
 
-int ql2xdbwr;
+int ql2xdbwr = 1;
 module_param(ql2xdbwr, int, S_IRUGO|S_IRUSR);
 MODULE_PARM_DESC(ql2xdbwr,
 	"Option to specify scheme for request queue posting\n"