Commit 5c167270 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

net: revert partially applied PHY topology series 

The series is causing issues with PHY drivers built as modules.
Since it was only partially applied and the merge window has
opened let's revert and try again for v6.11.

Revert 6916e461 ("net: phy: Introduce ethernet link topology representation")
Revert 0ec5ed6c ("net: sfp: pass the phy_device when disconnecting an sfp module's PHY")
Revert e75e4e07 ("net: phy: add helpers to handle sfp phy connect/disconnect")
Revert fdd35396 ("net: sfp: Add helper to return the SFP bus name")
Revert 841942bc ("net: ethtool: Allow passing a phy index for some commands")

Link: https://lore.kernel.org/all/171242462917.4000.9759453824684907063.git-patchwork-notify@kernel.org/
Link: https://lore.kernel.org/all/20240507102822.2023826-1-maxime.chevallier@bootlin.com/
Link: https://lore.kernel.org/r/20240513154156.104281-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b08191d8

Documentation/networking/ethtool-netlink.rst

+0 −7
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 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
@@ -82,12 +81,6 @@ 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

+0 −2
Original line number Diff line number Diff line
@@ -8027,8 +8027,6 @@ 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 phy_link_topology.o

				   linkmode.o

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



ifdef CONFIG_MDIO_DEVICE

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

+0 −2
Original line number Diff line number Diff line
@@ -553,8 +553,6 @@ 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

+0 −2
Original line number Diff line number Diff line
@@ -3613,8 +3613,6 @@ 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)