mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 01:59:02 +00:00
ca5c695a45
Deleted following upstreamed patches: bcm27xx: 950-0006-drm-vc4-hdmi-Fix-HPD-GPIO-detection.patch bcm27xx: 950-0420-drm-vc4-Adopt-the-dma-configuration-from-the-HVS-or-.patch bcm27xx: 950-0425-drm-vc4-A-present-but-empty-dmas-disables-audio.patch bcm27xx: 950-0432-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch bcm27xx: 950-0433-vc4-drm-vc4_plane-Remove-subpixel-positioning-check.patch bcm27xx: 950-0435-drm-vc4-Correct-pixel-order-for-DSI0.patch bcm27xx: 950-0436-drm-vc4-Register-dsi0-as-the-correct-vc4-encoder-typ.patch bcm27xx: 950-0437-drm-vc4-Fix-dsi0-interrupt-support.patch bcm27xx: 950-0438-drm-vc4-Add-correct-stop-condition-to-vc4_dsi_encode.patch bcm27xx: 950-0443-drm-vc4-Fix-timings-for-interlaced-modes.patch bcm27xx: 950-0445-drm-vc4-Fix-margin-calculations-for-the-right-bottom.patch bcm27xx: 950-0475-drm-vc4-Reset-HDMI-MISC_CONTROL-register.patch bcm27xx: 950-0476-drm-vc4-Release-workaround-buffer-and-DMA-in-error-p.patch bcm27xx: 950-0477-drm-vc4-Correct-DSI-divider-calculations.patch bcm27xx: 950-0664-drm-vc4-dsi-Correct-max-divider-to-255-not-7.patch bcm53xx: 072-next-ARM_dts_BCM53015-add-mr26.patch mediatek: 920-linux-next-dts-mt7622-bpi-r64-fix-wps-button.patch Manually rebased following patches: bcm27xx: 950-0004-drm-vc4-hdmi-Remove-the-DDC-probing-for-status-detec.patch bcm27xx: 950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch bcm27xx: 950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch bcm27xx: 950-0713-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch bcm27xx: 950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch bcm27xx: 950-0787-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch bcm27xx: 950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch Runtime tested on turris-omnia and glinet-b1300. Tested-by: John Audia <therealgraysky@proton.me> [bcm2711/RPi4B, mt7622/RT3200] Signed-off-by: Petr Štetiar <ynezz@true.cz>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From eb860f6a2dee9a4c94a7101c1d43194b95fdbc8d Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Wed, 22 Sep 2021 15:38:13 +0100
|
|
Subject: [PATCH] net: phy: lan87xx: Allow more time for link detect
|
|
|
|
With EDPWRDOWN set in idle, it must be cleared before checking for
|
|
ENERGYON going high, indicating that a link is being established.
|
|
The existing code allows 640ms for ENERGYON to go high, but on
|
|
Raspberry Pis that appears not to be enough, causing link detection
|
|
to fail.
|
|
|
|
Increase the polling timeout to 1500ms - with a polling interval of
|
|
10ms it shouldn't cause unnecessary delays.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/4393
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
drivers/net/phy/smsc.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/phy/smsc.c
|
|
+++ b/drivers/net/phy/smsc.c
|
|
@@ -230,12 +230,12 @@ static int lan87xx_read_status(struct ph
|
|
if (rc < 0)
|
|
return rc;
|
|
|
|
- /* Wait max 640 ms to detect energy and the timeout is not
|
|
+ /* Wait max 1500 ms to detect energy and the timeout is not
|
|
* an actual error.
|
|
*/
|
|
read_poll_timeout(phy_read, rc,
|
|
rc & MII_LAN83C185_ENERGYON || rc < 0,
|
|
- 10000, 640000, true, phydev,
|
|
+ 10000, 1500000, true, phydev,
|
|
MII_LAN83C185_CTRL_STATUS);
|
|
if (rc < 0)
|
|
return rc;
|