bfa: Chinook quad port 16G FC HBA claim issue

PATCH New Vijaya Mohan Guvva 1 participant 1 message Dec 4, 2013

Subsystems (2)

SCSI Brocade BFA FC SCSI driver

lore

Share & tools

lore

Vijaya Mohan Guvva

author

2013-12-04 13:44 UTC #0 lore raw

PATCH 1/1 bfa: Chinook quad port 16G FC HBA claim issue

From: Vijaya Mohan Guvva <[email protected]>

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 <[email protected]>

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

drivers/scsi/bfa/bfad.c +4 -2

index e85926c..1392547 100644
@@ -1829,7 +1829,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);

@@ -1839,12 +1839,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

Signature · 1 line

1.8.2.1