MCS7830 USB-Ether: add Rx error support (76802851) · Commits · 戴 / test

drivers/net/usb/mcs7830.c

+42 −1

Original line number	Diff line number	Diff line
		@@ -3,11 +3,27 @@
		*
		* based on usbnet.c, asix.c and the vendor provided mcs7830 driver
		*
		* Copyright (C) 2010 Andreas Mohr <andi@lisas.de>
		* Copyright (C) 2006 Arnd Bergmann <arnd@arndb.de>
		* Copyright (C) 2003-2005 David Hollis <dhollis@davehollis.com>
		* Copyright (C) 2005 Phil Chang <pchang23@sbcglobal.net>
		* Copyright (c) 2002-2003 TiVo Inc.
		*
		* Definitions gathered from MOSCHIP, Data Sheet_7830DA.pdf (thanks!).
		*
		* TODO:
		* - add .reset_resume support (iface is _gone_ after resume w/ power loss)
		* - verify that mcs7830_get_regs() does have same output pre-/post-suspend
		* - support HIF_REG_CONFIG_SLEEPMODE/HIF_REG_CONFIG_TXENABLE (via autopm?)
		* - implement ethtool_ops get_pauseparam/set_pauseparam
		* via HIF_REG_PAUSE_THRESHOLD (>= revision C only!)
		* - implement get_eeprom/[set_eeprom]
		* - switch PHY on/off on ifup/ifdown (perhaps in usbnet.c, via MII)
		* - mcs7830_get_regs() handling is weird: for rev 2 we return 32 regs,
		* can access only ~ 24, remaining user buffer is uninitialized garbage
		* - anything else?
		*
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		@@ -83,6 +99,17 @@ enum {
		HIF_REG_PAUSE_THRESHOLD_DEFAULT = 0,
		};

		/* Trailing status byte in Ethernet Rx frame */
		enum {
		MCS7830_RX_SHORT_FRAME = 0x01, /* < 64 bytes */
		MCS7830_RX_LENGTH_ERROR = 0x02, /* framelen != Ethernet length field */
		MCS7830_RX_ALIGNMENT_ERROR = 0x04, /* non-even number of nibbles */
		MCS7830_RX_CRC_ERROR = 0x08,
		MCS7830_RX_LARGE_FRAME = 0x10, /* > 1518 bytes */
		MCS7830_RX_FRAME_CORRECT = 0x20, /* frame is correct */
		/* [7:6] reserved */
		};

		struct mcs7830_data {
		u8 multi_filter[8];
		u8 config;
		@@ -539,9 +566,23 @@ static int mcs7830_rx_fixup(struct usbnet dev, struct sk_buff skb)
		skb_trim(skb, skb->len - 1);
		status = skb->data[skb->len];

		if (status != 0x20)
		if (status != MCS7830_RX_FRAME_CORRECT) {
		dev_dbg(&dev->udev->dev, "rx fixup status %x\n", status);

		/* hmm, perhaps usbnet.c already sees a globally visible
		frame error and increments rx_errors on its own already? */
		dev->net->stats.rx_errors++;

		if (status & (MCS7830_RX_SHORT_FRAME
		\|MCS7830_RX_LENGTH_ERROR
		\|MCS7830_RX_LARGE_FRAME))
		dev->net->stats.rx_length_errors++;
		if (status & MCS7830_RX_ALIGNMENT_ERROR)
		dev->net->stats.rx_frame_errors++;
		if (status & MCS7830_RX_CRC_ERROR)
		dev->net->stats.rx_crc_errors++;
		}

		return skb->len > 0;
		}

Admin message