aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe
diff options
context:
space:
mode:
authorDon Skidmore <donald.c.skidmore@intel.com>2009-02-01 04:18:23 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-01 04:18:23 -0500
commit2f21bdd3542838dc5513a585a32aa13f01b019e7 (patch)
tree1d145287286487b8feba3e1049ddb010f81b0a0a /drivers/net/ixgbe
parent1224736d97e83367bb66e29c2bee0f570f09db3e (diff)
ixgbe: Add 82598 support for BX mezzanine devices
Add the device ID for BX devices using the 82598 MAC. Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe')
-rw-r--r--drivers/net/ixgbe/ixgbe_82598.c4
-rw-r--r--drivers/net/ixgbe/ixgbe_ethtool.c8
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c2
-rw-r--r--drivers/net/ixgbe/ixgbe_type.h1
4 files changed, 14 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
index 6c7ddb96ed04..dffe7f062c87 100644
--- a/drivers/net/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ixgbe/ixgbe_82598.c
@@ -214,7 +214,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw)
214 /* Media type for I82598 is based on device ID */ 214 /* Media type for I82598 is based on device ID */
215 switch (hw->device_id) { 215 switch (hw->device_id) {
216 case IXGBE_DEV_ID_82598: 216 case IXGBE_DEV_ID_82598:
217 /* Default device ID is mezzanine card KX/KX4 */ 217 case IXGBE_DEV_ID_82598_BX:
218 media_type = ixgbe_media_type_backplane; 218 media_type = ixgbe_media_type_backplane;
219 break; 219 break;
220 case IXGBE_DEV_ID_82598AF_DUAL_PORT: 220 case IXGBE_DEV_ID_82598AF_DUAL_PORT:
@@ -1011,6 +1011,8 @@ static s32 ixgbe_get_supported_physical_layer_82598(struct ixgbe_hw *hw)
1011 physical_layer = (IXGBE_PHYSICAL_LAYER_10GBASE_KX4 | 1011 physical_layer = (IXGBE_PHYSICAL_LAYER_10GBASE_KX4 |
1012 IXGBE_PHYSICAL_LAYER_1000BASE_KX); 1012 IXGBE_PHYSICAL_LAYER_1000BASE_KX);
1013 break; 1013 break;
1014 case IXGBE_DEV_ID_82598_BX:
1015 physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_BX;
1014 case IXGBE_DEV_ID_82598EB_CX4: 1016 case IXGBE_DEV_ID_82598EB_CX4:
1015 case IXGBE_DEV_ID_82598_CX4_DUAL_PORT: 1017 case IXGBE_DEV_ID_82598_CX4_DUAL_PORT:
1016 physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_CX4; 1018 physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_CX4;
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 444200fa31e7..69eda891f59b 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -141,6 +141,14 @@ static int ixgbe_get_settings(struct net_device *netdev,
141 ADVERTISED_FIBRE); 141 ADVERTISED_FIBRE);
142 ecmd->port = PORT_FIBRE; 142 ecmd->port = PORT_FIBRE;
143 break; 143 break;
144 case IXGBE_DEV_ID_82598_BX:
145 ecmd->supported = (SUPPORTED_1000baseT_Full |
146 SUPPORTED_FIBRE);
147 ecmd->advertising = (ADVERTISED_1000baseT_Full |
148 ADVERTISED_FIBRE);
149 ecmd->port = PORT_FIBRE;
150 ecmd->autoneg = AUTONEG_DISABLE;
151 break;
144 } 152 }
145 } else { 153 } else {
146 ecmd->supported |= SUPPORTED_FIBRE; 154 ecmd->supported |= SUPPORTED_FIBRE;
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 88615f69976e..82afc606c238 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -84,6 +84,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = {
84 board_82598 }, 84 board_82598 },
85 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_SFP_LOM), 85 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_SFP_LOM),
86 board_82598 }, 86 board_82598 },
87 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_BX),
88 board_82598 },
87 89
88 /* required last entry */ 90 /* required last entry */
89 {0, } 91 {0, }
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index e43f0c7c3412..883ff821153d 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -35,6 +35,7 @@
35 35
36/* Device IDs */ 36/* Device IDs */
37#define IXGBE_DEV_ID_82598 0x10B6 37#define IXGBE_DEV_ID_82598 0x10B6
38#define IXGBE_DEV_ID_82598_BX 0x1508
38#define IXGBE_DEV_ID_82598AF_DUAL_PORT 0x10C6 39#define IXGBE_DEV_ID_82598AF_DUAL_PORT 0x10C6
39#define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7 40#define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7
40#define IXGBE_DEV_ID_82598EB_SFP_LOM 0x10DB 41#define IXGBE_DEV_ID_82598EB_SFP_LOM 0x10DB