5.4-stable patches

added patches:
	revert-net-mvpp2-disable-force-link-up-during-port-init-procedure.patch

diff --git a/queue-5.4/revert-net-mvpp2-disable-force-link-up-during-port-init-procedure.patch b/queue-5.4/revert-net-mvpp2-disable-force-link-up-during-port-init-procedure.patch
new file mode 100644 (file)
index 0000000..8fd1599
--- /dev/null
+++ b/queue-5.4/revert-net-mvpp2-disable-force-link-up-during-port-init-procedure.patch
@@ -0,0 +1,53 @@
+From 3a542d956198d227aa7ade4b2ef57188f10eb2d9 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 23 Nov 2021 13:16:52 +0100
+Subject: Revert "net: mvpp2: disable force link UP during port init procedure"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit f595e44b161a3c751943c256b6de80dc57d5fcf8 which is
+commit 87508224485323ce2d4e7fb929ec80f51adcc238 upstream.
+
+It causes reported problems so should be removed.
+
+Link: https://lore.kernel.org/r/YZv1SBrYTXmorcLJ@shell.armlinux.org.uk
+Reported-by: Jordan Vrtanoski <jordan.vrtanoski@gmail.com>
+Reported-by: Russell King <linux@armlinux.org.uk>
+Cc: Stefan Chulski <stefanc@marvell.com>
+Cc: Marcin Wojtas <mw@semihalf.com>
+Cc: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c |   14 +-------------
+ 1 file changed, 1 insertion(+), 13 deletions(-)
+
+--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
++++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+@@ -4545,7 +4545,7 @@ static int mvpp2_port_init(struct mvpp2_
+       struct mvpp2 *priv = port->priv;
+       struct mvpp2_txq_pcpu *txq_pcpu;
+       unsigned int thread;
+-      int queue, err, val;
++      int queue, err;
+ 
+       /* Checks for hardware constraints */
+       if (port->first_rxq + port->nrxqs >
+@@ -4559,18 +4559,6 @@ static int mvpp2_port_init(struct mvpp2_
+       mvpp2_egress_disable(port);
+       mvpp2_port_disable(port);
+ 
+-      if (mvpp2_is_xlg(port->phy_interface)) {
+-              val = readl(port->base + MVPP22_XLG_CTRL0_REG);
+-              val &= ~MVPP22_XLG_CTRL0_FORCE_LINK_PASS;
+-              val |= MVPP22_XLG_CTRL0_FORCE_LINK_DOWN;
+-              writel(val, port->base + MVPP22_XLG_CTRL0_REG);
+-      } else {
+-              val = readl(port->base + MVPP2_GMAC_AUTONEG_CONFIG);
+-              val &= ~MVPP2_GMAC_FORCE_LINK_PASS;
+-              val |= MVPP2_GMAC_FORCE_LINK_DOWN;
+-              writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG);
+-      }
+-
+       port->tx_time_coal = MVPP2_TXDONE_COAL_USEC;
+ 
+       port->txqs = devm_kcalloc(dev, port->ntxqs, sizeof(*port->txqs),

diff --git a/queue-5.4/series b/queue-5.4/series
index ff759cbe16758421cea65d942f0aabac46f3c871..cf0a488e59d6ee34f94e2cedc0535efe717fc8a9 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -43,7 +43,6 @@ tracing-histogram-do-not-copy-the-fixed-size-char-ar.patch
 perf-bpf-avoid-memory-leak-from-perf_env__insert_btf.patch
 perf-bench-futex-fix-memory-leak-of-perf_cpu_map__ne.patch
 perf-tests-remove-bash-construct-from-record-zstd_co.patch
-tracing-add-length-protection-to-histogram-string-co.patch
 net-bnx2x-fix-variable-dereferenced-before-check.patch
 iavf-check-for-null-in-iavf_fix_features.patch
 iavf-free-q_vectors-before-queues-in-iavf_disable_vf.patch
@@ -88,3 +87,4 @@ drm-udl-fix-control-message-timeout.patch
 drm-nouveau-use-drm_dev_unplug-during-device-removal.patch
 drm-i915-dp-ensure-sink-rate-values-are-always-valid.patch
 drm-amdgpu-fix-set-scaling-mode-full-full-aspect-center-not-works-on-vga-and-dvi-connectors.patch
+revert-net-mvpp2-disable-force-link-up-during-port-init-procedure.patch