net: dsa: lan9303: provide own phylink MAC operations

Convert lan9303 to provide its own phylink MAC operations, thus
avoiding the shim layer in DSA's port.c. We need to provide stubs for
the mac_link_down() and mac_config() methods which are mandatory.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1rwfuE-007537-1u@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c
index fcb20eac332a6d88d30eaafcf1713d179a9285c9..666b4d766c005913db574fba6084eb3218f908fd 100644 (file)
--- a/drivers/net/dsa/lan9303-core.c
+++ b/drivers/net/dsa/lan9303-core.c
@@ -1293,14 +1293,29 @@ static void lan9303_phylink_get_caps(struct dsa_switch *ds, int port,
        }
 }
 
-static void lan9303_phylink_mac_link_up(struct dsa_switch *ds, int port,
+static void lan9303_phylink_mac_config(struct phylink_config *config,
+                                      unsigned int mode,
+                                      const struct phylink_link_state *state)
+{
+}
+
+static void lan9303_phylink_mac_link_down(struct phylink_config *config,
+                                         unsigned int mode,
+                                         phy_interface_t interface)
+{
+}
+
+static void lan9303_phylink_mac_link_up(struct phylink_config *config,
+                                       struct phy_device *phydev,
                                        unsigned int mode,
                                        phy_interface_t interface,
-                                       struct phy_device *phydev, int speed,
-                                       int duplex, bool tx_pause,
+                                       int speed, int duplex, bool tx_pause,
                                        bool rx_pause)
 {
-       struct lan9303 *chip = ds->priv;
+       struct dsa_port *dp = dsa_phylink_to_port(config);
+       struct lan9303 *chip = dp->ds->priv;
+       struct dsa_switch *ds = dp->ds;
+       int port = dp->index;
        u32 ctl;
        u32 reg;
 
@@ -1330,6 +1345,12 @@ static void lan9303_phylink_mac_link_up(struct dsa_switch *ds, int port,
        regmap_write(chip->regmap, flow_ctl_reg[port], reg);
 }
 
+static const struct phylink_mac_ops lan9303_phylink_mac_ops = {
+       .mac_config     = lan9303_phylink_mac_config,
+       .mac_link_down  = lan9303_phylink_mac_link_down,
+       .mac_link_up    = lan9303_phylink_mac_link_up,
+};
+
 static const struct dsa_switch_ops lan9303_switch_ops = {
        .get_tag_protocol       = lan9303_get_tag_protocol,
        .setup                  = lan9303_setup,
@@ -1337,7 +1358,6 @@ static const struct dsa_switch_ops lan9303_switch_ops = {
        .phy_read               = lan9303_phy_read,
        .phy_write              = lan9303_phy_write,
        .phylink_get_caps       = lan9303_phylink_get_caps,
-       .phylink_mac_link_up    = lan9303_phylink_mac_link_up,
        .get_ethtool_stats      = lan9303_get_ethtool_stats,
        .get_sset_count         = lan9303_get_sset_count,
        .port_enable            = lan9303_port_enable,
@@ -1365,6 +1385,7 @@ static int lan9303_register_switch(struct lan9303 *chip)
        chip->ds->num_ports = LAN9303_NUM_PORTS;
        chip->ds->priv = chip;
        chip->ds->ops = &lan9303_switch_ops;
+       chip->ds->phylink_mac_ops = &lan9303_phylink_mac_ops;
        base = chip->phy_addr_base;
        chip->ds->phys_mii_mask = GENMASK(LAN9303_NUM_PORTS - 1 + base, base);