2005-04-17 00:20:36 +02:00
|
|
|
/*
|
|
|
|
* USB Empeg empeg-car player driver
|
|
|
|
*
|
|
|
|
* Copyright (C) 2000, 2001
|
|
|
|
* Gary Brubaker (xavyer@ix.netcom.com)
|
|
|
|
*
|
|
|
|
* Copyright (C) 1999 - 2001
|
|
|
|
* Greg Kroah-Hartman (greg@kroah.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, version 2.
|
|
|
|
*
|
|
|
|
* See Documentation/usb/usb-serial.txt for more information on using this driver
|
|
|
|
*
|
|
|
|
* (07/16/2001) gb
|
|
|
|
* remove unused code in empeg_close() (thanks to Oliver Neukum for pointing this
|
|
|
|
* out) and rewrote empeg_set_termios().
|
|
|
|
*
|
|
|
|
* (05/30/2001) gkh
|
|
|
|
* switched from using spinlock to a semaphore, which fixes lots of problems.
|
|
|
|
*
|
|
|
|
* (04/08/2001) gb
|
|
|
|
* Identify version on module load.
|
|
|
|
*
|
|
|
|
* (01/22/2001) gb
|
|
|
|
* Added write_room() and chars_in_buffer() support.
|
|
|
|
*
|
|
|
|
* (12/21/2000) gb
|
|
|
|
* Moved termio stuff inside the port->active check.
|
|
|
|
* Moved MOD_DEC_USE_COUNT to end of empeg_close().
|
|
|
|
*
|
|
|
|
* (12/03/2000) gb
|
|
|
|
* Added port->tty->ldisc.set_termios(port->tty, NULL) to empeg_open()
|
|
|
|
* This notifies the tty driver that the termios have changed.
|
|
|
|
*
|
|
|
|
* (11/13/2000) gb
|
|
|
|
* Moved tty->low_latency = 1 from empeg_read_bulk_callback() to empeg_open()
|
|
|
|
* (It only needs to be set once - Doh!)
|
|
|
|
*
|
|
|
|
* (11/11/2000) gb
|
|
|
|
* Updated to work with id_table structure.
|
|
|
|
*
|
|
|
|
* (11/04/2000) gb
|
|
|
|
* Forked this from visor.c, and hacked it up to work with an
|
|
|
|
* Empeg ltd. empeg-car player. Constructive criticism welcomed.
|
|
|
|
* I would like to say, 'Thank You' to Greg Kroah-Hartman for the
|
|
|
|
* use of his code, and for his guidance, advice and patience. :)
|
|
|
|
* A 'Thank You' is in order for John Ripley of Empeg ltd for his
|
|
|
|
* advice, and patience too.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/tty.h>
|
|
|
|
#include <linux/tty_driver.h>
|
|
|
|
#include <linux/tty_flip.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
#include <linux/usb.h>
|
2006-07-12 06:22:58 +02:00
|
|
|
#include <linux/usb/serial.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
static int debug;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Version Information
|
|
|
|
*/
|
|
|
|
#define DRIVER_VERSION "v1.2"
|
|
|
|
#define DRIVER_AUTHOR "Greg Kroah-Hartman <greg@kroah.com>, Gary Brubaker <xavyer@ix.netcom.com>"
|
|
|
|
#define DRIVER_DESC "USB Empeg Mark I/II Driver"
|
|
|
|
|
|
|
|
#define EMPEG_VENDOR_ID 0x084f
|
|
|
|
#define EMPEG_PRODUCT_ID 0x0001
|
|
|
|
|
|
|
|
/* function prototypes for an empeg-car player */
|
|
|
|
static int empeg_open (struct usb_serial_port *port, struct file *filp);
|
|
|
|
static void empeg_close (struct usb_serial_port *port, struct file *filp);
|
|
|
|
static int empeg_write (struct usb_serial_port *port,
|
|
|
|
const unsigned char *buf,
|
|
|
|
int count);
|
|
|
|
static int empeg_write_room (struct usb_serial_port *port);
|
|
|
|
static int empeg_chars_in_buffer (struct usb_serial_port *port);
|
|
|
|
static void empeg_throttle (struct usb_serial_port *port);
|
|
|
|
static void empeg_unthrottle (struct usb_serial_port *port);
|
|
|
|
static int empeg_startup (struct usb_serial *serial);
|
|
|
|
static void empeg_shutdown (struct usb_serial *serial);
|
|
|
|
static int empeg_ioctl (struct usb_serial_port *port,
|
|
|
|
struct file * file,
|
|
|
|
unsigned int cmd,
|
|
|
|
unsigned long arg);
|
2006-12-08 11:38:45 +01:00
|
|
|
static void empeg_set_termios (struct usb_serial_port *port, struct ktermios *old_termios);
|
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 15:55:46 +02:00
|
|
|
static void empeg_write_bulk_callback (struct urb *urb);
|
|
|
|
static void empeg_read_bulk_callback (struct urb *urb);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
static struct usb_device_id id_table [] = {
|
|
|
|
{ USB_DEVICE(EMPEG_VENDOR_ID, EMPEG_PRODUCT_ID) },
|
|
|
|
{ } /* Terminating entry */
|
|
|
|
};
|
|
|
|
|
|
|
|
MODULE_DEVICE_TABLE (usb, id_table);
|
|
|
|
|
|
|
|
static struct usb_driver empeg_driver = {
|
|
|
|
.name = "empeg",
|
|
|
|
.probe = usb_serial_probe,
|
|
|
|
.disconnect = usb_serial_disconnect,
|
|
|
|
.id_table = id_table,
|
2005-11-16 22:41:28 +01:00
|
|
|
.no_dynamic_id = 1,
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
|
|
|
|
2005-06-21 06:15:16 +02:00
|
|
|
static struct usb_serial_driver empeg_device = {
|
2005-06-21 06:15:16 +02:00
|
|
|
.driver = {
|
|
|
|
.owner = THIS_MODULE,
|
2005-06-21 06:15:16 +02:00
|
|
|
.name = "empeg",
|
2005-06-21 06:15:16 +02:00
|
|
|
},
|
2005-04-17 00:20:36 +02:00
|
|
|
.id_table = id_table,
|
2006-12-17 21:50:24 +01:00
|
|
|
.usb_driver = &empeg_driver,
|
2005-04-17 00:20:36 +02:00
|
|
|
.num_ports = 1,
|
|
|
|
.open = empeg_open,
|
|
|
|
.close = empeg_close,
|
|
|
|
.throttle = empeg_throttle,
|
|
|
|
.unthrottle = empeg_unthrottle,
|
|
|
|
.attach = empeg_startup,
|
|
|
|
.shutdown = empeg_shutdown,
|
|
|
|
.ioctl = empeg_ioctl,
|
|
|
|
.set_termios = empeg_set_termios,
|
|
|
|
.write = empeg_write,
|
|
|
|
.write_room = empeg_write_room,
|
|
|
|
.chars_in_buffer = empeg_chars_in_buffer,
|
|
|
|
.write_bulk_callback = empeg_write_bulk_callback,
|
|
|
|
.read_bulk_callback = empeg_read_bulk_callback,
|
|
|
|
};
|
|
|
|
|
|
|
|
#define NUM_URBS 16
|
|
|
|
#define URB_TRANSFER_BUFFER_SIZE 4096
|
|
|
|
|
|
|
|
static struct urb *write_urb_pool[NUM_URBS];
|
|
|
|
static spinlock_t write_urb_pool_lock;
|
|
|
|
static int bytes_in;
|
|
|
|
static int bytes_out;
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
* Empeg specific driver functions
|
|
|
|
******************************************************************************/
|
|
|
|
static int empeg_open (struct usb_serial_port *port, struct file *filp)
|
|
|
|
{
|
|
|
|
struct usb_serial *serial = port->serial;
|
|
|
|
int result = 0;
|
|
|
|
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - port %d", __func__, port->number);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* Force default termio settings */
|
|
|
|
empeg_set_termios (port, NULL) ;
|
|
|
|
|
|
|
|
bytes_in = 0;
|
|
|
|
bytes_out = 0;
|
|
|
|
|
|
|
|
/* Start reading from the device */
|
|
|
|
usb_fill_bulk_urb(
|
|
|
|
port->read_urb,
|
|
|
|
serial->dev,
|
|
|
|
usb_rcvbulkpipe(serial->dev,
|
|
|
|
port->bulk_in_endpointAddress),
|
|
|
|
port->read_urb->transfer_buffer,
|
|
|
|
port->read_urb->transfer_buffer_length,
|
|
|
|
empeg_read_bulk_callback,
|
|
|
|
port);
|
|
|
|
|
|
|
|
result = usb_submit_urb(port->read_urb, GFP_KERNEL);
|
|
|
|
|
|
|
|
if (result)
|
2008-03-04 01:08:34 +01:00
|
|
|
dev_err(&port->dev, "%s - failed submitting read urb, error %d\n", __func__, result);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void empeg_close (struct usb_serial_port *port, struct file * filp)
|
|
|
|
{
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - port %d", __func__, port->number);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* shutdown our bulk read */
|
|
|
|
usb_kill_urb(port->read_urb);
|
|
|
|
/* Uncomment the following line if you want to see some statistics in your syslog */
|
|
|
|
/* dev_info (&port->dev, "Bytes In = %d Bytes Out = %d\n", bytes_in, bytes_out); */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int empeg_write (struct usb_serial_port *port, const unsigned char *buf, int count)
|
|
|
|
{
|
|
|
|
struct usb_serial *serial = port->serial;
|
|
|
|
struct urb *urb;
|
|
|
|
const unsigned char *current_position = buf;
|
|
|
|
unsigned long flags;
|
|
|
|
int status;
|
|
|
|
int i;
|
|
|
|
int bytes_sent = 0;
|
|
|
|
int transfer_size;
|
|
|
|
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - port %d", __func__, port->number);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
while (count > 0) {
|
|
|
|
|
|
|
|
/* try to find a free urb in our list of them */
|
|
|
|
urb = NULL;
|
|
|
|
|
|
|
|
spin_lock_irqsave (&write_urb_pool_lock, flags);
|
|
|
|
|
|
|
|
for (i = 0; i < NUM_URBS; ++i) {
|
|
|
|
if (write_urb_pool[i]->status != -EINPROGRESS) {
|
|
|
|
urb = write_urb_pool[i];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock_irqrestore (&write_urb_pool_lock, flags);
|
|
|
|
|
|
|
|
if (urb == NULL) {
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - no more free urbs", __func__);
|
2005-04-17 00:20:36 +02:00
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (urb->transfer_buffer == NULL) {
|
|
|
|
urb->transfer_buffer = kmalloc (URB_TRANSFER_BUFFER_SIZE, GFP_ATOMIC);
|
|
|
|
if (urb->transfer_buffer == NULL) {
|
2008-03-04 01:08:34 +01:00
|
|
|
dev_err(&port->dev, "%s no more kernel memory...\n", __func__);
|
2005-04-17 00:20:36 +02:00
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
transfer_size = min (count, URB_TRANSFER_BUFFER_SIZE);
|
|
|
|
|
|
|
|
memcpy (urb->transfer_buffer, current_position, transfer_size);
|
|
|
|
|
2008-03-04 01:08:34 +01:00
|
|
|
usb_serial_debug_data(debug, &port->dev, __func__, transfer_size, urb->transfer_buffer);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* build up our urb */
|
|
|
|
usb_fill_bulk_urb (
|
|
|
|
urb,
|
|
|
|
serial->dev,
|
|
|
|
usb_sndbulkpipe(serial->dev,
|
|
|
|
port->bulk_out_endpointAddress),
|
|
|
|
urb->transfer_buffer,
|
|
|
|
transfer_size,
|
|
|
|
empeg_write_bulk_callback,
|
|
|
|
port);
|
|
|
|
|
|
|
|
/* send it down the pipe */
|
|
|
|
status = usb_submit_urb(urb, GFP_ATOMIC);
|
|
|
|
if (status) {
|
2008-03-04 01:08:34 +01:00
|
|
|
dev_err(&port->dev, "%s - usb_submit_urb(write bulk) failed with status = %d\n", __func__, status);
|
2005-04-17 00:20:36 +02:00
|
|
|
bytes_sent = status;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
current_position += transfer_size;
|
|
|
|
bytes_sent += transfer_size;
|
|
|
|
count -= transfer_size;
|
|
|
|
bytes_out += transfer_size;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
exit:
|
|
|
|
return bytes_sent;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int empeg_write_room (struct usb_serial_port *port)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
int i;
|
|
|
|
int room = 0;
|
|
|
|
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - port %d", __func__, port->number);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
spin_lock_irqsave (&write_urb_pool_lock, flags);
|
|
|
|
|
|
|
|
/* tally up the number of bytes available */
|
|
|
|
for (i = 0; i < NUM_URBS; ++i) {
|
|
|
|
if (write_urb_pool[i]->status != -EINPROGRESS) {
|
|
|
|
room += URB_TRANSFER_BUFFER_SIZE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock_irqrestore (&write_urb_pool_lock, flags);
|
|
|
|
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - returns %d", __func__, room);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return (room);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int empeg_chars_in_buffer (struct usb_serial_port *port)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
int i;
|
|
|
|
int chars = 0;
|
|
|
|
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - port %d", __func__, port->number);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
spin_lock_irqsave (&write_urb_pool_lock, flags);
|
|
|
|
|
|
|
|
/* tally up the number of bytes waiting */
|
|
|
|
for (i = 0; i < NUM_URBS; ++i) {
|
|
|
|
if (write_urb_pool[i]->status == -EINPROGRESS) {
|
|
|
|
chars += URB_TRANSFER_BUFFER_SIZE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock_irqrestore (&write_urb_pool_lock, flags);
|
|
|
|
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - returns %d", __func__, chars);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return (chars);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
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 15:55:46 +02:00
|
|
|
static void empeg_write_bulk_callback (struct urb *urb)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2007-06-16 00:44:13 +02:00
|
|
|
struct usb_serial_port *port = urb->context;
|
|
|
|
int status = urb->status;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - port %d", __func__, port->number);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-06-16 00:44:13 +02:00
|
|
|
if (status) {
|
|
|
|
dbg("%s - nonzero write bulk status received: %d",
|
2008-03-04 01:08:34 +01:00
|
|
|
__func__, status);
|
2005-04-17 00:20:36 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-05-23 06:58:49 +02:00
|
|
|
usb_serial_port_softint(port);
|
2005-04-17 00:20:36 +02: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 15:55:46 +02:00
|
|
|
static void empeg_read_bulk_callback (struct urb *urb)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2008-02-24 11:41:47 +01:00
|
|
|
struct usb_serial_port *port = urb->context;
|
2005-04-17 00:20:36 +02:00
|
|
|
struct tty_struct *tty;
|
|
|
|
unsigned char *data = urb->transfer_buffer;
|
|
|
|
int result;
|
2007-06-16 00:44:13 +02:00
|
|
|
int status = urb->status;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - port %d", __func__, port->number);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-06-16 00:44:13 +02:00
|
|
|
if (status) {
|
|
|
|
dbg("%s - nonzero read bulk status received: %d",
|
2008-03-04 01:08:34 +01:00
|
|
|
__func__, status);
|
2005-04-17 00:20:36 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-03-04 01:08:34 +01:00
|
|
|
usb_serial_debug_data(debug, &port->dev, __func__, urb->actual_length, data);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
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-10 05:54:13 +01:00
|
|
|
tty_buffer_request_room(tty, urb->actual_length);
|
|
|
|
tty_insert_flip_string(tty, data, urb->actual_length);
|
2005-04-17 00:20:36 +02:00
|
|
|
tty_flip_buffer_push(tty);
|
|
|
|
bytes_in += urb->actual_length;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Continue trying to always read */
|
|
|
|
usb_fill_bulk_urb(
|
|
|
|
port->read_urb,
|
|
|
|
port->serial->dev,
|
|
|
|
usb_rcvbulkpipe(port->serial->dev,
|
|
|
|
port->bulk_in_endpointAddress),
|
|
|
|
port->read_urb->transfer_buffer,
|
|
|
|
port->read_urb->transfer_buffer_length,
|
|
|
|
empeg_read_bulk_callback,
|
|
|
|
port);
|
|
|
|
|
|
|
|
result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
|
|
|
|
|
|
|
|
if (result)
|
2008-03-04 01:08:34 +01:00
|
|
|
dev_err(&urb->dev->dev, "%s - failed resubmitting read urb, error %d\n", __func__, result);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void empeg_throttle (struct usb_serial_port *port)
|
|
|
|
{
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - port %d", __func__, port->number);
|
2005-04-17 00:20:36 +02:00
|
|
|
usb_kill_urb(port->read_urb);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void empeg_unthrottle (struct usb_serial_port *port)
|
|
|
|
{
|
|
|
|
int result;
|
|
|
|
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - port %d", __func__, port->number);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
port->read_urb->dev = port->serial->dev;
|
|
|
|
|
|
|
|
result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
|
|
|
|
|
|
|
|
if (result)
|
2008-03-04 01:08:34 +01:00
|
|
|
dev_err(&port->dev, "%s - failed submitting read urb, error %d\n", __func__, result);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int empeg_startup (struct usb_serial *serial)
|
|
|
|
{
|
|
|
|
int r;
|
|
|
|
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s", __func__);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (serial->dev->actconfig->desc.bConfigurationValue != 1) {
|
|
|
|
err("active config #%d != 1 ??",
|
|
|
|
serial->dev->actconfig->desc.bConfigurationValue);
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - reset config", __func__);
|
2005-04-17 00:20:36 +02:00
|
|
|
r = usb_reset_configuration (serial->dev);
|
|
|
|
|
|
|
|
/* continue on with initialization */
|
|
|
|
return r;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void empeg_shutdown (struct usb_serial *serial)
|
|
|
|
{
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg ("%s", __func__);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int empeg_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg)
|
|
|
|
{
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - port %d, cmd 0x%.4x", __func__, port->number, cmd);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return -ENOIOCTLCMD;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-12-08 11:38:45 +01:00
|
|
|
static void empeg_set_termios (struct usb_serial_port *port, struct ktermios *old_termios)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2007-10-18 10:24:19 +02:00
|
|
|
struct ktermios *termios = port->tty->termios;
|
2008-03-04 01:08:34 +01:00
|
|
|
dbg("%s - port %d", __func__, port->number);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The empeg-car player wants these particular tty settings.
|
|
|
|
* You could, for example, change the baud rate, however the
|
|
|
|
* player only supports 115200 (currently), so there is really
|
|
|
|
* no point in support for changes to the tty settings.
|
|
|
|
* (at least for now)
|
|
|
|
*
|
|
|
|
* The default requirements for this device are:
|
|
|
|
*/
|
2007-10-18 10:24:19 +02:00
|
|
|
termios->c_iflag
|
2005-04-17 00:20:36 +02:00
|
|
|
&= ~(IGNBRK /* disable ignore break */
|
|
|
|
| BRKINT /* disable break causes interrupt */
|
|
|
|
| PARMRK /* disable mark parity errors */
|
|
|
|
| ISTRIP /* disable clear high bit of input characters */
|
|
|
|
| INLCR /* disable translate NL to CR */
|
|
|
|
| IGNCR /* disable ignore CR */
|
|
|
|
| ICRNL /* disable translate CR to NL */
|
|
|
|
| IXON); /* disable enable XON/XOFF flow control */
|
|
|
|
|
2007-10-18 10:24:19 +02:00
|
|
|
termios->c_oflag
|
2005-04-17 00:20:36 +02:00
|
|
|
&= ~OPOST; /* disable postprocess output characters */
|
|
|
|
|
2007-10-18 10:24:19 +02:00
|
|
|
termios->c_lflag
|
2005-04-17 00:20:36 +02:00
|
|
|
&= ~(ECHO /* disable echo input characters */
|
|
|
|
| ECHONL /* disable echo new line */
|
|
|
|
| ICANON /* disable erase, kill, werase, and rprnt special characters */
|
|
|
|
| ISIG /* disable interrupt, quit, and suspend special characters */
|
|
|
|
| IEXTEN); /* disable non-POSIX special characters */
|
|
|
|
|
2007-10-18 10:24:19 +02:00
|
|
|
termios->c_cflag
|
2005-04-17 00:20:36 +02:00
|
|
|
&= ~(CSIZE /* no size */
|
|
|
|
| PARENB /* disable parity bit */
|
|
|
|
| CBAUD); /* clear current baud rate */
|
|
|
|
|
2007-10-18 10:24:19 +02:00
|
|
|
termios->c_cflag
|
|
|
|
|= CS8; /* character size 8 bits */
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Force low_latency on; otherwise the pushes are scheduled;
|
|
|
|
* this is bad as it opens up the possibility of dropping bytes
|
|
|
|
* on the floor. We don't want to drop bytes on the floor. :)
|
|
|
|
*/
|
|
|
|
port->tty->low_latency = 1;
|
2007-10-18 10:24:19 +02:00
|
|
|
tty_encode_baud_rate(port->tty, 115200, 115200);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int __init empeg_init (void)
|
|
|
|
{
|
|
|
|
struct urb *urb;
|
|
|
|
int i, retval;
|
|
|
|
|
|
|
|
/* create our write urb pool and transfer buffers */
|
|
|
|
spin_lock_init (&write_urb_pool_lock);
|
|
|
|
for (i = 0; i < NUM_URBS; ++i) {
|
|
|
|
urb = usb_alloc_urb(0, GFP_KERNEL);
|
|
|
|
write_urb_pool[i] = urb;
|
|
|
|
if (urb == NULL) {
|
|
|
|
err("No more urbs???");
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
urb->transfer_buffer = kmalloc (URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL);
|
|
|
|
if (!urb->transfer_buffer) {
|
|
|
|
err("%s - out of memory for urb buffers.",
|
2008-03-04 01:08:34 +01:00
|
|
|
__func__);
|
2005-04-17 00:20:36 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
retval = usb_serial_register(&empeg_device);
|
|
|
|
if (retval)
|
|
|
|
goto failed_usb_serial_register;
|
|
|
|
retval = usb_register(&empeg_driver);
|
|
|
|
if (retval)
|
|
|
|
goto failed_usb_register;
|
|
|
|
|
|
|
|
info(DRIVER_VERSION ":" DRIVER_DESC);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
failed_usb_register:
|
|
|
|
usb_serial_deregister(&empeg_device);
|
|
|
|
failed_usb_serial_register:
|
|
|
|
for (i = 0; i < NUM_URBS; ++i) {
|
|
|
|
if (write_urb_pool[i]) {
|
2005-04-19 02:39:34 +02:00
|
|
|
kfree(write_urb_pool[i]->transfer_buffer);
|
2005-04-17 00:20:36 +02:00
|
|
|
usb_free_urb(write_urb_pool[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void __exit empeg_exit (void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
usb_deregister(&empeg_driver);
|
|
|
|
usb_serial_deregister (&empeg_device);
|
|
|
|
|
|
|
|
spin_lock_irqsave (&write_urb_pool_lock, flags);
|
|
|
|
|
|
|
|
for (i = 0; i < NUM_URBS; ++i) {
|
|
|
|
if (write_urb_pool[i]) {
|
|
|
|
/* FIXME - uncomment the following usb_kill_urb call when
|
|
|
|
* the host controllers get fixed to set urb->dev = NULL after
|
|
|
|
* the urb is finished. Otherwise this call oopses. */
|
|
|
|
/* usb_kill_urb(write_urb_pool[i]); */
|
2005-04-19 02:39:34 +02:00
|
|
|
kfree(write_urb_pool[i]->transfer_buffer);
|
2005-04-17 00:20:36 +02:00
|
|
|
usb_free_urb (write_urb_pool[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock_irqrestore (&write_urb_pool_lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
module_init(empeg_init);
|
|
|
|
module_exit(empeg_exit);
|
|
|
|
|
|
|
|
MODULE_AUTHOR( DRIVER_AUTHOR );
|
|
|
|
MODULE_DESCRIPTION( DRIVER_DESC );
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
|
|
|
module_param(debug, bool, S_IRUGO | S_IWUSR);
|
|
|
|
MODULE_PARM_DESC(debug, "Debug enabled or not");
|