[net-next,V2] net: pcs: xpcs: Add 2500BASE-X case in get state for XPCS drivers
Commit Message
Add DW_2500BASEX case in xpcs_get_state( ) to update speed, duplex and pause
Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
---
Change List:
============
V1 -> V2:
- Remove the default initialization of speed, pause and duplex
V0 -> V1:
- Remove the auto-negotiation check due to currently the DW_2500BASEX mode
doesn't imply any auto-negotiation
drivers/net/pcs/pcs-xpcs.c | 25 +++++++++++++++++++++++++
drivers/net/pcs/pcs-xpcs.h | 2 ++
2 files changed, 27 insertions(+)
Comments
On Thu, Oct 26, 2023 at 03:46:42PM +0530, Raju Lakkaraju wrote:
> Add DW_2500BASEX case in xpcs_get_state( ) to update speed, duplex and pause
>
> Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
Sorry for not doing a fuller review with the earlier iteration today.
Also, please note that on netdev, it's customary not to post more than
one version of a patch per day. Please see the netdev FAQ for guidance.
> +static int xpcs_get_state_2500basex(struct dw_xpcs *xpcs,
> + struct phylink_link_state *state)
> +{
> + int sts;
> +
> + sts = xpcs_read(xpcs, MDIO_MMD_VEND2, DW_VR_MII_MMD_STS);
if (sts < 0) {
state->link = 0;
return sts;
}
especially as a negative errno value could result in state->link being
true.
Thanks.
On Thu, Oct 26, 2023 at 12:03:39PM +0100, Russell King (Oracle) wrote:
> On Thu, Oct 26, 2023 at 03:46:42PM +0530, Raju Lakkaraju wrote:
> > Add DW_2500BASEX case in xpcs_get_state( ) to update speed, duplex and pause
> >
> > Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
>
> Sorry for not doing a fuller review with the earlier iteration today.
>
> Also, please note that on netdev, it's customary not to post more than
> one version of a patch per day. Please see the netdev FAQ for guidance.
>
> > +static int xpcs_get_state_2500basex(struct dw_xpcs *xpcs,
> > + struct phylink_link_state *state)
> > +{
> > + int sts;
> > +
> > + sts = xpcs_read(xpcs, MDIO_MMD_VEND2, DW_VR_MII_MMD_STS);
>
> if (sts < 0) {
> state->link = 0;
> return sts;
My 5cents to this note. Please use "ret" variable name as it's implied
by the local naming convention.
-Serge(y)
> }
>
> especially as a negative errno value could result in state->link being
> true.
>
> Thanks.
>
> --
> RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
> FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
@@ -1090,6 +1090,24 @@ static int xpcs_get_state_c37_1000basex(struct dw_xpcs *xpcs,
return 0;
}
+static int xpcs_get_state_2500basex(struct dw_xpcs *xpcs,
+ struct phylink_link_state *state)
+{
+ int sts;
+
+ sts = xpcs_read(xpcs, MDIO_MMD_VEND2, DW_VR_MII_MMD_STS);
+
+ state->link = !!(sts & DW_VR_MII_MMD_STS_LINK_STS);
+ if (!state->link)
+ return 0;
+
+ state->speed = SPEED_2500;
+ state->pause |= MLO_PAUSE_TX | MLO_PAUSE_RX;
+ state->duplex = DUPLEX_FULL;
+
+ return 0;
+}
+
static void xpcs_get_state(struct phylink_pcs *pcs,
struct phylink_link_state *state)
{
@@ -1127,6 +1145,13 @@ static void xpcs_get_state(struct phylink_pcs *pcs,
ERR_PTR(ret));
}
break;
+ case DW_2500BASEX:
+ ret = xpcs_get_state_2500basex(xpcs, state);
+ if (ret) {
+ pr_err("xpcs_get_state_2500basex returned %pe\n",
+ ERR_PTR(ret));
+ }
+ break;
default:
return;
}
@@ -55,6 +55,8 @@
/* Clause 37 Defines */
/* VR MII MMD registers offsets */
#define DW_VR_MII_MMD_CTRL 0x0000
+#define DW_VR_MII_MMD_STS 0x0001
+#define DW_VR_MII_MMD_STS_LINK_STS BIT(2)
#define DW_VR_MII_DIG_CTRL1 0x8000
#define DW_VR_MII_AN_CTRL 0x8001
#define DW_VR_MII_AN_INTR_STS 0x8002