Re: [net-next 1/4] phy: add the EEE support and the way to access to the MMD regs
From: Ben Hutchings <hidden>
Date: 2012-03-06 17:06:00
On Tue, 2012-03-06 at 16:55 +0000, Ben Hutchings wrote:
On Tue, 2012-03-06 at 09:28 +0100, Giuseppe CAVALLARO wrote:quoted
This patch adds the initial support for the Energy-Efficient Ethernet (EEE). It has been tested on IC+101G device on ST STB. To support the EEE we have to access to the MMD registers 3.20 and 3.60/61. So I added two new functions to read/write the MMD registers (clause 45) The upper-layer will invoke the phy_check_eee to properly check if the EEE is supported by the PHYs. Signed-off-by: Giuseppe Cavallaro <redacted> --- drivers/net/phy/phy_device.c | 136 ++++++++++++++++++++++++++++++++++++++++++ include/linux/mdio.h | 5 ++ include/linux/mii.h | 11 ++++ include/linux/phy.h | 3 + 4 files changed, 155 insertions(+), 0 deletions(-)diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index f320f46..c269492e 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c[...]quoted
@@ -898,6 +899,141 @@ int genphy_resume(struct phy_device *phydev) } EXPORT_SYMBOL(genphy_resume); +static inline void mmd_phy_cl45(struct mii_bus *bus, int prtad, int devad, + int addr)[...]quoted
+/** + * read_phy_mmd - reads data from the MMC register (clause 22 to access to + * clause 45)[...]quoted
+/** + * write_phy_mmd - writes data to the MMC register (clause 22 to access to + * clause 45)These names need to be changed as phylib also supports (or is intended to support) real clause 45 PHYs. [...]quoted
diff --git a/include/linux/mdio.h b/include/linux/mdio.h index dfb9479..a2dfe86 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h@@ -43,7 +43,11 @@ #define MDIO_PKGID2 15 #define MDIO_AN_ADVERTISE 16 /* AN advertising (base page) */ #define MDIO_AN_LPA 19 /* AN LP abilities (base page) */ +#define MDIO_EEE_CAP 20 /* EEE Capability register */ +#define MDIO_EEE_WK_ERR 22 /* EEE wake error counter */ #define MDIO_PHYXS_LNSTAT 24 /* PHY XGXS lane state */ +#define MDIO_EEE_ADV 60 /* EEE advertisement */ +#define MDIO_EEE_PART_LINK 61 /* EEE link partner ability */ /* Media-dependent registers. */ #define MDIO_PMA_10GBT_SWAPPOL 130 /* 10GBASE-T pair swap & polarity */The convention I tried to set here was that register numbers defined for only one MMD are named beginning with MDIO_<mmd>_. I also used 'LP' for link partner and 'ABLE' for capability/ability. So for consistency I think those should be named MDIO_PCS_EEE_ABLE, MDIO_PCS_EEE_WK_ERR, MDIO_AN_EEE_ADV, MDIO_AN_EEE_LPABLE.
[...] And note we already have MDIO_AN_EEE_ADV under 'Media-dependent registers'. I think that may be the wrong section so feel free to move it up to 'Generic MDIO registers', but don't make two definitions. Ben. -- Ben Hutchings, Staff Engineer, Solarflare Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.