qla2xxx: Introduce fw_dump_flag to track fw dump progress.

[mirror_ubuntu-bionic-kernel.git] / drivers / scsi / qla2xxx / qla_tmpl.c

diff --git a/drivers/scsi/qla2xxx/qla_tmpl.c b/drivers/scsi/qla2xxx/qla_tmpl.c
index a804e9b744bbac4db8e5cbc7db82daeacc35a0b0..8dc98132a0766fa1919076959fb3a6be60b8bf97 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_tmpl.c
+++ b/drivers/scsi/qla2xxx/qla_tmpl.c
@@ -191,6 +191,19 @@ static inline void (*qla27xx_read_vector(uint width))(void *, void *, ulong *)
                           qla27xx_read32;
 }
 
+static inline void
+qla27xx_read_off(__iomem struct device_reg_24xx *reg,
+       uint offset, void *buf, ulong *len)
+{
+       void *window = (void *)reg + offset;
+
+       if (buf) {
+               ql_dbg(ql_dbg_misc, NULL, 0xd300,
+                   "%s: @%x\n", __func__, offset);
+       }
+       qla27xx_read32(window, buf, len);
+}
+
 static inline void
 qla27xx_read_reg(__iomem struct device_reg_24xx *reg,
        uint offset, void *buf, ulong *len)
@@ -236,7 +249,7 @@ qla27xx_read_window(__iomem struct device_reg_24xx *reg,
                qla27xx_insert32(base, buf, len);
                readn(window, buf, len);
                window += width;
-               base += width;
+               base++;
        }
 }
 
@@ -503,7 +516,7 @@ qla27xx_fwdt_entry_t265(struct scsi_qla_host *vha,
        ql_dbg(ql_dbg_misc, vha, 0xd209,
            "%s: pause risc [%lx]\n", __func__, *len);
        if (buf)
-               qla24xx_pause_risc(reg);
+               qla24xx_pause_risc(reg, vha->hw);
 
        return false;
 }
@@ -590,7 +603,6 @@ qla27xx_fwdt_entry_t270(struct scsi_qla_host *vha,
        struct qla27xx_fwdt_entry *ent, void *buf, ulong *len)
 {
        struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);
-       void *window = (void *)reg + 0xc4;
        ulong dwords = ent->t270.count;
        ulong addr = ent->t270.addr;
 
@@ -599,9 +611,8 @@ qla27xx_fwdt_entry_t270(struct scsi_qla_host *vha,
        qla27xx_write_reg(reg, IOBASE_ADDR, 0x40, buf);
        while (dwords--) {
                qla27xx_write_reg(reg, 0xc0, addr|0x80000000, buf);
-               qla27xx_read_reg(reg, 0xc4, buf, len);
                qla27xx_insert32(addr, buf, len);
-               qla27xx_read32(window, buf, len);
+               qla27xx_read_off(reg, 0xc4, buf, len);
                addr++;
        }
 
@@ -614,12 +625,12 @@ qla27xx_fwdt_entry_t271(struct scsi_qla_host *vha,
 {
        struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);
        ulong addr = ent->t271.addr;
+       ulong data = ent->t271.data;
 
        ql_dbg(ql_dbg_misc, vha, 0xd20f,
            "%s: wrremreg [%lx]\n", __func__, *len);
        qla27xx_write_reg(reg, IOBASE_ADDR, 0x40, buf);
-       qla27xx_read_reg(reg, 0xc4, buf, len);
-       qla27xx_insert32(addr, buf, len);
+       qla27xx_write_reg(reg, 0xc4, data, buf);
        qla27xx_write_reg(reg, 0xc0, addr, buf);
 
        return false;