drivers: net: stmmac: add port selection programming

In case of SGMII more, for example when a MAC2MAC connection
is needed, the port selection bits (inside the MAC configuration
registers) have to be programmed according to the link selected.
So the patch adds a new DT parameter to pass the port selection
and to programmed related PCS and CORE to use it.

Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt
index 95816c5fc589b971e924fba438a3e5e42f024670..41b49e6075f55a396cb0bef002e32ce4e079af98 100644 (file)
--- a/Documentation/devicetree/bindings/net/stmmac.txt
+++ b/Documentation/devicetree/bindings/net/stmmac.txt
@@ -47,6 +47,9 @@ Optional properties:
                                supported by this device instance
 - snps,perfect-filter-entries: Number of perfect filter entries supported
                                by this device instance
+- snps,ps-speed: port selection speed that can be passed to the core when
+                PCS is supported. For example, this is used in case of SGMII
+                and MAC2MAC connection.
 - AXI BUS Mode parameters: below the list of all the parameters to program the
                           AXI register inside the DMA module:
        - snps,lpi_en: enable Low Power Interface

diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index 51077a8dc1f54cd50db0ac0c92cab402cf7a14db..2533b91f1421d60b080d7779b69aeca2a69aad42 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -531,6 +531,7 @@ struct mac_device_info {
        unsigned int rx_csum;
        unsigned int pcs;
        unsigned int pmt;
+       unsigned int ps;
 };
 
 struct mac_device_info *dwmac1000_setup(void __iomem *ioaddr, int mcbins,

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index 0d31f2f80d07bed742f864825fa7018004d396f9..cbefe9e2207cac01a418eb8df24fb8c82278c502 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -46,6 +46,21 @@ static void dwmac1000_core_init(struct mac_device_info *hw, int mtu)
        if (mtu > 2000)
                value |= GMAC_CONTROL_JE;
 
+       if (hw->ps) {
+               value |= GMAC_CONTROL_TE;
+
+               if (hw->ps == SPEED_1000) {
+                       value &= ~GMAC_CONTROL_PS;
+               } else {
+                       value |= GMAC_CONTROL_PS;
+
+                       if (hw->ps == SPEED_10)
+                               value &= ~GMAC_CONTROL_FES;
+                       else
+                               value |= GMAC_CONTROL_FES;
+               }
+       }
+
        writel(value, ioaddr + GMAC_CONTROL);
 
        /* Mask GMAC interrupts */

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index 747f3cf1e20bd1275fda61011171f1252ac611f5..df5580dcdfedd22c64fb79d7b0b6687cc3996af5 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -32,6 +32,21 @@ static void dwmac4_core_init(struct mac_device_info *hw, int mtu)
        if (mtu > 2000)
                value |= GMAC_CONFIG_JE;
 
+       if (hw->ps) {
+               value |= GMAC_CONFIG_TE;
+
+               if (hw->ps == SPEED_1000) {
+                       value &= ~GMAC_CONFIG_PS;
+               } else {
+                       value |= GMAC_CONFIG_PS;
+
+                       if (hw->ps == SPEED_10)
+                               value &= ~GMAC_CONFIG_FES;
+                       else
+                               value |= GMAC_CONFIG_FES;
+               }
+       }
+
        writel(value, ioaddr + GMAC_CONFIG);
 
        /* Mask GMAC interrupts */

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index da2d9b5b740a91320ce8f05bc70997e13ad57421..1e06173fc9d733d63c1e5ccbbc12c03506d0a44c 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -380,7 +380,8 @@ static int stmmac_ethtool_setsettings(struct net_device *dev,
                spin_lock(&priv->lock);
 
                if (priv->hw->mac->pcs_ctrl_ane)
-                       priv->hw->mac->pcs_ctrl_ane(priv->ioaddr, 1, 0, 0);
+                       priv->hw->mac->pcs_ctrl_ane(priv->ioaddr, 1,
+                                                   priv->hw->ps, 0);
 
                spin_unlock(&priv->lock);
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 6142fce9ffac346398a50efc42687c03f3f02ddc..aab777c1ba3369f91e252696842f3cceb8f88431 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1666,6 +1666,19 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
        if (priv->plat->bus_setup)
                priv->plat->bus_setup(priv->ioaddr);
 
+       /* PS and related bits will be programmed according to the speed */
+       if (priv->hw->pcs) {
+               int speed = priv->plat->mac_port_sel_speed;
+
+               if ((speed == SPEED_10) || (speed == SPEED_100) ||
+                   (speed == SPEED_1000)) {
+                       priv->hw->ps = speed;
+               } else {
+                       dev_warn(priv->device, "invalid port speed\n");
+                       priv->hw->ps = 0;
+               }
+       }
+
        /* Initialize the MAC Core */
        priv->hw->mac->core_init(priv->hw, dev->mtu);
 
@@ -1716,7 +1729,7 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
        }
 
        if (priv->hw->pcs && priv->hw->mac->pcs_ctrl_ane)
-               priv->hw->mac->pcs_ctrl_ane(priv->hw, 1, 0, 0);
+               priv->hw->mac->pcs_ctrl_ane(priv->hw, 1, priv->hw->ps, 0);
 
        /*  set TX ring length */
        if (priv->hw->dma->set_tx_ring_len)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index a96714d34560e9c09afc87cc097567b15766cdd5..f7dfc0ae8e9c52b32ae658a488e5f17718820966 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -319,6 +319,8 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
                pr_warn("force_sf_dma_mode is ignored if force_thresh_dma_mode is set.");
        }
 
+       of_property_read_u32(np, "snps,ps-speed", &plat->mac_port_sel_speed);
+
        plat->axi = stmmac_axi_setup(pdev);
 
        return plat;

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 0507dbfbf63c95a2f82f62f3d23d7eee640e40cc..705840e0438fec53136885d8b1b04f36367a7e04 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -141,5 +141,6 @@ struct plat_stmmacenet_data {
        struct stmmac_axi *axi;
        int has_gmac4;
        bool tso_en;
+       int mac_port_sel_speed;
 };
 #endif