| Message ID | E1l1t30-0005VL-Qx@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | dpaa2: add 1000base-X support | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 1 maintainers not CCed: linux@armlinux.org.uk |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 72 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On Tue, Jan 19, 2021 at 03:35:58PM +0000, Russell King wrote: > Add support for 1000BASE-X to pcs-lynx for the LX2160A. > > This commit prepares the ground work for allowing 1G fiber connections > to be used with DPAA2 on the SolidRun CEX7 platforms. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Ioana Ciornei <ioana.ciornei@nxp.com> Also tested 1000BASEX on a HoneyComb board with a 1G fiber connection. Thanks! > --- > drivers/net/pcs/pcs-lynx.c | 36 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 36 insertions(+) > > diff --git a/drivers/net/pcs/pcs-lynx.c b/drivers/net/pcs/pcs-lynx.c > index 62bb9272dcb2..af36cd647bf5 100644 > --- a/drivers/net/pcs/pcs-lynx.c > +++ b/drivers/net/pcs/pcs-lynx.c > @@ -11,6 +11,7 @@ > #define LINK_TIMER_VAL(ns) ((u32)((ns) / SGMII_CLOCK_PERIOD_NS)) > > #define SGMII_AN_LINK_TIMER_NS 1600000 /* defined by SGMII spec */ > +#define IEEE8023_LINK_TIMER_NS 10000000 > > #define LINK_TIMER_LO 0x12 > #define LINK_TIMER_HI 0x13 > @@ -83,6 +84,7 @@ static void lynx_pcs_get_state(struct phylink_pcs *pcs, > struct lynx_pcs *lynx = phylink_pcs_to_lynx(pcs); > > switch (state->interface) { > + case PHY_INTERFACE_MODE_1000BASEX: > case PHY_INTERFACE_MODE_SGMII: > case PHY_INTERFACE_MODE_QSGMII: > phylink_mii_c22_pcs_get_state(lynx->mdio, state); > @@ -108,6 +110,30 @@ static void lynx_pcs_get_state(struct phylink_pcs *pcs, > state->link, state->an_enabled, state->an_complete); > } > > +static int lynx_pcs_config_1000basex(struct mdio_device *pcs, > + unsigned int mode, > + const unsigned long *advertising) > +{ > + struct mii_bus *bus = pcs->bus; > + int addr = pcs->addr; > + u32 link_timer; > + int err; > + > + link_timer = LINK_TIMER_VAL(IEEE8023_LINK_TIMER_NS); > + mdiobus_write(bus, addr, LINK_TIMER_LO, link_timer & 0xffff); > + mdiobus_write(bus, addr, LINK_TIMER_HI, link_timer >> 16); > + > + err = mdiobus_modify(bus, addr, IF_MODE, > + IF_MODE_SGMII_EN | IF_MODE_USE_SGMII_AN, > + 0); > + if (err) > + return err; > + > + return phylink_mii_c22_pcs_config(pcs, mode, > + PHY_INTERFACE_MODE_1000BASEX, > + advertising); > +} > + > static int lynx_pcs_config_sgmii(struct mdio_device *pcs, unsigned int mode, > const unsigned long *advertising) > { > @@ -163,6 +189,8 @@ static int lynx_pcs_config(struct phylink_pcs *pcs, unsigned int mode, > struct lynx_pcs *lynx = phylink_pcs_to_lynx(pcs); > > switch (ifmode) { > + case PHY_INTERFACE_MODE_1000BASEX: > + return lynx_pcs_config_1000basex(lynx->mdio, mode, advertising); > case PHY_INTERFACE_MODE_SGMII: > case PHY_INTERFACE_MODE_QSGMII: > return lynx_pcs_config_sgmii(lynx->mdio, mode, advertising); > @@ -185,6 +213,13 @@ static int lynx_pcs_config(struct phylink_pcs *pcs, unsigned int mode, > return 0; > } > > +static void lynx_pcs_an_restart(struct phylink_pcs *pcs) > +{ > + struct lynx_pcs *lynx = phylink_pcs_to_lynx(pcs); > + > + phylink_mii_c22_pcs_an_restart(lynx->mdio); > +} > + > static void lynx_pcs_link_up_sgmii(struct mdio_device *pcs, unsigned int mode, > int speed, int duplex) > { > @@ -290,6 +325,7 @@ static void lynx_pcs_link_up(struct phylink_pcs *pcs, unsigned int mode, > static const struct phylink_pcs_ops lynx_pcs_phylink_ops = { > .pcs_get_state = lynx_pcs_get_state, > .pcs_config = lynx_pcs_config, > + .pcs_an_restart = lynx_pcs_an_restart, > .pcs_link_up = lynx_pcs_link_up, > }; > > -- > 2.20.1 >
diff --git a/drivers/net/pcs/pcs-lynx.c b/drivers/net/pcs/pcs-lynx.c index 62bb9272dcb2..af36cd647bf5 100644 --- a/drivers/net/pcs/pcs-lynx.c +++ b/drivers/net/pcs/pcs-lynx.c @@ -11,6 +11,7 @@ #define LINK_TIMER_VAL(ns) ((u32)((ns) / SGMII_CLOCK_PERIOD_NS)) #define SGMII_AN_LINK_TIMER_NS 1600000 /* defined by SGMII spec */ +#define IEEE8023_LINK_TIMER_NS 10000000 #define LINK_TIMER_LO 0x12 #define LINK_TIMER_HI 0x13 @@ -83,6 +84,7 @@ static void lynx_pcs_get_state(struct phylink_pcs *pcs, struct lynx_pcs *lynx = phylink_pcs_to_lynx(pcs); switch (state->interface) { + case PHY_INTERFACE_MODE_1000BASEX: case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_QSGMII: phylink_mii_c22_pcs_get_state(lynx->mdio, state); @@ -108,6 +110,30 @@ static void lynx_pcs_get_state(struct phylink_pcs *pcs, state->link, state->an_enabled, state->an_complete); } +static int lynx_pcs_config_1000basex(struct mdio_device *pcs, + unsigned int mode, + const unsigned long *advertising) +{ + struct mii_bus *bus = pcs->bus; + int addr = pcs->addr; + u32 link_timer; + int err; + + link_timer = LINK_TIMER_VAL(IEEE8023_LINK_TIMER_NS); + mdiobus_write(bus, addr, LINK_TIMER_LO, link_timer & 0xffff); + mdiobus_write(bus, addr, LINK_TIMER_HI, link_timer >> 16); + + err = mdiobus_modify(bus, addr, IF_MODE, + IF_MODE_SGMII_EN | IF_MODE_USE_SGMII_AN, + 0); + if (err) + return err; + + return phylink_mii_c22_pcs_config(pcs, mode, + PHY_INTERFACE_MODE_1000BASEX, + advertising); +} + static int lynx_pcs_config_sgmii(struct mdio_device *pcs, unsigned int mode, const unsigned long *advertising) { @@ -163,6 +189,8 @@ static int lynx_pcs_config(struct phylink_pcs *pcs, unsigned int mode, struct lynx_pcs *lynx = phylink_pcs_to_lynx(pcs); switch (ifmode) { + case PHY_INTERFACE_MODE_1000BASEX: + return lynx_pcs_config_1000basex(lynx->mdio, mode, advertising); case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_QSGMII: return lynx_pcs_config_sgmii(lynx->mdio, mode, advertising); @@ -185,6 +213,13 @@ static int lynx_pcs_config(struct phylink_pcs *pcs, unsigned int mode, return 0; } +static void lynx_pcs_an_restart(struct phylink_pcs *pcs) +{ + struct lynx_pcs *lynx = phylink_pcs_to_lynx(pcs); + + phylink_mii_c22_pcs_an_restart(lynx->mdio); +} + static void lynx_pcs_link_up_sgmii(struct mdio_device *pcs, unsigned int mode, int speed, int duplex) { @@ -290,6 +325,7 @@ static void lynx_pcs_link_up(struct phylink_pcs *pcs, unsigned int mode, static const struct phylink_pcs_ops lynx_pcs_phylink_ops = { .pcs_get_state = lynx_pcs_get_state, .pcs_config = lynx_pcs_config, + .pcs_an_restart = lynx_pcs_an_restart, .pcs_link_up = lynx_pcs_link_up, };
Add support for 1000BASE-X to pcs-lynx for the LX2160A. This commit prepares the ground work for allowing 1G fiber connections to be used with DPAA2 on the SolidRun CEX7 platforms. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- drivers/net/pcs/pcs-lynx.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)