scsi: qla2xxx: Fix flash read for Qlogic ISPs

[ Upstream commit cb92cb1657c438efe7c88c9759f40c0a9d46c353 ]

Use adapter specific callback to read flash instead of ISP adapter
specific.

Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Link: https://lore.kernel.org/r/20190830222402.23688-3-hmadhani@marvell.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index f4ed061b968868ec7f5e322945735ddc6388e5d6..fb9095179fc592ca668f6eb691b9040c1ab32f47 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -8385,7 +8385,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
                    active_regions.aux.vpd_nvram == QLA27XX_PRIMARY_IMAGE ?
                    "primary" : "secondary");
        }
-       qla24xx_read_flash_data(vha, ha->vpd, faddr, ha->vpd_size >> 2);
+       ha->isp_ops->read_optrom(vha, ha->vpd, faddr << 2, ha->vpd_size);
 
        /* Get NVRAM data into cache and calculate checksum. */
        faddr = ha->flt_region_nvram;
@@ -8397,7 +8397,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
            "Loading %s nvram image.\n",
            active_regions.aux.vpd_nvram == QLA27XX_PRIMARY_IMAGE ?
            "primary" : "secondary");
-       qla24xx_read_flash_data(vha, ha->nvram, faddr, ha->nvram_size >> 2);
+       ha->isp_ops->read_optrom(vha, ha->nvram, faddr << 2, ha->nvram_size);
 
        dptr = (uint32_t *)nv;
        for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++, dptr++)

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index c760ae354174c2c155ae6df03c9be0f52c7adb02..6ce0f026debb132caba10258a46f018ffc3401dc 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -2288,6 +2288,7 @@ qla82xx_disable_intrs(struct qla_hw_data *ha)
        scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
 
        qla82xx_mbx_intr_disable(vha);
+
        spin_lock_irq(&ha->hardware_lock);
        if (IS_QLA8044(ha))
                qla8044_wr_reg(ha, LEG_INTR_MASK_OFFSET, 1);

diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 1eb82384d933ca62f302bfe843e6dd656e053c4a..81c5d3de666b0717f350977e93accf458e31045b 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -680,8 +680,8 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)
 
        ha->flt_region_flt = flt_addr;
        wptr = (uint16_t *)ha->flt;
-       qla24xx_read_flash_data(vha, (void *)flt, flt_addr,
-           (sizeof(struct qla_flt_header) + FLT_REGIONS_SIZE) >> 2);
+       ha->isp_ops->read_optrom(vha, (void *)flt, flt_addr << 2,
+           (sizeof(struct qla_flt_header) + FLT_REGIONS_SIZE));
 
        if (le16_to_cpu(*wptr) == 0xffff)
                goto no_flash_data;
@@ -948,11 +948,11 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha)
        struct req_que *req = ha->req_q_map[0];
        uint16_t cnt, chksum;
        uint16_t *wptr = (void *)req->ring;
-       struct qla_fdt_layout *fdt = (void *)req->ring;
+       struct qla_fdt_layout *fdt = (struct qla_fdt_layout *)req->ring;
        uint8_t man_id, flash_id;
        uint16_t mid = 0, fid = 0;
 
-       qla24xx_read_flash_data(vha, (void *)fdt, ha->flt_region_fdt,
+       ha->isp_ops->read_optrom(vha, fdt, ha->flt_region_fdt << 2,
            OPTROM_BURST_DWORDS);
        if (le16_to_cpu(*wptr) == 0xffff)
                goto no_flash_data;