Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 139a1b1e777144aa745f10741e2fe09b93e63c38

Authored by John Soni Jose
Committed by James Bottomley
1 parent 8359c79b3b
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

[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>

Showing 3 changed files with 8 additions and 1 deletions Side-by-side Diff

drivers/scsi/be2iscsi/be.h
Diff comments   View file @ 139a1b1
... ... @@ -28,7 +28,7 @@
28 28 /* BladeEngine Generation numbers */
29 29 #define BE_GEN2 2
30 30 #define BE_GEN3 3
31   -
  31 +#define BE_GEN4 4
32 32 struct be_dma_mem {
33 33 void *va;
34 34 dma_addr_t dma;
drivers/scsi/be2iscsi/be_main.c
Diff comments   View file @ 139a1b1
... ... @@ -521,6 +521,7 @@
521 521 { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },
522 522 { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },
523 523 { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) },
  524 + { PCI_DEVICE(ELX_VENDOR_ID, OC_SKH_ID1) },
524 525 { 0 }
525 526 };
526 527 MODULE_DEVICE_TABLE(pci, beiscsi_pci_id_table);
... ... @@ -4611,6 +4612,8 @@
4611 4612 case OC_DEVICE_ID3:
4612 4613 phba->generation = BE_GEN3;
4613 4614 break;
  4615 + case OC_SKH_ID1:
  4616 + phba->generation = BE_GEN4;
4614 4617 default:
4615 4618 phba->generation = 0;
4616 4619 }
drivers/scsi/be2iscsi/be_main.h
Diff comments   View file @ 139a1b1
... ... @@ -42,6 +42,7 @@
42 42 #define DRV_DESC BE_NAME " " "Driver"
43 43  
44 44 #define BE_VENDOR_ID 0x19A2
  45 +#define ELX_VENDOR_ID 0x10DF
45 46 /* DEVICE ID's for BE2 */
46 47 #define BE_DEVICE_ID1 0x212
47 48 #define OC_DEVICE_ID1 0x702
... ... @@ -50,6 +51,9 @@
50 51 /* DEVICE ID's for BE3 */
51 52 #define BE_DEVICE_ID2 0x222
52 53 #define OC_DEVICE_ID3 0x712
  54 +
  55 +/* DEVICE ID for SKH */
  56 +#define OC_SKH_ID1 0x722
53 57  
54 58 #define BE2_IO_DEPTH 1024
55 59 #define BE2_MAX_SESSIONS 256