sfc: commonise some MAC configuration code

Refactor it a little as we go, and introduce efx_mcdi_set_mtu() which we
 will later use for ef100 to change MTU without touching other MAC settings.

Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/mcdi_port.c b/drivers/net/ethernet/sfc/mcdi_port.c
index 133f8b8ec3b3bab62addb6889d9dad19c471bca7..98eeb404f68d634982d1fb4f27dd3aba01735334 100644 (file)
--- a/drivers/net/ethernet/sfc/mcdi_port.c
+++ b/drivers/net/ethernet/sfc/mcdi_port.c
@@ -176,19 +176,6 @@ fail:
        return rc;
 }
 
-int efx_mcdi_port_reconfigure(struct efx_nic *efx)
-{
-       struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
-       u32 caps = (efx->link_advertising[0] ?
-                   ethtool_linkset_to_mcdi_cap(efx->link_advertising) :
-                   phy_cfg->forced_cap);
-
-       caps |= ethtool_fec_caps_to_mcdi(efx->fec_config);
-
-       return efx_mcdi_set_link(efx, caps, efx_get_mcdi_phy_flags(efx),
-                                efx->loopback_mode, 0);
-}
-
 static void efx_mcdi_phy_remove(struct efx_nic *efx)
 {
        struct efx_mcdi_phy_data *phy_data = efx->phy_data;

diff --git a/drivers/net/ethernet/sfc/mcdi_port_common.c b/drivers/net/ethernet/sfc/mcdi_port_common.c
index e0608d0d961b71381217e129fa79ac0c6ad3b7a2..56af8b54a864f28e3d17198fd0daee9b0d109c51 100644 (file)
--- a/drivers/net/ethernet/sfc/mcdi_port_common.c
+++ b/drivers/net/ethernet/sfc/mcdi_port_common.c
@@ -476,6 +476,24 @@ int efx_mcdi_phy_test_alive(struct efx_nic *efx)
        return 0;
 }
 
+int efx_mcdi_port_reconfigure(struct efx_nic *efx)
+{
+       struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
+       u32 caps = (efx->link_advertising[0] ?
+                   ethtool_linkset_to_mcdi_cap(efx->link_advertising) :
+                   phy_cfg->forced_cap);
+
+       caps |= ethtool_fec_caps_to_mcdi(efx->fec_config);
+
+       return efx_mcdi_set_link(efx, caps, efx_get_mcdi_phy_flags(efx),
+                                efx->loopback_mode, 0);
+}
+
+static unsigned int efx_calc_mac_mtu(struct efx_nic *efx)
+{
+       return EFX_MAX_FRAME_LEN(efx->net_dev->mtu);
+}
+
 int efx_mcdi_set_mac(struct efx_nic *efx)
 {
        u32 fcntl;
@@ -487,8 +505,7 @@ int efx_mcdi_set_mac(struct efx_nic *efx)
        ether_addr_copy(MCDI_PTR(cmdbytes, SET_MAC_IN_ADDR),
                        efx->net_dev->dev_addr);
 
-       MCDI_SET_DWORD(cmdbytes, SET_MAC_IN_MTU,
-                      EFX_MAX_FRAME_LEN(efx->net_dev->mtu));
+       MCDI_SET_DWORD(cmdbytes, SET_MAC_IN_MTU, efx_calc_mac_mtu(efx));
        MCDI_SET_DWORD(cmdbytes, SET_MAC_IN_DRAIN, 0);
 
        /* Set simple MAC filter for Siena */
@@ -521,6 +538,21 @@ int efx_mcdi_set_mac(struct efx_nic *efx)
                            NULL, 0, NULL);
 }
 
+int efx_mcdi_set_mtu(struct efx_nic *efx)
+{
+       MCDI_DECLARE_BUF(inbuf, MC_CMD_SET_MAC_EXT_IN_LEN);
+
+       BUILD_BUG_ON(MC_CMD_SET_MAC_OUT_LEN != 0);
+
+       MCDI_SET_DWORD(inbuf, SET_MAC_EXT_IN_MTU, efx_calc_mac_mtu(efx));
+
+       MCDI_POPULATE_DWORD_1(inbuf, SET_MAC_EXT_IN_CONTROL,
+                             SET_MAC_EXT_IN_CFG_MTU, 1);
+
+       return efx_mcdi_rpc(efx, MC_CMD_SET_MAC, inbuf, sizeof(inbuf),
+                           NULL, 0, NULL);
+}
+
 enum efx_stats_action {
        EFX_STATS_ENABLE,
        EFX_STATS_DISABLE,

diff --git a/drivers/net/ethernet/sfc/mcdi_port_common.h b/drivers/net/ethernet/sfc/mcdi_port_common.h
index 54c0acf8e24361657e2532892a313c0cdfcd6395..f6f81cbeb07e273fa1520f9d8b1b754b25e7bce4 100644 (file)
--- a/drivers/net/ethernet/sfc/mcdi_port_common.h
+++ b/drivers/net/ethernet/sfc/mcdi_port_common.h
@@ -51,6 +51,7 @@ int efx_mcdi_phy_get_fecparam(struct efx_nic *efx,
                              struct ethtool_fecparam *fec);
 int efx_mcdi_phy_test_alive(struct efx_nic *efx);
 int efx_mcdi_set_mac(struct efx_nic *efx);
+int efx_mcdi_set_mtu(struct efx_nic *efx);
 int efx_mcdi_mac_init_stats(struct efx_nic *efx);
 void efx_mcdi_mac_fini_stats(struct efx_nic *efx);
 int efx_mcdi_port_get_number(struct efx_nic *efx);