2005-04-17 05:20:36 +07:00
|
|
|
|
/*
|
2005-08-31 23:54:50 +07:00
|
|
|
|
* USB Network driver infrastructure
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
* Copyright (C) 2000-2005 by David Brownell
|
2005-04-17 05:20:36 +07:00
|
|
|
|
* Copyright (C) 2003-2005 David Hollis <dhollis@davehollis.com>
|
|
|
|
|
*
|
|
|
|
|
* 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
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This is a generic "USB networking" framework that works with several
|
2005-08-31 23:54:50 +07:00
|
|
|
|
* kinds of full and high speed networking devices: host-to-host cables,
|
|
|
|
|
* smart usb peripherals, and actual Ethernet adapters.
|
2005-04-17 05:20:36 +07:00
|
|
|
|
*
|
2005-08-31 23:54:50 +07:00
|
|
|
|
* These devices usually differ in terms of control protocols (if they
|
|
|
|
|
* even have one!) and sometimes they define new framing to wrap or batch
|
|
|
|
|
* Ethernet packets. Otherwise, they talk to USB pretty much the same,
|
|
|
|
|
* so interface (un)binding, endpoint I/O queues, fault handling, and other
|
|
|
|
|
* issues can usefully be addressed by this framework.
|
|
|
|
|
*/
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
// #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>
|
2009-04-18 14:24:17 +07:00
|
|
|
|
#include <linux/ctype.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
|
#include <linux/ethtool.h>
|
|
|
|
|
#include <linux/workqueue.h>
|
|
|
|
|
#include <linux/mii.h>
|
|
|
|
|
#include <linux/usb.h>
|
2008-01-26 05:51:45 +07: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 15:04:11 +07:00
|
|
|
|
#include <linux/slab.h>
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
|
|
|
|
|
#define DRIVER_VERSION "22-Aug-2005"
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Nineteen USB 1.1 max size bulk transactions per frame (ms), max.
|
|
|
|
|
* Several dozen bytes of IPv4 data can fit in two such transactions.
|
|
|
|
|
* One maximum size Ethernet packet takes twenty four of them.
|
|
|
|
|
* For high speed, each frame comfortably fits almost 36 max size
|
|
|
|
|
* Ethernet packets (so queues should be bigger).
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
*
|
|
|
|
|
* REVISIT qlens should be members of 'struct usbnet'; the goal is to
|
|
|
|
|
* let the USB host controller be busy for 5msec or more before an irq
|
|
|
|
|
* is required, under load. Jumbograms change the equation.
|
2005-04-17 05:20:36 +07:00
|
|
|
|
*/
|
2006-07-28 01:17:28 +07:00
|
|
|
|
#define RX_MAX_QUEUE_MEMORY (60 * 1518)
|
|
|
|
|
#define RX_QLEN(dev) (((dev)->udev->speed == USB_SPEED_HIGH) ? \
|
|
|
|
|
(RX_MAX_QUEUE_MEMORY/(dev)->rx_urb_size) : 4)
|
|
|
|
|
#define TX_QLEN(dev) (((dev)->udev->speed == USB_SPEED_HIGH) ? \
|
|
|
|
|
(RX_MAX_QUEUE_MEMORY/(dev)->hard_mtu) : 4)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
// reawaken network queue this soon after stopping; else watchdog barks
|
|
|
|
|
#define TX_TIMEOUT_JIFFIES (5*HZ)
|
|
|
|
|
|
|
|
|
|
// throttle rx/tx briefly after some faults, so khubd might disconnect()
|
|
|
|
|
// us (it polls at HZ/4 usually) before we report too many false errors.
|
|
|
|
|
#define THROTTLE_JIFFIES (HZ/8)
|
|
|
|
|
|
|
|
|
|
// between wakeups
|
|
|
|
|
#define UNLINK_TIMEOUT_MS 3
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
// randomly generated ethernet address
|
|
|
|
|
static u8 node_id [ETH_ALEN];
|
|
|
|
|
|
|
|
|
|
static const char driver_name [] = "usbnet";
|
|
|
|
|
|
|
|
|
|
/* use ethtool to change the level for any given device */
|
|
|
|
|
static int msg_level = -1;
|
|
|
|
|
module_param (msg_level, int, 0);
|
|
|
|
|
MODULE_PARM_DESC (msg_level, "Override default message level");
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
/* handles CDC Ethernet and many other network "bulk data" interfaces */
|
2005-08-31 23:53:10 +07:00
|
|
|
|
int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
int tmp;
|
|
|
|
|
struct usb_host_interface *alt = NULL;
|
|
|
|
|
struct usb_host_endpoint *in = NULL, *out = NULL;
|
|
|
|
|
struct usb_host_endpoint *status = NULL;
|
|
|
|
|
|
|
|
|
|
for (tmp = 0; tmp < intf->num_altsetting; tmp++) {
|
|
|
|
|
unsigned ep;
|
|
|
|
|
|
|
|
|
|
in = out = status = NULL;
|
|
|
|
|
alt = intf->altsetting + tmp;
|
|
|
|
|
|
|
|
|
|
/* take the first altsetting with in-bulk + out-bulk;
|
|
|
|
|
* remember any status endpoint, just in case;
|
|
|
|
|
* ignore other endpoints and altsetttings.
|
|
|
|
|
*/
|
|
|
|
|
for (ep = 0; ep < alt->desc.bNumEndpoints; ep++) {
|
|
|
|
|
struct usb_host_endpoint *e;
|
|
|
|
|
int intr = 0;
|
|
|
|
|
|
|
|
|
|
e = alt->endpoint + ep;
|
|
|
|
|
switch (e->desc.bmAttributes) {
|
|
|
|
|
case USB_ENDPOINT_XFER_INT:
|
2006-10-26 23:03:01 +07:00
|
|
|
|
if (!usb_endpoint_dir_in(&e->desc))
|
2005-04-17 05:20:36 +07:00
|
|
|
|
continue;
|
|
|
|
|
intr = 1;
|
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
|
case USB_ENDPOINT_XFER_BULK:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2006-10-26 23:03:01 +07:00
|
|
|
|
if (usb_endpoint_dir_in(&e->desc)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
|
if (!intr && !in)
|
|
|
|
|
in = e;
|
|
|
|
|
else if (intr && !status)
|
|
|
|
|
status = e;
|
|
|
|
|
} else {
|
|
|
|
|
if (!out)
|
|
|
|
|
out = e;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (in && out)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (!alt || !in || !out)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
2009-12-03 14:58:21 +07:00
|
|
|
|
if (alt->desc.bAlternateSetting != 0 ||
|
|
|
|
|
!(dev->driver_info->flags & FLAG_NO_SETINT)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
|
tmp = usb_set_interface (dev->udev, alt->desc.bInterfaceNumber,
|
|
|
|
|
alt->desc.bAlternateSetting);
|
|
|
|
|
if (tmp < 0)
|
|
|
|
|
return tmp;
|
|
|
|
|
}
|
2007-02-16 09:52:30 +07:00
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
dev->in = usb_rcvbulkpipe (dev->udev,
|
|
|
|
|
in->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
|
|
|
|
|
dev->out = usb_sndbulkpipe (dev->udev,
|
|
|
|
|
out->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
|
|
|
|
|
dev->status = status;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2005-08-31 23:53:10 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_get_endpoints);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2009-04-18 14:24:17 +07:00
|
|
|
|
static u8 nibble(unsigned char c)
|
|
|
|
|
{
|
|
|
|
|
if (likely(isdigit(c)))
|
|
|
|
|
return c - '0';
|
|
|
|
|
c = toupper(c);
|
|
|
|
|
if (likely(isxdigit(c)))
|
|
|
|
|
return 10 + c - 'A';
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress)
|
|
|
|
|
{
|
|
|
|
|
int tmp, i;
|
|
|
|
|
unsigned char buf [13];
|
|
|
|
|
|
|
|
|
|
tmp = usb_string(dev->udev, iMACAddress, buf, sizeof buf);
|
|
|
|
|
if (tmp != 12) {
|
|
|
|
|
dev_dbg(&dev->udev->dev,
|
|
|
|
|
"bad MAC string %d fetch, %d\n", iMACAddress, tmp);
|
|
|
|
|
if (tmp >= 0)
|
|
|
|
|
tmp = -EINVAL;
|
|
|
|
|
return tmp;
|
|
|
|
|
}
|
|
|
|
|
for (i = tmp = 0; i < 6; i++, tmp += 2)
|
|
|
|
|
dev->net->dev_addr [i] =
|
|
|
|
|
(nibble(buf [tmp]) << 4) + nibble(buf [tmp + 1]);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr);
|
|
|
|
|
|
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 20:55:46 +07:00
|
|
|
|
static void intr_complete (struct urb *urb);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
static int init_status (struct usbnet *dev, struct usb_interface *intf)
|
|
|
|
|
{
|
|
|
|
|
char *buf = NULL;
|
|
|
|
|
unsigned pipe = 0;
|
|
|
|
|
unsigned maxp;
|
|
|
|
|
unsigned period;
|
|
|
|
|
|
|
|
|
|
if (!dev->driver_info->status)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
pipe = usb_rcvintpipe (dev->udev,
|
|
|
|
|
dev->status->desc.bEndpointAddress
|
|
|
|
|
& USB_ENDPOINT_NUMBER_MASK);
|
|
|
|
|
maxp = usb_maxpacket (dev->udev, pipe, 0);
|
|
|
|
|
|
|
|
|
|
/* avoid 1 msec chatter: min 8 msec poll rate */
|
|
|
|
|
period = max ((int) dev->status->desc.bInterval,
|
|
|
|
|
(dev->udev->speed == USB_SPEED_HIGH) ? 7 : 3);
|
|
|
|
|
|
2006-12-07 11:33:17 +07:00
|
|
|
|
buf = kmalloc (maxp, GFP_KERNEL);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
if (buf) {
|
2006-12-07 11:33:17 +07:00
|
|
|
|
dev->interrupt = usb_alloc_urb (0, GFP_KERNEL);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
if (!dev->interrupt) {
|
|
|
|
|
kfree (buf);
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
} else {
|
|
|
|
|
usb_fill_int_urb(dev->interrupt, dev->udev, pipe,
|
|
|
|
|
buf, maxp, intr_complete, dev, period);
|
|
|
|
|
dev_dbg(&intf->dev,
|
|
|
|
|
"status ep%din, %d bytes period %d\n",
|
|
|
|
|
usb_pipeendpoint(pipe), maxp, period);
|
|
|
|
|
}
|
|
|
|
|
}
|
2007-05-26 02:31:32 +07:00
|
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
|
|
|
|
|
2005-08-31 23:53:10 +07:00
|
|
|
|
/* Passes this packet up the stack, updating its accounting.
|
|
|
|
|
* Some link protocols batch packets, so their rx_fixup paths
|
|
|
|
|
* can return clones as well as just modify the original skb.
|
|
|
|
|
*/
|
|
|
|
|
void usbnet_skb_return (struct usbnet *dev, struct sk_buff *skb)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
int status;
|
|
|
|
|
|
2009-08-12 02:57:16 +07:00
|
|
|
|
if (test_bit(EVENT_RX_PAUSED, &dev->flags)) {
|
|
|
|
|
skb_queue_tail(&dev->rxq_pause, skb);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
skb->protocol = eth_type_trans (skb, dev->net);
|
2009-06-29 23:53:28 +07:00
|
|
|
|
dev->net->stats.rx_packets++;
|
|
|
|
|
dev->net->stats.rx_bytes += skb->len;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, rx_status, dev->net, "< rx, len %zu, type 0x%x\n",
|
|
|
|
|
skb->len + sizeof (struct ethhdr), skb->protocol);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
memset (skb->cb, 0, sizeof (struct skb_data));
|
|
|
|
|
status = netif_rx (skb);
|
2010-02-17 17:30:24 +07:00
|
|
|
|
if (status != NET_RX_SUCCESS)
|
|
|
|
|
netif_dbg(dev, rx_err, dev->net,
|
|
|
|
|
"netif_rx status %d\n", status);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
2005-08-31 23:53:10 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_skb_return);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
*
|
|
|
|
|
* Network Device Driver (peer link to "Host Device", from USB host)
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------*/
|
|
|
|
|
|
2009-03-21 02:35:54 +07:00
|
|
|
|
int usbnet_change_mtu (struct net_device *net, int new_mtu)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = netdev_priv(net);
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
int ll_mtu = new_mtu + net->hard_header_len;
|
2006-07-28 01:17:28 +07:00
|
|
|
|
int old_hard_mtu = dev->hard_mtu;
|
|
|
|
|
int old_rx_urb_size = dev->rx_urb_size;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2006-07-28 01:17:28 +07:00
|
|
|
|
if (new_mtu <= 0)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
return -EINVAL;
|
|
|
|
|
// no second zero-length packet read wanted after mtu-sized packets
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
if ((ll_mtu % dev->maxpacket) == 0)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
return -EDOM;
|
|
|
|
|
net->mtu = new_mtu;
|
2006-07-28 01:17:28 +07:00
|
|
|
|
|
|
|
|
|
dev->hard_mtu = net->mtu + net->hard_header_len;
|
|
|
|
|
if (dev->rx_urb_size == old_hard_mtu) {
|
|
|
|
|
dev->rx_urb_size = dev->hard_mtu;
|
|
|
|
|
if (dev->rx_urb_size > old_rx_urb_size)
|
|
|
|
|
usbnet_unlink_rx_urbs(dev);
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
2009-03-21 02:35:54 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_change_mtu);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
/* some LK 2.4 HCDs oopsed if we freed or resubmitted urbs from
|
|
|
|
|
* completion callbacks. 2.5 should have fixed those bugs...
|
|
|
|
|
*/
|
|
|
|
|
|
2005-08-10 09:25:21 +07:00
|
|
|
|
static void defer_bh(struct usbnet *dev, struct sk_buff *skb, struct sk_buff_head *list)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
2005-08-10 09:25:21 +07:00
|
|
|
|
spin_lock_irqsave(&list->lock, flags);
|
|
|
|
|
__skb_unlink(skb, list);
|
|
|
|
|
spin_unlock(&list->lock);
|
|
|
|
|
spin_lock(&dev->done.lock);
|
|
|
|
|
__skb_queue_tail(&dev->done, skb);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
if (dev->done.qlen == 1)
|
2005-08-10 09:25:21 +07:00
|
|
|
|
tasklet_schedule(&dev->bh);
|
|
|
|
|
spin_unlock_irqrestore(&dev->done.lock, flags);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* some work can't be done in tasklets, so we use keventd
|
|
|
|
|
*
|
|
|
|
|
* NOTE: annoying asymmetry: if it's active, schedule_work() fails,
|
|
|
|
|
* but tasklet_schedule() doesn't. hope the failure is rare.
|
|
|
|
|
*/
|
2005-08-31 23:53:10 +07:00
|
|
|
|
void usbnet_defer_kevent (struct usbnet *dev, int work)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
set_bit (work, &dev->flags);
|
|
|
|
|
if (!schedule_work (&dev->kevent))
|
2010-02-17 17:30:23 +07:00
|
|
|
|
netdev_err(dev->net, "kevent %d may have been dropped\n", work);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
else
|
2010-02-17 17:30:23 +07:00
|
|
|
|
netdev_dbg(dev->net, "kevent %d scheduled\n", work);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
2005-08-31 23:53:10 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_defer_kevent);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
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 20:55:46 +07:00
|
|
|
|
static void rx_complete (struct urb *urb);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2005-10-21 14:21:58 +07:00
|
|
|
|
static void rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
struct skb_data *entry;
|
|
|
|
|
int retval = 0;
|
|
|
|
|
unsigned long lockflags;
|
2005-08-31 23:53:10 +07:00
|
|
|
|
size_t size = dev->rx_urb_size;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
if ((skb = alloc_skb (size + NET_IP_ALIGN, flags)) == NULL) {
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, rx_err, dev->net, "no rx skb\n");
|
2005-08-31 23:53:10 +07:00
|
|
|
|
usbnet_defer_kevent (dev, EVENT_RX_MEMORY);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
usb_free_urb (urb);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
skb_reserve (skb, NET_IP_ALIGN);
|
|
|
|
|
|
|
|
|
|
entry = (struct skb_data *) skb->cb;
|
|
|
|
|
entry->urb = urb;
|
|
|
|
|
entry->dev = dev;
|
|
|
|
|
entry->state = rx_start;
|
|
|
|
|
entry->length = 0;
|
|
|
|
|
|
|
|
|
|
usb_fill_bulk_urb (urb, dev->udev, dev->in,
|
|
|
|
|
skb->data, size, rx_complete, skb);
|
|
|
|
|
|
|
|
|
|
spin_lock_irqsave (&dev->rxq.lock, lockflags);
|
|
|
|
|
|
2009-12-03 14:58:21 +07:00
|
|
|
|
if (netif_running (dev->net) &&
|
|
|
|
|
netif_device_present (dev->net) &&
|
2009-12-04 06:31:18 +07:00
|
|
|
|
!test_bit (EVENT_RX_HALT, &dev->flags) &&
|
|
|
|
|
!test_bit (EVENT_DEV_ASLEEP, &dev->flags)) {
|
2007-05-26 02:31:32 +07:00
|
|
|
|
switch (retval = usb_submit_urb (urb, GFP_ATOMIC)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
|
case -EPIPE:
|
2005-08-31 23:53:10 +07:00
|
|
|
|
usbnet_defer_kevent (dev, EVENT_RX_HALT);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
break;
|
|
|
|
|
case -ENOMEM:
|
2005-08-31 23:53:10 +07:00
|
|
|
|
usbnet_defer_kevent (dev, EVENT_RX_MEMORY);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
break;
|
|
|
|
|
case -ENODEV:
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, ifdown, dev->net, "device gone\n");
|
2005-04-17 05:20:36 +07:00
|
|
|
|
netif_device_detach (dev->net);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, rx_err, dev->net,
|
|
|
|
|
"rx submit, %d\n", retval);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
tasklet_schedule (&dev->bh);
|
|
|
|
|
break;
|
|
|
|
|
case 0:
|
|
|
|
|
__skb_queue_tail (&dev->rxq, skb);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, ifdown, dev->net, "rx: stopped\n");
|
2005-04-17 05:20:36 +07:00
|
|
|
|
retval = -ENOLINK;
|
|
|
|
|
}
|
|
|
|
|
spin_unlock_irqrestore (&dev->rxq.lock, lockflags);
|
|
|
|
|
if (retval) {
|
|
|
|
|
dev_kfree_skb_any (skb);
|
|
|
|
|
usb_free_urb (urb);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
static inline void rx_process (struct usbnet *dev, struct sk_buff *skb)
|
|
|
|
|
{
|
2009-12-03 14:58:21 +07:00
|
|
|
|
if (dev->driver_info->rx_fixup &&
|
|
|
|
|
!dev->driver_info->rx_fixup (dev, skb))
|
2005-04-17 05:20:36 +07:00
|
|
|
|
goto error;
|
|
|
|
|
// else network stack removes extra byte if we forced a short packet
|
|
|
|
|
|
|
|
|
|
if (skb->len)
|
2005-08-31 23:53:10 +07:00
|
|
|
|
usbnet_skb_return (dev, skb);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
else {
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, rx_err, dev->net, "drop\n");
|
2005-04-17 05:20:36 +07:00
|
|
|
|
error:
|
2009-06-29 23:53:28 +07:00
|
|
|
|
dev->net->stats.rx_errors++;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
skb_queue_tail (&dev->done, skb);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
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 20:55:46 +07:00
|
|
|
|
static void rx_complete (struct urb *urb)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct sk_buff *skb = (struct sk_buff *) urb->context;
|
|
|
|
|
struct skb_data *entry = (struct skb_data *) skb->cb;
|
|
|
|
|
struct usbnet *dev = entry->dev;
|
|
|
|
|
int urb_status = urb->status;
|
|
|
|
|
|
|
|
|
|
skb_put (skb, urb->actual_length);
|
|
|
|
|
entry->state = rx_done;
|
|
|
|
|
entry->urb = NULL;
|
|
|
|
|
|
|
|
|
|
switch (urb_status) {
|
2007-05-26 02:31:32 +07:00
|
|
|
|
/* success */
|
|
|
|
|
case 0:
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
if (skb->len < dev->net->hard_header_len) {
|
2005-04-17 05:20:36 +07:00
|
|
|
|
entry->state = rx_cleanup;
|
2009-06-29 23:53:28 +07:00
|
|
|
|
dev->net->stats.rx_errors++;
|
|
|
|
|
dev->net->stats.rx_length_errors++;
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, rx_err, dev->net,
|
|
|
|
|
"rx length %d\n", skb->len);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2007-05-26 02:31:32 +07:00
|
|
|
|
/* stalls need manual reset. this is rare ... except that
|
|
|
|
|
* when going through USB 2.0 TTs, unplug appears this way.
|
2009-06-04 21:20:28 +07:00
|
|
|
|
* we avoid the highspeed version of the ETIMEDOUT/EILSEQ
|
2007-05-26 02:31:32 +07:00
|
|
|
|
* storm, recovering as needed.
|
|
|
|
|
*/
|
|
|
|
|
case -EPIPE:
|
2009-06-29 23:53:28 +07:00
|
|
|
|
dev->net->stats.rx_errors++;
|
2005-08-31 23:53:10 +07:00
|
|
|
|
usbnet_defer_kevent (dev, EVENT_RX_HALT);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
// FALLTHROUGH
|
|
|
|
|
|
2007-05-26 02:31:32 +07:00
|
|
|
|
/* software-driven interface shutdown */
|
|
|
|
|
case -ECONNRESET: /* async unlink */
|
|
|
|
|
case -ESHUTDOWN: /* hardware gone */
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, ifdown, dev->net,
|
|
|
|
|
"rx shutdown, code %d\n", urb_status);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
goto block;
|
|
|
|
|
|
2007-05-26 02:31:32 +07:00
|
|
|
|
/* we get controller i/o faults during khubd disconnect() delays.
|
|
|
|
|
* throttle down resubmits, to avoid log floods; just temporarily,
|
|
|
|
|
* so we still recover when the fault isn't a khubd delay.
|
|
|
|
|
*/
|
|
|
|
|
case -EPROTO:
|
|
|
|
|
case -ETIME:
|
|
|
|
|
case -EILSEQ:
|
2009-06-29 23:53:28 +07:00
|
|
|
|
dev->net->stats.rx_errors++;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
if (!timer_pending (&dev->delay)) {
|
|
|
|
|
mod_timer (&dev->delay, jiffies + THROTTLE_JIFFIES);
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, link, dev->net,
|
|
|
|
|
"rx throttle %d\n", urb_status);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
|
|
|
|
block:
|
|
|
|
|
entry->state = rx_cleanup;
|
|
|
|
|
entry->urb = urb;
|
|
|
|
|
urb = NULL;
|
|
|
|
|
break;
|
|
|
|
|
|
2007-05-26 02:31:32 +07:00
|
|
|
|
/* data overrun ... flush fifo? */
|
|
|
|
|
case -EOVERFLOW:
|
2009-06-29 23:53:28 +07:00
|
|
|
|
dev->net->stats.rx_over_errors++;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
// FALLTHROUGH
|
2007-02-16 09:52:30 +07:00
|
|
|
|
|
2007-05-26 02:31:32 +07:00
|
|
|
|
default:
|
2005-04-17 05:20:36 +07:00
|
|
|
|
entry->state = rx_cleanup;
|
2009-06-29 23:53:28 +07:00
|
|
|
|
dev->net->stats.rx_errors++;
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, rx_err, dev->net, "rx status %d\n", urb_status);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2005-08-10 09:25:21 +07:00
|
|
|
|
defer_bh(dev, skb, &dev->rxq);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
if (urb) {
|
2009-12-03 14:58:21 +07:00
|
|
|
|
if (netif_running (dev->net) &&
|
|
|
|
|
!test_bit (EVENT_RX_HALT, &dev->flags)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
|
rx_submit (dev, urb, GFP_ATOMIC);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
usb_free_urb (urb);
|
|
|
|
|
}
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, rx_err, dev->net, "no read resubmitted\n");
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
|
|
|
|
|
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 20:55:46 +07:00
|
|
|
|
static void intr_complete (struct urb *urb)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = urb->context;
|
|
|
|
|
int status = urb->status;
|
|
|
|
|
|
|
|
|
|
switch (status) {
|
2007-05-26 02:31:32 +07:00
|
|
|
|
/* success */
|
|
|
|
|
case 0:
|
2005-04-17 05:20:36 +07:00
|
|
|
|
dev->driver_info->status(dev, urb);
|
|
|
|
|
break;
|
|
|
|
|
|
2007-05-26 02:31:32 +07:00
|
|
|
|
/* software-driven interface shutdown */
|
|
|
|
|
case -ENOENT: /* urb killed */
|
|
|
|
|
case -ESHUTDOWN: /* hardware gone */
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, ifdown, dev->net,
|
|
|
|
|
"intr shutdown, code %d\n", status);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
return;
|
|
|
|
|
|
2007-05-26 02:31:32 +07:00
|
|
|
|
/* NOTE: not throttling like RX/TX, since this endpoint
|
|
|
|
|
* already polls infrequently
|
|
|
|
|
*/
|
|
|
|
|
default:
|
2010-02-17 17:30:23 +07:00
|
|
|
|
netdev_dbg(dev->net, "intr status %d\n", status);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!netif_running (dev->net))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
memset(urb->transfer_buffer, 0, urb->transfer_buffer_length);
|
|
|
|
|
status = usb_submit_urb (urb, GFP_ATOMIC);
|
2010-02-17 17:30:24 +07:00
|
|
|
|
if (status != 0)
|
|
|
|
|
netif_err(dev, timer, dev->net,
|
|
|
|
|
"intr resubmit --> %d\n", status);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
|
|
|
|
|
2009-08-12 02:57:16 +07:00
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
void usbnet_pause_rx(struct usbnet *dev)
|
|
|
|
|
{
|
|
|
|
|
set_bit(EVENT_RX_PAUSED, &dev->flags);
|
|
|
|
|
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, rx_status, dev->net, "paused rx queue enabled\n");
|
2009-08-12 02:57:16 +07:00
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_pause_rx);
|
|
|
|
|
|
|
|
|
|
void usbnet_resume_rx(struct usbnet *dev)
|
|
|
|
|
{
|
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
int num = 0;
|
|
|
|
|
|
|
|
|
|
clear_bit(EVENT_RX_PAUSED, &dev->flags);
|
|
|
|
|
|
|
|
|
|
while ((skb = skb_dequeue(&dev->rxq_pause)) != NULL) {
|
|
|
|
|
usbnet_skb_return(dev, skb);
|
|
|
|
|
num++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tasklet_schedule(&dev->bh);
|
|
|
|
|
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, rx_status, dev->net,
|
|
|
|
|
"paused rx queue disabled, %d skbs requeued\n", num);
|
2009-08-12 02:57:16 +07:00
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_resume_rx);
|
|
|
|
|
|
|
|
|
|
void usbnet_purge_paused_rxq(struct usbnet *dev)
|
|
|
|
|
{
|
|
|
|
|
skb_queue_purge(&dev->rxq_pause);
|
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_purge_paused_rxq);
|
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
// unlink pending rx/tx; completion handlers do all other cleanup
|
|
|
|
|
|
|
|
|
|
static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)
|
|
|
|
|
{
|
|
|
|
|
unsigned long flags;
|
|
|
|
|
struct sk_buff *skb, *skbnext;
|
|
|
|
|
int count = 0;
|
|
|
|
|
|
|
|
|
|
spin_lock_irqsave (&q->lock, flags);
|
2008-09-23 10:18:47 +07:00
|
|
|
|
skb_queue_walk_safe(q, skb, skbnext) {
|
2005-04-17 05:20:36 +07:00
|
|
|
|
struct skb_data *entry;
|
|
|
|
|
struct urb *urb;
|
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
|
|
entry = (struct skb_data *) skb->cb;
|
|
|
|
|
urb = entry->urb;
|
|
|
|
|
|
|
|
|
|
// during some PM-driven resume scenarios,
|
|
|
|
|
// these (async) unlinks complete immediately
|
|
|
|
|
retval = usb_unlink_urb (urb);
|
|
|
|
|
if (retval != -EINPROGRESS && retval != 0)
|
2010-02-17 17:30:23 +07:00
|
|
|
|
netdev_dbg(dev->net, "unlink urb err, %d\n", retval);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
else
|
|
|
|
|
count++;
|
|
|
|
|
}
|
|
|
|
|
spin_unlock_irqrestore (&q->lock, flags);
|
|
|
|
|
return count;
|
|
|
|
|
}
|
|
|
|
|
|
2006-07-28 01:17:28 +07:00
|
|
|
|
// Flush all pending rx urbs
|
|
|
|
|
// minidrivers may need to do this when the MTU changes
|
|
|
|
|
|
|
|
|
|
void usbnet_unlink_rx_urbs(struct usbnet *dev)
|
|
|
|
|
{
|
|
|
|
|
if (netif_running(dev->net)) {
|
|
|
|
|
(void) unlink_urbs (dev, &dev->rxq);
|
|
|
|
|
tasklet_schedule(&dev->bh);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_unlink_rx_urbs);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
// precondition: never called in_interrupt
|
2009-12-04 06:31:18 +07:00
|
|
|
|
static void usbnet_terminate_urbs(struct usbnet *dev)
|
|
|
|
|
{
|
|
|
|
|
DECLARE_WAIT_QUEUE_HEAD_ONSTACK(unlink_wakeup);
|
|
|
|
|
DECLARE_WAITQUEUE(wait, current);
|
|
|
|
|
int temp;
|
|
|
|
|
|
|
|
|
|
/* ensure there are no more active urbs */
|
|
|
|
|
add_wait_queue(&unlink_wakeup, &wait);
|
|
|
|
|
set_current_state(TASK_UNINTERRUPTIBLE);
|
|
|
|
|
dev->wait = &unlink_wakeup;
|
|
|
|
|
temp = unlink_urbs(dev, &dev->txq) +
|
|
|
|
|
unlink_urbs(dev, &dev->rxq);
|
|
|
|
|
|
|
|
|
|
/* maybe wait for deletions to finish. */
|
|
|
|
|
while (!skb_queue_empty(&dev->rxq)
|
|
|
|
|
&& !skb_queue_empty(&dev->txq)
|
|
|
|
|
&& !skb_queue_empty(&dev->done)) {
|
|
|
|
|
schedule_timeout(UNLINK_TIMEOUT_MS);
|
|
|
|
|
set_current_state(TASK_UNINTERRUPTIBLE);
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, ifdown, dev->net,
|
|
|
|
|
"waited for %d urb completions\n", temp);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
}
|
|
|
|
|
set_current_state(TASK_RUNNING);
|
|
|
|
|
dev->wait = NULL;
|
|
|
|
|
remove_wait_queue(&unlink_wakeup, &wait);
|
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2009-03-21 02:35:54 +07:00
|
|
|
|
int usbnet_stop (struct net_device *net)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = netdev_priv(net);
|
2009-06-16 21:17:27 +07:00
|
|
|
|
struct driver_info *info = dev->driver_info;
|
|
|
|
|
int retval;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
netif_stop_queue (net);
|
|
|
|
|
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_info(dev, ifdown, dev->net,
|
|
|
|
|
"stop stats: rx/tx %ld/%ld, errs %ld/%ld\n",
|
|
|
|
|
net->stats.rx_packets, net->stats.tx_packets,
|
|
|
|
|
net->stats.rx_errors, net->stats.tx_errors);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2009-06-16 21:17:27 +07:00
|
|
|
|
/* allow minidriver to stop correctly (wireless devices to turn off
|
|
|
|
|
* radio etc) */
|
|
|
|
|
if (info->stop) {
|
|
|
|
|
retval = info->stop(dev);
|
2010-02-17 17:30:24 +07:00
|
|
|
|
if (retval < 0)
|
|
|
|
|
netif_info(dev, ifdown, dev->net,
|
|
|
|
|
"stop fail (%d) usbnet usb-%s-%s, %s\n",
|
|
|
|
|
retval,
|
|
|
|
|
dev->udev->bus->bus_name, dev->udev->devpath,
|
|
|
|
|
info->description);
|
2009-06-16 21:17:27 +07:00
|
|
|
|
}
|
|
|
|
|
|
2009-12-04 06:31:18 +07:00
|
|
|
|
if (!(info->flags & FLAG_AVOID_UNLINK_URBS))
|
|
|
|
|
usbnet_terminate_urbs(dev);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
usb_kill_urb(dev->interrupt);
|
|
|
|
|
|
2009-08-12 02:57:16 +07:00
|
|
|
|
usbnet_purge_paused_rxq(dev);
|
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
/* deferred work (task, timer, softirq) must also stop.
|
|
|
|
|
* can't flush_scheduled_work() until we drop rtnl (later),
|
|
|
|
|
* else workers could deadlock; so make workers a NOP.
|
|
|
|
|
*/
|
|
|
|
|
dev->flags = 0;
|
|
|
|
|
del_timer_sync (&dev->delay);
|
|
|
|
|
tasklet_kill (&dev->bh);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
if (info->manage_power)
|
|
|
|
|
info->manage_power(dev, 0);
|
|
|
|
|
else
|
|
|
|
|
usb_autopm_put_interface(dev->intf);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2009-03-21 02:35:54 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_stop);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
// posts reads, and enables write queuing
|
|
|
|
|
|
|
|
|
|
// precondition: never called in_interrupt
|
|
|
|
|
|
2009-03-21 02:35:54 +07:00
|
|
|
|
int usbnet_open (struct net_device *net)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = netdev_priv(net);
|
2007-08-03 18:52:19 +07:00
|
|
|
|
int retval;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
struct driver_info *info = dev->driver_info;
|
|
|
|
|
|
2007-08-03 18:52:19 +07:00
|
|
|
|
if ((retval = usb_autopm_get_interface(dev->intf)) < 0) {
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_info(dev, ifup, dev->net,
|
|
|
|
|
"resumption fail (%d) usbnet usb-%s-%s, %s\n",
|
|
|
|
|
retval,
|
|
|
|
|
dev->udev->bus->bus_name,
|
|
|
|
|
dev->udev->devpath,
|
|
|
|
|
info->description);
|
2007-08-03 18:52:19 +07:00
|
|
|
|
goto done_nopm;
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
// put into "known safe" state
|
|
|
|
|
if (info->reset && (retval = info->reset (dev)) < 0) {
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_info(dev, ifup, dev->net,
|
|
|
|
|
"open reset fail (%d) usbnet usb-%s-%s, %s\n",
|
|
|
|
|
retval,
|
|
|
|
|
dev->udev->bus->bus_name,
|
|
|
|
|
dev->udev->devpath,
|
|
|
|
|
info->description);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// insist peer be connected
|
|
|
|
|
if (info->check_connect && (retval = info->check_connect (dev)) < 0) {
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, ifup, dev->net, "can't open; %d\n", retval);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* start any status interrupt transfer */
|
|
|
|
|
if (dev->interrupt) {
|
|
|
|
|
retval = usb_submit_urb (dev->interrupt, GFP_KERNEL);
|
|
|
|
|
if (retval < 0) {
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_err(dev, ifup, dev->net,
|
|
|
|
|
"intr submit %d\n", retval);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
netif_start_queue (net);
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_info(dev, ifup, dev->net,
|
|
|
|
|
"open: enable queueing (rx %d, tx %d) mtu %d %s framing\n",
|
|
|
|
|
(int)RX_QLEN(dev), (int)TX_QLEN(dev),
|
|
|
|
|
dev->net->mtu,
|
|
|
|
|
(dev->driver_info->flags & FLAG_FRAMING_NC) ? "NetChip" :
|
|
|
|
|
(dev->driver_info->flags & FLAG_FRAMING_GL) ? "GeneSys" :
|
|
|
|
|
(dev->driver_info->flags & FLAG_FRAMING_Z) ? "Zaurus" :
|
|
|
|
|
(dev->driver_info->flags & FLAG_FRAMING_RN) ? "RNDIS" :
|
|
|
|
|
(dev->driver_info->flags & FLAG_FRAMING_AX) ? "ASIX" :
|
|
|
|
|
"simple");
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
// delay posting reads until we're fully open
|
|
|
|
|
tasklet_schedule (&dev->bh);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
if (info->manage_power) {
|
|
|
|
|
retval = info->manage_power(dev, 1);
|
|
|
|
|
if (retval < 0)
|
|
|
|
|
goto done;
|
|
|
|
|
usb_autopm_put_interface(dev->intf);
|
|
|
|
|
}
|
2007-08-03 18:52:19 +07:00
|
|
|
|
return retval;
|
2010-02-17 17:30:24 +07:00
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
done:
|
2007-08-03 18:52:19 +07:00
|
|
|
|
usb_autopm_put_interface(dev->intf);
|
|
|
|
|
done_nopm:
|
2005-04-17 05:20:36 +07:00
|
|
|
|
return retval;
|
|
|
|
|
}
|
2009-03-21 02:35:54 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_open);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
2005-08-31 23:53:10 +07:00
|
|
|
|
/* ethtool methods; minidrivers may need to add some more, but
|
|
|
|
|
* they'll probably want to use this base set.
|
|
|
|
|
*/
|
|
|
|
|
|
2006-10-09 05:08:01 +07:00
|
|
|
|
int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd)
|
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = netdev_priv(net);
|
|
|
|
|
|
|
|
|
|
if (!dev->mii.mdio_read)
|
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
|
|
|
|
|
return mii_ethtool_gset(&dev->mii, cmd);
|
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_get_settings);
|
|
|
|
|
|
|
|
|
|
int usbnet_set_settings (struct net_device *net, struct ethtool_cmd *cmd)
|
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = netdev_priv(net);
|
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
|
|
if (!dev->mii.mdio_write)
|
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
|
|
|
|
|
retval = mii_ethtool_sset(&dev->mii, cmd);
|
|
|
|
|
|
|
|
|
|
/* link speed/duplex might have changed */
|
|
|
|
|
if (dev->driver_info->link_reset)
|
|
|
|
|
dev->driver_info->link_reset(dev);
|
|
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_set_settings);
|
|
|
|
|
|
|
|
|
|
u32 usbnet_get_link (struct net_device *net)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = netdev_priv(net);
|
|
|
|
|
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
/* If a check_connect is defined, return its result */
|
2005-04-17 05:20:36 +07:00
|
|
|
|
if (dev->driver_info->check_connect)
|
|
|
|
|
return dev->driver_info->check_connect (dev) == 0;
|
|
|
|
|
|
2006-10-09 05:08:01 +07:00
|
|
|
|
/* if the device has mii operations, use those */
|
|
|
|
|
if (dev->mii.mdio_read)
|
|
|
|
|
return mii_link_ok(&dev->mii);
|
|
|
|
|
|
2009-03-02 11:45:40 +07:00
|
|
|
|
/* Otherwise, dtrt for drivers calling netif_carrier_{on,off} */
|
|
|
|
|
return ethtool_op_get_link(net);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
2006-10-09 05:08:01 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_get_link);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2006-11-03 03:29:12 +07:00
|
|
|
|
int usbnet_nway_reset(struct net_device *net)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = netdev_priv(net);
|
|
|
|
|
|
2006-11-03 03:29:12 +07:00
|
|
|
|
if (!dev->mii.mdio_write)
|
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
|
|
|
|
|
return mii_nway_restart(&dev->mii);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
2006-11-03 03:29:12 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_nway_reset);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2006-11-03 03:29:12 +07:00
|
|
|
|
void usbnet_get_drvinfo (struct net_device *net, struct ethtool_drvinfo *info)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = netdev_priv(net);
|
|
|
|
|
|
2007-04-18 06:10:10 +07:00
|
|
|
|
strncpy (info->driver, dev->driver_name, sizeof info->driver);
|
2006-11-03 03:29:12 +07:00
|
|
|
|
strncpy (info->version, DRIVER_VERSION, sizeof info->version);
|
|
|
|
|
strncpy (info->fw_version, dev->driver_info->description,
|
|
|
|
|
sizeof info->fw_version);
|
|
|
|
|
usb_make_path (dev->udev, info->bus_info, sizeof info->bus_info);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
2006-11-03 03:29:12 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_get_drvinfo);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2006-11-03 03:29:12 +07:00
|
|
|
|
u32 usbnet_get_msglevel (struct net_device *net)
|
2006-10-09 05:08:01 +07:00
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = netdev_priv(net);
|
|
|
|
|
|
2006-11-03 03:29:12 +07:00
|
|
|
|
return dev->msg_enable;
|
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_get_msglevel);
|
2006-10-09 05:08:01 +07:00
|
|
|
|
|
2006-11-03 03:29:12 +07:00
|
|
|
|
void usbnet_set_msglevel (struct net_device *net, u32 level)
|
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = netdev_priv(net);
|
|
|
|
|
|
|
|
|
|
dev->msg_enable = level;
|
2006-10-09 05:08:01 +07:00
|
|
|
|
}
|
2006-11-03 03:29:12 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_set_msglevel);
|
2006-10-09 05:08:01 +07:00
|
|
|
|
|
2005-08-31 23:53:10 +07:00
|
|
|
|
/* drivers may override default ethtool_ops in their bind() routine */
|
2009-09-02 15:03:33 +07:00
|
|
|
|
static const struct ethtool_ops usbnet_ethtool_ops = {
|
2006-10-09 05:08:01 +07:00
|
|
|
|
.get_settings = usbnet_get_settings,
|
|
|
|
|
.set_settings = usbnet_set_settings,
|
2005-08-31 23:53:10 +07:00
|
|
|
|
.get_link = usbnet_get_link,
|
2006-10-09 05:08:01 +07:00
|
|
|
|
.nway_reset = usbnet_nway_reset,
|
2006-11-03 03:29:12 +07:00
|
|
|
|
.get_drvinfo = usbnet_get_drvinfo,
|
2005-08-31 23:53:10 +07:00
|
|
|
|
.get_msglevel = usbnet_get_msglevel,
|
|
|
|
|
.set_msglevel = usbnet_set_msglevel,
|
|
|
|
|
};
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
/* work that cannot be done in interrupt context uses keventd.
|
|
|
|
|
*
|
|
|
|
|
* NOTE: with 2.5 we could do more of this using completion callbacks,
|
|
|
|
|
* especially now that control transfers can be queued.
|
|
|
|
|
*/
|
|
|
|
|
static void
|
2006-11-22 21:57:56 +07:00
|
|
|
|
kevent (struct work_struct *work)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
2006-11-22 21:57:56 +07:00
|
|
|
|
struct usbnet *dev =
|
|
|
|
|
container_of(work, struct usbnet, kevent);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
int status;
|
|
|
|
|
|
|
|
|
|
/* usb_clear_halt() needs a thread context */
|
|
|
|
|
if (test_bit (EVENT_TX_HALT, &dev->flags)) {
|
|
|
|
|
unlink_urbs (dev, &dev->txq);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
status = usb_autopm_get_interface(dev->intf);
|
|
|
|
|
if (status < 0)
|
|
|
|
|
goto fail_pipe;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
status = usb_clear_halt (dev->udev, dev->out);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
usb_autopm_put_interface(dev->intf);
|
2009-12-03 14:58:21 +07:00
|
|
|
|
if (status < 0 &&
|
|
|
|
|
status != -EPIPE &&
|
|
|
|
|
status != -ESHUTDOWN) {
|
2005-04-17 05:20:36 +07:00
|
|
|
|
if (netif_msg_tx_err (dev))
|
2009-12-04 06:31:18 +07:00
|
|
|
|
fail_pipe:
|
2010-02-17 17:30:23 +07:00
|
|
|
|
netdev_err(dev->net, "can't clear tx halt, status %d\n",
|
|
|
|
|
status);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
} else {
|
|
|
|
|
clear_bit (EVENT_TX_HALT, &dev->flags);
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
if (status != -ESHUTDOWN)
|
|
|
|
|
netif_wake_queue (dev->net);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (test_bit (EVENT_RX_HALT, &dev->flags)) {
|
|
|
|
|
unlink_urbs (dev, &dev->rxq);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
status = usb_autopm_get_interface(dev->intf);
|
|
|
|
|
if (status < 0)
|
|
|
|
|
goto fail_halt;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
status = usb_clear_halt (dev->udev, dev->in);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
usb_autopm_put_interface(dev->intf);
|
2009-12-03 14:58:21 +07:00
|
|
|
|
if (status < 0 &&
|
|
|
|
|
status != -EPIPE &&
|
|
|
|
|
status != -ESHUTDOWN) {
|
2005-04-17 05:20:36 +07:00
|
|
|
|
if (netif_msg_rx_err (dev))
|
2009-12-04 06:31:18 +07:00
|
|
|
|
fail_halt:
|
2010-02-17 17:30:23 +07:00
|
|
|
|
netdev_err(dev->net, "can't clear rx halt, status %d\n",
|
|
|
|
|
status);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
} else {
|
|
|
|
|
clear_bit (EVENT_RX_HALT, &dev->flags);
|
|
|
|
|
tasklet_schedule (&dev->bh);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* tasklet could resubmit itself forever if memory is tight */
|
|
|
|
|
if (test_bit (EVENT_RX_MEMORY, &dev->flags)) {
|
|
|
|
|
struct urb *urb = NULL;
|
|
|
|
|
|
|
|
|
|
if (netif_running (dev->net))
|
|
|
|
|
urb = usb_alloc_urb (0, GFP_KERNEL);
|
|
|
|
|
else
|
|
|
|
|
clear_bit (EVENT_RX_MEMORY, &dev->flags);
|
|
|
|
|
if (urb != NULL) {
|
|
|
|
|
clear_bit (EVENT_RX_MEMORY, &dev->flags);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
status = usb_autopm_get_interface(dev->intf);
|
|
|
|
|
if (status < 0)
|
|
|
|
|
goto fail_lowmem;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
rx_submit (dev, urb, GFP_KERNEL);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
usb_autopm_put_interface(dev->intf);
|
|
|
|
|
fail_lowmem:
|
2005-04-17 05:20:36 +07:00
|
|
|
|
tasklet_schedule (&dev->bh);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-23 05:07:02 +07:00
|
|
|
|
if (test_bit (EVENT_LINK_RESET, &dev->flags)) {
|
2007-02-16 09:52:30 +07:00
|
|
|
|
struct driver_info *info = dev->driver_info;
|
2005-04-23 05:07:02 +07:00
|
|
|
|
int retval = 0;
|
|
|
|
|
|
|
|
|
|
clear_bit (EVENT_LINK_RESET, &dev->flags);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
status = usb_autopm_get_interface(dev->intf);
|
|
|
|
|
if (status < 0)
|
|
|
|
|
goto skip_reset;
|
2005-04-23 05:07:02 +07:00
|
|
|
|
if(info->link_reset && (retval = info->link_reset(dev)) < 0) {
|
2009-12-04 06:31:18 +07:00
|
|
|
|
usb_autopm_put_interface(dev->intf);
|
|
|
|
|
skip_reset:
|
2010-02-17 17:30:23 +07:00
|
|
|
|
netdev_info(dev->net, "link reset failed (%d) usbnet usb-%s-%s, %s\n",
|
|
|
|
|
retval,
|
|
|
|
|
dev->udev->bus->bus_name,
|
|
|
|
|
dev->udev->devpath,
|
|
|
|
|
info->description);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
} else {
|
|
|
|
|
usb_autopm_put_interface(dev->intf);
|
2005-04-23 05:07:02 +07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
if (dev->flags)
|
2010-02-17 17:30:23 +07:00
|
|
|
|
netdev_dbg(dev->net, "kevent done, flags = 0x%lx\n", dev->flags);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
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 20:55:46 +07:00
|
|
|
|
static void tx_complete (struct urb *urb)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct sk_buff *skb = (struct sk_buff *) urb->context;
|
|
|
|
|
struct skb_data *entry = (struct skb_data *) skb->cb;
|
|
|
|
|
struct usbnet *dev = entry->dev;
|
|
|
|
|
|
|
|
|
|
if (urb->status == 0) {
|
2009-06-29 23:53:28 +07:00
|
|
|
|
dev->net->stats.tx_packets++;
|
|
|
|
|
dev->net->stats.tx_bytes += entry->length;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
} else {
|
2009-06-29 23:53:28 +07:00
|
|
|
|
dev->net->stats.tx_errors++;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
switch (urb->status) {
|
|
|
|
|
case -EPIPE:
|
2005-08-31 23:53:10 +07:00
|
|
|
|
usbnet_defer_kevent (dev, EVENT_TX_HALT);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* software-driven interface shutdown */
|
|
|
|
|
case -ECONNRESET: // async unlink
|
|
|
|
|
case -ESHUTDOWN: // hardware gone
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
// like rx, tx gets controller i/o faults during khubd delays
|
|
|
|
|
// and so it uses the same throttling mechanism.
|
2006-09-19 12:49:02 +07:00
|
|
|
|
case -EPROTO:
|
|
|
|
|
case -ETIME:
|
|
|
|
|
case -EILSEQ:
|
2009-12-04 06:31:18 +07:00
|
|
|
|
usb_mark_last_busy(dev->udev);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
if (!timer_pending (&dev->delay)) {
|
|
|
|
|
mod_timer (&dev->delay,
|
|
|
|
|
jiffies + THROTTLE_JIFFIES);
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, link, dev->net,
|
|
|
|
|
"tx throttle %d\n", urb->status);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
|
|
|
|
netif_stop_queue (dev->net);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, tx_err, dev->net,
|
|
|
|
|
"tx err %d\n", entry->urb->status);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-12-04 06:31:18 +07:00
|
|
|
|
usb_autopm_put_interface_async(dev->intf);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
urb->dev = NULL;
|
|
|
|
|
entry->state = tx_done;
|
2005-08-10 09:25:21 +07:00
|
|
|
|
defer_bh(dev, skb, &dev->txq);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
2009-03-21 02:35:54 +07:00
|
|
|
|
void usbnet_tx_timeout (struct net_device *net)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = netdev_priv(net);
|
|
|
|
|
|
|
|
|
|
unlink_urbs (dev, &dev->txq);
|
|
|
|
|
tasklet_schedule (&dev->bh);
|
|
|
|
|
|
|
|
|
|
// FIXME: device recovery -- reset?
|
|
|
|
|
}
|
2009-03-21 02:35:54 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_tx_timeout);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
2009-09-01 02:50:45 +07:00
|
|
|
|
netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
|
|
|
|
|
struct net_device *net)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = netdev_priv(net);
|
|
|
|
|
int length;
|
|
|
|
|
struct urb *urb = NULL;
|
|
|
|
|
struct skb_data *entry;
|
|
|
|
|
struct driver_info *info = dev->driver_info;
|
|
|
|
|
unsigned long flags;
|
2009-09-01 02:50:45 +07:00
|
|
|
|
int retval;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
// some devices want funky USB-level framing, for
|
|
|
|
|
// win32 driver (usually) and/or hardware quirks
|
|
|
|
|
if (info->tx_fixup) {
|
|
|
|
|
skb = info->tx_fixup (dev, skb, GFP_ATOMIC);
|
|
|
|
|
if (!skb) {
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, tx_err, dev->net, "can't tx_fixup skb\n");
|
2005-04-17 05:20:36 +07:00
|
|
|
|
goto drop;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
length = skb->len;
|
|
|
|
|
|
|
|
|
|
if (!(urb = usb_alloc_urb (0, GFP_ATOMIC))) {
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, tx_err, dev->net, "no urb\n");
|
2005-04-17 05:20:36 +07:00
|
|
|
|
goto drop;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
entry = (struct skb_data *) skb->cb;
|
|
|
|
|
entry->urb = urb;
|
|
|
|
|
entry->dev = dev;
|
|
|
|
|
entry->state = tx_start;
|
|
|
|
|
entry->length = length;
|
|
|
|
|
|
|
|
|
|
usb_fill_bulk_urb (urb, dev->udev, dev->out,
|
|
|
|
|
skb->data, skb->len, tx_complete, skb);
|
|
|
|
|
|
|
|
|
|
/* don't assume the hardware handles USB_ZERO_PACKET
|
|
|
|
|
* NOTE: strictly conforming cdc-ether devices should expect
|
|
|
|
|
* the ZLP here, but ignore the one-byte packet.
|
|
|
|
|
*/
|
2010-04-06 21:23:07 +07:00
|
|
|
|
if (length % dev->maxpacket == 0) {
|
|
|
|
|
if (!(info->flags & FLAG_SEND_ZLP)) {
|
|
|
|
|
urb->transfer_buffer_length++;
|
|
|
|
|
if (skb_tailroom(skb)) {
|
|
|
|
|
skb->data[skb->len] = 0;
|
|
|
|
|
__skb_put(skb, 1);
|
|
|
|
|
}
|
|
|
|
|
} else
|
|
|
|
|
urb->transfer_flags |= URB_ZERO_PACKET;
|
2007-06-27 13:48:15 +07:00
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2009-12-04 06:31:18 +07:00
|
|
|
|
spin_lock_irqsave(&dev->txq.lock, flags);
|
|
|
|
|
retval = usb_autopm_get_interface_async(dev->intf);
|
|
|
|
|
if (retval < 0) {
|
|
|
|
|
spin_unlock_irqrestore(&dev->txq.lock, flags);
|
|
|
|
|
goto drop;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
|
/* if this triggers the device is still a sleep */
|
|
|
|
|
if (test_bit(EVENT_DEV_ASLEEP, &dev->flags)) {
|
|
|
|
|
/* transmission will be done in resume */
|
|
|
|
|
usb_anchor_urb(urb, &dev->deferred);
|
|
|
|
|
/* no use to process more packets */
|
|
|
|
|
netif_stop_queue(net);
|
|
|
|
|
spin_unlock_irqrestore(&dev->txq.lock, flags);
|
2010-02-17 17:30:23 +07:00
|
|
|
|
netdev_dbg(dev->net, "Delaying transmission for resumption\n");
|
2009-12-04 06:31:18 +07:00
|
|
|
|
goto deferred;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
switch ((retval = usb_submit_urb (urb, GFP_ATOMIC))) {
|
|
|
|
|
case -EPIPE:
|
|
|
|
|
netif_stop_queue (net);
|
2005-08-31 23:53:10 +07:00
|
|
|
|
usbnet_defer_kevent (dev, EVENT_TX_HALT);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
usb_autopm_put_interface_async(dev->intf);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
break;
|
|
|
|
|
default:
|
2009-12-04 06:31:18 +07:00
|
|
|
|
usb_autopm_put_interface_async(dev->intf);
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, tx_err, dev->net,
|
|
|
|
|
"tx: submit urb err %d\n", retval);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
break;
|
|
|
|
|
case 0:
|
|
|
|
|
net->trans_start = jiffies;
|
|
|
|
|
__skb_queue_tail (&dev->txq, skb);
|
|
|
|
|
if (dev->txq.qlen >= TX_QLEN (dev))
|
|
|
|
|
netif_stop_queue (net);
|
|
|
|
|
}
|
|
|
|
|
spin_unlock_irqrestore (&dev->txq.lock, flags);
|
|
|
|
|
|
|
|
|
|
if (retval) {
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_dbg(dev, tx_err, dev->net, "drop, code %d\n", retval);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
drop:
|
2009-06-29 23:53:28 +07:00
|
|
|
|
dev->net->stats.tx_dropped++;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
if (skb)
|
|
|
|
|
dev_kfree_skb_any (skb);
|
|
|
|
|
usb_free_urb (urb);
|
2010-02-17 17:30:24 +07:00
|
|
|
|
} else
|
|
|
|
|
netif_dbg(dev, tx_queued, dev->net,
|
|
|
|
|
"> tx, len %d, type 0x%x\n", length, skb->protocol);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
|
deferred:
|
|
|
|
|
#endif
|
2009-09-01 02:50:45 +07:00
|
|
|
|
return NETDEV_TX_OK;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
2009-03-21 02:35:54 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_start_xmit);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
// tasklet (work deferred from completions, in_irq) or timer
|
|
|
|
|
|
|
|
|
|
static void usbnet_bh (unsigned long param)
|
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = (struct usbnet *) param;
|
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
struct skb_data *entry;
|
|
|
|
|
|
|
|
|
|
while ((skb = skb_dequeue (&dev->done))) {
|
|
|
|
|
entry = (struct skb_data *) skb->cb;
|
|
|
|
|
switch (entry->state) {
|
2007-05-26 02:31:32 +07:00
|
|
|
|
case rx_done:
|
2005-04-17 05:20:36 +07:00
|
|
|
|
entry->state = rx_cleanup;
|
|
|
|
|
rx_process (dev, skb);
|
|
|
|
|
continue;
|
2007-05-26 02:31:32 +07:00
|
|
|
|
case tx_done:
|
|
|
|
|
case rx_cleanup:
|
2005-04-17 05:20:36 +07:00
|
|
|
|
usb_free_urb (entry->urb);
|
|
|
|
|
dev_kfree_skb (skb);
|
|
|
|
|
continue;
|
2007-05-26 02:31:32 +07:00
|
|
|
|
default:
|
2010-02-17 17:30:23 +07:00
|
|
|
|
netdev_dbg(dev->net, "bogus skb state %d\n", entry->state);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// waiting for all pending urbs to complete?
|
|
|
|
|
if (dev->wait) {
|
|
|
|
|
if ((dev->txq.qlen + dev->rxq.qlen + dev->done.qlen) == 0) {
|
|
|
|
|
wake_up (dev->wait);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// or are we maybe short a few urbs?
|
2009-12-03 14:58:21 +07:00
|
|
|
|
} else if (netif_running (dev->net) &&
|
|
|
|
|
netif_device_present (dev->net) &&
|
|
|
|
|
!timer_pending (&dev->delay) &&
|
|
|
|
|
!test_bit (EVENT_RX_HALT, &dev->flags)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
|
int temp = dev->rxq.qlen;
|
|
|
|
|
int qlen = RX_QLEN (dev);
|
|
|
|
|
|
|
|
|
|
if (temp < qlen) {
|
|
|
|
|
struct urb *urb;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
// don't refill the queue all at once
|
|
|
|
|
for (i = 0; i < 10 && dev->rxq.qlen < qlen; i++) {
|
|
|
|
|
urb = usb_alloc_urb (0, GFP_ATOMIC);
|
|
|
|
|
if (urb != NULL)
|
|
|
|
|
rx_submit (dev, urb, GFP_ATOMIC);
|
|
|
|
|
}
|
2010-02-17 17:30:24 +07:00
|
|
|
|
if (temp != dev->rxq.qlen)
|
|
|
|
|
netif_dbg(dev, link, dev->net,
|
|
|
|
|
"rxqlen %d --> %d\n",
|
|
|
|
|
temp, dev->rxq.qlen);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
if (dev->rxq.qlen < qlen)
|
|
|
|
|
tasklet_schedule (&dev->bh);
|
|
|
|
|
}
|
|
|
|
|
if (dev->txq.qlen < TX_QLEN (dev))
|
|
|
|
|
netif_wake_queue (dev->net);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
*
|
|
|
|
|
* USB Device Driver support
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------*/
|
2007-02-16 09:52:30 +07:00
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
// precondition: never called in_interrupt
|
|
|
|
|
|
2005-08-31 23:52:45 +07:00
|
|
|
|
void usbnet_disconnect (struct usb_interface *intf)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev;
|
|
|
|
|
struct usb_device *xdev;
|
|
|
|
|
struct net_device *net;
|
|
|
|
|
|
|
|
|
|
dev = usb_get_intfdata(intf);
|
|
|
|
|
usb_set_intfdata(intf, NULL);
|
|
|
|
|
if (!dev)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
xdev = interface_to_usbdev (intf);
|
|
|
|
|
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_info(dev, probe, dev->net, "unregister '%s' usb-%s-%s, %s\n",
|
|
|
|
|
intf->dev.driver->name,
|
|
|
|
|
xdev->bus->bus_name, xdev->devpath,
|
|
|
|
|
dev->driver_info->description);
|
2007-02-16 09:52:30 +07:00
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
net = dev->net;
|
|
|
|
|
unregister_netdev (net);
|
|
|
|
|
|
|
|
|
|
/* we don't hold rtnl here ... */
|
|
|
|
|
flush_scheduled_work ();
|
|
|
|
|
|
|
|
|
|
if (dev->driver_info->unbind)
|
|
|
|
|
dev->driver_info->unbind (dev, intf);
|
|
|
|
|
|
|
|
|
|
free_netdev(net);
|
|
|
|
|
usb_put_dev (xdev);
|
|
|
|
|
}
|
2005-08-31 23:52:45 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_disconnect);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2009-03-21 02:35:54 +07:00
|
|
|
|
static const struct net_device_ops usbnet_netdev_ops = {
|
|
|
|
|
.ndo_open = usbnet_open,
|
|
|
|
|
.ndo_stop = usbnet_stop,
|
|
|
|
|
.ndo_start_xmit = usbnet_start_xmit,
|
|
|
|
|
.ndo_tx_timeout = usbnet_tx_timeout,
|
|
|
|
|
.ndo_change_mtu = usbnet_change_mtu,
|
|
|
|
|
.ndo_set_mac_address = eth_mac_addr,
|
|
|
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
|
|
|
};
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
// precondition: never called in_interrupt
|
|
|
|
|
|
2009-10-02 12:15:26 +07:00
|
|
|
|
static struct device_type wlan_type = {
|
|
|
|
|
.name = "wlan",
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct device_type wwan_type = {
|
|
|
|
|
.name = "wwan",
|
|
|
|
|
};
|
|
|
|
|
|
2005-08-31 23:52:45 +07:00
|
|
|
|
int
|
2005-04-17 05:20:36 +07:00
|
|
|
|
usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
|
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev;
|
2007-02-16 09:52:30 +07:00
|
|
|
|
struct net_device *net;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
struct usb_host_interface *interface;
|
|
|
|
|
struct driver_info *info;
|
|
|
|
|
struct usb_device *xdev;
|
|
|
|
|
int status;
|
2007-04-18 06:10:10 +07:00
|
|
|
|
const char *name;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2007-04-18 06:10:10 +07:00
|
|
|
|
name = udev->dev.driver->name;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
info = (struct driver_info *) prod->driver_info;
|
|
|
|
|
if (!info) {
|
2007-04-18 06:10:10 +07:00
|
|
|
|
dev_dbg (&udev->dev, "blacklisted by %s\n", name);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
return -ENODEV;
|
|
|
|
|
}
|
|
|
|
|
xdev = interface_to_usbdev (udev);
|
|
|
|
|
interface = udev->cur_altsetting;
|
|
|
|
|
|
|
|
|
|
usb_get_dev (xdev);
|
|
|
|
|
|
|
|
|
|
status = -ENOMEM;
|
|
|
|
|
|
|
|
|
|
// set up our own records
|
|
|
|
|
net = alloc_etherdev(sizeof(*dev));
|
|
|
|
|
if (!net) {
|
|
|
|
|
dbg ("can't kmalloc dev");
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dev = netdev_priv(net);
|
|
|
|
|
dev->udev = xdev;
|
2007-08-03 18:52:19 +07:00
|
|
|
|
dev->intf = udev;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
dev->driver_info = info;
|
2007-04-18 06:10:10 +07:00
|
|
|
|
dev->driver_name = name;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
dev->msg_enable = netif_msg_init (msg_level, NETIF_MSG_DRV
|
|
|
|
|
| NETIF_MSG_PROBE | NETIF_MSG_LINK);
|
|
|
|
|
skb_queue_head_init (&dev->rxq);
|
|
|
|
|
skb_queue_head_init (&dev->txq);
|
|
|
|
|
skb_queue_head_init (&dev->done);
|
2009-08-12 02:57:16 +07:00
|
|
|
|
skb_queue_head_init(&dev->rxq_pause);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
dev->bh.func = usbnet_bh;
|
|
|
|
|
dev->bh.data = (unsigned long) dev;
|
2006-11-22 21:57:56 +07:00
|
|
|
|
INIT_WORK (&dev->kevent, kevent);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
init_usb_anchor(&dev->deferred);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
dev->delay.function = usbnet_bh;
|
|
|
|
|
dev->delay.data = (unsigned long) dev;
|
|
|
|
|
init_timer (&dev->delay);
|
2006-10-09 05:08:02 +07:00
|
|
|
|
mutex_init (&dev->phy_mutex);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
dev->net = net;
|
|
|
|
|
strcpy (net->name, "usb%d");
|
|
|
|
|
memcpy (net->dev_addr, node_id, sizeof node_id);
|
|
|
|
|
|
2005-08-31 23:53:10 +07:00
|
|
|
|
/* rx and tx sides can use different message sizes;
|
|
|
|
|
* bind() should set rx_urb_size in that case.
|
|
|
|
|
*/
|
|
|
|
|
dev->hard_mtu = net->mtu + net->hard_header_len;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
#if 0
|
|
|
|
|
// dma_supported() is deeply broken on almost all architectures
|
|
|
|
|
// possible with some EHCI controllers
|
2009-04-07 09:01:13 +07:00
|
|
|
|
if (dma_supported (&udev->dev, DMA_BIT_MASK(64)))
|
2005-04-17 05:20:36 +07:00
|
|
|
|
net->features |= NETIF_F_HIGHDMA;
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-03-21 02:35:54 +07:00
|
|
|
|
net->netdev_ops = &usbnet_netdev_ops;
|
|
|
|
|
net->watchdog_timeo = TX_TIMEOUT_JIFFIES;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
net->ethtool_ops = &usbnet_ethtool_ops;
|
|
|
|
|
|
|
|
|
|
// allow device-specific bind/init procedures
|
|
|
|
|
// NOTE net->name still not usable ...
|
|
|
|
|
if (info->bind) {
|
|
|
|
|
status = info->bind (dev, udev);
|
2007-02-16 09:52:30 +07:00
|
|
|
|
if (status < 0)
|
|
|
|
|
goto out1;
|
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
// heuristic: "usb%d" for links we know are two-host,
|
|
|
|
|
// else "eth%d" when there's reasonable doubt. userspace
|
|
|
|
|
// can rename the link if it knows better.
|
2009-12-03 14:58:21 +07:00
|
|
|
|
if ((dev->driver_info->flags & FLAG_ETHER) != 0 &&
|
|
|
|
|
(net->dev_addr [0] & 0x02) == 0)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
strcpy (net->name, "eth%d");
|
2008-01-26 05:51:06 +07:00
|
|
|
|
/* WLAN devices should always be named "wlan%d" */
|
|
|
|
|
if ((dev->driver_info->flags & FLAG_WLAN) != 0)
|
|
|
|
|
strcpy(net->name, "wlan%d");
|
2009-10-02 12:15:25 +07:00
|
|
|
|
/* WWAN devices should always be named "wwan%d" */
|
|
|
|
|
if ((dev->driver_info->flags & FLAG_WWAN) != 0)
|
|
|
|
|
strcpy(net->name, "wwan%d");
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
|
|
|
|
|
/* maybe the remote can't receive an Ethernet MTU */
|
|
|
|
|
if (net->mtu > (dev->hard_mtu - net->hard_header_len))
|
|
|
|
|
net->mtu = dev->hard_mtu - net->hard_header_len;
|
2005-08-31 23:53:10 +07:00
|
|
|
|
} else if (!info->in || !info->out)
|
|
|
|
|
status = usbnet_get_endpoints (dev, udev);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
else {
|
|
|
|
|
dev->in = usb_rcvbulkpipe (xdev, info->in);
|
|
|
|
|
dev->out = usb_sndbulkpipe (xdev, info->out);
|
|
|
|
|
if (!(info->flags & FLAG_NO_SETINT))
|
|
|
|
|
status = usb_set_interface (xdev,
|
|
|
|
|
interface->desc.bInterfaceNumber,
|
|
|
|
|
interface->desc.bAlternateSetting);
|
|
|
|
|
else
|
|
|
|
|
status = 0;
|
|
|
|
|
|
|
|
|
|
}
|
2007-07-03 05:46:42 +07:00
|
|
|
|
if (status >= 0 && dev->status)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
status = init_status (dev, udev);
|
|
|
|
|
if (status < 0)
|
2007-02-16 09:52:30 +07:00
|
|
|
|
goto out3;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2005-08-31 23:53:10 +07:00
|
|
|
|
if (!dev->rx_urb_size)
|
|
|
|
|
dev->rx_urb_size = dev->hard_mtu;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1);
|
2007-02-16 09:52:30 +07:00
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
SET_NETDEV_DEV(net, &udev->dev);
|
2009-10-02 12:15:26 +07:00
|
|
|
|
|
|
|
|
|
if ((dev->driver_info->flags & FLAG_WLAN) != 0)
|
|
|
|
|
SET_NETDEV_DEVTYPE(net, &wlan_type);
|
|
|
|
|
if ((dev->driver_info->flags & FLAG_WWAN) != 0)
|
|
|
|
|
SET_NETDEV_DEVTYPE(net, &wwan_type);
|
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
status = register_netdev (net);
|
|
|
|
|
if (status)
|
|
|
|
|
goto out3;
|
2010-02-17 17:30:24 +07:00
|
|
|
|
netif_info(dev, probe, dev->net,
|
|
|
|
|
"register '%s' at usb-%s-%s, %s, %pM\n",
|
|
|
|
|
udev->dev.driver->name,
|
|
|
|
|
xdev->bus->bus_name, xdev->devpath,
|
|
|
|
|
dev->driver_info->description,
|
|
|
|
|
net->dev_addr);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
// ok, it's ready to go.
|
|
|
|
|
usb_set_intfdata (udev, dev);
|
|
|
|
|
|
|
|
|
|
netif_device_attach (net);
|
|
|
|
|
|
2009-11-04 22:29:52 +07:00
|
|
|
|
if (dev->driver_info->flags & FLAG_LINK_INTR)
|
|
|
|
|
netif_carrier_off(net);
|
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
out3:
|
|
|
|
|
if (info->unbind)
|
|
|
|
|
info->unbind (dev, udev);
|
|
|
|
|
out1:
|
|
|
|
|
free_netdev(net);
|
|
|
|
|
out:
|
|
|
|
|
usb_put_dev(xdev);
|
|
|
|
|
return status;
|
|
|
|
|
}
|
2005-08-31 23:52:45 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_probe);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
2007-04-30 15:37:44 +07:00
|
|
|
|
/*
|
|
|
|
|
* suspend the whole driver as soon as the first interface is suspended
|
|
|
|
|
* resume only when the last interface is resumed
|
2005-08-31 23:52:45 +07:00
|
|
|
|
*/
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2005-08-31 23:52:45 +07:00
|
|
|
|
int usbnet_suspend (struct usb_interface *intf, pm_message_t message)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = usb_get_intfdata(intf);
|
2007-02-16 09:52:30 +07:00
|
|
|
|
|
2007-04-30 15:37:44 +07:00
|
|
|
|
if (!dev->suspend_count++) {
|
2009-12-04 06:31:18 +07:00
|
|
|
|
spin_lock_irq(&dev->txq.lock);
|
|
|
|
|
/* don't autosuspend while transmitting */
|
|
|
|
|
if (dev->txq.qlen && (message.event & PM_EVENT_AUTO)) {
|
|
|
|
|
spin_unlock_irq(&dev->txq.lock);
|
|
|
|
|
return -EBUSY;
|
|
|
|
|
} else {
|
|
|
|
|
set_bit(EVENT_DEV_ASLEEP, &dev->flags);
|
|
|
|
|
spin_unlock_irq(&dev->txq.lock);
|
|
|
|
|
}
|
2007-08-03 18:52:19 +07:00
|
|
|
|
/*
|
|
|
|
|
* accelerate emptying of the rx and queues, to avoid
|
2007-04-30 15:37:44 +07:00
|
|
|
|
* having everything error out.
|
|
|
|
|
*/
|
|
|
|
|
netif_device_detach (dev->net);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
usbnet_terminate_urbs(dev);
|
|
|
|
|
usb_kill_urb(dev->interrupt);
|
|
|
|
|
|
2007-08-03 18:52:19 +07:00
|
|
|
|
/*
|
|
|
|
|
* reattach so runtime management can use and
|
|
|
|
|
* wake the device
|
|
|
|
|
*/
|
|
|
|
|
netif_device_attach (dev->net);
|
2007-04-30 15:37:44 +07:00
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
2005-08-31 23:52:45 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_suspend);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2005-08-31 23:52:45 +07:00
|
|
|
|
int usbnet_resume (struct usb_interface *intf)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
struct usbnet *dev = usb_get_intfdata(intf);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
struct urb *res;
|
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
|
|
if (!--dev->suspend_count) {
|
|
|
|
|
spin_lock_irq(&dev->txq.lock);
|
|
|
|
|
while ((res = usb_get_from_anchor(&dev->deferred))) {
|
|
|
|
|
|
|
|
|
|
printk(KERN_INFO"%s has delayed data\n", __func__);
|
|
|
|
|
skb = (struct sk_buff *)res->context;
|
|
|
|
|
retval = usb_submit_urb(res, GFP_ATOMIC);
|
|
|
|
|
if (retval < 0) {
|
|
|
|
|
dev_kfree_skb_any(skb);
|
|
|
|
|
usb_free_urb(res);
|
|
|
|
|
usb_autopm_put_interface_async(dev->intf);
|
|
|
|
|
} else {
|
|
|
|
|
dev->net->trans_start = jiffies;
|
|
|
|
|
__skb_queue_tail(&dev->txq, skb);
|
|
|
|
|
}
|
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
2009-12-04 06:31:18 +07:00
|
|
|
|
smp_mb();
|
|
|
|
|
clear_bit(EVENT_DEV_ASLEEP, &dev->flags);
|
|
|
|
|
spin_unlock_irq(&dev->txq.lock);
|
|
|
|
|
if (!(dev->txq.qlen >= TX_QLEN(dev)))
|
|
|
|
|
netif_start_queue(dev->net);
|
2007-04-30 15:37:44 +07:00
|
|
|
|
tasklet_schedule (&dev->bh);
|
2009-12-04 06:31:18 +07:00
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
2005-08-31 23:52:45 +07:00
|
|
|
|
EXPORT_SYMBOL_GPL(usbnet_resume);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
static int __init usbnet_init(void)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
2005-08-31 23:54:50 +07:00
|
|
|
|
/* compiler should optimize this out */
|
2006-10-08 19:02:00 +07:00
|
|
|
|
BUILD_BUG_ON (sizeof (((struct sk_buff *)0)->cb)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
< sizeof (struct skb_data));
|
|
|
|
|
|
|
|
|
|
random_ether_addr(node_id);
|
2007-02-16 09:52:30 +07:00
|
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
}
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
module_init(usbnet_init);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
static void __exit usbnet_exit(void)
|
2005-04-17 05:20:36 +07:00
|
|
|
|
{
|
|
|
|
|
}
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
module_exit(usbnet_exit);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
MODULE_AUTHOR("David Brownell");
|
2005-08-31 23:54:50 +07:00
|
|
|
|
MODULE_DESCRIPTION("USB network driver framework");
|
[PATCH] USB: usbnet (1/9) clean up framing
This starts to prepare the core of "usbnet" to know less about various
framing protocols that map Ethernet packets onto USB, so "minidrivers"
can be modules that just plug into the core.
- Remove some framing-specific code that cluttered the core:
* net->hard_header_len records how much space to preallocate;
now drivers that add their own framing (Net1080, GeneLink,
Zaurus, and RNDIS) will have smoother TX paths. Even for
the drivers (Zaurus, Net1080) that need trailers.
* defines new dev->hard_mtu, using this "hardware" limit to
check changes to the link's settable "software" mtu.
* now net->hard_header_len and dev->hard_mtu are set up in the
driver bind() routines, if needed.
- Transaction ID is no longer specific to the Net1080 framing;
RNDIS needs one too.
- Creates a new "usbnet.h" header with declarations that are shared
between the core and what will be separate modules.
- Plus a couple other minor tweaks, like recognizing -ESHUTDOWN
means the keventd work should just shut itself down asap.
The core code is only about 1/3 of this large file. Splitting out the
minidrivers into separate modules (e.g. ones for ASIX adapters,
Zaurii and similar, CDC Ethernet, etc), in later patches, will
improve maintainability and shrink typical runtime footprints.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-31 23:52:31 +07:00
|
|
|
|
MODULE_LICENSE("GPL");
|