[SCSI] fusion - adding support for FC949ES

Add software recognition for the new LSI Logic Fibre Channel controller.

Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 8c26f093fb65e8b2c67359b76978b26907999501..33213370027e63a7dce18268f03c6942869555d9 100644 (file)
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1378,6 +1378,10 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                ioc->bus_type = FC;
                ioc->errata_flag_1064 = 1;
        }
+       else if (pdev->device == MPI_MANUFACTPAGE_DEVICEID_FC949E) {
+               ioc->prod_name = "LSIFC949E";
+               ioc->bus_type = FC;
+       }
        else if (pdev->device == MPI_MANUFACTPAGE_DEVID_53C1030) {
                ioc->prod_name = "LSI53C1030";
                ioc->bus_type = SPI;

diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index a380fe105a226121484a868f226b5d5b386f6ac3..b102c7666d0efcaf44f8a6e534ff340352b23489 100644 (file)
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -145,6 +145,8 @@ static struct pci_device_id mptfc_pci_table[] = {
                PCI_ANY_ID, PCI_ANY_ID },
        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC949X,
                PCI_ANY_ID, PCI_ANY_ID },
+       { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC949ES,
+               PCI_ANY_ID, PCI_ANY_ID },
        {0}     /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(pci, mptfc_pci_table);

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 7fb397e3f2d339f198fed3b08cd60a58e6927f5b..5403257ae3e7173218186453cb0141a3b87d71ca 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -181,6 +181,7 @@
 #define PCI_DEVICE_ID_LSI_FC929X       0x0626
 #define PCI_DEVICE_ID_LSI_FC939X       0x0642
 #define PCI_DEVICE_ID_LSI_FC949X       0x0640
+#define PCI_DEVICE_ID_LSI_FC949ES      0x0646
 #define PCI_DEVICE_ID_LSI_FC919X       0x0628
 #define PCI_DEVICE_ID_NCR_YELLOWFIN    0x0701
 #define PCI_DEVICE_ID_LSI_61C102       0x0901