| Message ID | 20210114043331.4572-3-kabel@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [net-next,v16,1/6] dt-bindings: net: Add 5GBASER phy interface | expand |
On Thu, Jan 14, 2021 at 05:33:27AM +0100, Marek Behún wrote: > From: Pavana Sharma <pavana.sharma@digi.com> > > Add 5GBASE-R phy interface mode > > Signed-off-by: Pavana Sharma <pavana.sharma@digi.com> > Reviewed-by: Andrew Lunn <andrew@lunn.ch> > Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> > Signed-off-by: Marek Behún <kabel@kernel.org> > --- This patch now conflicts with commit b1ae3587d16a ("net: phy: Add 100 base-x mode"). Could you resend and also carry over my review tags from the previous version? https://patchwork.kernel.org/project/netdevbpf/patch/20210112195405.12890-5-kabel@kernel.org/
On Sat, Jan 16, 2021 at 02:31:16AM +0200, Vladimir Oltean wrote: > On Thu, Jan 14, 2021 at 05:33:27AM +0100, Marek Behún wrote: > > From: Pavana Sharma <pavana.sharma@digi.com> > > > > Add 5GBASE-R phy interface mode > > > > Signed-off-by: Pavana Sharma <pavana.sharma@digi.com> > > Reviewed-by: Andrew Lunn <andrew@lunn.ch> > > Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> > > Signed-off-by: Marek Behún <kabel@kernel.org> > > --- > > This patch now conflicts with commit b1ae3587d16a ("net: phy: Add 100 > base-x mode"). Could you resend and also carry over my review tags from > the previous version? > https://patchwork.kernel.org/project/netdevbpf/patch/20210112195405.12890-5-kabel@kernel.org/ It may make sense to get this patch merged separately from the rest of the series - we're going to need it at some point anyway. -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
diff --git a/Documentation/networking/phy.rst b/Documentation/networking/phy.rst index b2f7ec794bc8..d7be261b5a8d 100644 --- a/Documentation/networking/phy.rst +++ b/Documentation/networking/phy.rst @@ -267,6 +267,12 @@ Some of the interface modes are described below: duplex, pause or other settings. This is dependent on the MAC and/or PHY behaviour. +``PHY_INTERFACE_MODE_5GBASER`` + This is the IEEE 802.3 Clause 129 defined 5GBASE-R protocol. It is + identical to the 10GBASE-R protocol defined in Clause 49, with the + exception that it operates at half the frequency. Please refer to the + IEEE standard for the definition. + ``PHY_INTERFACE_MODE_10GBASER`` This is the IEEE 802.3 Clause 49 defined 10GBASE-R protocol used with various different mediums. Please refer to the IEEE standard for a diff --git a/include/linux/phy.h b/include/linux/phy.h index 9effb511acde..548372eb253a 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -106,6 +106,7 @@ extern const int phy_10gbit_features_array[1]; * @PHY_INTERFACE_MODE_TRGMII: Turbo RGMII * @PHY_INTERFACE_MODE_1000BASEX: 1000 BaseX * @PHY_INTERFACE_MODE_2500BASEX: 2500 BaseX + * @PHY_INTERFACE_MODE_5GBASER: 5G BaseR * @PHY_INTERFACE_MODE_RXAUI: Reduced XAUI * @PHY_INTERFACE_MODE_XAUI: 10 Gigabit Attachment Unit Interface * @PHY_INTERFACE_MODE_10GBASER: 10G BaseR @@ -137,6 +138,7 @@ typedef enum { PHY_INTERFACE_MODE_TRGMII, PHY_INTERFACE_MODE_1000BASEX, PHY_INTERFACE_MODE_2500BASEX, + PHY_INTERFACE_MODE_5GBASER, PHY_INTERFACE_MODE_RXAUI, PHY_INTERFACE_MODE_XAUI, /* 10GBASE-R, XFI, SFI - single lane 10G Serdes */ @@ -207,6 +209,8 @@ static inline const char *phy_modes(phy_interface_t interface) return "1000base-x"; case PHY_INTERFACE_MODE_2500BASEX: return "2500base-x"; + case PHY_INTERFACE_MODE_5GBASER: + return "5gbase-r"; case PHY_INTERFACE_MODE_RXAUI: return "rxaui"; case PHY_INTERFACE_MODE_XAUI: