[SCSI] bfa: Support for chinook-quad port card

This patch enables support for chinook quad port 16G FC card (falcon)

Signed-off-by: Vijaya Mohan Guvva <vmohan@brocade.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/bfa/bfa_defs.h b/drivers/scsi/bfa/bfa_defs.h
index bef16d276668a29fcc1e45362daf712ff5309444..d40a79f5265f43dc72fbe48342cc45d21e106259 100644 (file)
--- a/drivers/scsi/bfa/bfa_defs.h
+++ b/drivers/scsi/bfa/bfa_defs.h
@@ -637,6 +637,7 @@ enum {
        BFA_PCI_DEVICE_ID_CT            = 0x14,
        BFA_PCI_DEVICE_ID_CT_FC         = 0x21,
        BFA_PCI_DEVICE_ID_CT2           = 0x22,
+       BFA_PCI_DEVICE_ID_CT2_QUAD      = 0x23,
 };
 
 #define bfa_asic_id_cb(__d)                    \
@@ -645,7 +646,9 @@ enum {
 #define bfa_asic_id_ct(__d)                    \
        ((__d) == BFA_PCI_DEVICE_ID_CT ||       \
         (__d) == BFA_PCI_DEVICE_ID_CT_FC)
-#define bfa_asic_id_ct2(__d)   ((__d) == BFA_PCI_DEVICE_ID_CT2)
+#define bfa_asic_id_ct2(__d)                   \
+       ((__d) == BFA_PCI_DEVICE_ID_CT2 ||      \
+       (__d) == BFA_PCI_DEVICE_ID_CT2_QUAD)
 #define bfa_asic_id_ctc(__d)   \
        (bfa_asic_id_ct(__d) || bfa_asic_id_ct2(__d))
 

diff --git a/drivers/scsi/bfa/bfa_ioc.c b/drivers/scsi/bfa/bfa_ioc.c
index a4f37414774e5e21afa007367dfe68caca43e229..f78bcb6696b2d74f6111db69085d0eabba07d7f0 100644 (file)
--- a/drivers/scsi/bfa/bfa_ioc.c
+++ b/drivers/scsi/bfa/bfa_ioc.c
@@ -2196,6 +2196,7 @@ bfa_ioc_pci_init(struct bfa_ioc_s *ioc, struct bfa_pcidev_s *pcidev,
                break;
 
        case BFA_PCI_DEVICE_ID_CT2:
+       case BFA_PCI_DEVICE_ID_CT2_QUAD:
                ioc->asic_gen = BFI_ASIC_GEN_CT2;
                if (clscode == BFI_PCIFN_CLASS_FC &&
                    pcidev->ssid == BFA_PCI_CT2_SSID_FC) {

diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index a5f7690e819ef13e8c74b76dcf8be9bf3d42268d..bf5c5d33c90ed3a6ffc78ce97ade1502845c9771 100644 (file)
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -1720,6 +1720,14 @@ struct pci_device_id bfad_id_table[] = {
                .class_mask = ~0,
        },
 
+       {
+               .vendor = BFA_PCI_VENDOR_ID_BROCADE,
+               .device = BFA_PCI_DEVICE_ID_CT2_QUAD,
+               .subvendor = PCI_ANY_ID,
+               .subdevice = PCI_ANY_ID,
+               .class = (PCI_CLASS_SERIAL_FIBER << 8),
+               .class_mask = ~0,
+       },
        {0, 0},
 };