2005-09-01 00:53:26 +08:00
|
|
|
/*
|
|
|
|
|
* Net1080 based USB host-to-host cables
|
|
|
|
|
* Copyright (C) 2000-2005 by David Brownell
|
|
|
|
|
*
|
|
|
|
|
* 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
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
// #define DEBUG // error path messages, extra info
|
|
|
|
|
// #define VERBOSE // more; success messages
|
|
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
|
#include <linux/ethtool.h>
|
|
|
|
|
#include <linux/workqueue.h>
|
|
|
|
|
#include <linux/mii.h>
|
|
|
|
|
#include <linux/usb.h>
|
2008-01-26 06:51:45 +08:00
|
|
|
#include <linux/usb/usbnet.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2005-09-01 00:53:26 +08:00
|
|
|
|
|
|
|
|
#include <asm/unaligned.h>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Netchip 1080 driver ... http://www.netchip.com
|
|
|
|
|
* (Sept 2004: End-of-life announcement has been sent.)
|
|
|
|
|
* Used in (some) LapLink cables
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define frame_errors data[1]
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* NetChip framing of ethernet packets, supporting additional error
|
|
|
|
|
* checks for links that may drop bulk packets from inside messages.
|
|
|
|
|
* Odd USB length == always short read for last usb packet.
|
|
|
|
|
* - nc_header
|
|
|
|
|
* - Ethernet header (14 bytes)
|
|
|
|
|
* - payload
|
|
|
|
|
* - (optional padding byte, if needed so length becomes odd)
|
|
|
|
|
* - nc_trailer
|
|
|
|
|
*
|
|
|
|
|
* This framing is to be avoided for non-NetChip devices.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
struct nc_header { // packed:
|
|
|
|
|
__le16 hdr_len; // sizeof nc_header (LE, all)
|
|
|
|
|
__le16 packet_len; // payload size (including ethhdr)
|
|
|
|
|
__le16 packet_id; // detects dropped packets
|
|
|
|
|
#define MIN_HEADER 6
|
|
|
|
|
|
|
|
|
|
// all else is optional, and must start with:
|
|
|
|
|
// __le16 vendorId; // from usb-if
|
|
|
|
|
// __le16 productId;
|
2010-06-03 02:10:09 +08:00
|
|
|
} __packed;
|
2005-09-01 00:53:26 +08:00
|
|
|
|
|
|
|
|
#define PAD_BYTE ((unsigned char)0xAC)
|
|
|
|
|
|
|
|
|
|
struct nc_trailer {
|
|
|
|
|
__le16 packet_id;
|
2010-06-03 02:10:09 +08:00
|
|
|
} __packed;
|
2005-09-01 00:53:26 +08:00
|
|
|
|
|
|
|
|
// packets may use FLAG_FRAMING_NC and optional pad
|
|
|
|
|
#define FRAMED_SIZE(mtu) (sizeof (struct nc_header) \
|
|
|
|
|
+ sizeof (struct ethhdr) \
|
|
|
|
|
+ (mtu) \
|
|
|
|
|
+ 1 \
|
|
|
|
|
+ sizeof (struct nc_trailer))
|
|
|
|
|
|
|
|
|
|
#define MIN_FRAMED FRAMED_SIZE(0)
|
|
|
|
|
|
|
|
|
|
/* packets _could_ be up to 64KB... */
|
|
|
|
|
#define NC_MAX_PACKET 32767
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Zero means no timeout; else, how long a 64 byte bulk packet may be queued
|
|
|
|
|
* before the hardware drops it. If that's done, the driver will need to
|
|
|
|
|
* frame network packets to guard against the dropped USB packets. The win32
|
|
|
|
|
* driver sets this for both sides of the link.
|
|
|
|
|
*/
|
|
|
|
|
#define NC_READ_TTL_MS ((u8)255) // ms
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* We ignore most registers and EEPROM contents.
|
|
|
|
|
*/
|
|
|
|
|
#define REG_USBCTL ((u8)0x04)
|
|
|
|
|
#define REG_TTL ((u8)0x10)
|
|
|
|
|
#define REG_STATUS ((u8)0x11)
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Vendor specific requests to read/write data
|
|
|
|
|
*/
|
|
|
|
|
#define REQUEST_REGISTER ((u8)0x10)
|
|
|
|
|
#define REQUEST_EEPROM ((u8)0x11)
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
nc_vendor_read(struct usbnet *dev, u8 req, u8 regnum, u16 *retval_ptr)
|
|
|
|
|
{
|
|
|
|
|
int status = usb_control_msg(dev->udev,
|
|
|
|
|
usb_rcvctrlpipe(dev->udev, 0),
|
|
|
|
|
req,
|
|
|
|
|
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
|
|
|
|
0, regnum,
|
|
|
|
|
retval_ptr, sizeof *retval_ptr,
|
|
|
|
|
USB_CTRL_GET_TIMEOUT);
|
|
|
|
|
if (status > 0)
|
|
|
|
|
status = 0;
|
|
|
|
|
if (!status)
|
|
|
|
|
le16_to_cpus(retval_ptr);
|
|
|
|
|
return status;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline int
|
|
|
|
|
nc_register_read(struct usbnet *dev, u8 regnum, u16 *retval_ptr)
|
|
|
|
|
{
|
|
|
|
|
return nc_vendor_read(dev, REQUEST_REGISTER, regnum, retval_ptr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// no retval ... can become async, usable in_interrupt()
|
|
|
|
|
static void
|
|
|
|
|
nc_vendor_write(struct usbnet *dev, u8 req, u8 regnum, u16 value)
|
|
|
|
|
{
|
|
|
|
|
usb_control_msg(dev->udev,
|
|
|
|
|
usb_sndctrlpipe(dev->udev, 0),
|
|
|
|
|
req,
|
|
|
|
|
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
|
|
|
|
value, regnum,
|
|
|
|
|
NULL, 0, // data is in setup packet
|
|
|
|
|
USB_CTRL_SET_TIMEOUT);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
nc_register_write(struct usbnet *dev, u8 regnum, u16 value)
|
|
|
|
|
{
|
|
|
|
|
nc_vendor_write(dev, REQUEST_REGISTER, regnum, value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
static void nc_dump_registers(struct usbnet *dev)
|
|
|
|
|
{
|
|
|
|
|
u8 reg;
|
|
|
|
|
u16 *vp = kmalloc(sizeof (u16));
|
|
|
|
|
|
|
|
|
|
if (!vp) {
|
|
|
|
|
dbg("no memory?");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dbg("%s registers:", dev->net->name);
|
|
|
|
|
for (reg = 0; reg < 0x20; reg++) {
|
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
|
|
// reading some registers is trouble
|
|
|
|
|
if (reg >= 0x08 && reg <= 0xf)
|
|
|
|
|
continue;
|
|
|
|
|
if (reg >= 0x12 && reg <= 0x1e)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
retval = nc_register_read(dev, reg, vp);
|
|
|
|
|
if (retval < 0)
|
|
|
|
|
dbg("%s reg [0x%x] ==> error %d",
|
|
|
|
|
dev->net->name, reg, retval);
|
|
|
|
|
else
|
|
|
|
|
dbg("%s reg [0x%x] = 0x%x",
|
|
|
|
|
dev->net->name, reg, *vp);
|
|
|
|
|
}
|
|
|
|
|
kfree(vp);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Control register
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define USBCTL_WRITABLE_MASK 0x1f0f
|
|
|
|
|
// bits 15-13 reserved, r/o
|
|
|
|
|
#define USBCTL_ENABLE_LANG (1 << 12)
|
|
|
|
|
#define USBCTL_ENABLE_MFGR (1 << 11)
|
|
|
|
|
#define USBCTL_ENABLE_PROD (1 << 10)
|
|
|
|
|
#define USBCTL_ENABLE_SERIAL (1 << 9)
|
|
|
|
|
#define USBCTL_ENABLE_DEFAULTS (1 << 8)
|
|
|
|
|
// bits 7-4 reserved, r/o
|
|
|
|
|
#define USBCTL_FLUSH_OTHER (1 << 3)
|
|
|
|
|
#define USBCTL_FLUSH_THIS (1 << 2)
|
|
|
|
|
#define USBCTL_DISCONN_OTHER (1 << 1)
|
|
|
|
|
#define USBCTL_DISCONN_THIS (1 << 0)
|
|
|
|
|
|
|
|
|
|
static inline void nc_dump_usbctl(struct usbnet *dev, u16 usbctl)
|
|
|
|
|
{
|
2010-02-17 18:30:24 +08:00
|
|
|
netif_dbg(dev, link, dev->net,
|
|
|
|
|
"net1080 %s-%s usbctl 0x%x:%s%s%s%s%s; this%s%s; other%s%s; r/o 0x%x\n",
|
|
|
|
|
dev->udev->bus->bus_name, dev->udev->devpath,
|
|
|
|
|
usbctl,
|
|
|
|
|
(usbctl & USBCTL_ENABLE_LANG) ? " lang" : "",
|
|
|
|
|
(usbctl & USBCTL_ENABLE_MFGR) ? " mfgr" : "",
|
|
|
|
|
(usbctl & USBCTL_ENABLE_PROD) ? " prod" : "",
|
|
|
|
|
(usbctl & USBCTL_ENABLE_SERIAL) ? " serial" : "",
|
|
|
|
|
(usbctl & USBCTL_ENABLE_DEFAULTS) ? " defaults" : "",
|
|
|
|
|
|
|
|
|
|
(usbctl & USBCTL_FLUSH_THIS) ? " FLUSH" : "",
|
|
|
|
|
(usbctl & USBCTL_DISCONN_THIS) ? " DIS" : "",
|
|
|
|
|
|
|
|
|
|
(usbctl & USBCTL_FLUSH_OTHER) ? " FLUSH" : "",
|
|
|
|
|
(usbctl & USBCTL_DISCONN_OTHER) ? " DIS" : "",
|
|
|
|
|
|
|
|
|
|
usbctl & ~USBCTL_WRITABLE_MASK);
|
2005-09-01 00:53:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Status register
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define STATUS_PORT_A (1 << 15)
|
|
|
|
|
|
|
|
|
|
#define STATUS_CONN_OTHER (1 << 14)
|
|
|
|
|
#define STATUS_SUSPEND_OTHER (1 << 13)
|
|
|
|
|
#define STATUS_MAILBOX_OTHER (1 << 12)
|
2006-11-10 05:02:37 +08:00
|
|
|
#define STATUS_PACKETS_OTHER(n) (((n) >> 8) & 0x03)
|
2005-09-01 00:53:26 +08:00
|
|
|
|
|
|
|
|
#define STATUS_CONN_THIS (1 << 6)
|
|
|
|
|
#define STATUS_SUSPEND_THIS (1 << 5)
|
|
|
|
|
#define STATUS_MAILBOX_THIS (1 << 4)
|
2006-11-10 05:02:37 +08:00
|
|
|
#define STATUS_PACKETS_THIS(n) (((n) >> 0) & 0x03)
|
2005-09-01 00:53:26 +08:00
|
|
|
|
|
|
|
|
#define STATUS_UNSPEC_MASK 0x0c8c
|
|
|
|
|
#define STATUS_NOISE_MASK ((u16)~(0x0303|STATUS_UNSPEC_MASK))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static inline void nc_dump_status(struct usbnet *dev, u16 status)
|
|
|
|
|
{
|
2010-02-17 18:30:24 +08:00
|
|
|
netif_dbg(dev, link, dev->net,
|
|
|
|
|
"net1080 %s-%s status 0x%x: this (%c) PKT=%d%s%s%s; other PKT=%d%s%s%s; unspec 0x%x\n",
|
|
|
|
|
dev->udev->bus->bus_name, dev->udev->devpath,
|
|
|
|
|
status,
|
|
|
|
|
|
|
|
|
|
// XXX the packet counts don't seem right
|
|
|
|
|
// (1 at reset, not 0); maybe UNSPEC too
|
|
|
|
|
|
|
|
|
|
(status & STATUS_PORT_A) ? 'A' : 'B',
|
|
|
|
|
STATUS_PACKETS_THIS(status),
|
|
|
|
|
(status & STATUS_CONN_THIS) ? " CON" : "",
|
|
|
|
|
(status & STATUS_SUSPEND_THIS) ? " SUS" : "",
|
|
|
|
|
(status & STATUS_MAILBOX_THIS) ? " MBOX" : "",
|
|
|
|
|
|
|
|
|
|
STATUS_PACKETS_OTHER(status),
|
|
|
|
|
(status & STATUS_CONN_OTHER) ? " CON" : "",
|
|
|
|
|
(status & STATUS_SUSPEND_OTHER) ? " SUS" : "",
|
|
|
|
|
(status & STATUS_MAILBOX_OTHER) ? " MBOX" : "",
|
|
|
|
|
|
|
|
|
|
status & STATUS_UNSPEC_MASK);
|
2005-09-01 00:53:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* TTL register
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define TTL_THIS(ttl) (0x00ff & ttl)
|
|
|
|
|
#define TTL_OTHER(ttl) (0x00ff & (ttl >> 8))
|
|
|
|
|
#define MK_TTL(this,other) ((u16)(((other)<<8)|(0x00ff&(this))))
|
|
|
|
|
|
|
|
|
|
static inline void nc_dump_ttl(struct usbnet *dev, u16 ttl)
|
|
|
|
|
{
|
2010-02-17 18:30:24 +08:00
|
|
|
netif_dbg(dev, link, dev->net, "net1080 %s-%s ttl 0x%x this = %d, other = %d\n",
|
|
|
|
|
dev->udev->bus->bus_name, dev->udev->devpath,
|
|
|
|
|
ttl, TTL_THIS(ttl), TTL_OTHER(ttl));
|
2005-09-01 00:53:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
static int net1080_reset(struct usbnet *dev)
|
|
|
|
|
{
|
|
|
|
|
u16 usbctl, status, ttl;
|
|
|
|
|
u16 *vp = kmalloc(sizeof (u16), GFP_KERNEL);
|
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
|
|
if (!vp)
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
|
|
// nc_dump_registers(dev);
|
|
|
|
|
|
|
|
|
|
if ((retval = nc_register_read(dev, REG_STATUS, vp)) < 0) {
|
|
|
|
|
dbg("can't read %s-%s status: %d",
|
|
|
|
|
dev->udev->bus->bus_name, dev->udev->devpath, retval);
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
status = *vp;
|
|
|
|
|
nc_dump_status(dev, status);
|
|
|
|
|
|
|
|
|
|
if ((retval = nc_register_read(dev, REG_USBCTL, vp)) < 0) {
|
|
|
|
|
dbg("can't read USBCTL, %d", retval);
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
usbctl = *vp;
|
|
|
|
|
nc_dump_usbctl(dev, usbctl);
|
|
|
|
|
|
|
|
|
|
nc_register_write(dev, REG_USBCTL,
|
|
|
|
|
USBCTL_FLUSH_THIS | USBCTL_FLUSH_OTHER);
|
|
|
|
|
|
|
|
|
|
if ((retval = nc_register_read(dev, REG_TTL, vp)) < 0) {
|
|
|
|
|
dbg("can't read TTL, %d", retval);
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
ttl = *vp;
|
|
|
|
|
// nc_dump_ttl(dev, ttl);
|
|
|
|
|
|
|
|
|
|
nc_register_write(dev, REG_TTL,
|
|
|
|
|
MK_TTL(NC_READ_TTL_MS, TTL_OTHER(ttl)) );
|
|
|
|
|
dbg("%s: assigned TTL, %d ms", dev->net->name, NC_READ_TTL_MS);
|
|
|
|
|
|
2010-02-17 18:30:24 +08:00
|
|
|
netif_info(dev, link, dev->net, "port %c, peer %sconnected\n",
|
|
|
|
|
(status & STATUS_PORT_A) ? 'A' : 'B',
|
|
|
|
|
(status & STATUS_CONN_OTHER) ? "" : "dis");
|
2005-09-01 00:53:26 +08:00
|
|
|
retval = 0;
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
kfree(vp);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int net1080_check_connect(struct usbnet *dev)
|
|
|
|
|
{
|
|
|
|
|
int retval;
|
|
|
|
|
u16 status;
|
|
|
|
|
u16 *vp = kmalloc(sizeof (u16), GFP_KERNEL);
|
|
|
|
|
|
|
|
|
|
if (!vp)
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
retval = nc_register_read(dev, REG_STATUS, vp);
|
|
|
|
|
status = *vp;
|
|
|
|
|
kfree(vp);
|
|
|
|
|
if (retval != 0) {
|
|
|
|
|
dbg("%s net1080_check_conn read - %d", dev->net->name, retval);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
if ((status & STATUS_CONN_OTHER) != STATUS_CONN_OTHER)
|
|
|
|
|
return -ENOLINK;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 21:55:46 +08:00
|
|
|
static void nc_flush_complete(struct urb *urb)
|
2005-09-01 00:53:26 +08:00
|
|
|
{
|
|
|
|
|
kfree(urb->context);
|
|
|
|
|
usb_free_urb(urb);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void nc_ensure_sync(struct usbnet *dev)
|
|
|
|
|
{
|
|
|
|
|
dev->frame_errors++;
|
|
|
|
|
if (dev->frame_errors > 5) {
|
|
|
|
|
struct urb *urb;
|
|
|
|
|
struct usb_ctrlrequest *req;
|
|
|
|
|
int status;
|
|
|
|
|
|
|
|
|
|
/* Send a flush */
|
2006-12-07 12:33:16 +08:00
|
|
|
urb = usb_alloc_urb(0, GFP_ATOMIC);
|
2005-09-01 00:53:26 +08:00
|
|
|
if (!urb)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
req = kmalloc(sizeof *req, GFP_ATOMIC);
|
|
|
|
|
if (!req) {
|
|
|
|
|
usb_free_urb(urb);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
req->bRequestType = USB_DIR_OUT
|
|
|
|
|
| USB_TYPE_VENDOR
|
|
|
|
|
| USB_RECIP_DEVICE;
|
|
|
|
|
req->bRequest = REQUEST_REGISTER;
|
|
|
|
|
req->wValue = cpu_to_le16(USBCTL_FLUSH_THIS
|
|
|
|
|
| USBCTL_FLUSH_OTHER);
|
|
|
|
|
req->wIndex = cpu_to_le16(REG_USBCTL);
|
|
|
|
|
req->wLength = cpu_to_le16(0);
|
|
|
|
|
|
|
|
|
|
/* queue an async control request, we don't need
|
|
|
|
|
* to do anything when it finishes except clean up.
|
|
|
|
|
*/
|
|
|
|
|
usb_fill_control_urb(urb, dev->udev,
|
|
|
|
|
usb_sndctrlpipe(dev->udev, 0),
|
|
|
|
|
(unsigned char *) req,
|
|
|
|
|
NULL, 0,
|
|
|
|
|
nc_flush_complete, req);
|
|
|
|
|
status = usb_submit_urb(urb, GFP_ATOMIC);
|
|
|
|
|
if (status) {
|
|
|
|
|
kfree(req);
|
|
|
|
|
usb_free_urb(urb);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2010-02-17 18:30:24 +08:00
|
|
|
netif_dbg(dev, rx_err, dev->net,
|
|
|
|
|
"flush net1080; too many framing errors\n");
|
2005-09-01 00:53:26 +08:00
|
|
|
dev->frame_errors = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int net1080_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
|
|
|
|
|
{
|
|
|
|
|
struct nc_header *header;
|
|
|
|
|
struct nc_trailer *trailer;
|
|
|
|
|
u16 hdr_len, packet_len;
|
|
|
|
|
|
|
|
|
|
if (!(skb->len & 0x01)) {
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
struct net_device *net = dev->net;
|
|
|
|
|
dbg("rx framesize %d range %d..%d mtu %d", skb->len,
|
|
|
|
|
net->hard_header_len, dev->hard_mtu, net->mtu);
|
|
|
|
|
#endif
|
2009-06-30 00:51:40 +08:00
|
|
|
dev->net->stats.rx_frame_errors++;
|
2005-09-01 00:53:26 +08:00
|
|
|
nc_ensure_sync(dev);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
header = (struct nc_header *) skb->data;
|
|
|
|
|
hdr_len = le16_to_cpup(&header->hdr_len);
|
|
|
|
|
packet_len = le16_to_cpup(&header->packet_len);
|
|
|
|
|
if (FRAMED_SIZE(packet_len) > NC_MAX_PACKET) {
|
2009-06-30 00:51:40 +08:00
|
|
|
dev->net->stats.rx_frame_errors++;
|
2005-09-01 00:53:26 +08:00
|
|
|
dbg("packet too big, %d", packet_len);
|
|
|
|
|
nc_ensure_sync(dev);
|
|
|
|
|
return 0;
|
|
|
|
|
} else if (hdr_len < MIN_HEADER) {
|
2009-06-30 00:51:40 +08:00
|
|
|
dev->net->stats.rx_frame_errors++;
|
2005-09-01 00:53:26 +08:00
|
|
|
dbg("header too short, %d", hdr_len);
|
|
|
|
|
nc_ensure_sync(dev);
|
|
|
|
|
return 0;
|
|
|
|
|
} else if (hdr_len > MIN_HEADER) {
|
|
|
|
|
// out of band data for us?
|
|
|
|
|
dbg("header OOB, %d bytes", hdr_len - MIN_HEADER);
|
|
|
|
|
nc_ensure_sync(dev);
|
|
|
|
|
// switch (vendor/product ids) { ... }
|
|
|
|
|
}
|
|
|
|
|
skb_pull(skb, hdr_len);
|
|
|
|
|
|
|
|
|
|
trailer = (struct nc_trailer *)
|
|
|
|
|
(skb->data + skb->len - sizeof *trailer);
|
|
|
|
|
skb_trim(skb, skb->len - sizeof *trailer);
|
|
|
|
|
|
|
|
|
|
if ((packet_len & 0x01) == 0) {
|
|
|
|
|
if (skb->data [packet_len] != PAD_BYTE) {
|
2009-06-30 00:51:40 +08:00
|
|
|
dev->net->stats.rx_frame_errors++;
|
2005-09-01 00:53:26 +08:00
|
|
|
dbg("bad pad");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
skb_trim(skb, skb->len - 1);
|
|
|
|
|
}
|
|
|
|
|
if (skb->len != packet_len) {
|
2009-06-30 00:51:40 +08:00
|
|
|
dev->net->stats.rx_frame_errors++;
|
2005-09-01 00:53:26 +08:00
|
|
|
dbg("bad packet len %d (expected %d)",
|
|
|
|
|
skb->len, packet_len);
|
|
|
|
|
nc_ensure_sync(dev);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
if (header->packet_id != get_unaligned(&trailer->packet_id)) {
|
2009-06-30 00:51:40 +08:00
|
|
|
dev->net->stats.rx_fifo_errors++;
|
2005-09-01 00:53:26 +08:00
|
|
|
dbg("(2+ dropped) rx packet_id mismatch 0x%x 0x%x",
|
|
|
|
|
le16_to_cpu(header->packet_id),
|
|
|
|
|
le16_to_cpu(trailer->packet_id));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#if 0
|
2010-02-17 18:30:23 +08:00
|
|
|
netdev_dbg(dev->net, "frame <rx h %d p %d id %d\n", header->hdr_len,
|
|
|
|
|
header->packet_len, header->packet_id);
|
2005-09-01 00:53:26 +08:00
|
|
|
#endif
|
|
|
|
|
dev->frame_errors = 0;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct sk_buff *
|
2005-10-21 15:21:58 +08:00
|
|
|
net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
|
2005-09-01 00:53:26 +08:00
|
|
|
{
|
|
|
|
|
struct sk_buff *skb2;
|
|
|
|
|
struct nc_header *header = NULL;
|
|
|
|
|
struct nc_trailer *trailer = NULL;
|
2006-07-19 14:23:02 +08:00
|
|
|
int padlen = sizeof (struct nc_trailer);
|
2005-09-01 00:53:26 +08:00
|
|
|
int len = skb->len;
|
|
|
|
|
|
2006-07-19 14:23:02 +08:00
|
|
|
if (!((len + padlen + sizeof (struct nc_header)) & 0x01))
|
|
|
|
|
padlen++;
|
2005-09-01 00:53:26 +08:00
|
|
|
if (!skb_cloned(skb)) {
|
|
|
|
|
int headroom = skb_headroom(skb);
|
|
|
|
|
int tailroom = skb_tailroom(skb);
|
|
|
|
|
|
2006-07-19 14:23:02 +08:00
|
|
|
if (padlen <= tailroom &&
|
|
|
|
|
sizeof(struct nc_header) <= headroom)
|
2005-09-01 00:53:26 +08:00
|
|
|
/* There's enough head and tail room */
|
|
|
|
|
goto encapsulate;
|
|
|
|
|
|
2006-07-19 14:23:02 +08:00
|
|
|
if ((sizeof (struct nc_header) + padlen) <
|
2005-09-01 00:53:26 +08:00
|
|
|
(headroom + tailroom)) {
|
|
|
|
|
/* There's enough total room, so just readjust */
|
|
|
|
|
skb->data = memmove(skb->head
|
|
|
|
|
+ sizeof (struct nc_header),
|
|
|
|
|
skb->data, skb->len);
|
2007-04-20 11:29:13 +08:00
|
|
|
skb_set_tail_pointer(skb, len);
|
2005-09-01 00:53:26 +08:00
|
|
|
goto encapsulate;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create a new skb to use with the correct size */
|
|
|
|
|
skb2 = skb_copy_expand(skb,
|
|
|
|
|
sizeof (struct nc_header),
|
2006-07-19 14:23:02 +08:00
|
|
|
padlen,
|
2005-09-01 00:53:26 +08:00
|
|
|
flags);
|
|
|
|
|
dev_kfree_skb_any(skb);
|
|
|
|
|
if (!skb2)
|
|
|
|
|
return skb2;
|
|
|
|
|
skb = skb2;
|
|
|
|
|
|
|
|
|
|
encapsulate:
|
|
|
|
|
/* header first */
|
|
|
|
|
header = (struct nc_header *) skb_push(skb, sizeof *header);
|
|
|
|
|
header->hdr_len = cpu_to_le16(sizeof (*header));
|
|
|
|
|
header->packet_len = cpu_to_le16(len);
|
|
|
|
|
header->packet_id = cpu_to_le16((u16)dev->xid++);
|
|
|
|
|
|
|
|
|
|
/* maybe pad; then trailer */
|
|
|
|
|
if (!((skb->len + sizeof *trailer) & 0x01))
|
|
|
|
|
*skb_put(skb, 1) = PAD_BYTE;
|
|
|
|
|
trailer = (struct nc_trailer *) skb_put(skb, sizeof *trailer);
|
|
|
|
|
put_unaligned(header->packet_id, &trailer->packet_id);
|
|
|
|
|
#if 0
|
2010-02-17 18:30:23 +08:00
|
|
|
netdev_dbg(dev->net, "frame >tx h %d p %d id %d\n",
|
|
|
|
|
header->hdr_len, header->packet_len,
|
|
|
|
|
header->packet_id);
|
2005-09-01 00:53:26 +08:00
|
|
|
#endif
|
|
|
|
|
return skb;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int net1080_bind(struct usbnet *dev, struct usb_interface *intf)
|
|
|
|
|
{
|
|
|
|
|
unsigned extra = sizeof (struct nc_header)
|
|
|
|
|
+ 1
|
|
|
|
|
+ sizeof (struct nc_trailer);
|
|
|
|
|
|
|
|
|
|
dev->net->hard_header_len += extra;
|
|
|
|
|
dev->rx_urb_size = dev->net->hard_header_len + dev->net->mtu;
|
|
|
|
|
dev->hard_mtu = NC_MAX_PACKET;
|
|
|
|
|
return usbnet_get_endpoints (dev, intf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct driver_info net1080_info = {
|
|
|
|
|
.description = "NetChip TurboCONNECT",
|
usbnet: use eth%d name for known ethernet devices
The documentation for the USB ethernet devices suggests that
only some devices are supposed to use usb0 as the network interface
name instead of eth0. The logic used there, and documented in
Kconfig for CDC is that eth0 will be used when the mac address
is a globally assigned one, but usb0 is used for the locally
managed range that is typically used on point-to-point links.
Unfortunately, this has caused a lot of pain on the smsc95xx
device that is used on the popular pandaboard without an
EEPROM to store the MAC address, which causes the driver to
call random_ether_address().
Obviously, there should be a proper MAC addressed assigned to
the device, and discussions are ongoing about how to solve
this, but this patch at least makes sure that the default
interface naming gets a little saner and matches what the
user can expect based on the documentation, including for
new devices.
The approach taken here is to flag whether a device might be a
point-to-point link with the new FLAG_POINTTOPOINT setting in
the usbnet driver_info. A driver can set both FLAG_POINTTOPOINT
and FLAG_ETHER if it is not sure (e.g. cdc_ether), or just one
of the two. The usbnet framework only looks at the MAC address
for device naming if both flags are set, otherwise it trusts the
flag.
Signed-off-by: Arnd Bergmann <arnd.bergmann@linaro.org>
Tested-by: Andy Green <andy.green@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-04-02 11:12:02 +08:00
|
|
|
.flags = FLAG_POINTTOPOINT | FLAG_FRAMING_NC,
|
2005-09-01 00:53:26 +08:00
|
|
|
.bind = net1080_bind,
|
|
|
|
|
.reset = net1080_reset,
|
|
|
|
|
.check_connect = net1080_check_connect,
|
|
|
|
|
.rx_fixup = net1080_rx_fixup,
|
|
|
|
|
.tx_fixup = net1080_tx_fixup,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct usb_device_id products [] = {
|
|
|
|
|
{
|
|
|
|
|
USB_DEVICE(0x0525, 0x1080), // NetChip ref design
|
|
|
|
|
.driver_info = (unsigned long) &net1080_info,
|
|
|
|
|
}, {
|
|
|
|
|
USB_DEVICE(0x06D0, 0x0622), // Laplink Gold
|
|
|
|
|
.driver_info = (unsigned long) &net1080_info,
|
|
|
|
|
},
|
|
|
|
|
{ }, // END
|
|
|
|
|
};
|
|
|
|
|
MODULE_DEVICE_TABLE(usb, products);
|
|
|
|
|
|
|
|
|
|
static struct usb_driver net1080_driver = {
|
|
|
|
|
.name = "net1080",
|
|
|
|
|
.id_table = products,
|
|
|
|
|
.probe = usbnet_probe,
|
|
|
|
|
.disconnect = usbnet_disconnect,
|
|
|
|
|
.suspend = usbnet_suspend,
|
|
|
|
|
.resume = usbnet_resume,
|
|
|
|
|
};
|
|
|
|
|
|
2011-11-19 01:44:20 +08:00
|
|
|
module_usb_driver(net1080_driver);
|
2005-09-01 00:53:26 +08:00
|
|
|
|
|
|
|
|
MODULE_AUTHOR("David Brownell");
|
|
|
|
|
MODULE_DESCRIPTION("NetChip 1080 based USB Host-to-Host Links");
|
|
|
|
|
MODULE_LICENSE("GPL");
|