mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
da98603597
This PR is a blend of several kernel bumps authored by ldir taken from his
staging tree w/ some further adjustments made by me and update_kernel.sh
Summary:
Deleted upstreamed patches:
generic:
742-v5.5-net-sfp-add-support-for-module-quirks.patch
743-v5.5-net-sfp-add-some-quirks-for-GPON-modules.patch
bcm63xx:
022-v5.8-mtd-rawnand-brcmnand-correctly-verify-erased-pages.patch
024-v5.8-mtd-rawnand-brcmnand-fix-CS0-layout.patch
mediatek:
0402-net-ethernet-mtk_eth_soc-Always-call-mtk_gmac0_rgmii.patch
Deleted patches applied differently upstream:
generic:
641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch
Manually merged patches:
generic:
395-v5.8-net-sch_cake-Take-advantage-of-skb-hash-where-appropriate.patch
bcm27xx:
950-0132-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
layerscape:
701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
Build system: x86_64
Build-tested: ath79/generic, bcm27xx/bcm2708, bcm27xx/bcm2711,
imx6, mvebu/cortexa9, sunxi/a53
Run-tested: Netgear R7800 (ipq806x)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-By: Lucian Cristian <Lucian.cristian@gmail.com> [mvebu]
Tested-By: Curtis Deptuck <curtdept@me.com> [x86/64]
[do not remove 395-v5.8-net-sch_cake-Take-advantage-... patch,
adjust and refresh patches, adjust commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-By: John Audia <graysky@archlinux.us> [ipq806x]
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 20c9da8c7bab3bbc18e42ee0b2659c4b43aabad7 Mon Sep 17 00:00:00 2001
|
|
From: Joshua Emele <jemele@acm.org>
|
|
Date: Wed, 7 Nov 2018 16:07:40 -0800
|
|
Subject: [PATCH] lan78xx: Debounce link events to minimize poll storm
|
|
|
|
The bInterval is set to 4 (i.e. 8 microframes => 1ms) and the only bit
|
|
that the driver pays attention to is "link was reset". If there's a
|
|
flapping status bit in that endpoint data, (such as if PHY negotiation
|
|
needs a few tries to get a stable link) then polling at a slower rate
|
|
would act as a de-bounce.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/2447
|
|
---
|
|
drivers/net/usb/lan78xx.c | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
--- a/drivers/net/usb/lan78xx.c
|
|
+++ b/drivers/net/usb/lan78xx.c
|
|
@@ -434,6 +434,11 @@ static bool enable_tso;
|
|
module_param(enable_tso, bool, 0644);
|
|
MODULE_PARM_DESC(enable_tso, "Enables TCP segmentation offload");
|
|
|
|
+#define INT_URB_MICROFRAMES_PER_MS 8
|
|
+static int int_urb_interval_ms = 8;
|
|
+module_param(int_urb_interval_ms, int, 0);
|
|
+MODULE_PARM_DESC(int_urb_interval_ms, "Override usb interrupt urb interval");
|
|
+
|
|
static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
|
|
{
|
|
u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL);
|
|
@@ -3768,7 +3773,12 @@ static int lan78xx_probe(struct usb_inte
|
|
netdev->max_mtu = MAX_SINGLE_PACKET_SIZE;
|
|
netif_set_gso_max_size(netdev, MAX_SINGLE_PACKET_SIZE - MAX_HEADER);
|
|
|
|
- period = ep_intr->desc.bInterval;
|
|
+ if (int_urb_interval_ms <= 0)
|
|
+ period = ep_intr->desc.bInterval;
|
|
+ else
|
|
+ period = int_urb_interval_ms * INT_URB_MICROFRAMES_PER_MS;
|
|
+
|
|
+ netif_notice(dev, probe, netdev, "int urb period %d\n", period);
|
|
maxp = usb_maxpacket(dev->udev, dev->pipe_intr, 0);
|
|
buf = kmalloc(maxp, GFP_KERNEL);
|
|
if (buf) {
|