net: dsa: Add PHYLINK switch operations

In preparation for adding support for PHYLINK within DSA, define a number of
operations that we will need and that switch drivers can start implementing.
Proper integration with PHYLINK will follow in subsequent patches.

We start selecting PHYLINK (which implies PHYLIB) in net/dsa/Kconfig
such that drivers can be guaranteed that this dependency is properly
taken care of and can start referencing PHYLINK helper functions without
requiring stubs or anything.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 462e9741b210da072c5bf8bff4f59a7d3feb84bd..ed64c1f3f117e42d9977a2091bf33f957b63a3ab 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -20,12 +20,14 @@
 #include <linux/of.h>
 #include <linux/ethtool.h>
 #include <linux/net_tstamp.h>
+#include <linux/phy.h>
 #include <net/devlink.h>
 #include <net/switchdev.h>
 
 struct tc_action;
 struct phy_device;
 struct fixed_phy_status;
+struct phylink_link_state;
 
 enum dsa_tag_protocol {
        DSA_TAG_PROTO_NONE = 0,
@@ -353,6 +355,27 @@ struct dsa_switch_ops {
        void    (*fixed_link_update)(struct dsa_switch *ds, int port,
                                struct fixed_phy_status *st);
 
+       /*
+        * PHYLINK integration
+        */
+       void    (*phylink_validate)(struct dsa_switch *ds, int port,
+                                   unsigned long *supported,
+                                   struct phylink_link_state *state);
+       int     (*phylink_mac_link_state)(struct dsa_switch *ds, int port,
+                                         struct phylink_link_state *state);
+       void    (*phylink_mac_config)(struct dsa_switch *ds, int port,
+                                     unsigned int mode,
+                                     const struct phylink_link_state *state);
+       void    (*phylink_mac_an_restart)(struct dsa_switch *ds, int port);
+       void    (*phylink_mac_link_down)(struct dsa_switch *ds, int port,
+                                        unsigned int mode,
+                                        phy_interface_t interface);
+       void    (*phylink_mac_link_up)(struct dsa_switch *ds, int port,
+                                      unsigned int mode,
+                                      phy_interface_t interface,
+                                      struct phy_device *phydev);
+       void    (*phylink_fixed_state)(struct dsa_switch *ds, int port,
+                                      struct phylink_link_state *state);
        /*
         * ethtool hardware statistics.
         */
@@ -595,5 +618,6 @@ static inline int call_dsa_notifiers(unsigned long val, struct net_device *dev,
 int dsa_port_get_phy_strings(struct dsa_port *dp, uint8_t *data);
 int dsa_port_get_ethtool_phy_stats(struct dsa_port *dp, uint64_t *data);
 int dsa_port_get_phy_sset_count(struct dsa_port *dp);
+void dsa_port_phylink_mac_change(struct dsa_switch *ds, int port, bool up);
 
 #endif

diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
index bbf2c82cf7b29a2fdc727b0304208f5271486d9e..4183e4ba27a50c3cf52bff9756d0552da612d619 100644 (file)
--- a/net/dsa/Kconfig
+++ b/net/dsa/Kconfig
@@ -9,7 +9,7 @@ config NET_DSA
        depends on HAVE_NET_DSA && MAY_USE_DEVLINK
        depends on BRIDGE || BRIDGE=n
        select NET_SWITCHDEV
-       select PHYLIB
+       select PHYLINK
        ---help---
          Say Y if you want to enable support for the hardware switches supported
          by the Distributed Switch Architecture.

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 746ab428a17afb656d87f84126a5e7740f5d76c4..6c2f042e3c29b9dae37c9adf5646bc9417e9c20c 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1119,6 +1119,11 @@ static int dsa_slave_phy_connect(struct net_device *slave_dev, int addr)
                                  dsa_slave_adjust_link, p->phy_interface);
 }
 
+void dsa_port_phylink_mac_change(struct dsa_switch *ds, int port, bool up)
+{
+}
+EXPORT_SYMBOL_GPL(dsa_port_phylink_mac_change);
+
 static int dsa_slave_phy_setup(struct net_device *slave_dev)
 {
        struct dsa_port *dp = dsa_slave_to_port(slave_dev);