| Message ID | E1mmfVl-0075nP-14@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b9241f54138ca5af4d3c5ca6db56be83d7491508 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: document SMII and correct phylink's new validation mechanism | expand |
On Mon, Nov 15, 2021 at 05:11:17PM +0000, Russell King (Oracle) wrote: > SMII has not been documented in the kernel, but information on this PHY > interface mode has been recently found. Document it, and correct the > recently introduced phylink handling for this interface mode. > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Mon, 15 Nov 2021 17:11:17 +0000 you wrote: > SMII has not been documented in the kernel, but information on this PHY > interface mode has been recently found. Document it, and correct the > recently introduced phylink handling for this interface mode. > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > --- > Documentation/networking/phy.rst | 5 +++++ > drivers/net/phy/phylink.c | 2 +- > include/linux/phy.h | 2 +- > 3 files changed, 7 insertions(+), 2 deletions(-) Here is the summary with links: - [net-next] net: document SMII and correct phylink's new validation mechanism https://git.kernel.org/netdev/net-next/c/b9241f54138c You are awesome, thank you!
diff --git a/Documentation/networking/phy.rst b/Documentation/networking/phy.rst index 571ba08386e7..d43da709bf40 100644 --- a/Documentation/networking/phy.rst +++ b/Documentation/networking/phy.rst @@ -237,6 +237,11 @@ negotiation results. Some of the interface modes are described below: +``PHY_INTERFACE_MODE_SMII`` + This is serial MII, clocked at 125MHz, supporting 100M and 10M speeds. + Some details can be found in + https://opencores.org/ocsvn/smii/smii/trunk/doc/SMII.pdf + ``PHY_INTERFACE_MODE_1000BASEX`` This defines the 1000BASE-X single-lane serdes link as defined by the 802.3 standard section 36. The link operates at a fixed bit rate of diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 33462fdc7add..f7156b6868e7 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -336,6 +336,7 @@ void phylink_get_linkmodes(unsigned long *linkmodes, phy_interface_t interface, case PHY_INTERFACE_MODE_REVRMII: case PHY_INTERFACE_MODE_RMII: + case PHY_INTERFACE_MODE_SMII: case PHY_INTERFACE_MODE_REVMII: case PHY_INTERFACE_MODE_MII: caps |= MAC_10HD | MAC_10FD; @@ -385,7 +386,6 @@ void phylink_get_linkmodes(unsigned long *linkmodes, phy_interface_t interface, case PHY_INTERFACE_MODE_NA: case PHY_INTERFACE_MODE_MAX: - case PHY_INTERFACE_MODE_SMII: break; } diff --git a/include/linux/phy.h b/include/linux/phy.h index 96e43fbb2dd8..1e57cdd95da3 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -99,7 +99,7 @@ extern const int phy_10gbit_features_array[1]; * @PHY_INTERFACE_MODE_RGMII_RXID: RGMII with Internal RX delay * @PHY_INTERFACE_MODE_RGMII_TXID: RGMII with Internal RX delay * @PHY_INTERFACE_MODE_RTBI: Reduced TBI - * @PHY_INTERFACE_MODE_SMII: ??? MII + * @PHY_INTERFACE_MODE_SMII: Serial MII * @PHY_INTERFACE_MODE_XGMII: 10 gigabit media-independent interface * @PHY_INTERFACE_MODE_XLGMII:40 gigabit media-independent interface * @PHY_INTERFACE_MODE_MOCA: Multimedia over Coax
SMII has not been documented in the kernel, but information on this PHY interface mode has been recently found. Document it, and correct the recently introduced phylink handling for this interface mode. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- Documentation/networking/phy.rst | 5 +++++ drivers/net/phy/phylink.c | 2 +- include/linux/phy.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)