| Message ID | 20221024082516.661199-3-Raju.Lakkaraju@microchip.com (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | b64e6a8794d9d56f9713b6ceb9e3fdfc9c5f99af |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: lan743x: PCI11010 / PCI11414 devices Enhancements | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Series has a cover letter |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/cc_maintainers | success | CCed 8 of 8 maintainers |
| netdev/build_clang | success | Errors and warnings before: 0 this patch: 0 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 89 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
The 10/24/2022 13:55, Raju Lakkaraju wrote: > Add support for MDI-X status and configuration for KSZ9131 chips Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com> > > Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com> > --- > Change List: > ============ > V0 -> V1: > - Drop the "_" from the end of the macros > - Add KSZ9131 MDI-X specific register contain 9131 in macro names > > drivers/net/phy/micrel.c | 77 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 77 insertions(+) > > diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c > index 54a17b576eac..26ce0c5defcd 100644 > --- a/drivers/net/phy/micrel.c > +++ b/drivers/net/phy/micrel.c > @@ -1295,6 +1295,81 @@ static int ksz9131_config_init(struct phy_device *phydev) > return 0; > } > > +#define MII_KSZ9131_AUTO_MDIX 0x1C > +#define MII_KSZ9131_AUTO_MDI_SET BIT(7) > +#define MII_KSZ9131_AUTO_MDIX_SWAP_OFF BIT(6) > + > +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; > + } else { > + phydev->mdix_ctrl = ETH_TP_MDI_AUTO; > + } > + > + if (ret & MII_KSZ9131_AUTO_MDI_SET) > + phydev->mdix = ETH_TP_MDI; > + else > + phydev->mdix = ETH_TP_MDI_X; > + > + return 0; > +} > + > +static int ksz9131_config_mdix(struct phy_device *phydev, u8 ctrl) > +{ > + u16 val; > + > + switch (ctrl) { > + case ETH_TP_MDI: > + val = MII_KSZ9131_AUTO_MDIX_SWAP_OFF | > + MII_KSZ9131_AUTO_MDI_SET; > + break; > + case ETH_TP_MDI_X: > + val = MII_KSZ9131_AUTO_MDIX_SWAP_OFF; > + break; > + case ETH_TP_MDI_AUTO: > + val = 0; > + break; > + default: > + return 0; > + } > + > + return phy_modify(phydev, MII_KSZ9131_AUTO_MDIX, > + MII_KSZ9131_AUTO_MDIX_SWAP_OFF | > + MII_KSZ9131_AUTO_MDI_SET, val); > +} > + > +static int ksz9131_read_status(struct phy_device *phydev) > +{ > + int ret; > + > + ret = ksz9131_mdix_update(phydev); > + if (ret < 0) > + return ret; > + > + return genphy_read_status(phydev); > +} > + > +static int ksz9131_config_aneg(struct phy_device *phydev) > +{ > + int ret; > + > + ret = ksz9131_config_mdix(phydev, phydev->mdix_ctrl); > + if (ret) > + return ret; > + > + return genphy_config_aneg(phydev); > +} > + > #define KSZ8873MLL_GLOBAL_CONTROL_4 0x06 > #define KSZ8873MLL_GLOBAL_CONTROL_4_DUPLEX BIT(6) > #define KSZ8873MLL_GLOBAL_CONTROL_4_SPEED BIT(4) > @@ -3304,6 +3379,8 @@ static struct phy_driver ksphy_driver[] = { > .probe = kszphy_probe, > .config_init = ksz9131_config_init, > .config_intr = kszphy_config_intr, > + .config_aneg = ksz9131_config_aneg, > + .read_status = ksz9131_read_status, > .handle_interrupt = kszphy_handle_interrupt, > .get_sset_count = kszphy_get_sset_count, > .get_strings = kszphy_get_strings, > -- > 2.25.1 >
On Mon, Oct 24, 2022 at 01:55:16PM +0530, Raju Lakkaraju wrote: > Add support for MDI-X status and configuration for KSZ9131 chips > > Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 54a17b576eac..26ce0c5defcd 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -1295,6 +1295,81 @@ static int ksz9131_config_init(struct phy_device *phydev) return 0; } +#define MII_KSZ9131_AUTO_MDIX 0x1C +#define MII_KSZ9131_AUTO_MDI_SET BIT(7) +#define MII_KSZ9131_AUTO_MDIX_SWAP_OFF BIT(6) + +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; + } else { + phydev->mdix_ctrl = ETH_TP_MDI_AUTO; + } + + if (ret & MII_KSZ9131_AUTO_MDI_SET) + phydev->mdix = ETH_TP_MDI; + else + phydev->mdix = ETH_TP_MDI_X; + + return 0; +} + +static int ksz9131_config_mdix(struct phy_device *phydev, u8 ctrl) +{ + u16 val; + + switch (ctrl) { + case ETH_TP_MDI: + val = MII_KSZ9131_AUTO_MDIX_SWAP_OFF | + MII_KSZ9131_AUTO_MDI_SET; + break; + case ETH_TP_MDI_X: + val = MII_KSZ9131_AUTO_MDIX_SWAP_OFF; + break; + case ETH_TP_MDI_AUTO: + val = 0; + break; + default: + return 0; + } + + return phy_modify(phydev, MII_KSZ9131_AUTO_MDIX, + MII_KSZ9131_AUTO_MDIX_SWAP_OFF | + MII_KSZ9131_AUTO_MDI_SET, val); +} + +static int ksz9131_read_status(struct phy_device *phydev) +{ + int ret; + + ret = ksz9131_mdix_update(phydev); + if (ret < 0) + return ret; + + return genphy_read_status(phydev); +} + +static int ksz9131_config_aneg(struct phy_device *phydev) +{ + int ret; + + ret = ksz9131_config_mdix(phydev, phydev->mdix_ctrl); + if (ret) + return ret; + + return genphy_config_aneg(phydev); +} + #define KSZ8873MLL_GLOBAL_CONTROL_4 0x06 #define KSZ8873MLL_GLOBAL_CONTROL_4_DUPLEX BIT(6) #define KSZ8873MLL_GLOBAL_CONTROL_4_SPEED BIT(4) @@ -3304,6 +3379,8 @@ static struct phy_driver ksphy_driver[] = { .probe = kszphy_probe, .config_init = ksz9131_config_init, .config_intr = kszphy_config_intr, + .config_aneg = ksz9131_config_aneg, + .read_status = ksz9131_read_status, .handle_interrupt = kszphy_handle_interrupt, .get_sset_count = kszphy_get_sset_count, .get_strings = kszphy_get_strings,
Add support for MDI-X status and configuration for KSZ9131 chips Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com> --- Change List: ============ V0 -> V1: - Drop the "_" from the end of the macros - Add KSZ9131 MDI-X specific register contain 9131 in macro names drivers/net/phy/micrel.c | 77 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+)