Commit 76b73530 authored by Padmanabh Ratnakar's avatar Padmanabh Ratnakar Committed by David S. Miller

be2net: Fix skyhawk VF PCI Device ID

Signed-off-by: default avatarPadmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 773a2d7c
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#define OC_DEVICE_ID3 0xe220 /* Device id for Lancer cards */ #define OC_DEVICE_ID3 0xe220 /* Device id for Lancer cards */
#define OC_DEVICE_ID4 0xe228 /* Device id for VF in Lancer */ #define OC_DEVICE_ID4 0xe228 /* Device id for VF in Lancer */
#define OC_DEVICE_ID5 0x720 /* Device Id for Skyhawk cards */ #define OC_DEVICE_ID5 0x720 /* Device Id for Skyhawk cards */
#define OC_DEVICE_ID6 0x728 /* Device id for VF in SkyHawk */
#define OC_SUBSYS_DEVICE_ID1 0xE602 #define OC_SUBSYS_DEVICE_ID1 0xE602
#define OC_SUBSYS_DEVICE_ID2 0xE642 #define OC_SUBSYS_DEVICE_ID2 0xE642
#define OC_SUBSYS_DEVICE_ID3 0xE612 #define OC_SUBSYS_DEVICE_ID3 0xE612
...@@ -71,6 +72,7 @@ static inline char *nic_name(struct pci_dev *pdev) ...@@ -71,6 +72,7 @@ static inline char *nic_name(struct pci_dev *pdev)
case BE_DEVICE_ID2: case BE_DEVICE_ID2:
return BE3_NAME; return BE3_NAME;
case OC_DEVICE_ID5: case OC_DEVICE_ID5:
case OC_DEVICE_ID6:
return OC_NAME_SH; return OC_NAME_SH;
default: default:
return BE_NAME; return BE_NAME;
...@@ -466,7 +468,8 @@ struct be_adapter { ...@@ -466,7 +468,8 @@ struct be_adapter {
#define lancer_chip(adapter) ((adapter->pdev->device == OC_DEVICE_ID3) || \ #define lancer_chip(adapter) ((adapter->pdev->device == OC_DEVICE_ID3) || \
(adapter->pdev->device == OC_DEVICE_ID4)) (adapter->pdev->device == OC_DEVICE_ID4))
#define skyhawk_chip(adapter) (adapter->pdev->device == OC_DEVICE_ID5) #define skyhawk_chip(adapter) (adapter->pdev->device == OC_DEVICE_ID5 || \
adapter->pdev->device == OC_DEVICE_ID6)
#define be_roce_supported(adapter) ((adapter->if_type == SLI_INTF_TYPE_3 || \ #define be_roce_supported(adapter) ((adapter->if_type == SLI_INTF_TYPE_3 || \
......
...@@ -44,6 +44,7 @@ static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = { ...@@ -44,6 +44,7 @@ static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = {
{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID3)}, { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID3)},
{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID4)}, { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID4)},
{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID5)}, { PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID5)},
{ PCI_DEVICE(EMULEX_VENDOR_ID, OC_DEVICE_ID6)},
{ 0 } { 0 }
}; };
MODULE_DEVICE_TABLE(pci, be_dev_ids); MODULE_DEVICE_TABLE(pci, be_dev_ids);
...@@ -3910,6 +3911,7 @@ static int be_dev_type_check(struct be_adapter *adapter) ...@@ -3910,6 +3911,7 @@ static int be_dev_type_check(struct be_adapter *adapter)
adapter->generation = BE_GEN3; adapter->generation = BE_GEN3;
break; break;
case OC_DEVICE_ID5: case OC_DEVICE_ID5:
case OC_DEVICE_ID6:
pci_read_config_dword(pdev, SLI_INTF_REG_OFFSET, &sli_intf); pci_read_config_dword(pdev, SLI_INTF_REG_OFFSET, &sli_intf);
if ((sli_intf & SLI_INTF_VALID_MASK) != SLI_INTF_VALID) { if ((sli_intf & SLI_INTF_VALID_MASK) != SLI_INTF_VALID) {
dev_err(&pdev->dev, "SLI_INTF reg val is not valid\n"); dev_err(&pdev->dev, "SLI_INTF reg val is not valid\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment