aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/emulex
diff options
context:
space:
mode:
authorPadmanabh Ratnakar <padmanabh.ratnakar@emulex.com>2012-10-20 02:04:40 -0400
committerDavid S. Miller <davem@davemloft.net>2012-10-21 22:15:37 -0400
commit76b735305b266615e8c565ce53b8fe47ff95c086 (patch)
tree52101c117b6c625f49ef7d6c489c844c0e45d543 /drivers/net/ethernet/emulex
parent773a2d7c55a3d63207841c824d21920bd3683460 (diff)
be2net: Fix skyhawk VF PCI Device ID
Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex')
-rw-r--r--drivers/net/ethernet/emulex/benet/be.h5
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index d95825f91a9a..3b66c634b5e3 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -53,6 +53,7 @@
53#define OC_DEVICE_ID3 0xe220 /* Device id for Lancer cards */ 53#define OC_DEVICE_ID3 0xe220 /* Device id for Lancer cards */
54#define OC_DEVICE_ID4 0xe228 /* Device id for VF in Lancer */ 54#define OC_DEVICE_ID4 0xe228 /* Device id for VF in Lancer */
55#define OC_DEVICE_ID5 0x720 /* Device Id for Skyhawk cards */ 55#define OC_DEVICE_ID5 0x720 /* Device Id for Skyhawk cards */
56#define OC_DEVICE_ID6 0x728 /* Device id for VF in SkyHawk */
56#define OC_SUBSYS_DEVICE_ID1 0xE602 57#define OC_SUBSYS_DEVICE_ID1 0xE602
57#define OC_SUBSYS_DEVICE_ID2 0xE642 58#define OC_SUBSYS_DEVICE_ID2 0xE642
58#define OC_SUBSYS_DEVICE_ID3 0xE612 59#define OC_SUBSYS_DEVICE_ID3 0xE612
@@ -71,6 +72,7 @@ static inline char *nic_name(struct pci_dev *pdev)
71 case BE_DEVICE_ID2: 72 case BE_DEVICE_ID2:
72 return BE3_NAME; 73 return BE3_NAME;
73 case OC_DEVICE_ID5: 74 case OC_DEVICE_ID5:
75 case OC_DEVICE_ID6:
74 return OC_NAME_SH; 76 return OC_NAME_SH;
75 default: 77 default:
76 return BE_NAME; 78 return BE_NAME;
@@ -466,7 +468,8 @@ struct be_adapter {
466#define lancer_chip(adapter) ((adapter->pdev->device == OC_DEVICE_ID3) || \ 468#define lancer_chip(adapter) ((adapter->pdev->device == OC_DEVICE_ID3) || \
467 (adapter->pdev->device == OC_DEVICE_ID4)) 469 (adapter->pdev->device == OC_DEVICE_ID4))
468 470
469#define skyhawk_chip(adapter) (adapter->pdev->device == OC_DEVICE_ID5) 471#define skyhawk_chip(adapter) (adapter->pdev->device == OC_DEVICE_ID5 || \
472 adapter->pdev->device == OC_DEVICE_ID6)
470 473
471 474
472#define be_roce_supported(adapter) ((adapter->if_type == SLI_INTF_TYPE_3 || \ 475#define be_roce_supported(adapter) ((adapter->if_type == SLI_INTF_TYPE_3 || \
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 2143e06f1ae9..68665da26a68 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -44,6 +44,7 @@ static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = {
44 { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID3)}, 44 { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID3)},
45 { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID4)}, 45 { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID4)},
46 { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID5)}, 46 { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID5)},
47 { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID6)},
47 { 0 } 48 { 0 }
48}; 49};
49MODULE_DEVICE_TABLE(pci, be_dev_ids); 50MODULE_DEVICE_TABLE(pci, be_dev_ids);
@@ -3910,6 +3911,7 @@ static int be_dev_type_check(struct be_adapter *adapter)
3910 adapter->generation = BE_GEN3; 3911 adapter->generation = BE_GEN3;
3911 break; 3912 break;
3912 case OC_DEVICE_ID5: 3913 case OC_DEVICE_ID5:
3914 case OC_DEVICE_ID6:
3913 pci_read_config_dword(pdev, SLI_INTF_REG_OFFSET, &sli_intf); 3915 pci_read_config_dword(pdev, SLI_INTF_REG_OFFSET, &sli_intf);
3914 if ((sli_intf & SLI_INTF_VALID_MASK) != SLI_INTF_VALID) { 3916 if ((sli_intf & SLI_INTF_VALID_MASK) != SLI_INTF_VALID) {
3915 dev_err(&pdev->dev, "SLI_INTF reg val is not valid\n"); 3917 dev_err(&pdev->dev, "SLI_INTF reg val is not valid\n");