On Fri, 2019-08-30 at 15:23 -0700, Himanshu Madhani wrote: > From: Quinn Tran <qut...@marvell.com> > > Use adapter specific callback to read flash instead of ISP > adapter specific. > > Signed-off-by: Quinn Tran <qut...@marvell.com> > Signed-off-by: Himanshu Madhani <hmadh...@marvell.com> > --- > drivers/scsi/qla2xxx/qla_init.c | 4 ++-- > drivers/scsi/qla2xxx/qla_nx.c | 1 + > drivers/scsi/qla2xxx/qla_sup.c | 8 ++++---- > 3 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c > index 632130b6165d..8161f08f3a4d 100644 > --- a/drivers/scsi/qla2xxx/qla_init.c > +++ b/drivers/scsi/qla2xxx/qla_init.c > @@ -8229,7 +8229,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; > @@ -8241,7 +8241,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 65a675906188..a79f8da38abe 100644 > --- 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 764e1bb0f695..f2d5115b2d8d 100644 > --- a/drivers/scsi/qla2xxx/qla_sup.c > +++ b/drivers/scsi/qla2xxx/qla_sup.c > @@ -682,8 +682,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; > @@ -950,11 +950,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;
Reviewed-by: Ewan D. Milne <emi...@redhat.com>
