aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Keller <jacob.e.keller@intel.com>2013-02-15 04:18:10 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-04-18 00:37:03 -0400
commite8710a5fbf903d514c8b93294e16eaaff954ffed (patch)
tree001bd0b6053f5b317abef9851321811ed907bfbd
parent7f66162b6272a31c5b3966869b5d4c2c58d8077a (diff)
ixgbe: Enable support for recognizing PCI-e Gen3 link speed
This patch adds support for displaying PCIe Gen3 link speed, which was previously missing from the driver. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_common.c3
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c3
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_type.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index f8d3deccc9b2..3f66abc45a2e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -635,6 +635,9 @@ s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw)
635 case IXGBE_PCI_LINK_SPEED_5000: 635 case IXGBE_PCI_LINK_SPEED_5000:
636 hw->bus.speed = ixgbe_bus_speed_5000; 636 hw->bus.speed = ixgbe_bus_speed_5000;
637 break; 637 break;
638 case IXGBE_PCI_LINK_SPEED_8000:
639 hw->bus.speed = ixgbe_bus_speed_8000;
640 break;
638 default: 641 default:
639 hw->bus.speed = ixgbe_bus_speed_unknown; 642 hw->bus.speed = ixgbe_bus_speed_unknown;
640 break; 643 break;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 0e7f0dd14d5f..54e7d0981039 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7490,7 +7490,8 @@ skip_sriov:
7490 7490
7491 /* print bus type/speed/width info */ 7491 /* print bus type/speed/width info */
7492 e_dev_info("(PCI Express:%s:%s) %pM\n", 7492 e_dev_info("(PCI Express:%s:%s) %pM\n",
7493 (hw->bus.speed == ixgbe_bus_speed_5000 ? "5.0GT/s" : 7493 (hw->bus.speed == ixgbe_bus_speed_8000 ? "8.0GT/s" :
7494 hw->bus.speed == ixgbe_bus_speed_5000 ? "5.0GT/s" :
7494 hw->bus.speed == ixgbe_bus_speed_2500 ? "2.5GT/s" : 7495 hw->bus.speed == ixgbe_bus_speed_2500 ? "2.5GT/s" :
7495 "Unknown"), 7496 "Unknown"),
7496 (hw->bus.width == ixgbe_bus_width_pcie_x8 ? "Width x8" : 7497 (hw->bus.width == ixgbe_bus_width_pcie_x8 ? "Width x8" :
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index 6652e96c352d..05df36ef9884 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -1827,6 +1827,7 @@ enum {
1827#define IXGBE_PCI_LINK_SPEED 0xF 1827#define IXGBE_PCI_LINK_SPEED 0xF
1828#define IXGBE_PCI_LINK_SPEED_2500 0x1 1828#define IXGBE_PCI_LINK_SPEED_2500 0x1
1829#define IXGBE_PCI_LINK_SPEED_5000 0x2 1829#define IXGBE_PCI_LINK_SPEED_5000 0x2
1830#define IXGBE_PCI_LINK_SPEED_8000 0x3
1830#define IXGBE_PCI_HEADER_TYPE_REGISTER 0x0E 1831#define IXGBE_PCI_HEADER_TYPE_REGISTER 0x0E
1831#define IXGBE_PCI_HEADER_TYPE_MULTIFUNC 0x80 1832#define IXGBE_PCI_HEADER_TYPE_MULTIFUNC 0x80
1832#define IXGBE_PCI_DEVICE_CONTROL2_16ms 0x0005 1833#define IXGBE_PCI_DEVICE_CONTROL2_16ms 0x0005
@@ -2650,6 +2651,7 @@ enum ixgbe_bus_speed {
2650 ixgbe_bus_speed_133 = 133, 2651 ixgbe_bus_speed_133 = 133,
2651 ixgbe_bus_speed_2500 = 2500, 2652 ixgbe_bus_speed_2500 = 2500,
2652 ixgbe_bus_speed_5000 = 5000, 2653 ixgbe_bus_speed_5000 = 5000,
2654 ixgbe_bus_speed_8000 = 8000,
2653 ixgbe_bus_speed_reserved 2655 ixgbe_bus_speed_reserved
2654}; 2656};
2655 2657