20b5a4ca01
Refreshed all patches. Fixes: - CVE-2019-14896 - CVE-2019-14897 Remove upstreamed: - 023-0007-crypto-crypto4xx-Fix-wrong-ppc4xx_trng_probe-ppc4xx_.patch - 950-0202-staging-bcm2835-camera-fix-module-autoloading.patch - 001-4.22-01-MIPS-BCM63XX-drop-unused-and-broken-DSP-platform-dev.patch Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From 1541649a9dd79e9b941d399de564475e426a2d0b Mon Sep 17 00:00:00 2001
|
|
From: Florian Fainelli <f.fainelli@gmail.com>
|
|
Date: Tue, 25 Sep 2018 11:28:45 -0700
|
|
Subject: [PATCH 602/660] net: phy: Stop with excessive soft reset
|
|
|
|
While consolidating the PHY reset in phy_init_hw() an unconditionaly
|
|
BMCR soft-reset I became quite trigger happy with those. This was later
|
|
on deactivated for the Generic PHY driver on the premise that a prior
|
|
software entity (e.g: bootloader) might have applied workarounds in
|
|
commit 0878fff1f42c ("net: phy: Do not perform software reset for
|
|
Generic PHY").
|
|
|
|
Since we have a hook to wire-up a soft_reset callback, just use that and
|
|
get rid of the call to genphy_soft_reset() entirely. This speeds up
|
|
initialization and link establishment for most PHYs out there that do
|
|
not require a reset.
|
|
|
|
Fixes: 87aa9f9c61ad ("net: phy: consolidate PHY reset in phy_init_hw()")
|
|
Tested-by: Wang, Dongsheng <dongsheng.wang@hxt-semitech.com>
|
|
Tested-by: Chris Healy <cphealy@gmail.com>
|
|
Tested-by: Andrew Lunn <andrew@lunn.ch>
|
|
Tested-by: Clemens Gruber <clemens.gruber@pqgruber.com>
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
drivers/net/phy/phy_device.c | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
--- a/drivers/net/phy/phy_device.c
|
|
+++ b/drivers/net/phy/phy_device.c
|
|
@@ -886,8 +886,6 @@ int phy_init_hw(struct phy_device *phyde
|
|
|
|
if (phydev->drv->soft_reset)
|
|
ret = phydev->drv->soft_reset(phydev);
|
|
- else
|
|
- ret = genphy_soft_reset(phydev);
|
|
|
|
if (ret < 0)
|
|
return ret;
|