aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>2009-05-17 16:58:04 -0400
committerDavid S. Miller <davem@davemloft.net>2009-05-18 18:09:44 -0400
commit1fcf03e65650ed888543d33b018bec8dcd95c8e2 (patch)
tree1656fcd3a6dc249047750c650ae0bcfcf5b4a1b0
parente76678dd654545c98a5d0bdc66bd41350573c23e (diff)
ixgbe: Add generic XAUI support to 82599
This patch adds the generic XAUI device support for 82599 controllers. 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>
-rw-r--r--drivers/net/ixgbe/ixgbe_82599.c3
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c2
-rw-r--r--drivers/net/ixgbe/ixgbe_type.h2
3 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index eaecf5e595c7..39d7b64aced7 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -347,6 +347,7 @@ enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
347 switch (hw->device_id) { 347 switch (hw->device_id) {
348 case IXGBE_DEV_ID_82599: 348 case IXGBE_DEV_ID_82599:
349 case IXGBE_DEV_ID_82599_KX4: 349 case IXGBE_DEV_ID_82599_KX4:
350 case IXGBE_DEV_ID_82599_XAUI_LOM:
350 /* Default device ID is mezzanine card KX/KX4 */ 351 /* Default device ID is mezzanine card KX/KX4 */
351 media_type = ixgbe_media_type_backplane; 352 media_type = ixgbe_media_type_backplane;
352 break; 353 break;
@@ -1199,6 +1200,8 @@ u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)
1199 physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_CX4; 1200 physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_CX4;
1200 else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_KX4) 1201 else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_KX4)
1201 physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KX4; 1202 physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KX4;
1203 else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_XAUI)
1204 physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_XAUI;
1202 goto out; 1205 goto out;
1203 break; 1206 break;
1204 case IXGBE_AUTOC_LMS_10G_SERIAL: 1207 case IXGBE_AUTOC_LMS_10G_SERIAL:
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 4ab17ab7fbce..f9f8831b993f 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -90,6 +90,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = {
90 board_82598 }, 90 board_82598 },
91 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4), 91 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4),
92 board_82599 }, 92 board_82599 },
93 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_XAUI_LOM),
94 board_82599 },
93 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP), 95 {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP),
94 board_82599 }, 96 board_82599 },
95 97
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index cb73b30f6c43..ba3ed0f0bc9c 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -49,6 +49,7 @@
49#define IXGBE_DEV_ID_82599 0x10D8 49#define IXGBE_DEV_ID_82599 0x10D8
50#define IXGBE_DEV_ID_82599_KX4 0x10F7 50#define IXGBE_DEV_ID_82599_KX4 0x10F7
51#define IXGBE_DEV_ID_82599_SFP 0x10FB 51#define IXGBE_DEV_ID_82599_SFP 0x10FB
52#define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC
52 53
53/* General Registers */ 54/* General Registers */
54#define IXGBE_CTRL 0x00000 55#define IXGBE_CTRL 0x00000
@@ -1954,6 +1955,7 @@ typedef u32 ixgbe_physical_layer;
1954#define IXGBE_PHYSICAL_LAYER_1000BASE_KX 0x0200 1955#define IXGBE_PHYSICAL_LAYER_1000BASE_KX 0x0200
1955#define IXGBE_PHYSICAL_LAYER_1000BASE_BX 0x0400 1956#define IXGBE_PHYSICAL_LAYER_1000BASE_BX 0x0400
1956#define IXGBE_PHYSICAL_LAYER_10GBASE_KR 0x0800 1957#define IXGBE_PHYSICAL_LAYER_10GBASE_KR 0x0800
1958#define IXGBE_PHYSICAL_LAYER_10GBASE_XAUI 0x1000
1957 1959
1958enum ixgbe_eeprom_type { 1960enum ixgbe_eeprom_type {
1959 ixgbe_eeprom_uninitialized = 0, 1961 ixgbe_eeprom_uninitialized = 0,