lkml.org 
[lkml]   [2014]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 34/37] SCSI: bfa: Chinook quad port 16G FC HBA claim issue
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Vijaya Mohan Guvva <vmohan@brocade.com>

    commit dcaf9aed995c2b2a49fb86bbbcfa2f92c797ab5d upstream.

    Bfa driver crash is observed while pushing the firmware on to chinook
    quad port card due to uninitialized bfi_image_ct2 access which gets
    initialized only for CT2 ASIC based cards after request_firmware().
    For quard port chinook (CT2 ASIC based), bfi_image_ct2 is not getting
    initialized as there is no check for chinook PCI device ID before
    request_firmware and instead bfi_image_cb is initialized as it is the
    default case for card type check.

    This patch includes changes to read the right firmware for quad port chinook.

    Signed-off-by: Vijaya Mohan Guvva <vmohan@brocade.com>
    Signed-off-by: James Bottomley <JBottomley@Parallels.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/scsi/bfa/bfad.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/scsi/bfa/bfad.c
    +++ b/drivers/scsi/bfa/bfad.c
    @@ -1615,7 +1615,7 @@ out:
    static u32 *
    bfad_load_fwimg(struct pci_dev *pdev)
    {
    - if (pdev->device == BFA_PCI_DEVICE_ID_CT2) {
    + if (bfa_asic_id_ct2(pdev->device)) {
    if (bfi_image_ct2_size == 0)
    bfad_read_firmware(pdev, &bfi_image_ct2,
    &bfi_image_ct2_size, BFAD_FW_FILE_CT2);
    @@ -1625,12 +1625,14 @@ bfad_load_fwimg(struct pci_dev *pdev)
    bfad_read_firmware(pdev, &bfi_image_ct,
    &bfi_image_ct_size, BFAD_FW_FILE_CT);
    return bfi_image_ct;
    - } else {
    + } else if (bfa_asic_id_cb(pdev->device)) {
    if (bfi_image_cb_size == 0)
    bfad_read_firmware(pdev, &bfi_image_cb,
    &bfi_image_cb_size, BFAD_FW_FILE_CB);
    return bfi_image_cb;
    }
    +
    + return NULL;
    }

    static void



    \
     
     \ /
      Last update: 2014-02-05 14:01    [W:5.476 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site