lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 079/779] scsi: qla2xxx: Fix incorrect display of max frame size
    Date
    From: Bikash Hazarika <bhazarika@marvell.com>

    commit cf3b4fb655796674e605268bd4bfb47a47c8bce6 upstream.

    Replace display field with the correct field.

    Link: https://lore.kernel.org/r/20220713052045.10683-3-njavali@marvell.com
    Fixes: 8777e4314d39 ("scsi: qla2xxx: Migrate NVME N2N handling into state machine")
    Cc: stable@vger.kernel.org
    Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
    Signed-off-by: Bikash Hazarika <bhazarika@marvell.com>
    Signed-off-by: Nilesh Javali <njavali@marvell.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/scsi/qla2xxx/qla_def.h | 1 +
    drivers/scsi/qla2xxx/qla_gs.c | 9 +++------
    drivers/scsi/qla2xxx/qla_init.c | 2 ++
    drivers/scsi/qla2xxx/qla_isr.c | 4 +---
    4 files changed, 7 insertions(+), 9 deletions(-)

    --- a/drivers/scsi/qla2xxx/qla_def.h
    +++ b/drivers/scsi/qla2xxx/qla_def.h
    @@ -3972,6 +3972,7 @@ struct qla_hw_data {
    /* SRB cache. */
    #define SRB_MIN_REQ 128
    mempool_t *srb_mempool;
    + u8 port_name[WWN_SIZE];

    volatile struct {
    uint32_t mbox_int :1;
    --- a/drivers/scsi/qla2xxx/qla_gs.c
    +++ b/drivers/scsi/qla2xxx/qla_gs.c
    @@ -1595,7 +1595,6 @@ qla2x00_hba_attributes(scsi_qla_host_t *
    unsigned int callopt)
    {
    struct qla_hw_data *ha = vha->hw;
    - struct init_cb_24xx *icb24 = (void *)ha->init_cb;
    struct new_utsname *p_sysid = utsname();
    struct ct_fdmi_hba_attr *eiter;
    uint16_t alen;
    @@ -1757,8 +1756,8 @@ qla2x00_hba_attributes(scsi_qla_host_t *
    /* MAX CT Payload Length */
    eiter = entries + size;
    eiter->type = cpu_to_be16(FDMI_HBA_MAXIMUM_CT_PAYLOAD_LENGTH);
    - eiter->a.max_ct_len = cpu_to_be32(le16_to_cpu(IS_FWI2_CAPABLE(ha) ?
    - icb24->frame_payload_size : ha->init_cb->frame_payload_size));
    + eiter->a.max_ct_len = cpu_to_be32(ha->frame_payload_size >> 2);
    +
    alen = sizeof(eiter->a.max_ct_len);
    alen += FDMI_ATTR_TYPELEN(eiter);
    eiter->len = cpu_to_be16(alen);
    @@ -1850,7 +1849,6 @@ qla2x00_port_attributes(scsi_qla_host_t
    unsigned int callopt)
    {
    struct qla_hw_data *ha = vha->hw;
    - struct init_cb_24xx *icb24 = (void *)ha->init_cb;
    struct new_utsname *p_sysid = utsname();
    char *hostname = p_sysid ?
    p_sysid->nodename : fc_host_system_hostname(vha->host);
    @@ -1902,8 +1900,7 @@ qla2x00_port_attributes(scsi_qla_host_t
    /* Max frame size. */
    eiter = entries + size;
    eiter->type = cpu_to_be16(FDMI_PORT_MAX_FRAME_SIZE);
    - eiter->a.max_frame_size = cpu_to_be32(le16_to_cpu(IS_FWI2_CAPABLE(ha) ?
    - icb24->frame_payload_size : ha->init_cb->frame_payload_size));
    + eiter->a.max_frame_size = cpu_to_be32(ha->frame_payload_size);
    alen = sizeof(eiter->a.max_frame_size);
    alen += FDMI_ATTR_TYPELEN(eiter);
    eiter->len = cpu_to_be16(alen);
    --- a/drivers/scsi/qla2xxx/qla_init.c
    +++ b/drivers/scsi/qla2xxx/qla_init.c
    @@ -4490,6 +4490,8 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
    BIT_6) != 0;
    ql_dbg(ql_dbg_init, vha, 0x00bc, "FA-WWPN Support: %s.\n",
    (ha->flags.fawwpn_enabled) ? "enabled" : "disabled");
    + /* Init_cb will be reused for other command(s). Save a backup copy of port_name */
    + memcpy(ha->port_name, ha->init_cb->port_name, WWN_SIZE);
    }

    /* ELS pass through payload is limit by frame size. */
    --- a/drivers/scsi/qla2xxx/qla_isr.c
    +++ b/drivers/scsi/qla2xxx/qla_isr.c
    @@ -1354,9 +1354,7 @@ skip_rio:
    if (!vha->vp_idx) {
    if (ha->flags.fawwpn_enabled &&
    (ha->current_topology == ISP_CFG_F)) {
    - void *wwpn = ha->init_cb->port_name;
    -
    - memcpy(vha->port_name, wwpn, WWN_SIZE);
    + memcpy(vha->port_name, ha->port_name, WWN_SIZE);
    fc_host_port_name(vha->host) =
    wwn_to_u64(vha->port_name);
    ql_dbg(ql_dbg_init + ql_dbg_verbose,

    \
     
     \ /
      Last update: 2022-08-15 20:23    [W:2.028 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site