On Sun, 26 Apr 2020, 8:03pm, Bart Van Assche wrote:
> This patch does not change any functionality.
>
> Cc: Nilesh Javali <njavali@xxxxxxxxxxx>
> Cc: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
> Cc: Quinn Tran <qutran@xxxxxxxxxxx>
> Cc: Martin Wilck <mwilck@xxxxxxxx>
> Cc: Daniel Wagner <dwagner@xxxxxxx>
> Cc: Roman Bolshakov <r.bolshakov@xxxxxxxxx>
> Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
> ---
> drivers/scsi/qla2xxx/qla_fw.h | 3 +--
> drivers/scsi/qla2xxx/qla_sup.c | 2 +-
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h
> index 4fa34374f34f..f18d2d00d28c 100644
> --- a/drivers/scsi/qla2xxx/qla_fw.h
> +++ b/drivers/scsi/qla2xxx/qla_fw.h
> @@ -2216,9 +2216,8 @@ struct qla_fcp_prio_cfg {
> #define FCP_PRIO_ATTR_ENABLE 0x1
> #define FCP_PRIO_ATTR_PERSIST 0x2
> uint8_t reserved; /* Reserved for future use */
> -#define FCP_PRIO_CFG_HDR_SIZE 0x10
> +#define FCP_PRIO_CFG_HDR_SIZE offsetof(struct qla_fcp_prio_cfg, entry)
> struct qla_fcp_prio_entry entry[1023]; /* fcp priority entries */
> -#define FCP_PRIO_CFG_ENTRY_SIZE 0x20
> uint8_t reserved2[16];
> };
>
> diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
> index 3da79ee1d88e..57ffbf9d7dbf 100644
> --- a/drivers/scsi/qla2xxx/qla_sup.c
> +++ b/drivers/scsi/qla2xxx/qla_sup.c
> @@ -3617,7 +3617,7 @@ qla24xx_read_fcp_prio_cfg(scsi_qla_host_t *vha)
>
> /* read remaining FCP CMD config data from flash */
> fcp_prio_addr += (FCP_PRIO_CFG_HDR_SIZE >> 2);
> - len = ha->fcp_prio_cfg->num_entries * FCP_PRIO_CFG_ENTRY_SIZE;
> + len = ha->fcp_prio_cfg->num_entries * sizeof(struct qla_fcp_prio_entry);
> max_len = FCP_PRIO_CFG_SIZE - FCP_PRIO_CFG_HDR_SIZE;
>
> ha->isp_ops->read_optrom(vha, &ha->fcp_prio_cfg->entry[0],
>
Thank you for the patch.
Reviewed-by: Arun Easi <aeasi@xxxxxxxxxxx>
