SHA256
1
0
forked from pool/u-boot
u-boot/0011-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch

38 lines
1.3 KiB
Diff
Raw Normal View History

Accepting request 795564 from hardware:boot:staging - Drop downstream zynqmp generic patches since zynqmp virt config superseed it: Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.04 * Patches dropped: 0005-zynqmp-Add-generic-target.patch 0006-tools-zynqmpbif-Add-support-for-loa.patch 0007-boo-1123170-Remove-ubifs-support-fr.patch 0008-zynqmp-generic-fix-compilation.patch 0009-boo-1144161-Remove-nand-mtd-spi-dfu.patch 0010-Kconfig-add-btrfs-to-distro-boot.patch 0011-configs-Re-sync-with-CONFIG_DISTRO_.patch 0012-configs-am335x_evm-disable-BTRFS.patch 0013-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch 0014-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch 0015-uboot-fs-btrfs-Fix-LZO-false-decomp.patch * Patches added: 0005-tools-zynqmpbif-Add-support-for-loa.patch 0006-boo-1123170-Remove-ubifs-support-fr.patch 0007-boo-1144161-Remove-nand-mtd-spi-dfu.patch 0008-Kconfig-add-btrfs-to-distro-boot.patch 0009-configs-Re-sync-with-CONFIG_DISTRO_.patch 0010-configs-am335x_evm-disable-BTRFS.patch 0011-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch 0012-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch 0013-uboot-fs-btrfs-Fix-LZO-false-decomp.patch - Follow upstream commits f7c6ee7f and be1b6c32 to unify zynq/zynqmp configs: * Update zynq configs to use generic config + device tree for u-boot-avnetultra96rev1 and u-boot-xilinxzynqmpzcu102rev10 * Use upstream u-boot-xilinxzynqmpvirt instead of downstream u-boot-xilinxzynqmpgeneric - Switch to http URLs, ftp is obsolete - Update to v2020.04: * Platfrom fixes: Amlogic, Atmel, fsl, iMX, Marvell, Mediatek, rockchip, RPi, samsung, socfpga, sunxi, Tegra, TI * EFI fixes * I2C fixes * GPIO fixes * MMC fixes * SPI fixes * USB fixes * Filesystem fixes Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.04 * Patches dropped: 0010-ARM-tegra-Add-NVIDIA-Jetson-Nano-De.patch 0011-net-Add-support-for-Broadcom-GENETv.patch 0012-rpi4-Update-memory-map-to-accommoda.patch 0013-rpi4-Enable-GENET-Ethernet-controll.patch 0014-Kconfig-add-btrfs-to-distro-boot.patch 0015-configs-Re-sync-with-CONFIG_DISTRO_.patch 0016-configs-am335x_evm-disable-BTRFS.patch 0017-net-phy-Fix-overlong-PHY-timeout.patch 0018-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch 0019-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch 0020-uboot-fs-btrfs-Fix-LZO-false-decomp.patch * Patches added: 0010-Kconfig-add-btrfs-to-distro-boot.patch 0011-configs-Re-sync-with-CONFIG_DISTRO_.patch 0012-configs-am335x_evm-disable-BTRFS.patch 0013-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch 0014-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch 0015-uboot-fs-btrfs-Fix-LZO-false-decomp.patch OBS-URL: https://build.opensuse.org/request/show/795564 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=96
2020-04-20 11:32:05 +02:00
From bf743c28432ba1eea23e0b05c582762b4b6fe1b7 Mon Sep 17 00:00:00 2001
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Date: Thu, 20 Feb 2020 17:36:31 +0100
Subject: [PATCH] net: bcmgenet: Don't set ID_MODE_DIS when not using RGMII
As per Linux's driver, ID_MODE_DIS is only set when the PHY interface is
RGMII. Don't enable it for the rest of setups.
This has been seen to misconfigure RPi4's PHY when booting Linux.
Upstream submission:
https://patchwork.ozlabs.org/patch/1241570/
Fixes: d53e3fa385 ("net: Add support for Broadcom GENETv5 Ethernet
controller")
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
drivers/net/bcmgenet.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index 8f4848aec6..e971b556ac 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -448,7 +448,10 @@ static int bcmgenet_adjust_link(struct bcmgenet_eth_priv *priv)
}
clrsetbits_32(priv->mac_reg + EXT_RGMII_OOB_CTRL, OOB_DISABLE,
- RGMII_LINK | RGMII_MODE_EN | ID_MODE_DIS);
+ RGMII_LINK | RGMII_MODE_EN);
+
+ if (phy_dev->interface == PHY_INTERFACE_MODE_RGMII)
+ setbits_32(priv->mac_reg + EXT_RGMII_OOB_CTRL, ID_MODE_DIS);
writel(speed << CMD_SPEED_SHIFT, (priv->mac_reg + UMAC_CMD));