add ethtool SQI support for LAN87xx T1 Phy
Arun Ramadoss
maintainerv2 cover add ethtool SQI support for LAN87xx T1 Phy
This patch series add the Signal Quality Index measurement for the LAN87xx and LAN937x T1 phy. Updated the maintainers file for microchip_t1.c.
v1 - v2
------
- Seperated the PHY_POLL_CABLE_TEST flag patch as a fix to net tree.
- Updated the individual people as Maintainer.
Arun Ramadoss (2):
net: phy: LAN87xx: add ethtool SQI support
MAINTAINERS: Add maintainers for Microchip T1 Phy driver
MAINTAINERS | 7 +++++ drivers/net/phy/microchip_t1.c | 48 ++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+)
base-commit: f45ba67eb74ab4b775616af731bdf8944afce3f1
Signature · 1 line
2.33.0
Arun Ramadoss
maintainerPATCH v2 1/2 net: phy: LAN87xx: add ethtool SQI support
This patch add the support for measuring Signal Quality Index for LAN87xx and LAN937x T1 Phy. It uses the SQI Method 5 for obtaining the values.
--- drivers/net/phy/microchip_t1.c | 48 ++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)
drivers/net/phy/microchip_t1.c +48 -0
@@ -68,7 +68,12 @@#define T1_POST_LCK_MUFACT_CFG_REG 0x1C#define T1_TX_RX_FIFO_CFG_REG 0x02#define T1_TX_LPF_FIR_CFG_REG 0x55 +#define T1_COEF_CLK_PWR_DN_CFG 0x04 +#define T1_COEF_RW_CTL_CFG 0x0D#define T1_SQI_CONFIG_REG 0x2E +#define T1_SQI_CONFIG2_REG 0x4A +#define T1_DCQ_SQI_REG 0xC3 +#define T1_DCQ_SQI_MSK GENMASK(3, 1)#define T1_MDIO_CONTROL2_REG 0x10#define T1_INTERRUPT_SOURCE_REG 0x18#define T1_INTERRUPT2_SOURCE_REG 0x08
@@ -82,6 +87,9 @@#define T1_MODE_STAT_REG 0x11#define T1_LINK_UP_MSK BIT(0) +/* SQI defines */ +#define LAN87XX_MAX_SQI 0x07 +#define DRIVER_AUTHOR "Nisar Sayed <[email protected]>"#define DRIVER_DESC "Microchip LAN87XX/LAN937x T1 PHY driver"
@@ -346,9 +354,20 @@ static int lan87xx_phy_init(struct phy_device *phydev) T1_TX_LPF_FIR_CFG_REG, 0x1011, 0 }, {PHYACC_ATTR_MODE_WRITE ,PHYACC_ATTR_BANK_DSP , T1_TX_LPF_FIR_CFG_REG, 0x1000, 0 }, +/* Setup SQI measurement */ + { PHYACC_ATTR_MODE_WRITE, PHYACC_ATTR_BANK_DSP, + T1_COEF_CLK_PWR_DN_CFG, 0x16d6, 0 },/* SQI enable */ { PHYACC_ATTR_MODE_WRITE, PHYACC_ATTR_BANK_DSP, T1_SQI_CONFIG_REG, 0x9572, 0 }, +/* SQI select mode 5 */ + { PHYACC_ATTR_MODE_WRITE, PHYACC_ATTR_BANK_DSP, + T1_SQI_CONFIG2_REG, 0x0001, 0 }, +/* Throws the first SQI reading */ + { PHYACC_ATTR_MODE_WRITE, PHYACC_ATTR_BANK_DSP, + T1_COEF_RW_CTL_CFG, 0x0301, 0 }, + { PHYACC_ATTR_MODE_READ, PHYACC_ATTR_BANK_DSP, + T1_DCQ_SQI_REG, 0, 0 },/* Flag LPS and WUR as idle errors */ { PHYACC_ATTR_MODE_WRITE, PHYACC_ATTR_BANK_SMI, T1_MDIO_CONTROL2_REG, 0x0014, 0 },
@@ -729,6 +748,31 @@ static int lan87xx_config_aneg(struct phy_device *phydev)return rc; } +static int lan87xx_get_sqi (struct phy_device *phydev) +{ +u8 sqi_value =0 ; +int rc; + + rc =access_ereg (phydev,PHYACC_ATTR_MODE_WRITE , +PHYACC_ATTR_BANK_DSP ,T1_COEF_RW_CTL_CFG ,0x0301 ); +if (rc <0 ) +return rc; + + rc =access_ereg (phydev,PHYACC_ATTR_MODE_READ , +PHYACC_ATTR_BANK_DSP ,T1_DCQ_SQI_REG ,0x0 ); +if (rc <0 ) +return rc; + + sqi_value =FIELD_GET (T1_DCQ_SQI_MSK , rc); + +return sqi_value; +} + +static int lan87xx_get_sqi_max (struct phy_device *phydev) +{ +return LAN87XX_MAX_SQI ; +} +static struct phy_driver microchip_t1_phy_driver[] = { {PHY_ID_MATCH_MODEL (PHY_ID_LAN87XX ),
@@ -742,6 +786,8 @@ static struct phy_driver microchip_t1_phy_driver[] = { .resume = genphy_resume, .config_aneg = lan87xx_config_aneg, .read_status = lan87xx_read_status, + .get_sqi = lan87xx_get_sqi, + .get_sqi_max = lan87xx_get_sqi_max, .cable_test_start = lan87xx_cable_test_start, .cable_test_get_status = lan87xx_cable_test_get_status, },
@@ -754,6 +800,8 @@ static struct phy_driver microchip_t1_phy_driver[] = { .resume = genphy_resume, .config_aneg = lan87xx_config_aneg, .read_status = lan87xx_read_status, + .get_sqi = lan87xx_get_sqi, + .get_sqi_max = lan87xx_get_sqi_max, .cable_test_start = lan87xx_cable_test_start, .cable_test_get_status = lan87xx_cable_test_get_status, }
Signature · 1 line
2.33.0
Arun Ramadoss
maintainerPATCH v2 2/2 MAINTAINERS: Add maintainers for Microchip T1 Phy driver
In reply to Arun Ramadoss--- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+)
MAINTAINERS +7 -0
@@ -12903,6 +12903,13 @@ F: drivers/net/dsa/microchip/* F: include/linux/platform_data/microchip-ksz.h F: net/dsa/tag_ksz.c +MICROCHIP LAN87xx/LAN937x T1 PHY DRIVER +M: Arun Ramadoss <[email protected]> +R: [email protected] +L: [email protected] +S: Maintained +F: drivers/net/phy/microchip_t1.c + MICROCHIP LAN743X ETHERNET DRIVER M: Bryan Whitehead <[email protected]> M: [email protected]
Signature · 1 line
2.33.0
Jakub Kicinski
maintainerQuoted 2 lines · On Wed, 13 Apr 2022 12:25:55 +0530 Arun Ramadoss wrote:
This patch series add the Signal Quality Index measurement for the LAN87xx and LAN937x T1 phy. Updated the maintainers file for
microchip_t1.c.
Please rebase and repost now that the fix also made its way to net-next. The line numbers don't much and the way git deals with it is not inspiring confidence.