net: phy: micrel: Fix the KSZ9131 MDI-X status issue
Subsystems (4)
PATCH 1/1 net: phy: micrel: Fix the KSZ9131 MDI-X status issue
The MDIX status is not accurately reflecting the current state after the link partner has manually altered its MDIX configuration while operating in forced mode.
Access information about Auto mdix completion and pair selection from the KSZ9131's Auto/MDI/MDI-X status register
--- drivers/net/phy/micrel.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)
drivers/net/phy/micrel.c +19 -15
@@ -1389,6 +1389,8 @@ static int ksz9131_config_init(struct phy_device *phydev)const struct device *dev_walker;int ret; + phydev->mdix_ctrl =ETH_TP_MDI_AUTO ; + dev_walker = &phydev->mdio.dev; do { of_node = dev_walker->of_node;
@@ -1438,28 +1440,30 @@ static int ksz9131_config_init(struct phy_device *phydev)#define MII_KSZ9131_AUTO_MDIX 0x1C#define MII_KSZ9131_AUTO_MDI_SET BIT(7)#define MII_KSZ9131_AUTO_MDIX_SWAP_OFF BIT(6) +#define MII_KSZ9131_DIG_AXAN_STS 0x14 +#define MII_KSZ9131_DIG_AXAN_STS_LINK_DET BIT(14) +#define MII_KSZ9131_DIG_AXAN_STS_A_SELECT BIT(12)static int ksz9131_mdix_update (struct phy_device *phydev) {int ret; - ret =phy_read (phydev,MII_KSZ9131_AUTO_MDIX ); -if (ret <0 ) -return ret; - -if (ret &MII_KSZ9131_AUTO_MDIX_SWAP_OFF ) { -if (ret &MII_KSZ9131_AUTO_MDI_SET ) - phydev->mdix_ctrl =ETH_TP_MDI ; -else - phydev->mdix_ctrl =ETH_TP_MDI_X ; +if (phydev->mdix_ctrl !=ETH_TP_MDI_AUTO ) { + phydev->mdix = phydev->mdix_ctrl; }else { - phydev->mdix_ctrl =ETH_TP_MDI_AUTO ; - } + ret =phy_read (phydev,MII_KSZ9131_DIG_AXAN_STS ); +if (ret <0 ) +return ret; -if (ret &MII_KSZ9131_AUTO_MDI_SET ) - phydev->mdix =ETH_TP_MDI ; -else - phydev->mdix =ETH_TP_MDI_X ; +if (ret &MII_KSZ9131_DIG_AXAN_STS_LINK_DET ) { +if (ret &MII_KSZ9131_DIG_AXAN_STS_A_SELECT ) + phydev->mdix =ETH_TP_MDI ; +else + phydev->mdix =ETH_TP_MDI_X ; + }else { + phydev->mdix =ETH_TP_MDI_INVALID ; + } + }return 0 ; }
Signature · 1 line
2.34.1
kernel test robot
build botFYI: kernel test robot notices the stable kernel rule is not satisfied.
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-1
Rule: add the tag "Cc: [email protected]" in the sign-off area to have the patch automatically included in the stable tree.
Subject: [PATCH net V1] net: phy: micrel: Fix the KSZ9131 MDI-X status issue
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Jakub Kicinski
maintainerQuoted 9 lines · On Thu, 25 Jul 2024 12:41:25 +0530 Raju Lakkaraju wrote:
The MDIX status is not accurately reflecting the current state after the link partner has manually altered its MDIX configuration while operating in forced mode.
Access information about Auto mdix completion and pair selection from the KSZ9131's Auto/MDI/MDI-X status register
Fixes b64e6a8794d9 ("net: phy: micrel: Add PHY Auto/MDI/MDI-X set driver for KSZ9131")Signed-off-by Raju Lakkaraju <[email protected]>
LGTM, can we get an ack from PHY maintainers?
Quoted 9 lines · Raju Lakkaraju
The MDIX status is not accurately reflecting the current state after the link partner has manually altered its MDIX configuration while operating in forced mode.
Access information about Auto mdix completion and pair selection from the KSZ9131's Auto/MDI/MDI-X status register
Fixes b64e6a8794d9 ("net: phy: micrel: Add PHY Auto/MDI/MDI-X set driver for KSZ9131")Signed-off-by Raju Lakkaraju <[email protected]>
Andrew
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Thu, 25 Jul 2024 12:41:25 +0530 you wrote:
The MDIX status is not accurately reflecting the current state after the link partner has manually altered its MDIX configuration while operating in forced mode.
Access information about Auto mdix completion and pair selection from the KSZ9131's Auto/MDI/MDI-X status register
[...]
Here is the summary with links:
- [net,V1] net: phy: micrel: Fix the KSZ9131 MDI-X status issue
https://git.kernel.org/netdev/net/c/84383b5ef4cd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html