From da6424d983c51391774541c2717278421a1cc659 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 13 Jun 2014 21:02:45 +0200 Subject: [PATCH] kernel: add mcs7830 link detection patch. fixes #10551 --- lfs/linux | 5 +- ....y-usbnet_mcs7830_rework_link_detect.patch | 71 +++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch diff --git a/lfs/linux b/lfs/linux index 0214bebc08..45e9ce6614 100644 --- a/lfs/linux +++ b/lfs/linux @@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 48 +PAK_VER = 49 DEPS = "" VERSUFIX=ipfire$(KCFG) @@ -160,6 +160,9 @@ endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch + # Moschip 7830 link detection + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch + ifeq "$(KCFG)" "-kirkwood" # Add dreamplug,guruplug and icy 62x0 support on ARM-kirkwood diff --git a/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch b/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch new file mode 100644 index 0000000000..2114ae83bf --- /dev/null +++ b/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch @@ -0,0 +1,71 @@ +From 4e9792dc8ab29175295c79c35f9f6fbd2d453b35 Mon Sep 17 00:00:00 2001 +From: Octavian Purdila +Date: Mon, 23 Dec 2013 19:06:31 +0200 +Subject: [PATCH] usbnet: mcs7830: rework link state detection + +Even with the quirks in commit dabdaf0c (mcs7830: Fix link state +detection) there are still spurious link-down events for some chips +where the false link-down events count go over a few hundreds. + +This patch takes a more conservative approach and only looks at +link-down events where the link-down state is not combined with other +states (e.g. half/full speed, pending frames in SRAM or TX status +information valid). In all other cases we assume the link is up. + +Tested on MCS7830CV-DA (USB ID 9710:7830). + +Cc: Ondrej Zary +Cc: Michael Leun +Cc: Ming Lei +Signed-off-by: Octavian Purdila +Signed-off-by: David S. Miller +--- + drivers/net/usb/mcs7830.c | 19 ++++--------------- + 1 file changed, 4 insertions(+), 15 deletions(-) + +diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c +index 9237c45..8dd48b5 100644 +--- a/drivers/net/usb/mcs7830.c ++++ b/drivers/net/usb/mcs7830.c +@@ -117,7 +117,6 @@ enum { + struct mcs7830_data { + u8 multi_filter[8]; + u8 config; +- u8 link_counter; + }; + + static const char driver_name[] = "MOSCHIP usb-ethernet driver"; +@@ -562,26 +561,16 @@ static void mcs7830_status(struct usbnet *dev, struct urb *urb) + { + u8 *buf = urb->transfer_buffer; + bool link, link_changed; +- struct mcs7830_data *data = mcs7830_get_data(dev); + + if (urb->actual_length < 16) + return; + +- link = !(buf[1] & 0x20); ++ link = !(buf[1] == 0x20); + link_changed = netif_carrier_ok(dev->net) != link; + if (link_changed) { +- data->link_counter++; +- /* +- track link state 20 times to guard against erroneous +- link state changes reported sometimes by the chip +- */ +- if (data->link_counter > 20) { +- data->link_counter = 0; +- usbnet_link_change(dev, link, 0); +- netdev_dbg(dev->net, "Link Status is: %d\n", link); +- } +- } else +- data->link_counter = 0; ++ usbnet_link_change(dev, link, 0); ++ netdev_dbg(dev->net, "Link Status is: %d\n", link); ++ } + } + + static const struct driver_info moschip_info = { +-- +2.0.0 + -- 2.39.5