2 files changed, 13 insertions, 9 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index bd54238e2df8..e3b81cdc94b2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -220,10 +220,10 @@ enum dma_irq_status {
         handle_tx = 0x8,
 };
 
-#define CORE_IRQ_TX_PATH_IN_LPI_MODE    (1 << 1)
-#define CORE_IRQ_TX_PATH_EXIT_LPI_MODE  (1 << 2)
-#define CORE_IRQ_RX_PATH_IN_LPI_MODE    (1 << 3)
-#define CORE_IRQ_RX_PATH_EXIT_LPI_MODE  (1 << 4)
+#define CORE_IRQ_TX_PATH_IN_LPI_MODE    (1 << 0)
+#define CORE_IRQ_TX_PATH_EXIT_LPI_MODE  (1 << 1)
+#define CORE_IRQ_RX_PATH_IN_LPI_MODE    (1 << 2)
+#define CORE_IRQ_RX_PATH_EXIT_LPI_MODE  (1 << 3)
 
 #define CORE_PCS_ANE_COMPLETE           (1 << 5)
 #define CORE_PCS_LINK_STATUS            (1 << 6)
@@ -287,7 +287,7 @@ struct dma_features {
 
 /* Default LPI timers */
 #define STMMAC_DEFAULT_LIT_LS   0x3E8
-#define STMMAC_DEFAULT_TWT_LS   0x0
+#define STMMAC_DEFAULT_TWT_LS   0x1E
 
 #define STMMAC_CHAIN_MODE       0x1
 #define STMMAC_RING_MODE        0x2
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index df15f00b1246..3d3db16c97d4 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -275,6 +275,7 @@ static void stmmac_eee_ctrl_timer(unsigned long arg)
  */
 bool stmmac_eee_init(struct stmmac_priv *priv)
 {
+        char *phy_bus_name = priv->plat->phy_bus_name;
         bool ret = false;
 
         /* Using PCS we cannot dial with the phy registers at this stage
@@ -284,6 +285,10 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
             (priv->pcs == STMMAC_PCS_RTBI))
                 goto out;
 
+        /* Never init EEE in case of a switch is attached */
+        if (phy_bus_name && (!strcmp(phy_bus_name, "fixed")))
+                goto out;
+
         /* MAC core supports the EEE feature. */
         if (priv->dma_cap.eee) {
                 int tx_lpi_timer = priv->tx_lpi_timer;
@@ -316,10 +321,9 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
                         priv->hw->mac->set_eee_timer(priv->hw,
                                                      STMMAC_DEFAULT_LIT_LS,
                                                      tx_lpi_timer);
-                } else
-                        /* Set HW EEE according to the speed */
-                        priv->hw->mac->set_eee_pls(priv->hw,
-                                                   priv->phydev->link);
+                }
+                /* Set HW EEE according to the speed */
+                priv->hw->mac->set_eee_pls(priv->hw, priv->phydev->link);
 
                 pr_debug("stmmac: Energy-Efficient Ethernet initialized\n");