2005-05-23 17:00:48 -07:00
|
|
|
/*
|
2006-06-02 02:48:56 -07:00
|
|
|
USB Driver for GSM modems
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
Copyright (C) 2005 Matthias Urlichs <smurf@smurf.noris.de>
|
|
|
|
|
|
|
|
|
|
This driver is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of Version 2 of the GNU General Public License as
|
|
|
|
|
published by the Free Software Foundation.
|
|
|
|
|
|
|
|
|
|
Portions copied from the Keyspan driver by Hugh Blemings <hugh@blemings.org>
|
|
|
|
|
|
2006-08-02 16:41:41 -07:00
|
|
|
History: see the git log.
|
2005-07-14 00:33:47 -07:00
|
|
|
|
|
|
|
|
Work sponsored by: Sigos GmbH, Germany <info@sigos.de>
|
|
|
|
|
|
2006-06-02 02:48:56 -07:00
|
|
|
This driver exists because the "normal" serial driver doesn't work too well
|
|
|
|
|
with GSM modems. Issues:
|
|
|
|
|
- data loss -- one single Receive URB is not nearly enough
|
2006-07-19 19:56:00 -07:00
|
|
|
- nonstandard flow (Option devices) control
|
2006-06-02 02:48:56 -07:00
|
|
|
- controlling the baud rate doesn't make sense
|
|
|
|
|
|
|
|
|
|
This driver is named "option" because the most common device it's
|
|
|
|
|
used for is a PC-Card (with an internal OHCI-USB interface, behind
|
|
|
|
|
which the GSM interface sits), made by Option Inc.
|
|
|
|
|
|
|
|
|
|
Some of the "one port" devices actually exhibit multiple USB instances
|
|
|
|
|
on the USB bus. This is not a bug, these ports are used for different
|
|
|
|
|
device features.
|
2005-05-23 17:00:48 -07:00
|
|
|
*/
|
2005-07-14 00:33:47 -07:00
|
|
|
|
2006-07-06 04:12:53 -07:00
|
|
|
#define DRIVER_VERSION "v0.7.1"
|
2005-05-23 17:00:48 -07:00
|
|
|
#define DRIVER_AUTHOR "Matthias Urlichs <smurf@smurf.noris.de>"
|
2006-06-02 02:48:56 -07:00
|
|
|
#define DRIVER_DESC "USB Driver for GSM modems"
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
|
#include <linux/jiffies.h>
|
|
|
|
|
#include <linux/errno.h>
|
|
|
|
|
#include <linux/tty.h>
|
|
|
|
|
#include <linux/tty_flip.h>
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
|
#include <linux/usb.h>
|
2006-07-11 21:22:58 -07:00
|
|
|
#include <linux/usb/serial.h>
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
/* Function prototypes */
|
2005-07-27 01:08:30 -07:00
|
|
|
static int option_open(struct usb_serial_port *port, struct file *filp);
|
|
|
|
|
static void option_close(struct usb_serial_port *port, struct file *filp);
|
|
|
|
|
static int option_startup(struct usb_serial *serial);
|
|
|
|
|
static void option_shutdown(struct usb_serial *serial);
|
|
|
|
|
static void option_rx_throttle(struct usb_serial_port *port);
|
|
|
|
|
static void option_rx_unthrottle(struct usb_serial_port *port);
|
|
|
|
|
static int option_write_room(struct usb_serial_port *port);
|
2005-05-23 17:00:48 -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 06:55:46 -07:00
|
|
|
static void option_instat_callback(struct urb *urb);
|
2005-05-23 17:00:48 -07:00
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static int option_write(struct usb_serial_port *port,
|
|
|
|
|
const unsigned char *buf, int count);
|
2005-05-23 17:00:48 -07:00
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static int option_chars_in_buffer(struct usb_serial_port *port);
|
|
|
|
|
static int option_ioctl(struct usb_serial_port *port, struct file *file,
|
|
|
|
|
unsigned int cmd, unsigned long arg);
|
|
|
|
|
static void option_set_termios(struct usb_serial_port *port,
|
2006-12-08 03:38:45 -07:00
|
|
|
struct ktermios *old);
|
2005-07-27 01:08:30 -07:00
|
|
|
static void option_break_ctl(struct usb_serial_port *port, int break_state);
|
|
|
|
|
static int option_tiocmget(struct usb_serial_port *port, struct file *file);
|
|
|
|
|
static int option_tiocmset(struct usb_serial_port *port, struct file *file,
|
|
|
|
|
unsigned int set, unsigned int clear);
|
|
|
|
|
static int option_send_setup(struct usb_serial_port *port);
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
/* Vendor and product IDs */
|
2006-06-02 02:48:56 -07:00
|
|
|
#define OPTION_VENDOR_ID 0x0AF0
|
|
|
|
|
#define HUAWEI_VENDOR_ID 0x12D1
|
|
|
|
|
#define AUDIOVOX_VENDOR_ID 0x0F3D
|
|
|
|
|
#define NOVATELWIRELESS_VENDOR_ID 0x1410
|
2006-07-11 23:35:29 -07:00
|
|
|
#define ANYDATA_VENDOR_ID 0x16d5
|
2006-06-02 02:48:56 -07:00
|
|
|
|
|
|
|
|
#define OPTION_PRODUCT_OLD 0x5000
|
|
|
|
|
#define OPTION_PRODUCT_FUSION 0x6000
|
|
|
|
|
#define OPTION_PRODUCT_FUSION2 0x6300
|
|
|
|
|
#define OPTION_PRODUCT_COBRA 0x6500
|
2006-07-06 04:12:53 -07:00
|
|
|
#define OPTION_PRODUCT_COBRA2 0x6600
|
2006-06-02 02:48:56 -07:00
|
|
|
#define HUAWEI_PRODUCT_E600 0x1001
|
2006-12-01 23:25:31 -07:00
|
|
|
#define HUAWEI_PRODUCT_E220 0x1003
|
2006-06-02 02:48:56 -07:00
|
|
|
#define AUDIOVOX_PRODUCT_AIRCARD 0x0112
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_U740 0x1400
|
2006-07-11 23:35:29 -07:00
|
|
|
#define ANYDATA_PRODUCT_ID 0x6501
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
static struct usb_device_id option_ids[] = {
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_OLD) },
|
2005-07-14 00:33:47 -07:00
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION2) },
|
2006-06-02 02:48:56 -07:00
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
|
2006-07-06 04:12:53 -07:00
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
|
2005-09-22 00:48:40 -07:00
|
|
|
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
|
2006-12-01 23:25:31 -07:00
|
|
|
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
|
2005-09-22 00:48:40 -07:00
|
|
|
{ USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
|
2006-06-02 02:48:56 -07:00
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },
|
2006-07-11 23:35:29 -07:00
|
|
|
{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) },
|
2006-06-02 02:48:56 -07:00
|
|
|
{ } /* Terminating entry */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct usb_device_id option_ids1[] = {
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_OLD) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION2) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
|
2006-07-06 04:12:53 -07:00
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
|
2006-06-02 02:48:56 -07:00
|
|
|
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
|
2006-12-01 23:25:31 -07:00
|
|
|
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
|
2006-06-02 02:48:56 -07:00
|
|
|
{ USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },
|
2006-07-11 23:35:29 -07:00
|
|
|
{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) },
|
2006-06-02 02:48:56 -07:00
|
|
|
{ } /* Terminating entry */
|
|
|
|
|
};
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
MODULE_DEVICE_TABLE(usb, option_ids);
|
|
|
|
|
|
|
|
|
|
static struct usb_driver option_driver = {
|
|
|
|
|
.name = "option",
|
|
|
|
|
.probe = usb_serial_probe,
|
|
|
|
|
.disconnect = usb_serial_disconnect,
|
|
|
|
|
.id_table = option_ids,
|
2005-11-16 14:41:28 -07:00
|
|
|
.no_dynamic_id = 1,
|
2005-05-23 17:00:48 -07:00
|
|
|
};
|
|
|
|
|
|
2006-03-24 10:23:14 -07:00
|
|
|
/* The card has three separate interfaces, which the serial driver
|
2005-05-23 17:00:48 -07:00
|
|
|
* recognizes separately, thus num_port=1.
|
|
|
|
|
*/
|
2006-06-02 02:48:56 -07:00
|
|
|
|
|
|
|
|
static struct usb_serial_driver option_1port_device = {
|
|
|
|
|
.driver = {
|
|
|
|
|
.owner = THIS_MODULE,
|
2006-08-02 16:41:41 -07:00
|
|
|
.name = "option1",
|
2006-06-02 02:48:56 -07:00
|
|
|
},
|
|
|
|
|
.description = "GSM modem (1-port)",
|
|
|
|
|
.id_table = option_ids1,
|
2005-07-14 00:33:47 -07:00
|
|
|
.num_interrupt_in = NUM_DONT_CARE,
|
|
|
|
|
.num_bulk_in = NUM_DONT_CARE,
|
|
|
|
|
.num_bulk_out = NUM_DONT_CARE,
|
2006-06-02 02:48:56 -07:00
|
|
|
.num_ports = 1,
|
2005-07-14 00:33:47 -07:00
|
|
|
.open = option_open,
|
|
|
|
|
.close = option_close,
|
|
|
|
|
.write = option_write,
|
|
|
|
|
.write_room = option_write_room,
|
|
|
|
|
.chars_in_buffer = option_chars_in_buffer,
|
|
|
|
|
.throttle = option_rx_throttle,
|
|
|
|
|
.unthrottle = option_rx_unthrottle,
|
|
|
|
|
.ioctl = option_ioctl,
|
|
|
|
|
.set_termios = option_set_termios,
|
|
|
|
|
.break_ctl = option_break_ctl,
|
|
|
|
|
.tiocmget = option_tiocmget,
|
|
|
|
|
.tiocmset = option_tiocmset,
|
|
|
|
|
.attach = option_startup,
|
|
|
|
|
.shutdown = option_shutdown,
|
|
|
|
|
.read_int_callback = option_instat_callback,
|
2005-05-23 17:00:48 -07:00
|
|
|
};
|
|
|
|
|
|
2005-07-14 00:33:47 -07:00
|
|
|
#ifdef CONFIG_USB_DEBUG
|
2005-05-23 17:00:48 -07:00
|
|
|
static int debug;
|
2005-07-14 00:33:47 -07:00
|
|
|
#else
|
|
|
|
|
#define debug 0
|
|
|
|
|
#endif
|
|
|
|
|
|
2005-05-23 17:00:48 -07:00
|
|
|
/* per port private data */
|
|
|
|
|
|
2005-07-14 00:33:47 -07:00
|
|
|
#define N_IN_URB 4
|
|
|
|
|
#define N_OUT_URB 1
|
2005-09-22 00:49:33 -07:00
|
|
|
#define IN_BUFLEN 4096
|
2005-07-14 00:33:47 -07:00
|
|
|
#define OUT_BUFLEN 128
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
struct option_port_private {
|
|
|
|
|
/* Input endpoints and buffer for this port */
|
2005-07-14 00:33:47 -07:00
|
|
|
struct urb *in_urbs[N_IN_URB];
|
|
|
|
|
char in_buffer[N_IN_URB][IN_BUFLEN];
|
2005-05-23 17:00:48 -07:00
|
|
|
/* Output endpoints and buffer for this port */
|
2005-07-14 00:33:47 -07:00
|
|
|
struct urb *out_urbs[N_OUT_URB];
|
|
|
|
|
char out_buffer[N_OUT_URB][OUT_BUFLEN];
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
/* Settings for the port */
|
2005-07-14 00:33:47 -07:00
|
|
|
int rts_state; /* Handshaking pins (outputs) */
|
|
|
|
|
int dtr_state;
|
|
|
|
|
int cts_state; /* Handshaking pins (inputs) */
|
|
|
|
|
int dsr_state;
|
|
|
|
|
int dcd_state;
|
|
|
|
|
int ri_state;
|
|
|
|
|
|
|
|
|
|
unsigned long tx_start_time[N_OUT_URB];
|
2005-05-23 17:00:48 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Functions used by new usb-serial code. */
|
2005-07-27 01:08:30 -07:00
|
|
|
static int __init option_init(void)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
|
|
|
|
int retval;
|
2006-06-02 02:48:56 -07:00
|
|
|
retval = usb_serial_register(&option_1port_device);
|
|
|
|
|
if (retval)
|
|
|
|
|
goto failed_1port_device_register;
|
2005-05-23 17:00:48 -07:00
|
|
|
retval = usb_register(&option_driver);
|
|
|
|
|
if (retval)
|
|
|
|
|
goto failed_driver_register;
|
|
|
|
|
|
|
|
|
|
info(DRIVER_DESC ": " DRIVER_VERSION);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
failed_driver_register:
|
2006-06-02 02:48:56 -07:00
|
|
|
usb_serial_deregister (&option_1port_device);
|
|
|
|
|
failed_1port_device_register:
|
2005-05-23 17:00:48 -07:00
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static void __exit option_exit(void)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
|
|
|
|
usb_deregister (&option_driver);
|
2006-06-02 02:48:56 -07:00
|
|
|
usb_serial_deregister (&option_1port_device);
|
2005-05-23 17:00:48 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
module_init(option_init);
|
|
|
|
|
module_exit(option_exit);
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static void option_rx_throttle(struct usb_serial_port *port)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
|
|
|
|
dbg("%s", __FUNCTION__);
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static void option_rx_unthrottle(struct usb_serial_port *port)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
|
|
|
|
dbg("%s", __FUNCTION__);
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static void option_break_ctl(struct usb_serial_port *port, int break_state)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
|
|
|
|
/* Unfortunately, I don't know how to send a break */
|
2005-07-14 00:33:47 -07:00
|
|
|
dbg("%s", __FUNCTION__);
|
2005-05-23 17:00:48 -07:00
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static void option_set_termios(struct usb_serial_port *port,
|
2006-12-08 03:38:45 -07:00
|
|
|
struct ktermios *old_termios)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
|
|
|
|
dbg("%s", __FUNCTION__);
|
|
|
|
|
|
|
|
|
|
option_send_setup(port);
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static int option_tiocmget(struct usb_serial_port *port, struct file *file)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
2005-07-14 00:33:47 -07:00
|
|
|
unsigned int value;
|
|
|
|
|
struct option_port_private *portdata;
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
|
|
|
|
value = ((portdata->rts_state) ? TIOCM_RTS : 0) |
|
|
|
|
|
((portdata->dtr_state) ? TIOCM_DTR : 0) |
|
|
|
|
|
((portdata->cts_state) ? TIOCM_CTS : 0) |
|
|
|
|
|
((portdata->dsr_state) ? TIOCM_DSR : 0) |
|
|
|
|
|
((portdata->dcd_state) ? TIOCM_CAR : 0) |
|
|
|
|
|
((portdata->ri_state) ? TIOCM_RNG : 0);
|
|
|
|
|
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static int option_tiocmset(struct usb_serial_port *port, struct file *file,
|
|
|
|
|
unsigned int set, unsigned int clear)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
2005-07-14 00:33:47 -07:00
|
|
|
struct option_port_private *portdata;
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
|
|
|
|
if (set & TIOCM_RTS)
|
|
|
|
|
portdata->rts_state = 1;
|
|
|
|
|
if (set & TIOCM_DTR)
|
|
|
|
|
portdata->dtr_state = 1;
|
|
|
|
|
|
|
|
|
|
if (clear & TIOCM_RTS)
|
|
|
|
|
portdata->rts_state = 0;
|
|
|
|
|
if (clear & TIOCM_DTR)
|
|
|
|
|
portdata->dtr_state = 0;
|
|
|
|
|
return option_send_setup(port);
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static int option_ioctl(struct usb_serial_port *port, struct file *file,
|
|
|
|
|
unsigned int cmd, unsigned long arg)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
|
|
|
|
return -ENOIOCTLCMD;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write */
|
2005-07-27 01:08:30 -07:00
|
|
|
static int option_write(struct usb_serial_port *port,
|
|
|
|
|
const unsigned char *buf, int count)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
2005-07-14 00:33:47 -07:00
|
|
|
struct option_port_private *portdata;
|
|
|
|
|
int i;
|
|
|
|
|
int left, todo;
|
|
|
|
|
struct urb *this_urb = NULL; /* spurious */
|
|
|
|
|
int err;
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
|
|
|
|
dbg("%s: write (%d chars)", __FUNCTION__, count);
|
|
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
left = count;
|
2005-07-14 00:33:47 -07:00
|
|
|
for (i=0; left > 0 && i < N_OUT_URB; i++) {
|
2005-05-23 17:00:48 -07:00
|
|
|
todo = left;
|
|
|
|
|
if (todo > OUT_BUFLEN)
|
|
|
|
|
todo = OUT_BUFLEN;
|
|
|
|
|
|
2005-07-14 00:33:47 -07:00
|
|
|
this_urb = portdata->out_urbs[i];
|
|
|
|
|
if (this_urb->status == -EINPROGRESS) {
|
2005-07-27 01:08:30 -07:00
|
|
|
if (time_before(jiffies,
|
|
|
|
|
portdata->tx_start_time[i] + 10 * HZ))
|
2005-05-23 17:00:48 -07:00
|
|
|
continue;
|
|
|
|
|
usb_unlink_urb(this_urb);
|
2005-07-14 00:33:47 -07:00
|
|
|
continue;
|
2005-05-23 17:00:48 -07:00
|
|
|
}
|
2005-07-14 00:33:47 -07:00
|
|
|
if (this_urb->status != 0)
|
2005-07-27 01:08:30 -07:00
|
|
|
dbg("usb_write %p failed (err=%d)",
|
|
|
|
|
this_urb, this_urb->status);
|
2005-05-23 17:00:48 -07:00
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
dbg("%s: endpoint %d buf %d", __FUNCTION__,
|
|
|
|
|
usb_pipeendpoint(this_urb->pipe), i);
|
2005-05-23 17:00:48 -07:00
|
|
|
|
2005-07-14 00:33:47 -07:00
|
|
|
/* send the data */
|
2005-05-23 17:00:48 -07:00
|
|
|
memcpy (this_urb->transfer_buffer, buf, todo);
|
|
|
|
|
this_urb->transfer_buffer_length = todo;
|
|
|
|
|
|
|
|
|
|
this_urb->dev = port->serial->dev;
|
|
|
|
|
err = usb_submit_urb(this_urb, GFP_ATOMIC);
|
|
|
|
|
if (err) {
|
2005-07-27 01:08:30 -07:00
|
|
|
dbg("usb_submit_urb %p (write bulk) failed "
|
|
|
|
|
"(%d, has %d)", this_urb,
|
|
|
|
|
err, this_urb->status);
|
2005-05-23 17:00:48 -07:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
portdata->tx_start_time[i] = jiffies;
|
|
|
|
|
buf += todo;
|
|
|
|
|
left -= todo;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
count -= left;
|
|
|
|
|
dbg("%s: wrote (did %d)", __FUNCTION__, count);
|
|
|
|
|
return count;
|
|
|
|
|
}
|
|
|
|
|
|
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 06:55:46 -07:00
|
|
|
static void option_indat_callback(struct urb *urb)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-09 21:54:13 -07:00
|
|
|
int err;
|
2005-05-23 17:00:48 -07:00
|
|
|
int endpoint;
|
|
|
|
|
struct usb_serial_port *port;
|
|
|
|
|
struct tty_struct *tty;
|
|
|
|
|
unsigned char *data = urb->transfer_buffer;
|
|
|
|
|
|
|
|
|
|
dbg("%s: %p", __FUNCTION__, urb);
|
|
|
|
|
|
|
|
|
|
endpoint = usb_pipeendpoint(urb->pipe);
|
|
|
|
|
port = (struct usb_serial_port *) urb->context;
|
|
|
|
|
|
|
|
|
|
if (urb->status) {
|
|
|
|
|
dbg("%s: nonzero status: %d on endpoint %02x.",
|
|
|
|
|
__FUNCTION__, urb->status, endpoint);
|
|
|
|
|
} else {
|
|
|
|
|
tty = port->tty;
|
|
|
|
|
if (urb->actual_length) {
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-09 21:54:13 -07:00
|
|
|
tty_buffer_request_room(tty, urb->actual_length);
|
|
|
|
|
tty_insert_flip_string(tty, data, urb->actual_length);
|
2005-05-23 17:00:48 -07:00
|
|
|
tty_flip_buffer_push(tty);
|
|
|
|
|
} else {
|
|
|
|
|
dbg("%s: empty read urb received", __FUNCTION__);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Resubmit urb so we continue receiving */
|
|
|
|
|
if (port->open_count && urb->status != -ESHUTDOWN) {
|
|
|
|
|
err = usb_submit_urb(urb, GFP_ATOMIC);
|
|
|
|
|
if (err)
|
2005-07-27 01:08:30 -07:00
|
|
|
printk(KERN_ERR "%s: resubmit read urb failed. "
|
|
|
|
|
"(%d)", __FUNCTION__, err);
|
2005-05-23 17:00:48 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
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 06:55:46 -07:00
|
|
|
static void option_outdat_callback(struct urb *urb)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
|
|
|
|
struct usb_serial_port *port;
|
|
|
|
|
|
|
|
|
|
dbg("%s", __FUNCTION__);
|
|
|
|
|
|
|
|
|
|
port = (struct usb_serial_port *) urb->context;
|
|
|
|
|
|
2006-05-22 21:58:49 -07:00
|
|
|
usb_serial_port_softint(port);
|
2005-05-23 17:00:48 -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 06:55:46 -07:00
|
|
|
static void option_instat_callback(struct urb *urb)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
|
|
|
|
int err;
|
|
|
|
|
struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
|
|
|
|
|
struct option_port_private *portdata = usb_get_serial_port_data(port);
|
|
|
|
|
struct usb_serial *serial = port->serial;
|
|
|
|
|
|
|
|
|
|
dbg("%s", __FUNCTION__);
|
|
|
|
|
dbg("%s: urb %p port %p has data %p", __FUNCTION__,urb,port,portdata);
|
|
|
|
|
|
|
|
|
|
if (urb->status == 0) {
|
|
|
|
|
struct usb_ctrlrequest *req_pkt =
|
|
|
|
|
(struct usb_ctrlrequest *)urb->transfer_buffer;
|
|
|
|
|
|
|
|
|
|
if (!req_pkt) {
|
|
|
|
|
dbg("%s: NULL req_pkt\n", __FUNCTION__);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2005-07-27 01:08:30 -07:00
|
|
|
if ((req_pkt->bRequestType == 0xA1) &&
|
|
|
|
|
(req_pkt->bRequest == 0x20)) {
|
2005-05-23 17:00:48 -07:00
|
|
|
int old_dcd_state;
|
|
|
|
|
unsigned char signals = *((unsigned char *)
|
2005-07-27 01:08:30 -07:00
|
|
|
urb->transfer_buffer +
|
|
|
|
|
sizeof(struct usb_ctrlrequest));
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
dbg("%s: signal x%x", __FUNCTION__, signals);
|
|
|
|
|
|
|
|
|
|
old_dcd_state = portdata->dcd_state;
|
|
|
|
|
portdata->cts_state = 1;
|
|
|
|
|
portdata->dcd_state = ((signals & 0x01) ? 1 : 0);
|
|
|
|
|
portdata->dsr_state = ((signals & 0x02) ? 1 : 0);
|
|
|
|
|
portdata->ri_state = ((signals & 0x08) ? 1 : 0);
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
if (port->tty && !C_CLOCAL(port->tty) &&
|
|
|
|
|
old_dcd_state && !portdata->dcd_state)
|
2005-05-23 17:00:48 -07:00
|
|
|
tty_hangup(port->tty);
|
2005-07-27 01:08:30 -07:00
|
|
|
} else {
|
|
|
|
|
dbg("%s: type %x req %x", __FUNCTION__,
|
|
|
|
|
req_pkt->bRequestType,req_pkt->bRequest);
|
|
|
|
|
}
|
2005-05-23 17:00:48 -07:00
|
|
|
} else
|
|
|
|
|
dbg("%s: error %d", __FUNCTION__, urb->status);
|
|
|
|
|
|
|
|
|
|
/* Resubmit urb so we continue receiving IRQ data */
|
|
|
|
|
if (urb->status != -ESHUTDOWN) {
|
|
|
|
|
urb->dev = serial->dev;
|
|
|
|
|
err = usb_submit_urb(urb, GFP_ATOMIC);
|
|
|
|
|
if (err)
|
2005-07-27 01:08:30 -07:00
|
|
|
dbg("%s: resubmit intr urb failed. (%d)",
|
|
|
|
|
__FUNCTION__, err);
|
2005-05-23 17:00:48 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static int option_write_room(struct usb_serial_port *port)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
|
|
|
|
struct option_port_private *portdata;
|
|
|
|
|
int i;
|
|
|
|
|
int data_len = 0;
|
|
|
|
|
struct urb *this_urb;
|
|
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
2005-07-14 00:33:47 -07:00
|
|
|
for (i=0; i < N_OUT_URB; i++) {
|
2005-05-23 17:00:48 -07:00
|
|
|
this_urb = portdata->out_urbs[i];
|
|
|
|
|
if (this_urb && this_urb->status != -EINPROGRESS)
|
|
|
|
|
data_len += OUT_BUFLEN;
|
2005-07-14 00:33:47 -07:00
|
|
|
}
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
dbg("%s: %d", __FUNCTION__, data_len);
|
|
|
|
|
return data_len;
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static int option_chars_in_buffer(struct usb_serial_port *port)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
|
|
|
|
struct option_port_private *portdata;
|
|
|
|
|
int i;
|
|
|
|
|
int data_len = 0;
|
|
|
|
|
struct urb *this_urb;
|
|
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
2005-07-14 00:33:47 -07:00
|
|
|
for (i=0; i < N_OUT_URB; i++) {
|
2005-05-23 17:00:48 -07:00
|
|
|
this_urb = portdata->out_urbs[i];
|
|
|
|
|
if (this_urb && this_urb->status == -EINPROGRESS)
|
|
|
|
|
data_len += this_urb->transfer_buffer_length;
|
2005-07-14 00:33:47 -07:00
|
|
|
}
|
2005-05-23 17:00:48 -07:00
|
|
|
dbg("%s: %d", __FUNCTION__, data_len);
|
|
|
|
|
return data_len;
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static int option_open(struct usb_serial_port *port, struct file *filp)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
2005-07-14 00:33:47 -07:00
|
|
|
struct option_port_private *portdata;
|
|
|
|
|
struct usb_serial *serial = port->serial;
|
|
|
|
|
int i, err;
|
|
|
|
|
struct urb *urb;
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
|
|
|
|
dbg("%s", __FUNCTION__);
|
|
|
|
|
|
|
|
|
|
/* Set some sane defaults */
|
|
|
|
|
portdata->rts_state = 1;
|
|
|
|
|
portdata->dtr_state = 1;
|
|
|
|
|
|
|
|
|
|
/* Reset low level data toggle and start reading from endpoints */
|
|
|
|
|
for (i = 0; i < N_IN_URB; i++) {
|
|
|
|
|
urb = portdata->in_urbs[i];
|
|
|
|
|
if (! urb)
|
|
|
|
|
continue;
|
|
|
|
|
if (urb->dev != serial->dev) {
|
2005-07-27 01:08:30 -07:00
|
|
|
dbg("%s: dev %p != %p", __FUNCTION__,
|
|
|
|
|
urb->dev, serial->dev);
|
2005-05-23 17:00:48 -07:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
/*
|
|
|
|
|
* make sure endpoint data toggle is synchronized with the
|
|
|
|
|
* device
|
|
|
|
|
*/
|
2005-05-23 17:00:48 -07:00
|
|
|
usb_clear_halt(urb->dev, urb->pipe);
|
|
|
|
|
|
|
|
|
|
err = usb_submit_urb(urb, GFP_KERNEL);
|
|
|
|
|
if (err) {
|
2005-07-27 01:08:30 -07:00
|
|
|
dbg("%s: submit urb %d failed (%d) %d",
|
|
|
|
|
__FUNCTION__, i, err,
|
2005-05-23 17:00:48 -07:00
|
|
|
urb->transfer_buffer_length);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Reset low level data toggle on out endpoints */
|
|
|
|
|
for (i = 0; i < N_OUT_URB; i++) {
|
|
|
|
|
urb = portdata->out_urbs[i];
|
|
|
|
|
if (! urb)
|
|
|
|
|
continue;
|
|
|
|
|
urb->dev = serial->dev;
|
2005-07-27 01:08:30 -07:00
|
|
|
/* usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe),
|
|
|
|
|
usb_pipeout(urb->pipe), 0); */
|
2005-05-23 17:00:48 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
port->tty->low_latency = 1;
|
|
|
|
|
|
|
|
|
|
option_send_setup(port);
|
|
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static inline void stop_urb(struct urb *urb)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
2005-07-29 13:11:07 -07:00
|
|
|
if (urb && urb->status == -EINPROGRESS)
|
2005-05-23 17:00:48 -07:00
|
|
|
usb_kill_urb(urb);
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static void option_close(struct usb_serial_port *port, struct file *filp)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
2005-07-14 00:33:47 -07:00
|
|
|
int i;
|
|
|
|
|
struct usb_serial *serial = port->serial;
|
|
|
|
|
struct option_port_private *portdata;
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
dbg("%s", __FUNCTION__);
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
|
|
|
|
portdata->rts_state = 0;
|
|
|
|
|
portdata->dtr_state = 0;
|
|
|
|
|
|
|
|
|
|
if (serial->dev) {
|
|
|
|
|
option_send_setup(port);
|
|
|
|
|
|
|
|
|
|
/* Stop reading/writing urbs */
|
|
|
|
|
for (i = 0; i < N_IN_URB; i++)
|
|
|
|
|
stop_urb(portdata->in_urbs[i]);
|
|
|
|
|
for (i = 0; i < N_OUT_URB; i++)
|
|
|
|
|
stop_urb(portdata->out_urbs[i]);
|
|
|
|
|
}
|
|
|
|
|
port->tty = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Helper functions used by option_setup_urbs */
|
2005-07-27 01:08:30 -07:00
|
|
|
static struct urb *option_setup_urb(struct usb_serial *serial, int endpoint,
|
|
|
|
|
int dir, void *ctx, char *buf, int len,
|
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 06:55:46 -07:00
|
|
|
void (*callback)(struct urb *))
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
|
|
|
|
struct urb *urb;
|
|
|
|
|
|
|
|
|
|
if (endpoint == -1)
|
|
|
|
|
return NULL; /* endpoint not needed */
|
|
|
|
|
|
|
|
|
|
urb = usb_alloc_urb(0, GFP_KERNEL); /* No ISO */
|
|
|
|
|
if (urb == NULL) {
|
|
|
|
|
dbg("%s: alloc for endpoint %d failed.", __FUNCTION__, endpoint);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Fill URB using supplied data. */
|
|
|
|
|
usb_fill_bulk_urb(urb, serial->dev,
|
|
|
|
|
usb_sndbulkpipe(serial->dev, endpoint) | dir,
|
|
|
|
|
buf, len, callback, ctx);
|
|
|
|
|
|
|
|
|
|
return urb;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Setup urbs */
|
2005-07-27 01:08:30 -07:00
|
|
|
static void option_setup_urbs(struct usb_serial *serial)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
2006-06-02 02:48:56 -07:00
|
|
|
int i,j;
|
2005-07-14 00:33:47 -07:00
|
|
|
struct usb_serial_port *port;
|
|
|
|
|
struct option_port_private *portdata;
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
dbg("%s", __FUNCTION__);
|
|
|
|
|
|
2006-06-02 02:48:56 -07:00
|
|
|
for (i = 0; i < serial->num_ports; i++) {
|
|
|
|
|
port = serial->port[i];
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
/* Do indat endpoints first */
|
2006-06-02 02:48:56 -07:00
|
|
|
for (j = 0; j < N_IN_URB; ++j) {
|
|
|
|
|
portdata->in_urbs[j] = option_setup_urb (serial,
|
|
|
|
|
port->bulk_in_endpointAddress, USB_DIR_IN, port,
|
|
|
|
|
portdata->in_buffer[j], IN_BUFLEN, option_indat_callback);
|
|
|
|
|
}
|
2005-05-23 17:00:48 -07:00
|
|
|
|
2006-06-02 02:48:56 -07:00
|
|
|
/* outdat endpoints */
|
|
|
|
|
for (j = 0; j < N_OUT_URB; ++j) {
|
|
|
|
|
portdata->out_urbs[j] = option_setup_urb (serial,
|
|
|
|
|
port->bulk_out_endpointAddress, USB_DIR_OUT, port,
|
|
|
|
|
portdata->out_buffer[j], OUT_BUFLEN, option_outdat_callback);
|
|
|
|
|
}
|
2005-05-23 17:00:48 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static int option_send_setup(struct usb_serial_port *port)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
|
|
|
|
struct usb_serial *serial = port->serial;
|
|
|
|
|
struct option_port_private *portdata;
|
|
|
|
|
|
|
|
|
|
dbg("%s", __FUNCTION__);
|
|
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
|
|
|
|
if (port->tty) {
|
|
|
|
|
int val = 0;
|
|
|
|
|
if (portdata->dtr_state)
|
|
|
|
|
val |= 0x01;
|
|
|
|
|
if (portdata->rts_state)
|
|
|
|
|
val |= 0x02;
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
return usb_control_msg(serial->dev,
|
|
|
|
|
usb_rcvctrlpipe(serial->dev, 0),
|
|
|
|
|
0x22,0x21,val,0,NULL,0,USB_CTRL_SET_TIMEOUT);
|
2005-05-23 17:00:48 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static int option_startup(struct usb_serial *serial)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
2005-07-14 00:33:47 -07:00
|
|
|
int i, err;
|
|
|
|
|
struct usb_serial_port *port;
|
|
|
|
|
struct option_port_private *portdata;
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
dbg("%s", __FUNCTION__);
|
|
|
|
|
|
|
|
|
|
/* Now setup per port private data */
|
|
|
|
|
for (i = 0; i < serial->num_ports; i++) {
|
|
|
|
|
port = serial->port[i];
|
2006-02-27 13:29:43 -07:00
|
|
|
portdata = kzalloc(sizeof(*portdata), GFP_KERNEL);
|
2005-05-23 17:00:48 -07:00
|
|
|
if (!portdata) {
|
2005-07-27 01:08:30 -07:00
|
|
|
dbg("%s: kmalloc for option_port_private (%d) failed!.",
|
|
|
|
|
__FUNCTION__, i);
|
2005-05-23 17:00:48 -07:00
|
|
|
return (1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
usb_set_serial_port_data(port, portdata);
|
|
|
|
|
|
|
|
|
|
if (! port->interrupt_in_urb)
|
|
|
|
|
continue;
|
|
|
|
|
err = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
|
|
|
|
|
if (err)
|
2005-07-27 01:08:30 -07:00
|
|
|
dbg("%s: submit irq_in urb failed %d",
|
|
|
|
|
__FUNCTION__, err);
|
2005-05-23 17:00:48 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
option_setup_urbs(serial);
|
|
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 01:08:30 -07:00
|
|
|
static void option_shutdown(struct usb_serial *serial)
|
2005-05-23 17:00:48 -07:00
|
|
|
{
|
2005-07-14 00:33:47 -07:00
|
|
|
int i, j;
|
|
|
|
|
struct usb_serial_port *port;
|
|
|
|
|
struct option_port_private *portdata;
|
2005-05-23 17:00:48 -07:00
|
|
|
|
|
|
|
|
dbg("%s", __FUNCTION__);
|
|
|
|
|
|
|
|
|
|
/* Stop reading/writing urbs */
|
|
|
|
|
for (i = 0; i < serial->num_ports; ++i) {
|
|
|
|
|
port = serial->port[i];
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
for (j = 0; j < N_IN_URB; j++)
|
|
|
|
|
stop_urb(portdata->in_urbs[j]);
|
|
|
|
|
for (j = 0; j < N_OUT_URB; j++)
|
|
|
|
|
stop_urb(portdata->out_urbs[j]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now free them */
|
|
|
|
|
for (i = 0; i < serial->num_ports; ++i) {
|
|
|
|
|
port = serial->port[i];
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
|
|
|
|
for (j = 0; j < N_IN_URB; j++) {
|
|
|
|
|
if (portdata->in_urbs[j]) {
|
|
|
|
|
usb_free_urb(portdata->in_urbs[j]);
|
|
|
|
|
portdata->in_urbs[j] = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for (j = 0; j < N_OUT_URB; j++) {
|
|
|
|
|
if (portdata->out_urbs[j]) {
|
|
|
|
|
usb_free_urb(portdata->out_urbs[j]);
|
|
|
|
|
portdata->out_urbs[j] = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now free per port private data */
|
|
|
|
|
for (i = 0; i < serial->num_ports; i++) {
|
|
|
|
|
port = serial->port[i];
|
|
|
|
|
kfree(usb_get_serial_port_data(port));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
MODULE_AUTHOR(DRIVER_AUTHOR);
|
|
|
|
|
MODULE_DESCRIPTION(DRIVER_DESC);
|
|
|
|
|
MODULE_VERSION(DRIVER_VERSION);
|
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
|
2005-07-14 00:33:47 -07:00
|
|
|
#ifdef CONFIG_USB_DEBUG
|
2005-05-23 17:00:48 -07:00
|
|
|
module_param(debug, bool, S_IRUGO | S_IWUSR);
|
|
|
|
|
MODULE_PARM_DESC(debug, "Debug messages");
|
2005-07-14 00:33:47 -07:00
|
|
|
#endif
|
2005-05-23 17:00:48 -07:00
|
|
|
|