Skip to content

Commit 9b89f07

Browse files
davem330davem330
committed
Merge branch 'SFP-phylink-updates'
Russell King says: ==================== SFP/phylink updates This series, which follows on from the fixes posted earlier, improves the phylink/sfp support. Changes included here are: - Merge 802.3z and SGMII modes into one "in-band" mode, using the PHY_INTERFACE_MODE_xxx definition to determine which should be used. This allows more flexibility as more interface modes become available. - Allow 2500base-X and 10GBASE-KR to be requested from SFP. - Remove unused and unnecessary phylink_init_eee() - Restart 802.3z autonegotiation when starting the network device to ensure that the negotiated parameters are always correct. It has been observed on mvneta that this is not always the case without this change. - Add kerneldoc documentation for phylink and sfp upstream facing APIs and link it in to the networking documentation. - Resolve a sparse warning in sfp-bus.c - Convert phylink/sfp to use fwnode rather than DT so that other firmware systems can take advantage of this - I have received a request for it to be usable with ACPI. The exception to this is our interactions with phylib, as phylib itself does not yet support fwnode. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents b0e9fe1 + 8fa7b9b commit 9b89f07

File tree

6 files changed

+591
-161
lines changed

6 files changed

+591
-161
lines changed

‎Documentation/networking/kapi.rst

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,27 @@ PHY Support
145145

146146
.. kernel-doc:: drivers/net/phy/mdio_bus.c
147147
:internal:
148+
149+
PHYLINK
150+
-------
151+
152+
PHYLINK interfaces traditional network drivers with PHYLIB, fixed-links,
153+
and SFF modules (eg, hot-pluggable SFP) that may contain PHYs. PHYLINK
154+
provides management of the link state and link modes.
155+
156+
.. kernel-doc:: include/linux/phylink.h
157+
:internal:
158+
159+
.. kernel-doc:: drivers/net/phy/phylink.c
160+
161+
SFP support
162+
-----------
163+
164+
.. kernel-doc:: drivers/net/phy/sfp-bus.c
165+
:internal:
166+
167+
.. kernel-doc:: include/linux/sfp.h
168+
:internal:
169+
170+
.. kernel-doc:: drivers/net/phy/sfp-bus.c
171+
:export:

0 commit comments

Comments
 (0)