[SCSI] be2iscsi: Fix driver support for Skyhawk-R adapter.

Fix support for Skyhawk-R adapter by populating the pci_id_table

Signed-off-by: John Soni Jose <sony.john-n@emulex.com>
Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/be2iscsi/be.h b/drivers/scsi/be2iscsi/be.h
index 3c1f8e9a15e7d1fa6f281fb1762f80715df3892f..36777ef57ad5f99dc323533a9c34c2485c061c2e 100644 (file)
--- a/drivers/scsi/be2iscsi/be.h
+++ b/drivers/scsi/be2iscsi/be.h
@@ -28,7 +28,7 @@
 /* BladeEngine Generation numbers */
 #define BE_GEN2 2
 #define BE_GEN3 3
-
+#define BE_GEN4        4
 struct be_dma_mem {
        void *va;
        dma_addr_t dma;

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 0df2b2ac6ec97e5a4f889e2093579280ea0d9dc4..3328eb8e69f0deff73dbd9e95d8f45fdc5b14406 100644 (file)
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -521,6 +521,7 @@ static DEFINE_PCI_DEVICE_TABLE(beiscsi_pci_id_table) = {
        { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },
        { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },
        { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) },
+       { PCI_DEVICE(ELX_VENDOR_ID, OC_SKH_ID1) },
        { 0 }
 };
 MODULE_DEVICE_TABLE(pci, beiscsi_pci_id_table);
@@ -4611,6 +4612,8 @@ static int __devinit beiscsi_dev_probe(struct pci_dev *pcidev,
        case OC_DEVICE_ID3:
                phba->generation = BE_GEN3;
                break;
+       case OC_SKH_ID1:
+               phba->generation = BE_GEN4;
        default:
                phba->generation = 0;
        }

diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
index 02b23c954e1e12a76096162a1912a1be4cb45190..5302d3762f77f6131379292a1d3bd07986949c0c 100644 (file)
--- a/drivers/scsi/be2iscsi/be_main.h
+++ b/drivers/scsi/be2iscsi/be_main.h
@@ -42,6 +42,7 @@
 #define DRV_DESC               BE_NAME " " "Driver"
 
 #define BE_VENDOR_ID           0x19A2
+#define ELX_VENDOR_ID          0x10DF
 /* DEVICE ID's for BE2 */
 #define BE_DEVICE_ID1          0x212
 #define OC_DEVICE_ID1          0x702
@@ -51,6 +52,9 @@
 #define BE_DEVICE_ID2          0x222
 #define OC_DEVICE_ID3          0x712
 
+/* DEVICE ID for SKH */
+#define OC_SKH_ID1             0x722
+
 #define BE2_IO_DEPTH           1024
 #define BE2_MAX_SESSIONS       256
 #define BE2_CMDS_PER_CXN       128