ethtool: Add Direct Attach support to connector port reporting
Subsystems (3)
PATCH 1/2 ethtool: Add Direct Attach support to connector port reporting
From: PJ Waskiewicz <[email protected]>
This patch allows a base driver to specify Direct Attach as the type of port through the ethtool interface.
---
include/linux/ethtool.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
include/linux/ethtool.h +2 -0
@@ -631,6 +631,8 @@ struct ethtool_ops {#define PORT_MII 0x02#define PORT_FIBRE 0x03#define PORT_BNC 0x04 +#define PORT_DA 0x05 +#define PORT_NONE 0xef#define PORT_OTHER 0xff/* Which transceiver to use. */
PATCH 2/2 ixgbe: Display currently attached PHY through ethtool
From: PJ Waskiewicz <[email protected]>
This patch extends the ethtool interface to display what PHY is currently connected to a NIC. The results can be viewed in ethtool ethX output.
---
drivers/net/ixgbe/ixgbe_ethtool.c | 50 +++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-)
drivers/net/ixgbe/ixgbe_ethtool.c +50 -0
@@ -205,6 +205,56 @@ static int ixgbe_get_settings(struct net_device *netdev, ecmd->autoneg =AUTONEG_DISABLE ; } +/* Get PHY type */ +switch (adapter->hw.phy.type) { +case ixgbe_phy_tn: +case ixgbe_phy_cu_unknown: +/* Copper 10G-BASET */ + ecmd->port =PORT_TP ; +break ; +case ixgbe_phy_qt: + ecmd->port =PORT_FIBRE ; +break ; +case ixgbe_phy_nl: +case ixgbe_phy_tw_tyco: +case ixgbe_phy_tw_unknown: +case ixgbe_phy_sfp_ftl: +case ixgbe_phy_sfp_avago: +case ixgbe_phy_sfp_intel: +case ixgbe_phy_sfp_unknown: +switch (adapter->hw.phy.sfp_type) { +/* SFP+ devices, further checking needed */ +case ixgbe_sfp_type_da_cu: +case ixgbe_sfp_type_da_cu_core0: +case ixgbe_sfp_type_da_cu_core1: + ecmd->port =PORT_DA ; +break ; +case ixgbe_sfp_type_sr: +case ixgbe_sfp_type_lr: +case ixgbe_sfp_type_srlr_core0: +case ixgbe_sfp_type_srlr_core1: + ecmd->port =PORT_FIBRE ; +break ; +case ixgbe_sfp_type_not_present: + ecmd->port =PORT_NONE ; +break ; +case ixgbe_sfp_type_unknown: +default : + ecmd->port =PORT_OTHER ; +break ; + } +break ; +case ixgbe_phy_xaui: + ecmd->port =PORT_NONE ; +break ; +case ixgbe_phy_unknown: +case ixgbe_phy_generic: +case ixgbe_phy_sfp_unsupported: +default : + ecmd->port =PORT_OTHER ; +break ; + } + hw->mac.ops.check_link (hw, &link_speed, &link_up, false);if (link_up) { ecmd->speed = (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
Re: [net-next-2.6 PATCH 2/2] ixgbe: Display currently attached PHY through ethtool
From: Jeff Kirsher <[email protected]>
Date: Wed, 25 Nov 2009 02:11:54 -0800
Quoted 8 lines
From: PJ Waskiewicz <[email protected]>
This patch extends the ethtool interface to display what PHY is currently connected to a NIC. The results can be viewed in ethtool ethX output.
Signed-off-by Peter P Waskiewicz Jr <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Wed, 25 Nov 2009 02:11:30 -0800
Quoted 7 lines
From: PJ Waskiewicz <[email protected]>
This patch allows a base driver to specify Direct Attach as the type of port through the ethtool interface.
Signed-off-by Peter P Waskiewicz Jr <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.