From: "Ewan D. Milne" <emilne@redhat.com>
To: Himanshu Madhani <hmadhani@marvell.com>,
James.Bottomley@HansenPartnership.com,
martin.petersen@oracle.com
Cc: linux-scsi@vger.kernel.org
Subject: Re: [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs
Date: Tue, 03 Sep 2019 10:48:26 -0400 [thread overview]
Message-ID: <135ea288fca9d11146e661798afefb92ef968649.camel@redhat.com> (raw)
In-Reply-To: <20190830222402.23688-3-hmadhani@marvell.com>
On Fri, 2019-08-30 at 15:23 -0700, Himanshu Madhani wrote:
> From: Quinn Tran <qutran@marvell.com>
>
> 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>
> ---
> 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 <emilne@redhat.com>
next prev parent reply other threads:[~2019-09-03 14:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-30 22:23 [PATCH 0/6] qla2xxx: Bug fixes for the driver Himanshu Madhani
2019-08-30 22:23 ` [PATCH 1/6] qla2xxx: Fix message indicating vectors used by driver Himanshu Madhani
2019-09-03 14:46 ` Ewan D. Milne
2019-09-04 22:33 ` Lee Duncan
2019-08-30 22:23 ` [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs Himanshu Madhani
2019-09-03 14:48 ` Ewan D. Milne [this message]
2019-09-13 20:36 ` Martin Wilck
2019-09-13 22:37 ` Martin K. Petersen
2019-09-16 16:19 ` [EXT] " Himanshu Madhani
2019-08-30 22:23 ` [PATCH 3/6] qla2xxx: Fix driver reload for ISP82xx Himanshu Madhani
2019-09-03 14:49 ` Ewan D. Milne
2019-08-30 22:24 ` [PATCH 4/6] qla2xxx: Fix stuck login session Himanshu Madhani
2019-09-03 14:50 ` Ewan D. Milne
2019-08-30 22:24 ` [PATCH 5/6] qla2xxx: Fix stale session Himanshu Madhani
2019-09-03 14:52 ` Ewan D. Milne
2019-08-30 22:24 ` [PATCH 6/6] qla2xxx: Update driver version to 10.01.00.19-k Himanshu Madhani
2019-09-03 14:52 ` Ewan D. Milne
2019-09-07 19:39 ` [PATCH 0/6] qla2xxx: Bug fixes for the driver Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=135ea288fca9d11146e661798afefb92ef968649.camel@redhat.com \
--to=emilne@redhat.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=hmadhani@marvell.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).