lkml.org 
[lkml]   [2008]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 30/46] SCSI: qla2xxx: Do not honour max_vports from firmware for 2G ISPs and below.
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Shyam Sundar <shyam.sundar@qlogic.com>

    commit 680d7db88ace53c673e1c437c9b6abcc053e8d6f upstream.

    For 23XX ISPs, max_vports may return an invalid value.
    Do not honour it.

    Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/scsi/qla2xxx/qla_init.c | 2 +-
    drivers/scsi/qla2xxx/qla_mbx.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/scsi/qla2xxx/qla_init.c
    +++ b/drivers/scsi/qla2xxx/qla_init.c
    @@ -974,7 +974,6 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
    &ha->fw_minor_version,
    &ha->fw_subminor_version,
    &ha->fw_attributes, &ha->fw_memory_size);
    - qla2x00_resize_request_q(ha);
    ha->flags.npiv_supported = 0;
    if ((IS_QLA24XX(ha) || IS_QLA25XX(ha) ||
    IS_QLA84XX(ha)) &&
    @@ -986,6 +985,7 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
    ha->max_npiv_vports =
    MIN_MULTI_ID_FABRIC - 1;
    }
    + qla2x00_resize_request_q(ha);

    if (ql2xallocfwdump)
    qla2x00_alloc_fw_dump(ha);
    --- a/drivers/scsi/qla2xxx/qla_mbx.c
    +++ b/drivers/scsi/qla2xxx/qla_mbx.c
    @@ -1964,7 +1964,7 @@ qla2x00_get_resource_cnts(scsi_qla_host_
    *cur_iocb_cnt = mcp->mb[7];
    if (orig_iocb_cnt)
    *orig_iocb_cnt = mcp->mb[10];
    - if (max_npiv_vports)
    + if (ha->flags.npiv_supported && max_npiv_vports)
    *max_npiv_vports = mcp->mb[11];
    }

    --


    \
     
     \ /
      Last update: 2008-11-17 08:41    [W:0.022 / U:0.648 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site