tg3: Move EEE definitions into mdio.h
Subsystems (3)
PATCH 2/6 tg3: Move EEE definitions into mdio.h
In commit 52b02d04c801fff51ca49ad033210846d1713253 entitled "tg3: Add EEE support", Ben Hutchings had commented that the EEE advertisement register will be in a standard location. This patch moves that definition into mdio.h and changes the code to use it.
Signed-off-by Matt Carlson <[email protected]>
Reviewed-by Benjamin Li <[email protected]>
--- drivers/net/tg3.c | 16 ++++++++-------- drivers/net/tg3.h | 3 --- include/linux/mdio.h | 5 +++++ 3 files changed, 13 insertions(+), 11 deletions(-)
drivers/net/tg3.c +8 -8
@@ -32,6 +32,7 @@#include <linux/etherdevice.h> #include <linux/skbuff.h> #include <linux/ethtool.h> +#include <linux/mdio.h> #include <linux/mii.h> #include <linux/phy.h> #include <linux/brcmphy.h>
@@ -1781,7 +1782,8 @@ static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up)tw32 (TG3_CPMU_EEE_CTRL , eeectl); -tg3_phy_cl45_read (tp,0x7 ,TG3_CL45_D7_EEERES_STAT , &val); +tg3_phy_cl45_read (tp,MDIO_MMD_AN , +TG3_CL45_D7_EEERES_STAT , &val);if (val ==TG3_CL45_D7_EEERES_STAT_LP_1000T || val ==TG3_CL45_D7_EEERES_STAT_LP_100TX )
@@ -2987,16 +2989,14 @@ static void tg3_phy_copper_begin(struct tg3 *tp)if (tp->link_config.autoneg ==AUTONEG_ENABLE ) {/* Advertise 100-BaseTX EEE ability */ if (tp->link_config.advertising & - (ADVERTISED_100baseT_Half | - ADVERTISED_100baseT_Full)) - val |=TG3_CL45_D7_EEEADV_CAP_100TX ; + ADVERTISED_100baseT_Full) + val |=MDIO_AN_EEE_ADV_100TX ;/* Advertise 1000-BaseT EEE ability */ if (tp->link_config.advertising & - (ADVERTISED_1000baseT_Half | - ADVERTISED_1000baseT_Full)) - val |=TG3_CL45_D7_EEEADV_CAP_1000T ; + ADVERTISED_1000baseT_Full) + val |=MDIO_AN_EEE_ADV_1000T ; } -tg3_phy_cl45_write (tp,0x7 ,TG3_CL45_D7_EEEADV_CAP , val); +tg3_phy_cl45_write (tp,MDIO_MMD_AN ,MDIO_AN_EEE_ADV , val);/* Turn off SM_DSP clock. */ val = MII_TG3_AUXCTL_SHDWSEL_AUXCTL |
drivers/net/tg3.h +0 -3
@@ -2172,9 +2172,6 @@#define MII_TG3_TEST1_CRC_EN 0x8000/* Clause 45 expansion registers */ -#define TG3_CL45_D7_EEEADV_CAP 0x003c -#define TG3_CL45_D7_EEEADV_CAP_100TX 0x0002 -#define TG3_CL45_D7_EEEADV_CAP_1000T 0x0004#define TG3_CL45_D7_EEERES_STAT 0x803e#define TG3_CL45_D7_EEERES_STAT_LP_100TX 0x0002#define TG3_CL45_D7_EEERES_STAT_LP_1000T 0x0004
include/linux/mdio.h +5 -0
@@ -55,6 +55,7 @@#define MDIO_PCS_10GBRT_STAT2 33/* 10GBASE-R/-T PCS status 2 */ #define MDIO_AN_10GBT_CTRL 32/* 10GBASE-T auto-negotiation control */ #define MDIO_AN_10GBT_STAT 33/* 10GBASE-T auto-negotiation status */ +#define MDIO_AN_EEE_ADV 60/* EEE advertisement */ /* LASI (Link Alarm Status Interrupt) registers, defined by XENPAK MSA. */ #define MDIO_PMA_LASI_RXCTRL 0x9000/* RX_ALARM control */
@@ -235,6 +236,10 @@#define MDIO_AN_10GBT_STAT_MS 0x4000/* Master/slave config */ #define MDIO_AN_10GBT_STAT_MSFLT 0x8000/* Master/slave config fault */ +/* AN EEE Advertisement register. */ +#define MDIO_AN_EEE_ADV_100TX 0x0002/* Advertise 100TX EEE cap */ +#define MDIO_AN_EEE_ADV_1000T 0x0004/* Advertise 1000T EEE cap */ +/* LASI RX_ALARM control/status registers. */ #define MDIO_PMA_LASI_RX_PHYXSLFLT 0x0001/* PHY XS RX local fault */ #define MDIO_PMA_LASI_RX_PCSLFLT 0x0008/* PCS RX local fault */
Signature · 1 line
1.7.2.2
Quoted 7 lines · Matt Carlson
In commit
52b02d04c801fff51ca49ad033210846d1713253entitled "tg3: Add EEE support", Ben Hutchings had commented that the EEE advertisement register will be in a standard location. This patch moves that definition intomdio.hand changes the code to use it.Signed-off-by Matt Carlson <[email protected]>Reviewed-by Benjamin Li <[email protected]>
[...]
Thanks, Matt.
Ben.
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.