This is a note to let you know that I've just added the patch titled
Revert "net: mvpp2: disable force link UP during port init procedure"
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-net-mvpp2-disable-force-link-up-during-port-init-procedure.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 3a542d956198d227aa7ade4b2ef57188f10eb2d9 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxx>
This reverts commit f595e44b161a3c751943c256b6de80dc57d5fcf8 which is
commit 87508224485323ce2d4e7fb929ec80f51adcc238 upstream.
It causes reported problems so should be removed.
Link: https://lore.kernel.org/r/YZv1SBrYTXmorcLJ@xxxxxxxxxxxxxxxxxxxxx
Reported-by: Jordan Vrtanoski <jordan.vrtanoski@xxxxxxxxx>
Reported-by: Russell King <linux@xxxxxxxxxxxxxxx>
Cc: Stefan Chulski <stefanc@xxxxxxxxxxx>
Cc: Marcin Wojtas <mw@xxxxxxxxxxxx>
Cc: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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),
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-5.4/revert-net-mvpp2-disable-force-link-up-during-port-init-procedure.patch
queue-5.4/cfg80211-call-cfg80211_stop_ap-when-switch-from-p2p_go-type.patch
queue-5.4/mm-kmemleak-slob-respect-slab_noleaktrace-flag.patch
queue-5.4/tun-fix-bonding-active-backup-with-arp-monitoring.patch
queue-5.4/s390-kexec-fix-memory-leak-of-ipl-report-buffer.patch
queue-5.4/btrfs-fix-memory-ordering-between-normal-and-ordered-work-functions.patch
queue-5.4/usb-host-ohci-tmio-check-return-value-after-calling-.patch
queue-5.4/usb-typec-tipd-remove-warn_on-in-tps6598x_block_read.patch
queue-5.4/parisc-sticon-fix-reverse-colors.patch
queue-5.4/ipc-warn-if-trying-to-remove-ipc-object-which-is-absent.patch
queue-5.4/tty-tty_buffer-fix-the-softlockup-issue-in-flush_to_.patch
queue-5.4/hexagon-export-raw-i-o-routines-for-modules.patch
queue-5.4/drm-udl-fix-control-message-timeout.patch
queue-5.4/arm64-vdso32-suppress-error-message-for-make-mrproper.patch
queue-5.4/udf-fix-crash-after-seekdir.patch
queue-5.4/drm-amdgpu-fix-set-scaling-mode-full-full-aspect-center-not-works-on-vga-and-dvi-connectors.patch
queue-5.4/x86-hyperv-fix-null-deref-in-set_hv_tscchange_cb-if-hyper-v-setup-fails.patch
queue-5.4/usb-musb-tusb6010-check-return-value-after-calling-p.patch
queue-5.4/firmware_loader-fix-pre-allocated-buf-built-in-firmw.patch
queue-5.4/drm-i915-dp-ensure-sink-rate-values-are-always-valid.patch
queue-5.4/drm-nouveau-use-drm_dev_unplug-during-device-removal.patch
