Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 139a1b1e authored by John Soni Jose's avatar John Soni Jose Committed by James Bottomley
Browse files

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



Fix support for Skyhawk-R adapter by populating the pci_id_table

Signed-off-by: default avatarJohn Soni Jose <sony.john-n@emulex.com>
Signed-off-by: default avatarJayamohan Kallickal <jayamohan.kallickal@emulex.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 8359c79b

drivers/scsi/be2iscsi/be.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/scsi/be2iscsi/be_main.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

	}

drivers/scsi/be2iscsi/be_main.h

+4 −0
Original line number Diff line number Diff line
@@ -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