diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-31 17:52:49 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-31 17:52:49 +0200 |
| commit | 3560d23f14c26b65f89a9d6b674fc0f3196fa0f1 (patch) | |
| tree | 292247e6b4e0f7a588e552b631c2fd29c0adebbe | |
| parent | 1a0ab01fdd5104255dcfdeb0527e7001d28e3345 (diff) | |
igb: integrate tools only device support
Springville/i211 with a blank Flash/iNVM use a different PCI ID (tools
only, not for driver) than properly programmed ones.
| -rw-r--r-- | drivers/net/igb/e1000_api.c | 2 | ||||
| -rw-r--r-- | drivers/net/igb/e1000_hw.h | 2 | ||||
| -rw-r--r-- | drivers/net/igb/igb_main.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/igb/e1000_api.c b/drivers/net/igb/e1000_api.c index b1d748fed732..12e66a7e3817 100644 --- a/drivers/net/igb/e1000_api.c +++ b/drivers/net/igb/e1000_api.c @@ -184,6 +184,7 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) break; case E1000_DEV_ID_I210_COPPER_FLASHLESS: case E1000_DEV_ID_I210_SERDES_FLASHLESS: + case E1000_DEV_ID_I210_TOOLS_ONLY: case E1000_DEV_ID_I210_COPPER: case E1000_DEV_ID_I210_COPPER_OEM1: case E1000_DEV_ID_I210_COPPER_IT: @@ -192,6 +193,7 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_I210_SGMII: mac->type = e1000_i210; break; + case E1000_DEV_ID_I211_TOOLS_ONLY: case E1000_DEV_ID_I211_COPPER: mac->type = e1000_i211; break; diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h index 347cef716994..0c4c1fb49dac 100644 --- a/drivers/net/igb/e1000_hw.h +++ b/drivers/net/igb/e1000_hw.h @@ -56,6 +56,8 @@ struct e1000_hw; #define E1000_DEV_ID_I350_SERDES 0x1523 #define E1000_DEV_ID_I350_SGMII 0x1524 #define E1000_DEV_ID_I350_DA4 0x1546 +#define E1000_DEV_ID_I210_TOOLS_ONLY 0x1531 +#define E1000_DEV_ID_I211_TOOLS_ONLY 0x1532 #define E1000_DEV_ID_I210_COPPER 0x1533 #define E1000_DEV_ID_I210_COPPER_OEM1 0x1534 #define E1000_DEV_ID_I210_COPPER_IT 0x1535 diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index ed30d130f5d6..29237a3cddcf 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -78,12 +78,14 @@ static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = { { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_1GBPS) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_SGMII) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_2_5GBPS) }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_TOOLS_ONLY) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_COPPER) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_FIBER) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SERDES) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SGMII) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_COPPER_FLASHLESS) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SERDES_FLASHLESS) }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_I211_TOOLS_ONLY) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I211_COPPER) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_COPPER) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_FIBER) }, |