diff options
-rw-r--r-- | drivers/scsi/bfa/bfa_defs.h | 5 | ||||
-rw-r--r-- | drivers/scsi/bfa/bfa_ioc.c | 1 | ||||
-rw-r--r-- | drivers/scsi/bfa/bfad.c | 8 |
3 files changed, 13 insertions, 1 deletions
diff --git a/drivers/scsi/bfa/bfa_defs.h b/drivers/scsi/bfa/bfa_defs.h index bef16d276668..d40a79f5265f 100644 --- a/drivers/scsi/bfa/bfa_defs.h +++ b/drivers/scsi/bfa/bfa_defs.h | |||
@@ -637,6 +637,7 @@ enum { | |||
637 | BFA_PCI_DEVICE_ID_CT = 0x14, | 637 | BFA_PCI_DEVICE_ID_CT = 0x14, |
638 | BFA_PCI_DEVICE_ID_CT_FC = 0x21, | 638 | BFA_PCI_DEVICE_ID_CT_FC = 0x21, |
639 | BFA_PCI_DEVICE_ID_CT2 = 0x22, | 639 | BFA_PCI_DEVICE_ID_CT2 = 0x22, |
640 | BFA_PCI_DEVICE_ID_CT2_QUAD = 0x23, | ||
640 | }; | 641 | }; |
641 | 642 | ||
642 | #define bfa_asic_id_cb(__d) \ | 643 | #define bfa_asic_id_cb(__d) \ |
@@ -645,7 +646,9 @@ enum { | |||
645 | #define bfa_asic_id_ct(__d) \ | 646 | #define bfa_asic_id_ct(__d) \ |
646 | ((__d) == BFA_PCI_DEVICE_ID_CT || \ | 647 | ((__d) == BFA_PCI_DEVICE_ID_CT || \ |
647 | (__d) == BFA_PCI_DEVICE_ID_CT_FC) | 648 | (__d) == BFA_PCI_DEVICE_ID_CT_FC) |
648 | #define bfa_asic_id_ct2(__d) ((__d) == BFA_PCI_DEVICE_ID_CT2) | 649 | #define bfa_asic_id_ct2(__d) \ |
650 | ((__d) == BFA_PCI_DEVICE_ID_CT2 || \ | ||
651 | (__d) == BFA_PCI_DEVICE_ID_CT2_QUAD) | ||
649 | #define bfa_asic_id_ctc(__d) \ | 652 | #define bfa_asic_id_ctc(__d) \ |
650 | (bfa_asic_id_ct(__d) || bfa_asic_id_ct2(__d)) | 653 | (bfa_asic_id_ct(__d) || bfa_asic_id_ct2(__d)) |
651 | 654 | ||
diff --git a/drivers/scsi/bfa/bfa_ioc.c b/drivers/scsi/bfa/bfa_ioc.c index a4f37414774e..f78bcb6696b2 100644 --- 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, | |||
2196 | break; | 2196 | break; |
2197 | 2197 | ||
2198 | case BFA_PCI_DEVICE_ID_CT2: | 2198 | case BFA_PCI_DEVICE_ID_CT2: |
2199 | case BFA_PCI_DEVICE_ID_CT2_QUAD: | ||
2199 | ioc->asic_gen = BFI_ASIC_GEN_CT2; | 2200 | ioc->asic_gen = BFI_ASIC_GEN_CT2; |
2200 | if (clscode == BFI_PCIFN_CLASS_FC && | 2201 | if (clscode == BFI_PCIFN_CLASS_FC && |
2201 | pcidev->ssid == BFA_PCI_CT2_SSID_FC) { | 2202 | pcidev->ssid == BFA_PCI_CT2_SSID_FC) { |
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index a5f7690e819e..bf5c5d33c90e 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c | |||
@@ -1720,6 +1720,14 @@ struct pci_device_id bfad_id_table[] = { | |||
1720 | .class_mask = ~0, | 1720 | .class_mask = ~0, |
1721 | }, | 1721 | }, |
1722 | 1722 | ||
1723 | { | ||
1724 | .vendor = BFA_PCI_VENDOR_ID_BROCADE, | ||
1725 | .device = BFA_PCI_DEVICE_ID_CT2_QUAD, | ||
1726 | .subvendor = PCI_ANY_ID, | ||
1727 | .subdevice = PCI_ANY_ID, | ||
1728 | .class = (PCI_CLASS_SERIAL_FIBER << 8), | ||
1729 | .class_mask = ~0, | ||
1730 | }, | ||
1723 | {0, 0}, | 1731 | {0, 0}, |
1724 | }; | 1732 | }; |
1725 | 1733 | ||