Skip to content

Commit

Permalink
Merge branch 'SFP-phylink-updates'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller committed Dec 5, 2017
2 parents b0e9fe1 + 8fa7b9b commit 9b89f07
Show file tree
Hide file tree
Showing 6 changed files with 591 additions and 161 deletions.
24 changes: 24 additions & 0 deletions Documentation/networking/kapi.rst
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,27 @@ PHY Support

.. kernel-doc:: drivers/net/phy/mdio_bus.c
:internal:

PHYLINK
-------

PHYLINK interfaces traditional network drivers with PHYLIB, fixed-links,
and SFF modules (eg, hot-pluggable SFP) that may contain PHYs. PHYLINK
provides management of the link state and link modes.

.. kernel-doc:: include/linux/phylink.h
:internal:

.. kernel-doc:: drivers/net/phy/phylink.c

SFP support
-----------

.. kernel-doc:: drivers/net/phy/sfp-bus.c
:internal:

.. kernel-doc:: include/linux/sfp.h
:internal:

.. kernel-doc:: drivers/net/phy/sfp-bus.c
:export:
Loading

0 comments on commit 9b89f07

Please sign in to comment.