Commit 267e3175 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'phy-listing-link_topology-tracking' 

Maxime Chevallier says:

====================
Introduce PHY listing and link_topology tracking

This is V11 for the link topology addition, allowing to track all PHYs
that are linked to netdevices.

This V11 addresses the various netlink-related issues that were raised
by Jakub, and fixes some typos in the documentation.

As a remainder, here's what the PHY listings would look like :
 - eth0 has a 88x3310 acting as media converter, and an SFP module with
   an embedded 88e1111 PHY
 - eth2 has a 88e1510 PHY

PHY for eth0:
PHY index: 1
Driver name: mv88x3310
PHY device name: f212a600.mdio-mii:00
Downstream SFP bus name: sfp-eth0
PHY id: 0
Upstream type: MAC

PHY for eth0:
PHY index: 2
Driver name: Marvell 88E1111
PHY device name: i2c:sfp-eth0:16
PHY id: 21040322
Upstream type: PHY
Upstream PHY index: 1
Upstream SFP name: sfp-eth0

PHY for eth2:
PHY index: 1
Driver name: Marvell 88E1510
PHY device name: f212a200.mdio-mii:00
PHY id: 21040593
Upstream type: MAC

Ethtool patches : https://github.com/minimaxwell/ethtool/tree/link-topo-v6


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d133ef1e 841942bc

Documentation/networking/ethtool-netlink.rst

+7 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ Structure of this header is 
  ``ETHTOOL_A_HEADER_DEV_INDEX``  u32     device ifindex

  ``ETHTOOL_A_HEADER_DEV_NAME``   string  device name

  ``ETHTOOL_A_HEADER_FLAGS``      u32     flags common for all requests

  ``ETHTOOL_A_HEADER_PHY_INDEX``  u32     phy device index

  ==============================  ======  =============================



``ETHTOOL_A_HEADER_DEV_INDEX`` and ``ETHTOOL_A_HEADER_DEV_NAME`` identify the
@@ -81,6 +82,12 @@ the behaviour is backward compatible, i.e. requests from old clients not aware 
of the flag should be interpreted the way the client expects. A client must

not set flags it does not understand.



``ETHTOOL_A_HEADER_PHY_INDEX`` identifies the Ethernet PHY the message relates to.

As there are numerous commands that are related to PHY configuration, and because

there may be more than one PHY on the link, the PHY index can be passed in the

request for the commands that needs it. It is, however, not mandatory, and if it

is not passed for commands that target a PHY, the net_device.phydev pointer

is used.



Bit sets

========

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -8015,6 +8015,8 @@ F: include/linux/mii.h 
F:	include/linux/of_net.h

F:	include/linux/phy.h

F:	include/linux/phy_fixed.h

F:	include/linux/phy_link_topology.h

F:	include/linux/phy_link_topology_core.h

F:	include/linux/phylib_stubs.h

F:	include/linux/platform_data/mdio-bcm-unimac.h

F:	include/linux/platform_data/mdio-gpio.h

drivers/net/phy/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for Linux PHY drivers



libphy-y			:= phy.o phy-c45.o phy-core.o phy_device.o \

				   linkmode.o

				   linkmode.o phy_link_topology.o

mdio-bus-y			+= mdio_bus.o mdio_device.o



ifdef CONFIG_MDIO_DEVICE

drivers/net/phy/marvell-88x2222.c

+2 −0
Original line number Diff line number Diff line
@@ -553,6 +553,8 @@ static const struct sfp_upstream_ops sfp_phy_ops = { 
	.link_down = mv2222_sfp_link_down,

	.attach = phy_sfp_attach,

	.detach = phy_sfp_detach,

	.connect_phy = phy_sfp_connect_phy,

	.disconnect_phy = phy_sfp_disconnect_phy,

};



static int mv2222_probe(struct phy_device *phydev)

drivers/net/phy/marvell.c

+2 −0
Original line number Diff line number Diff line
@@ -3550,6 +3550,8 @@ static const struct sfp_upstream_ops m88e1510_sfp_ops = { 
	.module_remove = m88e1510_sfp_remove,

	.attach = phy_sfp_attach,

	.detach = phy_sfp_detach,

	.connect_phy = phy_sfp_connect_phy,

	.disconnect_phy = phy_sfp_disconnect_phy,

};



static int m88e1510_probe(struct phy_device *phydev)