Skip to content

net: dsa: microchip: use phylink_mac_ops for ksz driver

Russell King (Oracle) netdev 1 version Applied

Status from this message: This series was applied to netdev/net-next.git (main)

Get series with b4
b4 am ZivP/[email protected]

Versions newest first

  1. v1 Latest0 of 4 patches 0 repliesApplied

Patches in v1 Applied

None of the 4 patches the cover letter announces are in this archive.

Reviews trailers per patch

PatchFlorian Fainelli
SeriesR-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH net-next 0/4] net: dsa: microchip: use phylink_mac_ops for ksz driver

Hi,

This four patch series switches the Microchip KSZ DSA driver to use phylink_mac_ops support, and for this one we go a little further beyond a simple conversion. This driver has four distinct cases:

lan937x
ksz9477
ksz8
ksz8830

Three of these cases are handled by shimming the existing DSA calls through ksz_dev_ops, and the final case is handled through a conditional in ksz_phylink_mac_config(). These can all be handled with separate phylink_mac_ops.

To get there, we do a progressive conversion.

Patch 1 removes ksz_dev_ops' phylink_mac_config() method which is not populated in any of the arrays - and is thus redundant.

Patch 2 switches the driver to use a common set of phylink_mac_ops for all cases, doing the simple conversion to avoid the DSA shim.

Patch 3 pushes the phylink_mac_ops down to the first three classes (lan937x, ksz9477, ksz8) adding an appropriate pointer to the phylink_mac_ops to struct ksz_chip_data, and using that to populate DSA's ds->phylink_mac_ops pointer. The difference between each of these are the mac_link_up() method. mac_config() and mac_link_down() remain common between each at this stage.

Patch 4 splits out ksz8830, which needs different mac_config() handling, and thus means we have a difference in mac_config() methods between the now four phylink_mac_ops structures.

Build tested only, with additional -Wunused-const-variable flag.

 drivers/net/dsa/microchip/ksz8.h       |   6 +-
 drivers/net/dsa/microchip/ksz8795.c    |  10 ++-
 drivers/net/dsa/microchip/ksz_common.c | 121 ++++++++++++++++++++++-----------
 drivers/net/dsa/microchip/ksz_common.h |   5 +-
 4 files changed, 94 insertions(+), 48 deletions(-)
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!