net: make xpcs_do_config to accept advertising for pcs-xpcs and sja1105

xpcs_config() has 'advertising' input that is required for C37 1000BASE-X
AN in later patch series. So, we prepare xpcs_do_config() for it.

For sja1105, xpcs_do_config() is used for xpcs configuration without
depending on advertising input, so set to NULL.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index 72b6fc1932b5445518f3b2fc3907e1f7ce1baa41..b253e27bcfb47aa10d522b698f629643fddf4930 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -2330,7 +2330,7 @@ int sja1105_static_config_reload(struct sja1105_private *priv,
                else
                        mode = MLO_AN_PHY;
 
-               rc = xpcs_do_config(xpcs, priv->phy_mode[i], mode);
+               rc = xpcs_do_config(xpcs, priv->phy_mode[i], mode, NULL);
                if (rc < 0)
                        goto out;
 

diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c
index 4cfd05c15aeedfc73ea22d41403f4bd0b3993c10..48d81c40aab7f019c2203ba813864a176b59a40c 100644 (file)
--- a/drivers/net/pcs/pcs-xpcs.c
+++ b/drivers/net/pcs/pcs-xpcs.c
@@ -795,7 +795,7 @@ static int xpcs_config_2500basex(struct dw_xpcs *xpcs)
 }
 
 int xpcs_do_config(struct dw_xpcs *xpcs, phy_interface_t interface,
-                  unsigned int mode)
+                  unsigned int mode, const unsigned long *advertising)
 {
        const struct xpcs_compat *compat;
        int ret;
@@ -843,7 +843,7 @@ static int xpcs_config(struct phylink_pcs *pcs, unsigned int mode,
 {
        struct dw_xpcs *xpcs = phylink_pcs_to_xpcs(pcs);
 
-       return xpcs_do_config(xpcs, interface, mode);
+       return xpcs_do_config(xpcs, interface, mode, advertising);
 }
 
 static int xpcs_get_state_c73(struct dw_xpcs *xpcs,
@@ -864,7 +864,7 @@ static int xpcs_get_state_c73(struct dw_xpcs *xpcs,
 
                state->link = 0;
 
-               return xpcs_do_config(xpcs, state->interface, MLO_AN_INBAND);
+               return xpcs_do_config(xpcs, state->interface, MLO_AN_INBAND, NULL);
        }
 
        if (state->an_enabled && xpcs_aneg_done_c73(xpcs, state, compat)) {

diff --git a/include/linux/pcs/pcs-xpcs.h b/include/linux/pcs/pcs-xpcs.h
index 266eb26fb02903cff5fcfc15034f84ed1f1957d0..37eb97cc2283afdbffa460e888a4db4beff88a22 100644 (file)
--- a/include/linux/pcs/pcs-xpcs.h
+++ b/include/linux/pcs/pcs-xpcs.h
@@ -30,7 +30,7 @@ int xpcs_get_an_mode(struct dw_xpcs *xpcs, phy_interface_t interface);
 void xpcs_link_up(struct phylink_pcs *pcs, unsigned int mode,
                  phy_interface_t interface, int speed, int duplex);
 int xpcs_do_config(struct dw_xpcs *xpcs, phy_interface_t interface,
-                  unsigned int mode);
+                  unsigned int mode, const unsigned long *advertising);
 void xpcs_get_interfaces(struct dw_xpcs *xpcs, unsigned long *interfaces);
 int xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns,
                    int enable);