[SCSI] qla2xxx: Enable CRB based doorbell posting for request queue as default for...

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index ee575b4efbee78d05544559845e0ff692140332f..e3e3ebdfe5d97a7b9a9ab83f1b6d255c392868ee 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/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/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index bc35ecfbc28fbdaf5cbdd2c4bf81765ed1834c1e..5be8db74896468a2a1d3a3247903675acda213ff 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/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"