diff options
| author | John Audia <graysky@archlinux.us> | 2021-08-26 14:09:35 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-08-29 16:31:02 +0200 |
| commit | be7e0091feb32f579818825a36e28bfe3acdf930 (patch) | |
| tree | 1f97769e90225ba6e506ff7ccce1cbd718d126b5 /target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch | |
| parent | 6b1cd3e3451ab1057dd3b27fd3f9834e1765d20c (diff) | |
| download | upstream-be7e0091feb32f579818825a36e28bfe3acdf930.tar.gz upstream-be7e0091feb32f579818825a36e28bfe3acdf930.tar.bz2 upstream-be7e0091feb32f579818825a36e28bfe3acdf930.zip | |
kernel: bump 5.4 to 5.4.143
Manually rebased:
bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
Removed upstreamed:
mvebu/patches-5.4/100-cpufreq-armada-37xx-forbid-cpufreq-for-1.2-GHz-variant.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch b/target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch index 2dc2a13cb7..b2e7b7ee95 100644 --- a/target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch +++ b/target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch @@ -23,10 +23,10 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> @@ -1181,6 +1181,9 @@ static int lan78xx_link_reset(struct lan if (unlikely(ret < 0)) return -EIO; - + + /* Acknowledge any pending PHY interrupt, lest it be the last */ + phy_read(phydev, LAN88XX_INT_STS); + + mutex_lock(&phydev->lock); phy_read_status(phydev); - - if (!phydev->link && dev->link_on) { + link = phydev->link; |