mdio: Expose 10GBASE-T MDI-X status via ethtool
Subsystems (3)
PATCH 1/2 mdio: Expose 10GBASE-T MDI-X status via ethtool
This is available in a standard MDIO register in 10GBASE-T PHYs.
Signed-off-by Ben Hutchings <[email protected]>
--- drivers/net/mdio.c | 17 +++++++++++++++++ include/linux/mdio.h | 9 +++++++++ 2 files changed, 26 insertions(+), 0 deletions(-)
drivers/net/mdio.c +17 -0
@@ -296,6 +296,23 @@ void mdio45_ethtool_gset_npage(const struct mdio_if_info *mdio, ecmd->duplex = (reg &MDIO_CTRL1_FULLDPLX || ecmd->speed ==SPEED_10000 ); } + +/* 10GBASE-T MDI/MDI-X */ +if (ecmd->port ==PORT_TP && ecmd->speed ==SPEED_10000 ) { +switch (mdio->mdio_read (mdio->dev, mdio->prtad,MDIO_MMD_PMAPMD , +MDIO_PMA_10GBT_SWAPPOL )) { +case MDIO_PMA_10GBT_SWAPPOL_ABNX |MDIO_PMA_10GBT_SWAPPOL_CDNX : + ecmd->eth_tp_mdix =ETH_TP_MDI ; +break ; +case 0 : + ecmd->eth_tp_mdix =ETH_TP_MDI_X ; +break ; +default : +/* It's complicated... */ + ecmd->eth_tp_mdix =ETH_TP_MDI_INVALID ; +break ; + } + } }EXPORT_SYMBOL (mdio45_ethtool_gset_npage);
include/linux/mdio.h +9 -0
@@ -45,6 +45,7 @@#define MDIO_PHYXS_LNSTAT 24/* PHY XGXS lane state */ /* Media-dependent registers. */ +#define MDIO_PMA_10GBT_SWAPPOL 130/* 10GBASE-T pair swap & polarity */ #define MDIO_PMA_10GBT_TXPWR 131/* 10GBASE-T TX power control */ #define MDIO_PMA_10GBT_SNR 133/* 10GBASE-T SNR margin, lane A. * Lanes B-D are numbered 134-136. */
@@ -195,6 +196,14 @@#define MDIO_PHYXS_LNSTAT_SYNC3 0x0008#define MDIO_PHYXS_LNSTAT_ALIGN 0x1000 +/* PMA 10GBASE-T pair swap & polarity */ +#define MDIO_PMA_10GBT_SWAPPOL_ABNX 0x0001/* Pair A/B uncrossed */ +#define MDIO_PMA_10GBT_SWAPPOL_CDNX 0x0002/* Pair C/D uncrossed */ +#define MDIO_PMA_10GBT_SWAPPOL_AREV 0x0100/* Pair A polarity reversed */ +#define MDIO_PMA_10GBT_SWAPPOL_BREV 0x0200/* Pair B polarity reversed */ +#define MDIO_PMA_10GBT_SWAPPOL_CREV 0x0400/* Pair C polarity reversed */ +#define MDIO_PMA_10GBT_SWAPPOL_DREV 0x0800/* Pair D polarity reversed */ +/* PMA 10GBASE-T TX power register. */ #define MDIO_PMA_10GBT_TXPWR_SHORT 0x0001/* Short-reach mode */
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
PATCH 2/2 sfc: Expose 100/1000BASE-T MDI-X status via ethtool
Signed-off-by Ben Hutchings <[email protected]>
--- drivers/net/sfc/tenxpress.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)
drivers/net/sfc/tenxpress.c +10 -1
@@ -63,6 +63,7 @@/* extended status register */ #define PMA_PMD_XSTATUS_REG 49153 +#define PMA_PMD_XSTAT_MDIX_LBN 14#define PMA_PMD_XSTAT_FLP_LBN (12)/* LED control register */
@@ -741,9 +742,17 @@ tenxpress_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)mdio45_ethtool_gset_npage (&efx->mdio, ecmd, adv, lpa); -if (efx->phy_type !=PHY_TYPE_SFX7101 ) +if (efx->phy_type !=PHY_TYPE_SFX7101 ) { ecmd->supported |= (SUPPORTED_100baseT_Full | SUPPORTED_1000baseT_Full); +if (ecmd->speed !=SPEED_10000 ) { + ecmd->eth_tp_mdix = + (efx_mdio_read (efx,MDIO_MMD_PMAPMD , +PMA_PMD_XSTATUS_REG ) & + (1 <<PMA_PMD_XSTAT_MDIX_LBN )) + ?ETH_TP_MDI_X :ETH_TP_MDI ; + } + }/* In loopback, the PHY automatically brings up the correct interface, * but doesn't advertise the correct speed. So override it */
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
From: Ben Hutchings <[email protected]>
Date: Wed, 10 Jun 2009 16:28:04 +0100
Quoted 3 lines
This is available in a standard MDIO register in 10GBASE-T PHYs.
Signed-off-by Ben Hutchings <[email protected]>
Applied.
Re: [PATCH 2/2] sfc: Expose 100/1000BASE-T MDI-X status via ethtool
In reply to Ben HutchingsFrom: Ben Hutchings <[email protected]>
Date: Wed, 10 Jun 2009 16:30:05 +0100
Quoted 1 line
Signed-off-by Ben Hutchings <[email protected]>
Applied.