55be1c3734
All modifications made by by update_kernel.sh.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800 [only 5.4.107]
No dmesg regressions, everything functional
Run-tested by @timocapa:
- ramips/mt7621/{Xiaomi R3G, Redmi 2100}
- Lantiq/XWAY/Fritz!Box 7320/7330
Signed-off-by: John Audia <graysky@archlinux.us>
[squash, edit commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
31 lines
995 B
Diff
31 lines
995 B
Diff
From 434d2312cd8057aa6972f2b39aa0b359d02af9f4 Mon Sep 17 00:00:00 2001
|
|
From: Paul Barker <pbarker@konsulko.com>
|
|
Date: Thu, 3 Sep 2020 12:26:21 +0100
|
|
Subject: [PATCH] net: dsa: b53: Print err message on SW_RST timeout
|
|
|
|
This allows us to differentiate between the possible failure modes of
|
|
b53_switch_reset() by looking at the dmesg output.
|
|
|
|
Signed-off-by: Paul Barker <pbarker@konsulko.com>
|
|
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/b53/b53_common.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_common.c
|
|
+++ b/drivers/net/dsa/b53/b53_common.c
|
|
@@ -755,8 +755,11 @@ static int b53_switch_reset(struct b53_d
|
|
usleep_range(1000, 2000);
|
|
} while (timeout-- > 0);
|
|
|
|
- if (timeout == 0)
|
|
+ if (timeout == 0) {
|
|
+ dev_err(dev->dev,
|
|
+ "Timeout waiting for SW_RST to clear!\n");
|
|
return -ETIMEDOUT;
|
|
+ }
|
|
}
|
|
|
|
b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, &mgmt);
|