net: dsa: populate supported_interfaces member

Add a new DSA switch operation, phylink_get_interfaces, which should
fill in which PHY_INTERFACE_MODE_* are supported by given port.

Use this before phylink_create() to fill phylinks supported_interfaces
member, allowing phylink to determine which PHY_INTERFACE_MODEs are
supported.

Signed-off-by: Marek Behún <kabel@kernel.org>
[tweaked patch and description to add more complete support -- rmk]
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index badd214f74700b58c44b09c1b329e855990c1737..eff5c44ba3774a6799762f5c34f075500fd64024 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -645,6 +645,8 @@ struct dsa_switch_ops {
        /*
         * PHYLINK integration
         */
+       void    (*phylink_get_interfaces)(struct dsa_switch *ds, int port,
+                                         unsigned long *supported_interfaces);
        void    (*phylink_validate)(struct dsa_switch *ds, int port,
                                    unsigned long *supported,
                                    struct phylink_link_state *state);

diff --git a/net/dsa/port.c b/net/dsa/port.c
index c0e630f7f0bd1c0540ae2c997d5fb27dd9026ef0..f6f12ad2b52514f5331a87578ca2677834aa4a34 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -1168,6 +1168,10 @@ static int dsa_port_phylink_register(struct dsa_port *dp)
        dp->pl_config.type = PHYLINK_DEV;
        dp->pl_config.pcs_poll = ds->pcs_poll;
 
+       if (ds->ops->phylink_get_interfaces)
+               ds->ops->phylink_get_interfaces(ds, dp->index,
+                                       dp->pl_config.supported_interfaces);
+
        dp->pl = phylink_create(&dp->pl_config, of_fwnode_handle(port_dn),
                                mode, &dsa_port_phylink_mac_ops);
        if (IS_ERR(dp->pl)) {

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index db066f0da4b5e28cbe0c7fc699d3358055a6ac90..ad61f6bc88868af7f8f5218f5937a4e4f01ea567 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1871,6 +1871,10 @@ static int dsa_slave_phy_setup(struct net_device *slave_dev)
                dp->pl_config.poll_fixed_state = true;
        }
 
+       if (ds->ops->phylink_get_interfaces)
+               ds->ops->phylink_get_interfaces(ds, dp->index,
+                                       dp->pl_config.supported_interfaces);
+
        dp->pl = phylink_create(&dp->pl_config, of_fwnode_handle(port_dn), mode,
                                &dsa_port_phylink_mac_ops);
        if (IS_ERR(dp->pl)) {