2006-03-26 09:38:34 +00:00
|
|
|
/*
|
|
|
|
* USB driver for Gigaset 307x base via direct USB connection.
|
|
|
|
*
|
|
|
|
* Copyright (c) 2001 by Hansjoerg Lipp <hjlipp@web.de>,
|
|
|
|
* Tilman Schmidt <tilman@imap.cc>,
|
2006-04-11 05:55:14 +00:00
|
|
|
* Stefan Eilers.
|
2006-03-26 09:38:34 +00:00
|
|
|
*
|
|
|
|
* =====================================================================
|
|
|
|
* 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.
|
|
|
|
* =====================================================================
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "gigaset.h"
|
|
|
|
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/timer.h>
|
|
|
|
#include <linux/usb.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/moduleparam.h>
|
|
|
|
|
|
|
|
/* Version Information */
|
2006-04-11 05:55:14 +00:00
|
|
|
#define DRIVER_AUTHOR "Tilman Schmidt <tilman@imap.cc>, Hansjoerg Lipp <hjlipp@web.de>, Stefan Eilers"
|
2006-03-26 09:38:34 +00:00
|
|
|
#define DRIVER_DESC "USB Driver for Gigaset 307x"
|
|
|
|
|
|
|
|
|
|
|
|
/* Module parameters */
|
|
|
|
|
|
|
|
static int startmode = SM_ISDN;
|
|
|
|
static int cidmode = 1;
|
|
|
|
|
|
|
|
module_param(startmode, int, S_IRUGO);
|
|
|
|
module_param(cidmode, int, S_IRUGO);
|
|
|
|
MODULE_PARM_DESC(startmode, "start in isdn4linux mode");
|
|
|
|
MODULE_PARM_DESC(cidmode, "Call-ID mode");
|
|
|
|
|
|
|
|
#define GIGASET_MINORS 1
|
|
|
|
#define GIGASET_MINOR 16
|
|
|
|
#define GIGASET_MODULENAME "bas_gigaset"
|
|
|
|
#define GIGASET_DEVNAME "ttyGB"
|
|
|
|
|
2006-04-22 09:35:30 +00:00
|
|
|
/* length limit according to Siemens 3070usb-protokoll.doc ch. 2.1 */
|
|
|
|
#define IF_WRITEBUF 264
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2009-03-19 06:44:23 +00:00
|
|
|
/* interrupt pipe message size according to ibid. ch. 2.2 */
|
|
|
|
#define IP_MSGSIZE 3
|
|
|
|
|
2006-03-26 09:38:34 +00:00
|
|
|
/* Values for the Gigaset 307x */
|
|
|
|
#define USB_GIGA_VENDOR_ID 0x0681
|
2006-04-22 09:35:30 +00:00
|
|
|
#define USB_3070_PRODUCT_ID 0x0001
|
|
|
|
#define USB_3075_PRODUCT_ID 0x0002
|
2006-03-26 09:38:34 +00:00
|
|
|
#define USB_SX303_PRODUCT_ID 0x0021
|
|
|
|
#define USB_SX353_PRODUCT_ID 0x0022
|
|
|
|
|
|
|
|
/* table of devices that work with this driver */
|
2009-10-25 09:30:37 +00:00
|
|
|
static const struct usb_device_id gigaset_table[] = {
|
2006-04-22 09:35:30 +00:00
|
|
|
{ USB_DEVICE(USB_GIGA_VENDOR_ID, USB_3070_PRODUCT_ID) },
|
|
|
|
{ USB_DEVICE(USB_GIGA_VENDOR_ID, USB_3075_PRODUCT_ID) },
|
2006-03-26 09:38:34 +00:00
|
|
|
{ USB_DEVICE(USB_GIGA_VENDOR_ID, USB_SX303_PRODUCT_ID) },
|
|
|
|
{ USB_DEVICE(USB_GIGA_VENDOR_ID, USB_SX353_PRODUCT_ID) },
|
|
|
|
{ } /* Terminating entry */
|
|
|
|
};
|
|
|
|
|
|
|
|
MODULE_DEVICE_TABLE(usb, gigaset_table);
|
|
|
|
|
2006-06-26 07:25:33 +00:00
|
|
|
/*======================= local function prototypes ==========================*/
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2006-06-26 07:25:33 +00:00
|
|
|
/* function called if a new device belonging to this driver is connected */
|
2006-03-26 09:38:34 +00:00
|
|
|
static int gigaset_probe(struct usb_interface *interface,
|
|
|
|
const struct usb_device_id *id);
|
|
|
|
|
|
|
|
/* Function will be called if the device is unplugged */
|
|
|
|
static void gigaset_disconnect(struct usb_interface *interface);
|
|
|
|
|
2008-02-06 09:38:26 +00:00
|
|
|
/* functions called before/after suspend */
|
|
|
|
static int gigaset_suspend(struct usb_interface *intf, pm_message_t message);
|
|
|
|
static int gigaset_resume(struct usb_interface *intf);
|
|
|
|
|
|
|
|
/* functions called before/after device reset */
|
|
|
|
static int gigaset_pre_reset(struct usb_interface *intf);
|
|
|
|
static int gigaset_post_reset(struct usb_interface *intf);
|
|
|
|
|
2006-06-26 07:25:33 +00:00
|
|
|
static int atread_submit(struct cardstate *, int);
|
2006-04-22 09:35:30 +00:00
|
|
|
static void stopurbs(struct bas_bc_state *);
|
2006-06-26 07:25:33 +00:00
|
|
|
static int req_submit(struct bc_state *, int, int, int);
|
2006-04-22 09:35:30 +00:00
|
|
|
static int atwrite_submit(struct cardstate *, unsigned char *, int);
|
|
|
|
static int start_cbsend(struct cardstate *);
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2006-06-26 07:25:33 +00:00
|
|
|
/*============================================================================*/
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
struct bas_cardstate {
|
2006-04-11 05:55:04 +00:00
|
|
|
struct usb_device *udev; /* USB device pointer */
|
|
|
|
struct usb_interface *interface; /* interface for this device */
|
2006-03-26 09:38:34 +00:00
|
|
|
unsigned char minor; /* starting minor number */
|
|
|
|
|
2006-04-11 05:55:04 +00:00
|
|
|
struct urb *urb_ctrl; /* control pipe default URB */
|
2006-03-26 09:38:34 +00:00
|
|
|
struct usb_ctrlrequest dr_ctrl;
|
|
|
|
struct timer_list timer_ctrl; /* control request timeout */
|
2006-06-26 07:25:33 +00:00
|
|
|
int retry_ctrl;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
struct timer_list timer_atrdy; /* AT command ready timeout */
|
2006-04-11 05:55:04 +00:00
|
|
|
struct urb *urb_cmd_out; /* for sending AT commands */
|
2006-03-26 09:38:34 +00:00
|
|
|
struct usb_ctrlrequest dr_cmd_out;
|
|
|
|
int retry_cmd_out;
|
|
|
|
|
2006-04-11 05:55:04 +00:00
|
|
|
struct urb *urb_cmd_in; /* for receiving AT replies */
|
2006-03-26 09:38:34 +00:00
|
|
|
struct usb_ctrlrequest dr_cmd_in;
|
|
|
|
struct timer_list timer_cmd_in; /* receive request timeout */
|
2006-04-11 05:55:04 +00:00
|
|
|
unsigned char *rcvbuf; /* AT reply receive buffer */
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2006-04-11 05:55:04 +00:00
|
|
|
struct urb *urb_int_in; /* URB for interrupt pipe */
|
2009-03-19 06:44:23 +00:00
|
|
|
unsigned char *int_in_buf;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
spinlock_t lock; /* locks all following */
|
2008-02-06 09:38:28 +00:00
|
|
|
int basstate; /* bitmap (BS_*) */
|
2006-03-26 09:38:34 +00:00
|
|
|
int pending; /* uncompleted base request */
|
2008-02-06 09:38:26 +00:00
|
|
|
wait_queue_head_t waitqueue;
|
2006-03-26 09:38:34 +00:00
|
|
|
int rcvbuf_size; /* size of AT receive buffer */
|
|
|
|
/* 0: no receive in progress */
|
|
|
|
int retry_cmd_in; /* receive req retry count */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* status of direct USB connection to 307x base (bits in basstate) */
|
2006-04-22 09:35:30 +00:00
|
|
|
#define BS_ATOPEN 0x001 /* AT channel open */
|
|
|
|
#define BS_B1OPEN 0x002 /* B channel 1 open */
|
|
|
|
#define BS_B2OPEN 0x004 /* B channel 2 open */
|
|
|
|
#define BS_ATREADY 0x008 /* base ready for AT command */
|
|
|
|
#define BS_INIT 0x010 /* base has signalled INIT_OK */
|
|
|
|
#define BS_ATTIMER 0x020 /* waiting for HD_READY_SEND_ATDATA */
|
|
|
|
#define BS_ATRDPEND 0x040 /* urb_cmd_in in use */
|
|
|
|
#define BS_ATWRPEND 0x080 /* urb_cmd_out in use */
|
2008-02-06 09:38:26 +00:00
|
|
|
#define BS_SUSPEND 0x100 /* USB port suspended */
|
2009-10-06 12:18:51 +00:00
|
|
|
#define BS_RESETTING 0x200 /* waiting for HD_RESET_INTERRUPT_PIPE_ACK */
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
|
2009-10-25 09:30:37 +00:00
|
|
|
static struct gigaset_driver *driver;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
/* usb specific object needed to register this driver with the usb subsystem */
|
|
|
|
static struct usb_driver gigaset_usb_driver = {
|
|
|
|
.name = GIGASET_MODULENAME,
|
|
|
|
.probe = gigaset_probe,
|
|
|
|
.disconnect = gigaset_disconnect,
|
|
|
|
.id_table = gigaset_table,
|
2008-02-06 09:38:26 +00:00
|
|
|
.suspend = gigaset_suspend,
|
|
|
|
.resume = gigaset_resume,
|
|
|
|
.reset_resume = gigaset_post_reset,
|
|
|
|
.pre_reset = gigaset_pre_reset,
|
|
|
|
.post_reset = gigaset_post_reset,
|
2006-03-26 09:38:34 +00:00
|
|
|
};
|
|
|
|
|
2006-04-22 09:35:30 +00:00
|
|
|
/* get message text for usb_submit_urb return code
|
|
|
|
*/
|
|
|
|
static char *get_usb_rcmsg(int rc)
|
|
|
|
{
|
|
|
|
static char unkmsg[28];
|
|
|
|
|
|
|
|
switch (rc) {
|
|
|
|
case 0:
|
|
|
|
return "success";
|
|
|
|
case -ENOMEM:
|
|
|
|
return "out of memory";
|
|
|
|
case -ENODEV:
|
|
|
|
return "device not present";
|
|
|
|
case -ENOENT:
|
|
|
|
return "endpoint not present";
|
|
|
|
case -ENXIO:
|
|
|
|
return "URB type not supported";
|
|
|
|
case -EINVAL:
|
|
|
|
return "invalid argument";
|
|
|
|
case -EAGAIN:
|
|
|
|
return "start frame too early or too much scheduled";
|
|
|
|
case -EFBIG:
|
|
|
|
return "too many isochronous frames requested";
|
|
|
|
case -EPIPE:
|
|
|
|
return "endpoint stalled";
|
|
|
|
case -EMSGSIZE:
|
|
|
|
return "invalid packet size";
|
|
|
|
case -ENOSPC:
|
|
|
|
return "would overcommit USB bandwidth";
|
|
|
|
case -ESHUTDOWN:
|
|
|
|
return "device shut down";
|
|
|
|
case -EPERM:
|
|
|
|
return "reject flag set";
|
|
|
|
case -EHOSTUNREACH:
|
|
|
|
return "device suspended";
|
|
|
|
default:
|
|
|
|
snprintf(unkmsg, sizeof(unkmsg), "unknown error %d", rc);
|
|
|
|
return unkmsg;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-26 09:38:34 +00:00
|
|
|
/* get message text for USB status code
|
|
|
|
*/
|
|
|
|
static char *get_usb_statmsg(int status)
|
|
|
|
{
|
|
|
|
static char unkmsg[28];
|
|
|
|
|
|
|
|
switch (status) {
|
|
|
|
case 0:
|
|
|
|
return "success";
|
|
|
|
case -ENOENT:
|
2006-04-22 09:35:30 +00:00
|
|
|
return "unlinked (sync)";
|
2006-03-26 09:38:34 +00:00
|
|
|
case -EINPROGRESS:
|
|
|
|
return "pending";
|
|
|
|
case -EPROTO:
|
2006-04-22 09:35:30 +00:00
|
|
|
return "bit stuffing error, timeout, or unknown USB error";
|
2006-03-26 09:38:34 +00:00
|
|
|
case -EILSEQ:
|
2006-04-22 09:35:30 +00:00
|
|
|
return "CRC mismatch, timeout, or unknown USB error";
|
2006-09-19 05:49:02 +00:00
|
|
|
case -ETIME:
|
2006-03-26 09:38:34 +00:00
|
|
|
return "timed out";
|
2006-04-22 09:35:30 +00:00
|
|
|
case -EPIPE:
|
|
|
|
return "endpoint stalled";
|
|
|
|
case -ECOMM:
|
|
|
|
return "IN buffer overrun";
|
|
|
|
case -ENOSR:
|
|
|
|
return "OUT buffer underrun";
|
|
|
|
case -EOVERFLOW:
|
|
|
|
return "too much data";
|
2006-03-26 09:38:34 +00:00
|
|
|
case -EREMOTEIO:
|
|
|
|
return "short packet detected";
|
2006-04-22 09:35:30 +00:00
|
|
|
case -ENODEV:
|
|
|
|
return "device removed";
|
2006-03-26 09:38:34 +00:00
|
|
|
case -EXDEV:
|
|
|
|
return "partial isochronous transfer";
|
|
|
|
case -EINVAL:
|
|
|
|
return "invalid argument";
|
2006-04-22 09:35:30 +00:00
|
|
|
case -ECONNRESET:
|
|
|
|
return "unlinked (async)";
|
2006-03-26 09:38:34 +00:00
|
|
|
case -ESHUTDOWN:
|
2006-04-22 09:35:30 +00:00
|
|
|
return "device shut down";
|
2006-03-26 09:38:34 +00:00
|
|
|
default:
|
2006-04-22 09:35:30 +00:00
|
|
|
snprintf(unkmsg, sizeof(unkmsg), "unknown status %d", status);
|
2006-03-26 09:38:34 +00:00
|
|
|
return unkmsg;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* usb_pipetype_str
|
|
|
|
* retrieve string representation of USB pipe type
|
|
|
|
*/
|
|
|
|
static inline char *usb_pipetype_str(int pipe)
|
|
|
|
{
|
|
|
|
if (usb_pipeisoc(pipe))
|
|
|
|
return "Isoc";
|
|
|
|
if (usb_pipeint(pipe))
|
|
|
|
return "Int";
|
|
|
|
if (usb_pipecontrol(pipe))
|
|
|
|
return "Ctrl";
|
|
|
|
if (usb_pipebulk(pipe))
|
|
|
|
return "Bulk";
|
|
|
|
return "?";
|
|
|
|
}
|
|
|
|
|
|
|
|
/* dump_urb
|
|
|
|
* write content of URB to syslog for debugging
|
|
|
|
*/
|
|
|
|
static inline void dump_urb(enum debuglevel level, const char *tag,
|
2006-04-11 05:55:04 +00:00
|
|
|
struct urb *urb)
|
2006-03-26 09:38:34 +00:00
|
|
|
{
|
|
|
|
#ifdef CONFIG_GIGASET_DEBUG
|
|
|
|
int i;
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(level, "%s urb(0x%08lx)->{", tag, (unsigned long) urb);
|
2006-03-26 09:38:34 +00:00
|
|
|
if (urb) {
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(level,
|
|
|
|
" dev=0x%08lx, pipe=%s:EP%d/DV%d:%s, "
|
2008-02-06 09:38:23 +00:00
|
|
|
"hcpriv=0x%08lx, transfer_flags=0x%x,",
|
2006-04-11 05:55:04 +00:00
|
|
|
(unsigned long) urb->dev,
|
|
|
|
usb_pipetype_str(urb->pipe),
|
|
|
|
usb_pipeendpoint(urb->pipe), usb_pipedevice(urb->pipe),
|
|
|
|
usb_pipein(urb->pipe) ? "in" : "out",
|
2008-02-06 09:38:23 +00:00
|
|
|
(unsigned long) urb->hcpriv,
|
2006-04-11 05:55:04 +00:00
|
|
|
urb->transfer_flags);
|
|
|
|
gig_dbg(level,
|
|
|
|
" transfer_buffer=0x%08lx[%d], actual_length=%d, "
|
2007-02-10 09:46:49 +00:00
|
|
|
"setup_packet=0x%08lx,",
|
2006-04-11 05:55:04 +00:00
|
|
|
(unsigned long) urb->transfer_buffer,
|
|
|
|
urb->transfer_buffer_length, urb->actual_length,
|
2007-02-10 09:46:49 +00:00
|
|
|
(unsigned long) urb->setup_packet);
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(level,
|
|
|
|
" start_frame=%d, number_of_packets=%d, interval=%d, "
|
|
|
|
"error_count=%d,",
|
|
|
|
urb->start_frame, urb->number_of_packets, urb->interval,
|
|
|
|
urb->error_count);
|
|
|
|
gig_dbg(level,
|
|
|
|
" context=0x%08lx, complete=0x%08lx, "
|
|
|
|
"iso_frame_desc[]={",
|
|
|
|
(unsigned long) urb->context,
|
|
|
|
(unsigned long) urb->complete);
|
2006-03-26 09:38:34 +00:00
|
|
|
for (i = 0; i < urb->number_of_packets; i++) {
|
2006-04-11 05:55:00 +00:00
|
|
|
struct usb_iso_packet_descriptor *pifd
|
|
|
|
= &urb->iso_frame_desc[i];
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(level,
|
|
|
|
" {offset=%u, length=%u, actual_length=%u, "
|
|
|
|
"status=%u}",
|
|
|
|
pifd->offset, pifd->length, pifd->actual_length,
|
|
|
|
pifd->status);
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
}
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(level, "}}");
|
2006-03-26 09:38:34 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/* read/set modem control bits etc. (m10x only) */
|
|
|
|
static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
|
2006-04-11 05:55:04 +00:00
|
|
|
unsigned new_state)
|
2006-03-26 09:38:34 +00:00
|
|
|
{
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag)
|
|
|
|
{
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
|
|
|
|
{
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2009-10-06 12:18:51 +00:00
|
|
|
/* set/clear bits in base connection state, return previous state
|
|
|
|
*/
|
|
|
|
static inline int update_basstate(struct bas_cardstate *ucs,
|
|
|
|
int set, int clear)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
int state;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&ucs->lock, flags);
|
|
|
|
state = ucs->basstate;
|
|
|
|
ucs->basstate = (state & ~clear) | set;
|
|
|
|
spin_unlock_irqrestore(&ucs->lock, flags);
|
|
|
|
return state;
|
|
|
|
}
|
|
|
|
|
2006-03-26 09:38:34 +00:00
|
|
|
/* error_hangup
|
|
|
|
* hang up any existing connection because of an unrecoverable error
|
|
|
|
* This function may be called from any context and takes care of scheduling
|
|
|
|
* the necessary actions for execution outside of interrupt context.
|
2006-06-26 07:25:33 +00:00
|
|
|
* cs->lock must not be held.
|
2006-03-26 09:38:34 +00:00
|
|
|
* argument:
|
|
|
|
* B channel control structure
|
|
|
|
*/
|
|
|
|
static inline void error_hangup(struct bc_state *bcs)
|
|
|
|
{
|
|
|
|
struct cardstate *cs = bcs->cs;
|
|
|
|
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ANY, "%s: scheduling HUP for channel %d",
|
|
|
|
__func__, bcs->channel);
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2006-04-22 09:35:30 +00:00
|
|
|
if (!gigaset_add_event(cs, &bcs->at_state, EV_HUP, NULL, 0, NULL))
|
|
|
|
dev_err(cs->dev, "event queue full\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
gigaset_schedule_event(cs);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* error_reset
|
|
|
|
* reset Gigaset device because of an unrecoverable error
|
2006-06-26 07:25:33 +00:00
|
|
|
* This function may be called from any context, and takes care of
|
2006-04-22 09:35:30 +00:00
|
|
|
* scheduling the necessary actions for execution outside of interrupt context.
|
2006-06-26 07:25:33 +00:00
|
|
|
* cs->lock must not be held.
|
2006-03-26 09:38:34 +00:00
|
|
|
* argument:
|
|
|
|
* controller state structure
|
|
|
|
*/
|
|
|
|
static inline void error_reset(struct cardstate *cs)
|
|
|
|
{
|
2009-10-06 12:18:51 +00:00
|
|
|
/* reset interrupt pipe to recover (ignore errors) */
|
|
|
|
update_basstate(cs->hw.bas, BS_RESETTING, 0);
|
|
|
|
req_submit(cs->bcs, HD_RESET_INTERRUPT_PIPE, 0, BAS_TIMEOUT);
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* check_pending
|
|
|
|
* check for completion of pending control request
|
|
|
|
* parameter:
|
2006-04-11 05:55:04 +00:00
|
|
|
* ucs hardware specific controller state structure
|
2006-03-26 09:38:34 +00:00
|
|
|
*/
|
|
|
|
static void check_pending(struct bas_cardstate *ucs)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&ucs->lock, flags);
|
|
|
|
switch (ucs->pending) {
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
case HD_OPEN_ATCHANNEL:
|
2008-02-06 09:38:28 +00:00
|
|
|
if (ucs->basstate & BS_ATOPEN)
|
2006-03-26 09:38:34 +00:00
|
|
|
ucs->pending = 0;
|
|
|
|
break;
|
|
|
|
case HD_OPEN_B1CHANNEL:
|
2008-02-06 09:38:28 +00:00
|
|
|
if (ucs->basstate & BS_B1OPEN)
|
2006-03-26 09:38:34 +00:00
|
|
|
ucs->pending = 0;
|
|
|
|
break;
|
|
|
|
case HD_OPEN_B2CHANNEL:
|
2008-02-06 09:38:28 +00:00
|
|
|
if (ucs->basstate & BS_B2OPEN)
|
2006-03-26 09:38:34 +00:00
|
|
|
ucs->pending = 0;
|
|
|
|
break;
|
|
|
|
case HD_CLOSE_ATCHANNEL:
|
2008-02-06 09:38:28 +00:00
|
|
|
if (!(ucs->basstate & BS_ATOPEN))
|
2006-03-26 09:38:34 +00:00
|
|
|
ucs->pending = 0;
|
|
|
|
break;
|
|
|
|
case HD_CLOSE_B1CHANNEL:
|
2008-02-06 09:38:28 +00:00
|
|
|
if (!(ucs->basstate & BS_B1OPEN))
|
2006-03-26 09:38:34 +00:00
|
|
|
ucs->pending = 0;
|
|
|
|
break;
|
|
|
|
case HD_CLOSE_B2CHANNEL:
|
2008-02-06 09:38:28 +00:00
|
|
|
if (!(ucs->basstate & BS_B2OPEN))
|
2006-03-26 09:38:34 +00:00
|
|
|
ucs->pending = 0;
|
|
|
|
break;
|
|
|
|
case HD_DEVICE_INIT_ACK: /* no reply expected */
|
|
|
|
ucs->pending = 0;
|
|
|
|
break;
|
2009-10-06 12:18:51 +00:00
|
|
|
case HD_RESET_INTERRUPT_PIPE:
|
|
|
|
if (!(ucs->basstate & BS_RESETTING))
|
|
|
|
ucs->pending = 0;
|
|
|
|
break;
|
|
|
|
/*
|
|
|
|
* HD_READ_ATMESSAGE and HD_WRITE_ATMESSAGE are handled separately
|
|
|
|
* and should never end up here
|
2006-03-26 09:38:34 +00:00
|
|
|
*/
|
|
|
|
default:
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(&ucs->interface->dev,
|
|
|
|
"unknown pending request 0x%02x cleared\n",
|
|
|
|
ucs->pending);
|
2006-03-26 09:38:34 +00:00
|
|
|
ucs->pending = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ucs->pending)
|
|
|
|
del_timer(&ucs->timer_ctrl);
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&ucs->lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* cmd_in_timeout
|
|
|
|
* timeout routine for command input request
|
|
|
|
* argument:
|
|
|
|
* controller state structure
|
|
|
|
*/
|
|
|
|
static void cmd_in_timeout(unsigned long data)
|
|
|
|
{
|
|
|
|
struct cardstate *cs = (struct cardstate *) data;
|
2006-04-11 05:55:08 +00:00
|
|
|
struct bas_cardstate *ucs = cs->hw.bas;
|
2006-06-26 07:25:33 +00:00
|
|
|
int rc;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
if (!ucs->rcvbuf_size) {
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_USBREQ, "%s: no receive in progress", __func__);
|
2006-03-26 09:38:34 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-06-26 07:25:33 +00:00
|
|
|
if (ucs->retry_cmd_in++ < BAS_RETRY) {
|
|
|
|
dev_notice(cs->dev, "control read: timeout, retry %d\n",
|
|
|
|
ucs->retry_cmd_in);
|
|
|
|
rc = atread_submit(cs, BAS_TIMEOUT);
|
|
|
|
if (rc >= 0 || rc == -ENODEV)
|
|
|
|
/* resubmitted or disconnected */
|
|
|
|
/* - bypass regular exit block */
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
dev_err(cs->dev,
|
|
|
|
"control read: timeout, giving up after %d tries\n",
|
|
|
|
ucs->retry_cmd_in);
|
|
|
|
}
|
|
|
|
kfree(ucs->rcvbuf);
|
|
|
|
ucs->rcvbuf = NULL;
|
|
|
|
ucs->rcvbuf_size = 0;
|
|
|
|
error_reset(cs);
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
2006-06-26 07:25:33 +00:00
|
|
|
/* read_ctrl_callback
|
|
|
|
* USB completion handler for control pipe input
|
|
|
|
* called by the USB subsystem in interrupt context
|
|
|
|
* parameter:
|
|
|
|
* urb USB request block
|
|
|
|
* urb->context = inbuf structure for controller state
|
|
|
|
*/
|
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 13:55:46 +00:00
|
|
|
static void read_ctrl_callback(struct urb *urb)
|
2006-06-26 07:25:33 +00:00
|
|
|
{
|
|
|
|
struct inbuf_t *inbuf = urb->context;
|
|
|
|
struct cardstate *cs = inbuf->cs;
|
|
|
|
struct bas_cardstate *ucs = cs->hw.bas;
|
2008-02-06 09:38:23 +00:00
|
|
|
int status = urb->status;
|
2006-06-26 07:25:33 +00:00
|
|
|
int have_data = 0;
|
|
|
|
unsigned numbytes;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
update_basstate(ucs, 0, BS_ATRDPEND);
|
2008-02-06 09:38:26 +00:00
|
|
|
wake_up(&ucs->waitqueue);
|
2006-06-26 07:25:33 +00:00
|
|
|
|
|
|
|
if (!ucs->rcvbuf_size) {
|
|
|
|
dev_warn(cs->dev, "%s: no receive in progress\n", __func__);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
del_timer(&ucs->timer_cmd_in);
|
|
|
|
|
2008-02-06 09:38:23 +00:00
|
|
|
switch (status) {
|
2006-06-26 07:25:33 +00:00
|
|
|
case 0: /* normal completion */
|
|
|
|
numbytes = urb->actual_length;
|
|
|
|
if (unlikely(numbytes != ucs->rcvbuf_size)) {
|
|
|
|
dev_warn(cs->dev,
|
|
|
|
"control read: received %d chars, expected %d\n",
|
|
|
|
numbytes, ucs->rcvbuf_size);
|
|
|
|
if (numbytes > ucs->rcvbuf_size)
|
|
|
|
numbytes = ucs->rcvbuf_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* copy received bytes to inbuf */
|
|
|
|
have_data = gigaset_fill_inbuf(inbuf, ucs->rcvbuf, numbytes);
|
|
|
|
|
|
|
|
if (unlikely(numbytes < ucs->rcvbuf_size)) {
|
|
|
|
/* incomplete - resubmit for remaining bytes */
|
|
|
|
ucs->rcvbuf_size -= numbytes;
|
|
|
|
ucs->retry_cmd_in = 0;
|
|
|
|
rc = atread_submit(cs, BAS_TIMEOUT);
|
|
|
|
if (rc >= 0 || rc == -ENODEV)
|
|
|
|
/* resubmitted or disconnected */
|
|
|
|
/* - bypass regular exit block */
|
|
|
|
return;
|
|
|
|
error_reset(cs);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case -ENOENT: /* cancelled */
|
|
|
|
case -ECONNRESET: /* cancelled (async) */
|
|
|
|
case -EINPROGRESS: /* pending */
|
|
|
|
case -ENODEV: /* device removed */
|
|
|
|
case -ESHUTDOWN: /* device shut down */
|
|
|
|
/* no action necessary */
|
|
|
|
gig_dbg(DEBUG_USBREQ, "%s: %s",
|
2008-02-06 09:38:23 +00:00
|
|
|
__func__, get_usb_statmsg(status));
|
2006-06-26 07:25:33 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default: /* severe trouble */
|
|
|
|
dev_warn(cs->dev, "control read: %s\n",
|
2008-02-06 09:38:23 +00:00
|
|
|
get_usb_statmsg(status));
|
2006-06-26 07:25:33 +00:00
|
|
|
if (ucs->retry_cmd_in++ < BAS_RETRY) {
|
|
|
|
dev_notice(cs->dev, "control read: retry %d\n",
|
|
|
|
ucs->retry_cmd_in);
|
|
|
|
rc = atread_submit(cs, BAS_TIMEOUT);
|
|
|
|
if (rc >= 0 || rc == -ENODEV)
|
|
|
|
/* resubmitted or disconnected */
|
|
|
|
/* - bypass regular exit block */
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
dev_err(cs->dev,
|
|
|
|
"control read: giving up after %d tries\n",
|
|
|
|
ucs->retry_cmd_in);
|
|
|
|
}
|
|
|
|
error_reset(cs);
|
|
|
|
}
|
|
|
|
|
|
|
|
kfree(ucs->rcvbuf);
|
|
|
|
ucs->rcvbuf = NULL;
|
|
|
|
ucs->rcvbuf_size = 0;
|
|
|
|
if (have_data) {
|
|
|
|
gig_dbg(DEBUG_INTR, "%s-->BH", __func__);
|
|
|
|
gigaset_schedule_event(cs);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-26 09:38:34 +00:00
|
|
|
/* atread_submit
|
2006-04-22 09:35:30 +00:00
|
|
|
* submit an HD_READ_ATMESSAGE command URB and optionally start a timeout
|
2006-03-26 09:38:34 +00:00
|
|
|
* parameters:
|
|
|
|
* cs controller state structure
|
|
|
|
* timeout timeout in 1/10 sec., 0: none
|
|
|
|
* return value:
|
|
|
|
* 0 on success
|
|
|
|
* -EBUSY if another request is pending
|
|
|
|
* any URB submission error code
|
|
|
|
*/
|
|
|
|
static int atread_submit(struct cardstate *cs, int timeout)
|
|
|
|
{
|
2006-04-11 05:55:08 +00:00
|
|
|
struct bas_cardstate *ucs = cs->hw.bas;
|
2008-02-06 09:38:26 +00:00
|
|
|
int basstate;
|
2006-03-26 09:38:34 +00:00
|
|
|
int ret;
|
|
|
|
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_USBREQ, "-------> HD_READ_ATMESSAGE (%d)",
|
|
|
|
ucs->rcvbuf_size);
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2008-02-06 09:38:26 +00:00
|
|
|
basstate = update_basstate(ucs, BS_ATRDPEND, 0);
|
|
|
|
if (basstate & BS_ATRDPEND) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(cs->dev,
|
|
|
|
"could not submit HD_READ_ATMESSAGE: URB busy\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
return -EBUSY;
|
|
|
|
}
|
|
|
|
|
2008-02-06 09:38:26 +00:00
|
|
|
if (basstate & BS_SUSPEND) {
|
|
|
|
dev_notice(cs->dev,
|
|
|
|
"HD_READ_ATMESSAGE not submitted, "
|
|
|
|
"suspend in progress\n");
|
|
|
|
update_basstate(ucs, 0, BS_ATRDPEND);
|
|
|
|
/* treat like disconnect */
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
2006-03-26 09:38:34 +00:00
|
|
|
ucs->dr_cmd_in.bRequestType = IN_VENDOR_REQ;
|
|
|
|
ucs->dr_cmd_in.bRequest = HD_READ_ATMESSAGE;
|
|
|
|
ucs->dr_cmd_in.wValue = 0;
|
|
|
|
ucs->dr_cmd_in.wIndex = 0;
|
|
|
|
ucs->dr_cmd_in.wLength = cpu_to_le16(ucs->rcvbuf_size);
|
|
|
|
usb_fill_control_urb(ucs->urb_cmd_in, ucs->udev,
|
2006-04-11 05:55:04 +00:00
|
|
|
usb_rcvctrlpipe(ucs->udev, 0),
|
2009-10-25 09:30:37 +00:00
|
|
|
(unsigned char *) &ucs->dr_cmd_in,
|
2006-04-11 05:55:04 +00:00
|
|
|
ucs->rcvbuf, ucs->rcvbuf_size,
|
|
|
|
read_ctrl_callback, cs->inbuf);
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2009-10-25 09:30:37 +00:00
|
|
|
ret = usb_submit_urb(ucs->urb_cmd_in, GFP_ATOMIC);
|
|
|
|
if (ret != 0) {
|
2006-04-22 09:35:30 +00:00
|
|
|
update_basstate(ucs, 0, BS_ATRDPEND);
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(cs->dev, "could not submit HD_READ_ATMESSAGE: %s\n",
|
2006-06-26 07:25:33 +00:00
|
|
|
get_usb_rcmsg(ret));
|
2006-03-26 09:38:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (timeout > 0) {
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_USBREQ, "setting timeout of %d/10 secs", timeout);
|
2006-03-26 09:38:34 +00:00
|
|
|
ucs->timer_cmd_in.expires = jiffies + timeout * HZ / 10;
|
|
|
|
ucs->timer_cmd_in.data = (unsigned long) cs;
|
|
|
|
ucs->timer_cmd_in.function = cmd_in_timeout;
|
|
|
|
add_timer(&ucs->timer_cmd_in);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* read_int_callback
|
|
|
|
* USB completion handler for interrupt pipe input
|
|
|
|
* called by the USB subsystem in interrupt context
|
|
|
|
* parameter:
|
|
|
|
* urb USB request block
|
|
|
|
* urb->context = controller state structure
|
|
|
|
*/
|
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 13:55:46 +00:00
|
|
|
static void read_int_callback(struct urb *urb)
|
2006-03-26 09:38:34 +00:00
|
|
|
{
|
2006-04-11 05:55:08 +00:00
|
|
|
struct cardstate *cs = urb->context;
|
|
|
|
struct bas_cardstate *ucs = cs->hw.bas;
|
2006-03-26 09:38:34 +00:00
|
|
|
struct bc_state *bcs;
|
2008-02-06 09:38:23 +00:00
|
|
|
int status = urb->status;
|
2006-03-26 09:38:34 +00:00
|
|
|
unsigned long flags;
|
2006-04-22 09:35:30 +00:00
|
|
|
int rc;
|
2006-03-26 09:38:34 +00:00
|
|
|
unsigned l;
|
|
|
|
int channel;
|
|
|
|
|
2008-02-06 09:38:23 +00:00
|
|
|
switch (status) {
|
2006-03-26 09:38:34 +00:00
|
|
|
case 0: /* success */
|
|
|
|
break;
|
2006-04-22 09:35:30 +00:00
|
|
|
case -ENOENT: /* cancelled */
|
|
|
|
case -ECONNRESET: /* cancelled (async) */
|
2006-03-26 09:38:34 +00:00
|
|
|
case -EINPROGRESS: /* pending */
|
|
|
|
/* ignore silently */
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_USBREQ, "%s: %s",
|
2008-02-06 09:38:23 +00:00
|
|
|
__func__, get_usb_statmsg(status));
|
2006-03-26 09:38:34 +00:00
|
|
|
return;
|
2006-04-22 09:35:30 +00:00
|
|
|
case -ENODEV: /* device removed */
|
|
|
|
case -ESHUTDOWN: /* device shut down */
|
|
|
|
gig_dbg(DEBUG_USBREQ, "%s: device disconnected", __func__);
|
|
|
|
return;
|
2006-03-26 09:38:34 +00:00
|
|
|
default: /* severe trouble */
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev, "interrupt read: %s\n",
|
2008-02-06 09:38:23 +00:00
|
|
|
get_usb_statmsg(status));
|
2006-03-26 09:38:34 +00:00
|
|
|
goto resubmit;
|
|
|
|
}
|
|
|
|
|
2006-04-22 09:35:30 +00:00
|
|
|
/* drop incomplete packets even if the missing bytes wouldn't matter */
|
2009-03-19 06:44:23 +00:00
|
|
|
if (unlikely(urb->actual_length < IP_MSGSIZE)) {
|
2006-04-22 09:35:30 +00:00
|
|
|
dev_warn(cs->dev, "incomplete interrupt packet (%d bytes)\n",
|
|
|
|
urb->actual_length);
|
|
|
|
goto resubmit;
|
|
|
|
}
|
|
|
|
|
2006-03-26 09:38:34 +00:00
|
|
|
l = (unsigned) ucs->int_in_buf[1] +
|
|
|
|
(((unsigned) ucs->int_in_buf[2]) << 8);
|
|
|
|
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_USBREQ, "<-------%d: 0x%02x (%u [0x%02x 0x%02x])",
|
|
|
|
urb->actual_length, (int)ucs->int_in_buf[0], l,
|
|
|
|
(int)ucs->int_in_buf[1], (int)ucs->int_in_buf[2]);
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
channel = 0;
|
|
|
|
|
|
|
|
switch (ucs->int_in_buf[0]) {
|
|
|
|
case HD_DEVICE_INIT_OK:
|
|
|
|
update_basstate(ucs, BS_INIT, 0);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HD_READY_SEND_ATDATA:
|
|
|
|
del_timer(&ucs->timer_atrdy);
|
|
|
|
update_basstate(ucs, BS_ATREADY, BS_ATTIMER);
|
|
|
|
start_cbsend(cs);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HD_OPEN_B2CHANNEL_ACK:
|
|
|
|
++channel;
|
|
|
|
case HD_OPEN_B1CHANNEL_ACK:
|
|
|
|
bcs = cs->bcs + channel;
|
|
|
|
update_basstate(ucs, BS_B1OPEN << channel, 0);
|
|
|
|
gigaset_bchannel_up(bcs);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HD_OPEN_ATCHANNEL_ACK:
|
|
|
|
update_basstate(ucs, BS_ATOPEN, 0);
|
|
|
|
start_cbsend(cs);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HD_CLOSE_B2CHANNEL_ACK:
|
|
|
|
++channel;
|
|
|
|
case HD_CLOSE_B1CHANNEL_ACK:
|
|
|
|
bcs = cs->bcs + channel;
|
|
|
|
update_basstate(ucs, 0, BS_B1OPEN << channel);
|
|
|
|
stopurbs(bcs->hw.bas);
|
|
|
|
gigaset_bchannel_down(bcs);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HD_CLOSE_ATCHANNEL_ACK:
|
|
|
|
update_basstate(ucs, 0, BS_ATOPEN);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HD_B2_FLOW_CONTROL:
|
|
|
|
++channel;
|
|
|
|
case HD_B1_FLOW_CONTROL:
|
|
|
|
bcs = cs->bcs + channel;
|
|
|
|
atomic_add((l - BAS_NORMFRAME) * BAS_CORRFRAMES,
|
2006-04-11 05:55:04 +00:00
|
|
|
&bcs->hw.bas->corrbytes);
|
|
|
|
gig_dbg(DEBUG_ISO,
|
|
|
|
"Flow control (channel %d, sub %d): 0x%02x => %d",
|
|
|
|
channel, bcs->hw.bas->numsub, l,
|
|
|
|
atomic_read(&bcs->hw.bas->corrbytes));
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case HD_RECEIVEATDATA_ACK: /* AT response ready to be received */
|
|
|
|
if (!l) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev,
|
|
|
|
"HD_RECEIVEATDATA_ACK with length 0 ignored\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
spin_lock_irqsave(&cs->lock, flags);
|
|
|
|
if (ucs->rcvbuf_size) {
|
2006-04-22 09:35:30 +00:00
|
|
|
/* throw away previous buffer - we have no queue */
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(cs->dev,
|
2006-04-22 09:35:30 +00:00
|
|
|
"receive AT data overrun, %d bytes lost\n",
|
|
|
|
ucs->rcvbuf_size);
|
|
|
|
kfree(ucs->rcvbuf);
|
|
|
|
ucs->rcvbuf_size = 0;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
2009-10-25 09:30:37 +00:00
|
|
|
ucs->rcvbuf = kmalloc(l, GFP_ATOMIC);
|
|
|
|
if (ucs->rcvbuf == NULL) {
|
2006-03-26 09:38:34 +00:00
|
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
2006-04-22 09:35:30 +00:00
|
|
|
dev_err(cs->dev, "out of memory receiving AT data\n");
|
|
|
|
error_reset(cs);
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
ucs->rcvbuf_size = l;
|
|
|
|
ucs->retry_cmd_in = 0;
|
2009-10-25 09:30:37 +00:00
|
|
|
rc = atread_submit(cs, BAS_TIMEOUT);
|
|
|
|
if (rc < 0) {
|
2006-03-26 09:38:34 +00:00
|
|
|
kfree(ucs->rcvbuf);
|
|
|
|
ucs->rcvbuf = NULL;
|
|
|
|
ucs->rcvbuf_size = 0;
|
2006-06-26 07:25:33 +00:00
|
|
|
if (rc != -ENODEV) {
|
|
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
2006-04-22 09:35:30 +00:00
|
|
|
error_reset(cs);
|
2006-06-26 07:25:33 +00:00
|
|
|
break;
|
|
|
|
}
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HD_RESET_INTERRUPT_PIPE_ACK:
|
2009-10-06 12:18:51 +00:00
|
|
|
update_basstate(ucs, 0, BS_RESETTING);
|
|
|
|
dev_notice(cs->dev, "interrupt pipe reset\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case HD_SUSPEND_END:
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_USBREQ, "HD_SUSPEND_END");
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev,
|
|
|
|
"unknown Gigaset signal 0x%02x (%u) ignored\n",
|
|
|
|
(int) ucs->int_in_buf[0], l);
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
check_pending(ucs);
|
2008-02-06 09:38:26 +00:00
|
|
|
wake_up(&ucs->waitqueue);
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
resubmit:
|
2006-12-07 04:33:16 +00:00
|
|
|
rc = usb_submit_urb(urb, GFP_ATOMIC);
|
2006-04-22 09:35:30 +00:00
|
|
|
if (unlikely(rc != 0 && rc != -ENODEV)) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(cs->dev, "could not resubmit interrupt URB: %s\n",
|
2006-04-22 09:35:30 +00:00
|
|
|
get_usb_rcmsg(rc));
|
2006-03-26 09:38:34 +00:00
|
|
|
error_reset(cs);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* read_iso_callback
|
|
|
|
* USB completion handler for B channel isochronous input
|
|
|
|
* called by the USB subsystem in interrupt context
|
|
|
|
* parameter:
|
|
|
|
* urb USB request block of completed request
|
|
|
|
* urb->context = bc_state structure
|
|
|
|
*/
|
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 13:55:46 +00:00
|
|
|
static void read_iso_callback(struct urb *urb)
|
2006-03-26 09:38:34 +00:00
|
|
|
{
|
|
|
|
struct bc_state *bcs;
|
|
|
|
struct bas_bc_state *ubc;
|
2008-02-06 09:38:23 +00:00
|
|
|
int status = urb->status;
|
2006-03-26 09:38:34 +00:00
|
|
|
unsigned long flags;
|
|
|
|
int i, rc;
|
|
|
|
|
|
|
|
/* status codes not worth bothering the tasklet with */
|
2008-02-06 09:38:23 +00:00
|
|
|
if (unlikely(status == -ENOENT ||
|
|
|
|
status == -ECONNRESET ||
|
|
|
|
status == -EINPROGRESS ||
|
|
|
|
status == -ENODEV ||
|
|
|
|
status == -ESHUTDOWN)) {
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ISO, "%s: %s",
|
2008-02-06 09:38:23 +00:00
|
|
|
__func__, get_usb_statmsg(status));
|
2006-03-26 09:38:34 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-04-11 05:55:08 +00:00
|
|
|
bcs = urb->context;
|
2006-03-26 09:38:34 +00:00
|
|
|
ubc = bcs->hw.bas;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&ubc->isoinlock, flags);
|
|
|
|
if (likely(ubc->isoindone == NULL)) {
|
|
|
|
/* pass URB to tasklet */
|
|
|
|
ubc->isoindone = urb;
|
2008-02-06 09:38:23 +00:00
|
|
|
ubc->isoinstatus = status;
|
2009-04-05 06:39:33 +00:00
|
|
|
tasklet_hi_schedule(&ubc->rcvd_tasklet);
|
2006-03-26 09:38:34 +00:00
|
|
|
} else {
|
|
|
|
/* tasklet still busy, drop data and resubmit URB */
|
2008-02-06 09:38:23 +00:00
|
|
|
ubc->loststatus = status;
|
2006-03-26 09:38:34 +00:00
|
|
|
for (i = 0; i < BAS_NUMFRAMES; i++) {
|
|
|
|
ubc->isoinlost += urb->iso_frame_desc[i].actual_length;
|
|
|
|
if (unlikely(urb->iso_frame_desc[i].status != 0 &&
|
2006-04-22 09:35:30 +00:00
|
|
|
urb->iso_frame_desc[i].status !=
|
|
|
|
-EINPROGRESS))
|
2006-03-26 09:38:34 +00:00
|
|
|
ubc->loststatus = urb->iso_frame_desc[i].status;
|
|
|
|
urb->iso_frame_desc[i].status = 0;
|
|
|
|
urb->iso_frame_desc[i].actual_length = 0;
|
|
|
|
}
|
2008-02-06 09:38:28 +00:00
|
|
|
if (likely(ubc->running)) {
|
2006-04-11 05:55:04 +00:00
|
|
|
/* urb->dev is clobbered by USB subsystem */
|
|
|
|
urb->dev = bcs->cs->hw.bas->udev;
|
2006-03-26 09:38:34 +00:00
|
|
|
urb->transfer_flags = URB_ISO_ASAP;
|
|
|
|
urb->number_of_packets = BAS_NUMFRAMES;
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ISO, "%s: isoc read overrun/resubmit",
|
|
|
|
__func__);
|
2006-12-07 04:33:16 +00:00
|
|
|
rc = usb_submit_urb(urb, GFP_ATOMIC);
|
2006-04-22 09:35:30 +00:00
|
|
|
if (unlikely(rc != 0 && rc != -ENODEV)) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(bcs->cs->dev,
|
|
|
|
"could not resubmit isochronous read "
|
2006-04-22 09:35:30 +00:00
|
|
|
"URB: %s\n", get_usb_rcmsg(rc));
|
2006-03-26 09:38:34 +00:00
|
|
|
dump_urb(DEBUG_ISO, "isoc read", urb);
|
|
|
|
error_hangup(bcs);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&ubc->isoinlock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* write_iso_callback
|
|
|
|
* USB completion handler for B channel isochronous output
|
|
|
|
* called by the USB subsystem in interrupt context
|
|
|
|
* parameter:
|
|
|
|
* urb USB request block of completed request
|
|
|
|
* urb->context = isow_urbctx_t structure
|
|
|
|
*/
|
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 13:55:46 +00:00
|
|
|
static void write_iso_callback(struct urb *urb)
|
2006-03-26 09:38:34 +00:00
|
|
|
{
|
|
|
|
struct isow_urbctx_t *ucx;
|
|
|
|
struct bas_bc_state *ubc;
|
2008-02-06 09:38:23 +00:00
|
|
|
int status = urb->status;
|
2006-03-26 09:38:34 +00:00
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
/* status codes not worth bothering the tasklet with */
|
2008-02-06 09:38:23 +00:00
|
|
|
if (unlikely(status == -ENOENT ||
|
|
|
|
status == -ECONNRESET ||
|
|
|
|
status == -EINPROGRESS ||
|
|
|
|
status == -ENODEV ||
|
|
|
|
status == -ESHUTDOWN)) {
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ISO, "%s: %s",
|
2008-02-06 09:38:23 +00:00
|
|
|
__func__, get_usb_statmsg(status));
|
2006-03-26 09:38:34 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* pass URB context to tasklet */
|
2006-04-11 05:55:08 +00:00
|
|
|
ucx = urb->context;
|
2006-03-26 09:38:34 +00:00
|
|
|
ubc = ucx->bcs->hw.bas;
|
2008-02-06 09:38:23 +00:00
|
|
|
ucx->status = status;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
spin_lock_irqsave(&ubc->isooutlock, flags);
|
|
|
|
ubc->isooutovfl = ubc->isooutdone;
|
|
|
|
ubc->isooutdone = ucx;
|
|
|
|
spin_unlock_irqrestore(&ubc->isooutlock, flags);
|
2009-04-05 06:39:33 +00:00
|
|
|
tasklet_hi_schedule(&ubc->sent_tasklet);
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* starturbs
|
|
|
|
* prepare and submit USB request blocks for isochronous input and output
|
|
|
|
* argument:
|
|
|
|
* B channel control structure
|
|
|
|
* return value:
|
|
|
|
* 0 on success
|
|
|
|
* < 0 on error (no URBs submitted)
|
|
|
|
*/
|
|
|
|
static int starturbs(struct bc_state *bcs)
|
|
|
|
{
|
2006-04-11 05:55:08 +00:00
|
|
|
struct bas_bc_state *ubc = bcs->hw.bas;
|
2006-03-26 09:38:34 +00:00
|
|
|
struct urb *urb;
|
|
|
|
int j, k;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
/* initialize L2 reception */
|
2009-10-06 12:19:07 +00:00
|
|
|
if (bcs->proto2 == L2_HDLC)
|
2006-03-26 09:38:34 +00:00
|
|
|
bcs->inputstate |= INS_flag_hunt;
|
|
|
|
|
|
|
|
/* submit all isochronous input URBs */
|
2008-02-06 09:38:28 +00:00
|
|
|
ubc->running = 1;
|
2006-03-26 09:38:34 +00:00
|
|
|
for (k = 0; k < BAS_INURBS; k++) {
|
|
|
|
urb = ubc->isoinurbs[k];
|
|
|
|
if (!urb) {
|
|
|
|
rc = -EFAULT;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
urb->dev = bcs->cs->hw.bas->udev;
|
|
|
|
urb->pipe = usb_rcvisocpipe(urb->dev, 3 + 2 * bcs->channel);
|
|
|
|
urb->transfer_flags = URB_ISO_ASAP;
|
|
|
|
urb->transfer_buffer = ubc->isoinbuf + k * BAS_INBUFSIZE;
|
|
|
|
urb->transfer_buffer_length = BAS_INBUFSIZE;
|
|
|
|
urb->number_of_packets = BAS_NUMFRAMES;
|
|
|
|
urb->interval = BAS_FRAMETIME;
|
|
|
|
urb->complete = read_iso_callback;
|
|
|
|
urb->context = bcs;
|
|
|
|
for (j = 0; j < BAS_NUMFRAMES; j++) {
|
|
|
|
urb->iso_frame_desc[j].offset = j * BAS_MAXFRAME;
|
|
|
|
urb->iso_frame_desc[j].length = BAS_MAXFRAME;
|
|
|
|
urb->iso_frame_desc[j].status = 0;
|
|
|
|
urb->iso_frame_desc[j].actual_length = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
dump_urb(DEBUG_ISO, "Initial isoc read", urb);
|
2009-10-25 09:30:37 +00:00
|
|
|
rc = usb_submit_urb(urb, GFP_ATOMIC);
|
|
|
|
if (rc != 0)
|
2006-03-26 09:38:34 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* initialize L2 transmission */
|
|
|
|
gigaset_isowbuf_init(ubc->isooutbuf, PPP_FLAG);
|
|
|
|
|
|
|
|
/* set up isochronous output URBs for flag idling */
|
|
|
|
for (k = 0; k < BAS_OUTURBS; ++k) {
|
|
|
|
urb = ubc->isoouturbs[k].urb;
|
|
|
|
if (!urb) {
|
|
|
|
rc = -EFAULT;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
urb->dev = bcs->cs->hw.bas->udev;
|
|
|
|
urb->pipe = usb_sndisocpipe(urb->dev, 4 + 2 * bcs->channel);
|
|
|
|
urb->transfer_flags = URB_ISO_ASAP;
|
|
|
|
urb->transfer_buffer = ubc->isooutbuf->data;
|
|
|
|
urb->transfer_buffer_length = sizeof(ubc->isooutbuf->data);
|
|
|
|
urb->number_of_packets = BAS_NUMFRAMES;
|
|
|
|
urb->interval = BAS_FRAMETIME;
|
|
|
|
urb->complete = write_iso_callback;
|
|
|
|
urb->context = &ubc->isoouturbs[k];
|
|
|
|
for (j = 0; j < BAS_NUMFRAMES; ++j) {
|
|
|
|
urb->iso_frame_desc[j].offset = BAS_OUTBUFSIZE;
|
|
|
|
urb->iso_frame_desc[j].length = BAS_NORMFRAME;
|
|
|
|
urb->iso_frame_desc[j].status = 0;
|
|
|
|
urb->iso_frame_desc[j].actual_length = 0;
|
|
|
|
}
|
|
|
|
ubc->isoouturbs[k].limit = -1;
|
|
|
|
}
|
|
|
|
|
2008-02-06 09:38:24 +00:00
|
|
|
/* keep one URB free, submit the others */
|
|
|
|
for (k = 0; k < BAS_OUTURBS-1; ++k) {
|
2006-03-26 09:38:34 +00:00
|
|
|
dump_urb(DEBUG_ISO, "Initial isoc write", urb);
|
2006-12-07 04:33:16 +00:00
|
|
|
rc = usb_submit_urb(ubc->isoouturbs[k].urb, GFP_ATOMIC);
|
2006-04-22 09:35:30 +00:00
|
|
|
if (rc != 0)
|
2006-03-26 09:38:34 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
dump_urb(DEBUG_ISO, "Initial isoc write (free)", urb);
|
2008-02-06 09:38:24 +00:00
|
|
|
ubc->isooutfree = &ubc->isoouturbs[BAS_OUTURBS-1];
|
2006-03-26 09:38:34 +00:00
|
|
|
ubc->isooutdone = ubc->isooutovfl = NULL;
|
|
|
|
return 0;
|
|
|
|
error:
|
|
|
|
stopurbs(ubc);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* stopurbs
|
|
|
|
* cancel the USB request blocks for isochronous input and output
|
|
|
|
* errors are silently ignored
|
|
|
|
* argument:
|
|
|
|
* B channel control structure
|
|
|
|
*/
|
|
|
|
static void stopurbs(struct bas_bc_state *ubc)
|
|
|
|
{
|
|
|
|
int k, rc;
|
|
|
|
|
2008-02-06 09:38:28 +00:00
|
|
|
ubc->running = 0;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
for (k = 0; k < BAS_INURBS; ++k) {
|
|
|
|
rc = usb_unlink_urb(ubc->isoinurbs[k]);
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ISO,
|
2006-04-22 09:35:30 +00:00
|
|
|
"%s: isoc input URB %d unlinked, result = %s",
|
|
|
|
__func__, k, get_usb_rcmsg(rc));
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
for (k = 0; k < BAS_OUTURBS; ++k) {
|
|
|
|
rc = usb_unlink_urb(ubc->isoouturbs[k].urb);
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ISO,
|
2006-04-22 09:35:30 +00:00
|
|
|
"%s: isoc output URB %d unlinked, result = %s",
|
|
|
|
__func__, k, get_usb_rcmsg(rc));
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Isochronous Write - Bottom Half */
|
|
|
|
/* =============================== */
|
|
|
|
|
|
|
|
/* submit_iso_write_urb
|
|
|
|
* fill and submit the next isochronous write URB
|
|
|
|
* parameters:
|
2006-04-22 09:35:30 +00:00
|
|
|
* ucx context structure containing URB
|
2006-03-26 09:38:34 +00:00
|
|
|
* return value:
|
|
|
|
* number of frames submitted in URB
|
|
|
|
* 0 if URB not submitted because no data available (isooutbuf busy)
|
|
|
|
* error code < 0 on error
|
|
|
|
*/
|
|
|
|
static int submit_iso_write_urb(struct isow_urbctx_t *ucx)
|
|
|
|
{
|
2006-04-11 05:55:08 +00:00
|
|
|
struct urb *urb = ucx->urb;
|
|
|
|
struct bas_bc_state *ubc = ucx->bcs->hw.bas;
|
2006-03-26 09:38:34 +00:00
|
|
|
struct usb_iso_packet_descriptor *ifd;
|
|
|
|
int corrbytes, nframe, rc;
|
|
|
|
|
2006-04-11 05:55:04 +00:00
|
|
|
/* urb->dev is clobbered by USB subsystem */
|
|
|
|
urb->dev = ucx->bcs->cs->hw.bas->udev;
|
2006-03-26 09:38:34 +00:00
|
|
|
urb->transfer_flags = URB_ISO_ASAP;
|
|
|
|
urb->transfer_buffer = ubc->isooutbuf->data;
|
|
|
|
urb->transfer_buffer_length = sizeof(ubc->isooutbuf->data);
|
|
|
|
|
|
|
|
for (nframe = 0; nframe < BAS_NUMFRAMES; nframe++) {
|
|
|
|
ifd = &urb->iso_frame_desc[nframe];
|
|
|
|
|
|
|
|
/* compute frame length according to flow control */
|
|
|
|
ifd->length = BAS_NORMFRAME;
|
2009-10-25 09:30:37 +00:00
|
|
|
corrbytes = atomic_read(&ubc->corrbytes);
|
|
|
|
if (corrbytes != 0) {
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ISO, "%s: corrbytes=%d",
|
|
|
|
__func__, corrbytes);
|
2006-03-26 09:38:34 +00:00
|
|
|
if (corrbytes > BAS_HIGHFRAME - BAS_NORMFRAME)
|
|
|
|
corrbytes = BAS_HIGHFRAME - BAS_NORMFRAME;
|
|
|
|
else if (corrbytes < BAS_LOWFRAME - BAS_NORMFRAME)
|
|
|
|
corrbytes = BAS_LOWFRAME - BAS_NORMFRAME;
|
|
|
|
ifd->length += corrbytes;
|
|
|
|
atomic_add(-corrbytes, &ubc->corrbytes);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* retrieve block of data to send */
|
2008-07-24 04:28:27 +00:00
|
|
|
rc = gigaset_isowbuf_getbytes(ubc->isooutbuf, ifd->length);
|
|
|
|
if (rc < 0) {
|
|
|
|
if (rc == -EBUSY) {
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ISO,
|
|
|
|
"%s: buffer busy at frame %d",
|
|
|
|
__func__, nframe);
|
|
|
|
/* tasklet will be restarted from
|
2009-10-06 12:19:07 +00:00
|
|
|
gigaset_isoc_send_skb() */
|
2006-03-26 09:38:34 +00:00
|
|
|
} else {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(ucx->bcs->cs->dev,
|
|
|
|
"%s: buffer error %d at frame %d\n",
|
2008-07-24 04:28:27 +00:00
|
|
|
__func__, rc, nframe);
|
|
|
|
return rc;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2008-07-24 04:28:27 +00:00
|
|
|
ifd->offset = rc;
|
2008-02-06 09:38:28 +00:00
|
|
|
ucx->limit = ubc->isooutbuf->nextread;
|
2006-03-26 09:38:34 +00:00
|
|
|
ifd->status = 0;
|
|
|
|
ifd->actual_length = 0;
|
|
|
|
}
|
2006-04-22 09:35:30 +00:00
|
|
|
if (unlikely(nframe == 0))
|
|
|
|
return 0; /* no data to send */
|
|
|
|
urb->number_of_packets = nframe;
|
2006-04-11 05:55:16 +00:00
|
|
|
|
2006-12-07 04:33:16 +00:00
|
|
|
rc = usb_submit_urb(urb, GFP_ATOMIC);
|
2006-04-22 09:35:30 +00:00
|
|
|
if (unlikely(rc)) {
|
|
|
|
if (rc == -ENODEV)
|
|
|
|
/* device removed - give up silently */
|
|
|
|
gig_dbg(DEBUG_ISO, "%s: disconnected", __func__);
|
|
|
|
else
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(ucx->bcs->cs->dev,
|
|
|
|
"could not submit isochronous write URB: %s\n",
|
2006-04-22 09:35:30 +00:00
|
|
|
get_usb_rcmsg(rc));
|
|
|
|
return rc;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
2006-04-22 09:35:30 +00:00
|
|
|
++ubc->numsub;
|
2006-03-26 09:38:34 +00:00
|
|
|
return nframe;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* write_iso_tasklet
|
|
|
|
* tasklet scheduled when an isochronous output URB from the Gigaset device
|
|
|
|
* has completed
|
|
|
|
* parameter:
|
|
|
|
* data B channel state structure
|
|
|
|
*/
|
|
|
|
static void write_iso_tasklet(unsigned long data)
|
|
|
|
{
|
2006-04-11 05:55:08 +00:00
|
|
|
struct bc_state *bcs = (struct bc_state *) data;
|
|
|
|
struct bas_bc_state *ubc = bcs->hw.bas;
|
|
|
|
struct cardstate *cs = bcs->cs;
|
2006-03-26 09:38:34 +00:00
|
|
|
struct isow_urbctx_t *done, *next, *ovfl;
|
|
|
|
struct urb *urb;
|
2008-02-06 09:38:23 +00:00
|
|
|
int status;
|
2006-03-26 09:38:34 +00:00
|
|
|
struct usb_iso_packet_descriptor *ifd;
|
|
|
|
int offset;
|
|
|
|
unsigned long flags;
|
|
|
|
int i;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
int len;
|
2006-04-22 09:35:30 +00:00
|
|
|
int rc;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
/* loop while completed URBs arrive in time */
|
|
|
|
for (;;) {
|
2008-02-06 09:38:28 +00:00
|
|
|
if (unlikely(!(ubc->running))) {
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ISO, "%s: not running", __func__);
|
2006-03-26 09:38:34 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* retrieve completed URBs */
|
|
|
|
spin_lock_irqsave(&ubc->isooutlock, flags);
|
|
|
|
done = ubc->isooutdone;
|
|
|
|
ubc->isooutdone = NULL;
|
|
|
|
ovfl = ubc->isooutovfl;
|
|
|
|
ubc->isooutovfl = NULL;
|
|
|
|
spin_unlock_irqrestore(&ubc->isooutlock, flags);
|
|
|
|
if (ovfl) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(cs->dev, "isochronous write buffer underrun\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
error_hangup(bcs);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!done)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* submit free URB if available */
|
|
|
|
spin_lock_irqsave(&ubc->isooutlock, flags);
|
|
|
|
next = ubc->isooutfree;
|
|
|
|
ubc->isooutfree = NULL;
|
|
|
|
spin_unlock_irqrestore(&ubc->isooutlock, flags);
|
|
|
|
if (next) {
|
2006-04-22 09:35:30 +00:00
|
|
|
rc = submit_iso_write_urb(next);
|
|
|
|
if (unlikely(rc <= 0 && rc != -ENODEV)) {
|
2006-03-26 09:38:34 +00:00
|
|
|
/* could not submit URB, put it back */
|
|
|
|
spin_lock_irqsave(&ubc->isooutlock, flags);
|
|
|
|
if (ubc->isooutfree == NULL) {
|
|
|
|
ubc->isooutfree = next;
|
|
|
|
next = NULL;
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&ubc->isooutlock, flags);
|
|
|
|
if (next) {
|
|
|
|
/* couldn't put it back */
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(cs->dev,
|
|
|
|
"losing isochronous write URB\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
error_hangup(bcs);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* process completed URB */
|
|
|
|
urb = done->urb;
|
2008-02-06 09:38:23 +00:00
|
|
|
status = done->status;
|
|
|
|
switch (status) {
|
2006-04-22 09:35:30 +00:00
|
|
|
case -EXDEV: /* partial completion */
|
|
|
|
gig_dbg(DEBUG_ISO, "%s: URB partially completed",
|
|
|
|
__func__);
|
|
|
|
/* fall through - what's the difference anyway? */
|
2006-03-26 09:38:34 +00:00
|
|
|
case 0: /* normal completion */
|
2006-04-22 09:35:30 +00:00
|
|
|
/* inspect individual frames
|
|
|
|
* assumptions (for lack of documentation):
|
|
|
|
* - actual_length bytes of first frame in error are
|
2006-04-11 05:55:00 +00:00
|
|
|
* successfully sent
|
2006-03-26 09:38:34 +00:00
|
|
|
* - all following frames are not sent at all
|
|
|
|
*/
|
2006-04-22 09:35:30 +00:00
|
|
|
offset = done->limit; /* default (no error) */
|
2006-03-26 09:38:34 +00:00
|
|
|
for (i = 0; i < BAS_NUMFRAMES; i++) {
|
|
|
|
ifd = &urb->iso_frame_desc[i];
|
|
|
|
if (ifd->status ||
|
|
|
|
ifd->actual_length != ifd->length) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev,
|
|
|
|
"isochronous write: frame %d: %s, "
|
|
|
|
"only %d of %d bytes sent\n",
|
2006-03-26 09:38:34 +00:00
|
|
|
i, get_usb_statmsg(ifd->status),
|
|
|
|
ifd->actual_length, ifd->length);
|
|
|
|
offset = (ifd->offset +
|
2006-04-11 05:55:04 +00:00
|
|
|
ifd->actual_length)
|
|
|
|
% BAS_OUTBUFSIZE;
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#ifdef CONFIG_GIGASET_DEBUG
|
|
|
|
/* check assumption on remaining frames */
|
|
|
|
for (; i < BAS_NUMFRAMES; i++) {
|
|
|
|
ifd = &urb->iso_frame_desc[i];
|
|
|
|
if (ifd->status != -EINPROGRESS
|
|
|
|
|| ifd->actual_length != 0) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev,
|
|
|
|
"isochronous write: frame %d: %s, "
|
|
|
|
"%d of %d bytes sent\n",
|
2006-03-26 09:38:34 +00:00
|
|
|
i, get_usb_statmsg(ifd->status),
|
|
|
|
ifd->actual_length, ifd->length);
|
|
|
|
offset = (ifd->offset +
|
2006-04-11 05:55:04 +00:00
|
|
|
ifd->actual_length)
|
|
|
|
% BAS_OUTBUFSIZE;
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
break;
|
2006-04-22 09:35:30 +00:00
|
|
|
case -EPIPE: /* stall - probably underrun */
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(cs->dev, "isochronous write stalled\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
error_hangup(bcs);
|
|
|
|
break;
|
|
|
|
default: /* severe trouble */
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev, "isochronous write: %s\n",
|
2008-02-06 09:38:23 +00:00
|
|
|
get_usb_statmsg(status));
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* mark the write buffer area covered by this URB as free */
|
|
|
|
if (done->limit >= 0)
|
2008-02-06 09:38:28 +00:00
|
|
|
ubc->isooutbuf->read = done->limit;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
/* mark URB as free */
|
|
|
|
spin_lock_irqsave(&ubc->isooutlock, flags);
|
|
|
|
next = ubc->isooutfree;
|
|
|
|
ubc->isooutfree = done;
|
|
|
|
spin_unlock_irqrestore(&ubc->isooutlock, flags);
|
|
|
|
if (next) {
|
|
|
|
/* only one URB still active - resubmit one */
|
2006-04-22 09:35:30 +00:00
|
|
|
rc = submit_iso_write_urb(next);
|
|
|
|
if (unlikely(rc <= 0 && rc != -ENODEV)) {
|
2006-03-26 09:38:34 +00:00
|
|
|
/* couldn't submit */
|
|
|
|
error_hangup(bcs);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* process queued SKBs */
|
|
|
|
while ((skb = skb_dequeue(&bcs->squeue))) {
|
|
|
|
/* copy to output buffer, doing L2 encapsulation */
|
|
|
|
len = skb->len;
|
|
|
|
if (gigaset_isoc_buildframe(bcs, skb->data, len) == -EAGAIN) {
|
|
|
|
/* insufficient buffer space, push back onto queue */
|
|
|
|
skb_queue_head(&bcs->squeue, skb);
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ISO, "%s: skb requeued, qlen=%d",
|
|
|
|
__func__, skb_queue_len(&bcs->squeue));
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
skb_pull(skb, len);
|
|
|
|
gigaset_skb_sent(bcs, skb);
|
|
|
|
dev_kfree_skb_any(skb);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Isochronous Read - Bottom Half */
|
|
|
|
/* ============================== */
|
|
|
|
|
|
|
|
/* read_iso_tasklet
|
|
|
|
* tasklet scheduled when an isochronous input URB from the Gigaset device
|
|
|
|
* has completed
|
|
|
|
* parameter:
|
|
|
|
* data B channel state structure
|
|
|
|
*/
|
|
|
|
static void read_iso_tasklet(unsigned long data)
|
|
|
|
{
|
2006-04-11 05:55:08 +00:00
|
|
|
struct bc_state *bcs = (struct bc_state *) data;
|
|
|
|
struct bas_bc_state *ubc = bcs->hw.bas;
|
|
|
|
struct cardstate *cs = bcs->cs;
|
2006-03-26 09:38:34 +00:00
|
|
|
struct urb *urb;
|
2008-02-06 09:38:23 +00:00
|
|
|
int status;
|
2006-03-26 09:38:34 +00:00
|
|
|
char *rcvbuf;
|
|
|
|
unsigned long flags;
|
|
|
|
int totleft, numbytes, offset, frame, rc;
|
|
|
|
|
|
|
|
/* loop while more completed URBs arrive in the meantime */
|
|
|
|
for (;;) {
|
|
|
|
/* retrieve URB */
|
|
|
|
spin_lock_irqsave(&ubc->isoinlock, flags);
|
2009-10-25 09:30:37 +00:00
|
|
|
urb = ubc->isoindone;
|
|
|
|
if (!urb) {
|
2006-03-26 09:38:34 +00:00
|
|
|
spin_unlock_irqrestore(&ubc->isoinlock, flags);
|
|
|
|
return;
|
|
|
|
}
|
2008-02-06 09:38:23 +00:00
|
|
|
status = ubc->isoinstatus;
|
2006-03-26 09:38:34 +00:00
|
|
|
ubc->isoindone = NULL;
|
|
|
|
if (unlikely(ubc->loststatus != -EINPROGRESS)) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev,
|
|
|
|
"isochronous read overrun, "
|
|
|
|
"dropped URB with status: %s, %d bytes lost\n",
|
|
|
|
get_usb_statmsg(ubc->loststatus),
|
|
|
|
ubc->isoinlost);
|
2006-03-26 09:38:34 +00:00
|
|
|
ubc->loststatus = -EINPROGRESS;
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&ubc->isoinlock, flags);
|
|
|
|
|
2008-02-06 09:38:28 +00:00
|
|
|
if (unlikely(!(ubc->running))) {
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ISO,
|
|
|
|
"%s: channel not running, "
|
|
|
|
"dropped URB with status: %s",
|
2008-02-06 09:38:23 +00:00
|
|
|
__func__, get_usb_statmsg(status));
|
2006-03-26 09:38:34 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-02-06 09:38:23 +00:00
|
|
|
switch (status) {
|
2006-03-26 09:38:34 +00:00
|
|
|
case 0: /* normal completion */
|
|
|
|
break;
|
2006-04-11 05:55:00 +00:00
|
|
|
case -EXDEV: /* inspect individual frames
|
|
|
|
(we do that anyway) */
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ISO, "%s: URB partially completed",
|
|
|
|
__func__);
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
case -ENOENT:
|
|
|
|
case -ECONNRESET:
|
2006-04-22 09:35:30 +00:00
|
|
|
case -EINPROGRESS:
|
|
|
|
gig_dbg(DEBUG_ISO, "%s: %s",
|
2008-02-06 09:38:23 +00:00
|
|
|
__func__, get_usb_statmsg(status));
|
2006-03-26 09:38:34 +00:00
|
|
|
continue; /* -> skip */
|
|
|
|
case -EPIPE:
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(cs->dev, "isochronous read stalled\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
error_hangup(bcs);
|
|
|
|
continue; /* -> skip */
|
|
|
|
default: /* severe trouble */
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev, "isochronous read: %s\n",
|
2008-02-06 09:38:23 +00:00
|
|
|
get_usb_statmsg(status));
|
2006-03-26 09:38:34 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
rcvbuf = urb->transfer_buffer;
|
|
|
|
totleft = urb->actual_length;
|
|
|
|
for (frame = 0; totleft > 0 && frame < BAS_NUMFRAMES; frame++) {
|
2009-10-06 12:18:36 +00:00
|
|
|
numbytes = urb->iso_frame_desc[frame].actual_length;
|
|
|
|
if (unlikely(urb->iso_frame_desc[frame].status))
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev,
|
2009-10-06 12:18:36 +00:00
|
|
|
"isochronous read: frame %d[%d]: %s\n",
|
|
|
|
frame, numbytes,
|
2006-04-11 05:55:04 +00:00
|
|
|
get_usb_statmsg(
|
|
|
|
urb->iso_frame_desc[frame].status));
|
2009-10-06 12:18:36 +00:00
|
|
|
if (unlikely(numbytes > BAS_MAXFRAME))
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev,
|
|
|
|
"isochronous read: frame %d: "
|
|
|
|
"numbytes (%d) > BAS_MAXFRAME\n",
|
|
|
|
frame, numbytes);
|
2006-03-26 09:38:34 +00:00
|
|
|
if (unlikely(numbytes > totleft)) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev,
|
|
|
|
"isochronous read: frame %d: "
|
|
|
|
"numbytes (%d) > totleft (%d)\n",
|
|
|
|
frame, numbytes, totleft);
|
2009-10-06 12:18:36 +00:00
|
|
|
numbytes = totleft;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
offset = urb->iso_frame_desc[frame].offset;
|
|
|
|
if (unlikely(offset + numbytes > BAS_INBUFSIZE)) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev,
|
|
|
|
"isochronous read: frame %d: "
|
|
|
|
"offset (%d) + numbytes (%d) "
|
|
|
|
"> BAS_INBUFSIZE\n",
|
|
|
|
frame, offset, numbytes);
|
2009-10-06 12:18:36 +00:00
|
|
|
numbytes = BAS_INBUFSIZE - offset;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
gigaset_isoc_receive(rcvbuf + offset, numbytes, bcs);
|
|
|
|
totleft -= numbytes;
|
|
|
|
}
|
|
|
|
if (unlikely(totleft > 0))
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev,
|
|
|
|
"isochronous read: %d data bytes missing\n",
|
|
|
|
totleft);
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2009-10-25 09:30:37 +00:00
|
|
|
error:
|
2006-03-26 09:38:34 +00:00
|
|
|
/* URB processed, resubmit */
|
|
|
|
for (frame = 0; frame < BAS_NUMFRAMES; frame++) {
|
|
|
|
urb->iso_frame_desc[frame].status = 0;
|
|
|
|
urb->iso_frame_desc[frame].actual_length = 0;
|
|
|
|
}
|
2006-04-11 05:55:04 +00:00
|
|
|
/* urb->dev is clobbered by USB subsystem */
|
|
|
|
urb->dev = bcs->cs->hw.bas->udev;
|
2006-03-26 09:38:34 +00:00
|
|
|
urb->transfer_flags = URB_ISO_ASAP;
|
|
|
|
urb->number_of_packets = BAS_NUMFRAMES;
|
2006-12-07 04:33:16 +00:00
|
|
|
rc = usb_submit_urb(urb, GFP_ATOMIC);
|
2006-04-22 09:35:30 +00:00
|
|
|
if (unlikely(rc != 0 && rc != -ENODEV)) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(cs->dev,
|
|
|
|
"could not resubmit isochronous read URB: %s\n",
|
2006-04-22 09:35:30 +00:00
|
|
|
get_usb_rcmsg(rc));
|
2006-03-26 09:38:34 +00:00
|
|
|
dump_urb(DEBUG_ISO, "resubmit iso read", urb);
|
|
|
|
error_hangup(bcs);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Channel Operations */
|
|
|
|
/* ================== */
|
|
|
|
|
|
|
|
/* req_timeout
|
|
|
|
* timeout routine for control output request
|
|
|
|
* argument:
|
|
|
|
* B channel control structure
|
|
|
|
*/
|
|
|
|
static void req_timeout(unsigned long data)
|
|
|
|
{
|
|
|
|
struct bc_state *bcs = (struct bc_state *) data;
|
2006-04-11 05:55:08 +00:00
|
|
|
struct bas_cardstate *ucs = bcs->cs->hw.bas;
|
2006-03-26 09:38:34 +00:00
|
|
|
int pending;
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
check_pending(ucs);
|
|
|
|
|
|
|
|
spin_lock_irqsave(&ucs->lock, flags);
|
|
|
|
pending = ucs->pending;
|
|
|
|
ucs->pending = 0;
|
|
|
|
spin_unlock_irqrestore(&ucs->lock, flags);
|
|
|
|
|
|
|
|
switch (pending) {
|
|
|
|
case 0: /* no pending request */
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_USBREQ, "%s: no request pending", __func__);
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case HD_OPEN_ATCHANNEL:
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(bcs->cs->dev, "timeout opening AT channel\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
error_reset(bcs->cs);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HD_OPEN_B2CHANNEL:
|
|
|
|
case HD_OPEN_B1CHANNEL:
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(bcs->cs->dev, "timeout opening channel %d\n",
|
|
|
|
bcs->channel + 1);
|
2006-03-26 09:38:34 +00:00
|
|
|
error_hangup(bcs);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HD_CLOSE_ATCHANNEL:
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(bcs->cs->dev, "timeout closing AT channel\n");
|
2009-10-06 12:18:51 +00:00
|
|
|
error_reset(bcs->cs);
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case HD_CLOSE_B2CHANNEL:
|
|
|
|
case HD_CLOSE_B1CHANNEL:
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(bcs->cs->dev, "timeout closing channel %d\n",
|
|
|
|
bcs->channel + 1);
|
2006-06-26 07:25:33 +00:00
|
|
|
error_reset(bcs->cs);
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
|
2009-10-06 12:18:51 +00:00
|
|
|
case HD_RESET_INTERRUPT_PIPE:
|
|
|
|
/* error recovery escalation */
|
|
|
|
dev_err(bcs->cs->dev,
|
|
|
|
"reset interrupt pipe timeout, attempting USB reset\n");
|
|
|
|
usb_queue_reset_device(bcs->cs->hw.bas->interface);
|
|
|
|
break;
|
|
|
|
|
2006-03-26 09:38:34 +00:00
|
|
|
default:
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(bcs->cs->dev, "request 0x%02x timed out, clearing\n",
|
|
|
|
pending);
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
2008-02-06 09:38:26 +00:00
|
|
|
|
|
|
|
wake_up(&ucs->waitqueue);
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* write_ctrl_callback
|
|
|
|
* USB completion handler for control pipe output
|
|
|
|
* called by the USB subsystem in interrupt context
|
|
|
|
* parameter:
|
|
|
|
* urb USB request block of completed request
|
|
|
|
* urb->context = hardware specific controller state structure
|
|
|
|
*/
|
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 13:55:46 +00:00
|
|
|
static void write_ctrl_callback(struct urb *urb)
|
2006-03-26 09:38:34 +00:00
|
|
|
{
|
2006-04-11 05:55:08 +00:00
|
|
|
struct bas_cardstate *ucs = urb->context;
|
2008-02-06 09:38:23 +00:00
|
|
|
int status = urb->status;
|
2006-06-26 07:25:33 +00:00
|
|
|
int rc;
|
2006-03-26 09:38:34 +00:00
|
|
|
unsigned long flags;
|
|
|
|
|
2006-06-26 07:25:33 +00:00
|
|
|
/* check status */
|
2008-02-06 09:38:23 +00:00
|
|
|
switch (status) {
|
2006-06-26 07:25:33 +00:00
|
|
|
case 0: /* normal completion */
|
|
|
|
spin_lock_irqsave(&ucs->lock, flags);
|
|
|
|
switch (ucs->pending) {
|
|
|
|
case HD_DEVICE_INIT_ACK: /* no reply expected */
|
|
|
|
del_timer(&ucs->timer_ctrl);
|
|
|
|
ucs->pending = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&ucs->lock, flags);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case -ENOENT: /* cancelled */
|
|
|
|
case -ECONNRESET: /* cancelled (async) */
|
|
|
|
case -EINPROGRESS: /* pending */
|
|
|
|
case -ENODEV: /* device removed */
|
|
|
|
case -ESHUTDOWN: /* device shut down */
|
|
|
|
/* ignore silently */
|
|
|
|
gig_dbg(DEBUG_USBREQ, "%s: %s",
|
2008-02-06 09:38:23 +00:00
|
|
|
__func__, get_usb_statmsg(status));
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
2006-06-26 07:25:33 +00:00
|
|
|
|
|
|
|
default: /* any failure */
|
2008-02-06 09:38:26 +00:00
|
|
|
/* don't retry if suspend requested */
|
|
|
|
if (++ucs->retry_ctrl > BAS_RETRY ||
|
2008-02-06 09:38:28 +00:00
|
|
|
(ucs->basstate & BS_SUSPEND)) {
|
2006-06-26 07:25:33 +00:00
|
|
|
dev_err(&ucs->interface->dev,
|
|
|
|
"control request 0x%02x failed: %s\n",
|
|
|
|
ucs->dr_ctrl.bRequest,
|
2008-02-06 09:38:23 +00:00
|
|
|
get_usb_statmsg(status));
|
2006-06-26 07:25:33 +00:00
|
|
|
break; /* give up */
|
|
|
|
}
|
|
|
|
dev_notice(&ucs->interface->dev,
|
|
|
|
"control request 0x%02x: %s, retry %d\n",
|
2008-02-06 09:38:23 +00:00
|
|
|
ucs->dr_ctrl.bRequest, get_usb_statmsg(status),
|
2006-06-26 07:25:33 +00:00
|
|
|
ucs->retry_ctrl);
|
|
|
|
/* urb->dev is clobbered by USB subsystem */
|
|
|
|
urb->dev = ucs->udev;
|
2006-12-07 04:33:16 +00:00
|
|
|
rc = usb_submit_urb(urb, GFP_ATOMIC);
|
2006-06-26 07:25:33 +00:00
|
|
|
if (unlikely(rc)) {
|
|
|
|
dev_err(&ucs->interface->dev,
|
|
|
|
"could not resubmit request 0x%02x: %s\n",
|
|
|
|
ucs->dr_ctrl.bRequest, get_usb_rcmsg(rc));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* resubmitted */
|
|
|
|
return;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
2006-06-26 07:25:33 +00:00
|
|
|
|
|
|
|
/* failed, clear pending request */
|
|
|
|
spin_lock_irqsave(&ucs->lock, flags);
|
|
|
|
del_timer(&ucs->timer_ctrl);
|
|
|
|
ucs->pending = 0;
|
2006-03-26 09:38:34 +00:00
|
|
|
spin_unlock_irqrestore(&ucs->lock, flags);
|
2008-02-06 09:38:26 +00:00
|
|
|
wake_up(&ucs->waitqueue);
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* req_submit
|
|
|
|
* submit a control output request without message buffer to the Gigaset base
|
|
|
|
* and optionally start a timeout
|
|
|
|
* parameters:
|
|
|
|
* bcs B channel control structure
|
|
|
|
* req control request code (HD_*)
|
|
|
|
* val control request parameter value (set to 0 if unused)
|
|
|
|
* timeout timeout in seconds (0: no timeout)
|
|
|
|
* return value:
|
|
|
|
* 0 on success
|
|
|
|
* -EBUSY if another request is pending
|
|
|
|
* any URB submission error code
|
|
|
|
*/
|
|
|
|
static int req_submit(struct bc_state *bcs, int req, int val, int timeout)
|
|
|
|
{
|
2006-04-11 05:55:08 +00:00
|
|
|
struct bas_cardstate *ucs = bcs->cs->hw.bas;
|
2006-03-26 09:38:34 +00:00
|
|
|
int ret;
|
|
|
|
unsigned long flags;
|
|
|
|
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_USBREQ, "-------> 0x%02x (%d)", req, val);
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
spin_lock_irqsave(&ucs->lock, flags);
|
|
|
|
if (ucs->pending) {
|
|
|
|
spin_unlock_irqrestore(&ucs->lock, flags);
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(bcs->cs->dev,
|
|
|
|
"submission of request 0x%02x failed: "
|
|
|
|
"request 0x%02x still pending\n",
|
|
|
|
req, ucs->pending);
|
2006-03-26 09:38:34 +00:00
|
|
|
return -EBUSY;
|
|
|
|
}
|
|
|
|
|
|
|
|
ucs->dr_ctrl.bRequestType = OUT_VENDOR_REQ;
|
|
|
|
ucs->dr_ctrl.bRequest = req;
|
|
|
|
ucs->dr_ctrl.wValue = cpu_to_le16(val);
|
|
|
|
ucs->dr_ctrl.wIndex = 0;
|
|
|
|
ucs->dr_ctrl.wLength = 0;
|
|
|
|
usb_fill_control_urb(ucs->urb_ctrl, ucs->udev,
|
2006-04-11 05:55:04 +00:00
|
|
|
usb_sndctrlpipe(ucs->udev, 0),
|
2009-10-25 09:30:37 +00:00
|
|
|
(unsigned char *) &ucs->dr_ctrl, NULL, 0,
|
2006-04-11 05:55:04 +00:00
|
|
|
write_ctrl_callback, ucs);
|
2006-06-26 07:25:33 +00:00
|
|
|
ucs->retry_ctrl = 0;
|
2006-12-07 04:33:16 +00:00
|
|
|
ret = usb_submit_urb(ucs->urb_ctrl, GFP_ATOMIC);
|
2006-06-26 07:25:33 +00:00
|
|
|
if (unlikely(ret)) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(bcs->cs->dev, "could not submit request 0x%02x: %s\n",
|
2006-06-26 07:25:33 +00:00
|
|
|
req, get_usb_rcmsg(ret));
|
2006-03-26 09:38:34 +00:00
|
|
|
spin_unlock_irqrestore(&ucs->lock, flags);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
ucs->pending = req;
|
|
|
|
|
|
|
|
if (timeout > 0) {
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_USBREQ, "setting timeout of %d/10 secs", timeout);
|
2006-03-26 09:38:34 +00:00
|
|
|
ucs->timer_ctrl.expires = jiffies + timeout * HZ / 10;
|
|
|
|
ucs->timer_ctrl.data = (unsigned long) bcs;
|
|
|
|
ucs->timer_ctrl.function = req_timeout;
|
|
|
|
add_timer(&ucs->timer_ctrl);
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&ucs->lock, flags);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* gigaset_init_bchannel
|
|
|
|
* called by common.c to connect a B channel
|
|
|
|
* initialize isochronous I/O and tell the Gigaset base to open the channel
|
|
|
|
* argument:
|
|
|
|
* B channel control structure
|
|
|
|
* return value:
|
|
|
|
* 0 on success, error code < 0 on error
|
|
|
|
*/
|
|
|
|
static int gigaset_init_bchannel(struct bc_state *bcs)
|
|
|
|
{
|
2008-02-06 09:38:24 +00:00
|
|
|
struct cardstate *cs = bcs->cs;
|
2006-03-26 09:38:34 +00:00
|
|
|
int req, ret;
|
2006-04-22 09:35:30 +00:00
|
|
|
unsigned long flags;
|
|
|
|
|
2008-02-06 09:38:24 +00:00
|
|
|
spin_lock_irqsave(&cs->lock, flags);
|
|
|
|
if (unlikely(!cs->connected)) {
|
2006-04-22 09:35:30 +00:00
|
|
|
gig_dbg(DEBUG_USBREQ, "%s: not connected", __func__);
|
2008-02-06 09:38:24 +00:00
|
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
2006-04-22 09:35:30 +00:00
|
|
|
return -ENODEV;
|
|
|
|
}
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2008-02-06 09:38:28 +00:00
|
|
|
if (cs->hw.bas->basstate & BS_SUSPEND) {
|
2008-02-06 09:38:26 +00:00
|
|
|
dev_notice(cs->dev,
|
|
|
|
"not starting isochronous I/O, "
|
|
|
|
"suspend in progress\n");
|
|
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
|
|
|
return -EHOSTUNREACH;
|
|
|
|
}
|
|
|
|
|
2009-10-25 09:30:37 +00:00
|
|
|
ret = starturbs(bcs);
|
|
|
|
if (ret < 0) {
|
2008-02-06 09:38:24 +00:00
|
|
|
dev_err(cs->dev,
|
2006-04-22 09:35:30 +00:00
|
|
|
"could not start isochronous I/O for channel B%d: %s\n",
|
|
|
|
bcs->channel + 1,
|
|
|
|
ret == -EFAULT ? "null URB" : get_usb_rcmsg(ret));
|
|
|
|
if (ret != -ENODEV)
|
|
|
|
error_hangup(bcs);
|
2008-02-06 09:38:24 +00:00
|
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
2006-03-26 09:38:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
req = bcs->channel ? HD_OPEN_B2CHANNEL : HD_OPEN_B1CHANNEL;
|
2009-10-25 09:30:37 +00:00
|
|
|
ret = req_submit(bcs, req, 0, BAS_TIMEOUT);
|
|
|
|
if (ret < 0) {
|
2008-02-06 09:38:24 +00:00
|
|
|
dev_err(cs->dev, "could not open channel B%d\n",
|
2006-04-22 09:35:30 +00:00
|
|
|
bcs->channel + 1);
|
2006-03-26 09:38:34 +00:00
|
|
|
stopurbs(bcs->hw.bas);
|
2006-04-22 09:35:30 +00:00
|
|
|
if (ret != -ENODEV)
|
|
|
|
error_hangup(bcs);
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
2006-04-22 09:35:30 +00:00
|
|
|
|
2008-02-06 09:38:24 +00:00
|
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
2006-03-26 09:38:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* gigaset_close_bchannel
|
|
|
|
* called by common.c to disconnect a B channel
|
|
|
|
* tell the Gigaset base to close the channel
|
|
|
|
* stopping isochronous I/O and LL notification will be done when the
|
|
|
|
* acknowledgement for the close arrives
|
|
|
|
* argument:
|
|
|
|
* B channel control structure
|
|
|
|
* return value:
|
|
|
|
* 0 on success, error code < 0 on error
|
|
|
|
*/
|
|
|
|
static int gigaset_close_bchannel(struct bc_state *bcs)
|
|
|
|
{
|
2008-02-06 09:38:24 +00:00
|
|
|
struct cardstate *cs = bcs->cs;
|
2006-03-26 09:38:34 +00:00
|
|
|
int req, ret;
|
2006-04-22 09:35:30 +00:00
|
|
|
unsigned long flags;
|
|
|
|
|
2008-02-06 09:38:24 +00:00
|
|
|
spin_lock_irqsave(&cs->lock, flags);
|
|
|
|
if (unlikely(!cs->connected)) {
|
|
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
2006-04-22 09:35:30 +00:00
|
|
|
gig_dbg(DEBUG_USBREQ, "%s: not connected", __func__);
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2008-02-06 09:38:28 +00:00
|
|
|
if (!(cs->hw.bas->basstate & (bcs->channel ? BS_B2OPEN : BS_B1OPEN))) {
|
2006-03-26 09:38:34 +00:00
|
|
|
/* channel not running: just signal common.c */
|
2008-02-06 09:38:24 +00:00
|
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
2006-03-26 09:38:34 +00:00
|
|
|
gigaset_bchannel_down(bcs);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-04-22 09:35:30 +00:00
|
|
|
/* channel running: tell device to close it */
|
2006-03-26 09:38:34 +00:00
|
|
|
req = bcs->channel ? HD_CLOSE_B2CHANNEL : HD_CLOSE_B1CHANNEL;
|
2009-10-25 09:30:37 +00:00
|
|
|
ret = req_submit(bcs, req, 0, BAS_TIMEOUT);
|
|
|
|
if (ret < 0)
|
2008-02-06 09:38:24 +00:00
|
|
|
dev_err(cs->dev, "closing channel B%d failed\n",
|
2006-04-22 09:35:30 +00:00
|
|
|
bcs->channel + 1);
|
|
|
|
|
2008-02-06 09:38:24 +00:00
|
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
2006-03-26 09:38:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Device Operations */
|
|
|
|
/* ================= */
|
|
|
|
|
|
|
|
/* complete_cb
|
|
|
|
* unqueue first command buffer from queue, waking any sleepers
|
|
|
|
* must be called with cs->cmdlock held
|
|
|
|
* parameter:
|
|
|
|
* cs controller state structure
|
|
|
|
*/
|
|
|
|
static void complete_cb(struct cardstate *cs)
|
|
|
|
{
|
2006-04-11 05:55:08 +00:00
|
|
|
struct cmdbuf_t *cb = cs->cmdbuf;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
/* unqueue completed buffer */
|
|
|
|
cs->cmdbytes -= cs->curlen;
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_TRANSCMD|DEBUG_LOCKCMD,
|
|
|
|
"write_command: sent %u bytes, %u left",
|
|
|
|
cs->curlen, cs->cmdbytes);
|
2009-10-25 09:30:37 +00:00
|
|
|
if (cb->next != NULL) {
|
|
|
|
cs->cmdbuf = cb->next;
|
2006-03-26 09:38:34 +00:00
|
|
|
cs->cmdbuf->prev = NULL;
|
|
|
|
cs->curlen = cs->cmdbuf->len;
|
|
|
|
} else {
|
2009-10-25 09:30:37 +00:00
|
|
|
cs->cmdbuf = NULL;
|
2006-03-26 09:38:34 +00:00
|
|
|
cs->lastcmdbuf = NULL;
|
|
|
|
cs->curlen = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cb->wake_tasklet)
|
|
|
|
tasklet_schedule(cb->wake_tasklet);
|
|
|
|
|
|
|
|
kfree(cb);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* write_command_callback
|
|
|
|
* USB completion handler for AT command transmission
|
|
|
|
* called by the USB subsystem in interrupt context
|
|
|
|
* parameter:
|
|
|
|
* urb USB request block of completed request
|
|
|
|
* urb->context = controller state structure
|
|
|
|
*/
|
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 13:55:46 +00:00
|
|
|
static void write_command_callback(struct urb *urb)
|
2006-03-26 09:38:34 +00:00
|
|
|
{
|
2006-04-11 05:55:08 +00:00
|
|
|
struct cardstate *cs = urb->context;
|
|
|
|
struct bas_cardstate *ucs = cs->hw.bas;
|
2008-02-06 09:38:23 +00:00
|
|
|
int status = urb->status;
|
2006-03-26 09:38:34 +00:00
|
|
|
unsigned long flags;
|
|
|
|
|
2006-04-22 09:35:30 +00:00
|
|
|
update_basstate(ucs, 0, BS_ATWRPEND);
|
2008-02-06 09:38:26 +00:00
|
|
|
wake_up(&ucs->waitqueue);
|
2006-04-22 09:35:30 +00:00
|
|
|
|
2006-03-26 09:38:34 +00:00
|
|
|
/* check status */
|
2008-02-06 09:38:23 +00:00
|
|
|
switch (status) {
|
2006-03-26 09:38:34 +00:00
|
|
|
case 0: /* normal completion */
|
|
|
|
break;
|
2006-04-22 09:35:30 +00:00
|
|
|
case -ENOENT: /* cancelled */
|
|
|
|
case -ECONNRESET: /* cancelled (async) */
|
2006-03-26 09:38:34 +00:00
|
|
|
case -EINPROGRESS: /* pending */
|
2006-04-22 09:35:30 +00:00
|
|
|
case -ENODEV: /* device removed */
|
|
|
|
case -ESHUTDOWN: /* device shut down */
|
2006-03-26 09:38:34 +00:00
|
|
|
/* ignore silently */
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_USBREQ, "%s: %s",
|
2008-02-06 09:38:23 +00:00
|
|
|
__func__, get_usb_statmsg(status));
|
2006-03-26 09:38:34 +00:00
|
|
|
return;
|
|
|
|
default: /* any failure */
|
|
|
|
if (++ucs->retry_cmd_out > BAS_RETRY) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev,
|
|
|
|
"command write: %s, "
|
|
|
|
"giving up after %d retries\n",
|
2008-02-06 09:38:23 +00:00
|
|
|
get_usb_statmsg(status),
|
2006-04-11 05:55:04 +00:00
|
|
|
ucs->retry_cmd_out);
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
}
|
2008-02-06 09:38:28 +00:00
|
|
|
if (ucs->basstate & BS_SUSPEND) {
|
2008-02-06 09:38:26 +00:00
|
|
|
dev_warn(cs->dev,
|
|
|
|
"command write: %s, "
|
|
|
|
"won't retry - suspend requested\n",
|
|
|
|
get_usb_statmsg(status));
|
|
|
|
break;
|
|
|
|
}
|
2006-03-26 09:38:34 +00:00
|
|
|
if (cs->cmdbuf == NULL) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev,
|
|
|
|
"command write: %s, "
|
|
|
|
"cannot retry - cmdbuf gone\n",
|
2008-02-06 09:38:23 +00:00
|
|
|
get_usb_statmsg(status));
|
2006-03-26 09:38:34 +00:00
|
|
|
break;
|
|
|
|
}
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_notice(cs->dev, "command write: %s, retry %d\n",
|
2008-02-06 09:38:23 +00:00
|
|
|
get_usb_statmsg(status), ucs->retry_cmd_out);
|
2006-03-26 09:38:34 +00:00
|
|
|
if (atwrite_submit(cs, cs->cmdbuf->buf, cs->cmdbuf->len) >= 0)
|
|
|
|
/* resubmitted - bypass regular exit block */
|
|
|
|
return;
|
|
|
|
/* command send failed, assume base still waiting */
|
|
|
|
update_basstate(ucs, BS_ATREADY, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_lock_irqsave(&cs->cmdlock, flags);
|
|
|
|
if (cs->cmdbuf != NULL)
|
|
|
|
complete_cb(cs);
|
|
|
|
spin_unlock_irqrestore(&cs->cmdlock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* atrdy_timeout
|
|
|
|
* timeout routine for AT command transmission
|
|
|
|
* argument:
|
|
|
|
* controller state structure
|
|
|
|
*/
|
|
|
|
static void atrdy_timeout(unsigned long data)
|
|
|
|
{
|
|
|
|
struct cardstate *cs = (struct cardstate *) data;
|
2006-04-11 05:55:08 +00:00
|
|
|
struct bas_cardstate *ucs = cs->hw.bas;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(cs->dev, "timeout waiting for HD_READY_SEND_ATDATA\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
/* fake the missing signal - what else can I do? */
|
|
|
|
update_basstate(ucs, BS_ATREADY, BS_ATTIMER);
|
|
|
|
start_cbsend(cs);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* atwrite_submit
|
|
|
|
* submit an HD_WRITE_ATMESSAGE command URB
|
|
|
|
* parameters:
|
|
|
|
* cs controller state structure
|
|
|
|
* buf buffer containing command to send
|
|
|
|
* len length of command to send
|
|
|
|
* return value:
|
|
|
|
* 0 on success
|
|
|
|
* -EBUSY if another request is pending
|
|
|
|
* any URB submission error code
|
|
|
|
*/
|
|
|
|
static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len)
|
|
|
|
{
|
2006-04-11 05:55:08 +00:00
|
|
|
struct bas_cardstate *ucs = cs->hw.bas;
|
2006-04-22 09:35:30 +00:00
|
|
|
int rc;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_USBREQ, "-------> HD_WRITE_ATMESSAGE (%d)", len);
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2006-04-22 09:35:30 +00:00
|
|
|
if (update_basstate(ucs, BS_ATWRPEND, 0) & BS_ATWRPEND) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(cs->dev,
|
|
|
|
"could not submit HD_WRITE_ATMESSAGE: URB busy\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
return -EBUSY;
|
|
|
|
}
|
|
|
|
|
|
|
|
ucs->dr_cmd_out.bRequestType = OUT_VENDOR_REQ;
|
|
|
|
ucs->dr_cmd_out.bRequest = HD_WRITE_ATMESSAGE;
|
|
|
|
ucs->dr_cmd_out.wValue = 0;
|
|
|
|
ucs->dr_cmd_out.wIndex = 0;
|
|
|
|
ucs->dr_cmd_out.wLength = cpu_to_le16(len);
|
|
|
|
usb_fill_control_urb(ucs->urb_cmd_out, ucs->udev,
|
|
|
|
usb_sndctrlpipe(ucs->udev, 0),
|
2009-10-25 09:30:37 +00:00
|
|
|
(unsigned char *) &ucs->dr_cmd_out, buf, len,
|
2006-03-26 09:38:34 +00:00
|
|
|
write_command_callback, cs);
|
2006-12-07 04:33:16 +00:00
|
|
|
rc = usb_submit_urb(ucs->urb_cmd_out, GFP_ATOMIC);
|
2006-04-22 09:35:30 +00:00
|
|
|
if (unlikely(rc)) {
|
|
|
|
update_basstate(ucs, 0, BS_ATWRPEND);
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(cs->dev, "could not submit HD_WRITE_ATMESSAGE: %s\n",
|
2006-04-22 09:35:30 +00:00
|
|
|
get_usb_rcmsg(rc));
|
|
|
|
return rc;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
2006-04-22 09:35:30 +00:00
|
|
|
/* submitted successfully, start timeout if necessary */
|
|
|
|
if (!(update_basstate(ucs, BS_ATTIMER, BS_ATREADY) & BS_ATTIMER)) {
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_OUTPUT, "setting ATREADY timeout of %d/10 secs",
|
|
|
|
ATRDY_TIMEOUT);
|
2006-03-26 09:38:34 +00:00
|
|
|
ucs->timer_atrdy.expires = jiffies + ATRDY_TIMEOUT * HZ / 10;
|
|
|
|
ucs->timer_atrdy.data = (unsigned long) cs;
|
|
|
|
ucs->timer_atrdy.function = atrdy_timeout;
|
|
|
|
add_timer(&ucs->timer_atrdy);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* start_cbsend
|
|
|
|
* start transmission of AT command queue if necessary
|
|
|
|
* parameter:
|
|
|
|
* cs controller state structure
|
|
|
|
* return value:
|
|
|
|
* 0 on success
|
|
|
|
* error code < 0 on error
|
|
|
|
*/
|
|
|
|
static int start_cbsend(struct cardstate *cs)
|
|
|
|
{
|
|
|
|
struct cmdbuf_t *cb;
|
2006-04-11 05:55:08 +00:00
|
|
|
struct bas_cardstate *ucs = cs->hw.bas;
|
2006-03-26 09:38:34 +00:00
|
|
|
unsigned long flags;
|
|
|
|
int rc;
|
|
|
|
int retval = 0;
|
|
|
|
|
2008-02-06 09:38:26 +00:00
|
|
|
/* check if suspend requested */
|
2008-02-06 09:38:28 +00:00
|
|
|
if (ucs->basstate & BS_SUSPEND) {
|
2008-02-06 09:38:26 +00:00
|
|
|
gig_dbg(DEBUG_TRANSCMD|DEBUG_LOCKCMD, "suspending");
|
|
|
|
return -EHOSTUNREACH;
|
|
|
|
}
|
|
|
|
|
2006-03-26 09:38:34 +00:00
|
|
|
/* check if AT channel is open */
|
2008-02-06 09:38:28 +00:00
|
|
|
if (!(ucs->basstate & BS_ATOPEN)) {
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_TRANSCMD|DEBUG_LOCKCMD, "AT channel not open");
|
2006-03-26 09:38:34 +00:00
|
|
|
rc = req_submit(cs->bcs, HD_OPEN_ATCHANNEL, 0, BAS_TIMEOUT);
|
|
|
|
if (rc < 0) {
|
|
|
|
/* flush command queue */
|
|
|
|
spin_lock_irqsave(&cs->cmdlock, flags);
|
|
|
|
while (cs->cmdbuf != NULL)
|
|
|
|
complete_cb(cs);
|
|
|
|
spin_unlock_irqrestore(&cs->cmdlock, flags);
|
|
|
|
}
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* try to send first command in queue */
|
|
|
|
spin_lock_irqsave(&cs->cmdlock, flags);
|
|
|
|
|
2008-02-06 09:38:28 +00:00
|
|
|
while ((cb = cs->cmdbuf) != NULL && (ucs->basstate & BS_ATREADY)) {
|
2006-03-26 09:38:34 +00:00
|
|
|
ucs->retry_cmd_out = 0;
|
|
|
|
rc = atwrite_submit(cs, cb->buf, cb->len);
|
|
|
|
if (unlikely(rc)) {
|
|
|
|
retval = rc;
|
|
|
|
complete_cb(cs);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&cs->cmdlock, flags);
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* gigaset_write_cmd
|
|
|
|
* This function is called by the device independent part of the driver
|
|
|
|
* to transmit an AT command string to the Gigaset device.
|
|
|
|
* It encapsulates the device specific method for transmission over the
|
|
|
|
* direct USB connection to the base.
|
|
|
|
* The command string is added to the queue of commands to send, and
|
|
|
|
* USB transmission is started if necessary.
|
|
|
|
* parameters:
|
|
|
|
* cs controller state structure
|
|
|
|
* buf command string to send
|
|
|
|
* len number of bytes to send (max. IF_WRITEBUF)
|
2006-04-11 05:55:00 +00:00
|
|
|
* wake_tasklet tasklet to run when transmission is completed
|
|
|
|
* (NULL if none)
|
2006-03-26 09:38:34 +00:00
|
|
|
* return value:
|
|
|
|
* number of bytes queued on success
|
|
|
|
* error code < 0 on error
|
|
|
|
*/
|
|
|
|
static int gigaset_write_cmd(struct cardstate *cs,
|
2006-04-11 05:55:04 +00:00
|
|
|
const unsigned char *buf, int len,
|
|
|
|
struct tasklet_struct *wake_tasklet)
|
2006-03-26 09:38:34 +00:00
|
|
|
{
|
|
|
|
struct cmdbuf_t *cb;
|
|
|
|
unsigned long flags;
|
2006-12-13 08:33:52 +00:00
|
|
|
int rc;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2008-02-06 09:38:28 +00:00
|
|
|
gigaset_dbg_buffer(cs->mstate != MS_LOCKED ?
|
2006-04-11 05:55:04 +00:00
|
|
|
DEBUG_TRANSCMD : DEBUG_LOCKCMD,
|
2006-04-11 05:55:11 +00:00
|
|
|
"CMD Transmit", len, buf);
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2006-12-13 08:33:52 +00:00
|
|
|
if (len <= 0) {
|
|
|
|
/* nothing to do */
|
|
|
|
rc = 0;
|
|
|
|
goto notqueued;
|
|
|
|
}
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2009-10-06 12:18:51 +00:00
|
|
|
/* translate "+++" escape sequence sent as a single separate command
|
|
|
|
* into "close AT channel" command for error recovery
|
|
|
|
* The next command will reopen the AT channel automatically.
|
|
|
|
*/
|
|
|
|
if (len == 3 && !memcmp(buf, "+++", 3)) {
|
|
|
|
rc = req_submit(cs->bcs, HD_CLOSE_ATCHANNEL, 0, BAS_TIMEOUT);
|
|
|
|
goto notqueued;
|
|
|
|
}
|
|
|
|
|
2006-03-26 09:38:34 +00:00
|
|
|
if (len > IF_WRITEBUF)
|
|
|
|
len = IF_WRITEBUF;
|
2009-10-25 09:30:37 +00:00
|
|
|
cb = kmalloc(sizeof(struct cmdbuf_t) + len, GFP_ATOMIC);
|
|
|
|
if (!cb) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(cs->dev, "%s: out of memory\n", __func__);
|
2006-12-13 08:33:52 +00:00
|
|
|
rc = -ENOMEM;
|
|
|
|
goto notqueued;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(cb->buf, buf, len);
|
|
|
|
cb->len = len;
|
|
|
|
cb->offset = 0;
|
|
|
|
cb->next = NULL;
|
|
|
|
cb->wake_tasklet = wake_tasklet;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&cs->cmdlock, flags);
|
|
|
|
cb->prev = cs->lastcmdbuf;
|
|
|
|
if (cs->lastcmdbuf)
|
|
|
|
cs->lastcmdbuf->next = cb;
|
|
|
|
else {
|
|
|
|
cs->cmdbuf = cb;
|
|
|
|
cs->curlen = len;
|
|
|
|
}
|
|
|
|
cs->cmdbytes += len;
|
|
|
|
cs->lastcmdbuf = cb;
|
|
|
|
spin_unlock_irqrestore(&cs->cmdlock, flags);
|
|
|
|
|
2006-04-22 09:35:30 +00:00
|
|
|
spin_lock_irqsave(&cs->lock, flags);
|
|
|
|
if (unlikely(!cs->connected)) {
|
|
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
|
|
|
gig_dbg(DEBUG_USBREQ, "%s: not connected", __func__);
|
2006-12-13 08:33:52 +00:00
|
|
|
/* flush command queue */
|
|
|
|
spin_lock_irqsave(&cs->cmdlock, flags);
|
|
|
|
while (cs->cmdbuf != NULL)
|
|
|
|
complete_cb(cs);
|
|
|
|
spin_unlock_irqrestore(&cs->cmdlock, flags);
|
2006-04-22 09:35:30 +00:00
|
|
|
return -ENODEV;
|
|
|
|
}
|
2006-12-13 08:33:52 +00:00
|
|
|
rc = start_cbsend(cs);
|
2006-04-22 09:35:30 +00:00
|
|
|
spin_unlock_irqrestore(&cs->lock, flags);
|
2006-12-13 08:33:52 +00:00
|
|
|
return rc < 0 ? rc : len;
|
|
|
|
|
|
|
|
notqueued: /* request handled without queuing */
|
|
|
|
if (wake_tasklet)
|
|
|
|
tasklet_schedule(wake_tasklet);
|
|
|
|
return rc;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* gigaset_write_room
|
|
|
|
* tty_driver.write_room interface routine
|
2006-04-11 05:55:00 +00:00
|
|
|
* return number of characters the driver will accept to be written via
|
|
|
|
* gigaset_write_cmd
|
2006-03-26 09:38:34 +00:00
|
|
|
* parameter:
|
|
|
|
* controller state structure
|
|
|
|
* return value:
|
|
|
|
* number of characters
|
|
|
|
*/
|
|
|
|
static int gigaset_write_room(struct cardstate *cs)
|
|
|
|
{
|
|
|
|
return IF_WRITEBUF;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* gigaset_chars_in_buffer
|
|
|
|
* tty_driver.chars_in_buffer interface routine
|
|
|
|
* return number of characters waiting to be sent
|
|
|
|
* parameter:
|
|
|
|
* controller state structure
|
|
|
|
* return value:
|
|
|
|
* number of characters
|
|
|
|
*/
|
|
|
|
static int gigaset_chars_in_buffer(struct cardstate *cs)
|
|
|
|
{
|
2007-10-16 08:27:50 +00:00
|
|
|
return cs->cmdbytes;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* gigaset_brkchars
|
|
|
|
* implementation of ioctl(GIGASET_BRKCHARS)
|
|
|
|
* parameter:
|
|
|
|
* controller state structure
|
|
|
|
* return value:
|
|
|
|
* -EINVAL (unimplemented function)
|
|
|
|
*/
|
|
|
|
static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
|
|
|
|
{
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Device Initialization/Shutdown */
|
|
|
|
/* ============================== */
|
|
|
|
|
|
|
|
/* Free hardware dependent part of the B channel structure
|
|
|
|
* parameter:
|
|
|
|
* bcs B channel structure
|
|
|
|
* return value:
|
|
|
|
* !=0 on success
|
|
|
|
*/
|
|
|
|
static int gigaset_freebcshw(struct bc_state *bcs)
|
|
|
|
{
|
2006-04-22 09:35:30 +00:00
|
|
|
struct bas_bc_state *ubc = bcs->hw.bas;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!ubc)
|
2006-03-26 09:38:34 +00:00
|
|
|
return 0;
|
|
|
|
|
2006-04-22 09:35:30 +00:00
|
|
|
/* kill URBs and tasklets before freeing - better safe than sorry */
|
2008-02-06 09:38:28 +00:00
|
|
|
ubc->running = 0;
|
2006-12-13 08:33:52 +00:00
|
|
|
gig_dbg(DEBUG_INIT, "%s: killing iso URBs", __func__);
|
|
|
|
for (i = 0; i < BAS_OUTURBS; ++i) {
|
|
|
|
usb_kill_urb(ubc->isoouturbs[i].urb);
|
|
|
|
usb_free_urb(ubc->isoouturbs[i].urb);
|
|
|
|
}
|
|
|
|
for (i = 0; i < BAS_INURBS; ++i) {
|
|
|
|
usb_kill_urb(ubc->isoinurbs[i]);
|
|
|
|
usb_free_urb(ubc->isoinurbs[i]);
|
|
|
|
}
|
2006-04-22 09:35:30 +00:00
|
|
|
tasklet_kill(&ubc->sent_tasklet);
|
|
|
|
tasklet_kill(&ubc->rcvd_tasklet);
|
|
|
|
kfree(ubc->isooutbuf);
|
|
|
|
kfree(ubc);
|
2006-03-26 09:38:34 +00:00
|
|
|
bcs->hw.bas = NULL;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Initialize hardware dependent part of the B channel structure
|
|
|
|
* parameter:
|
|
|
|
* bcs B channel structure
|
|
|
|
* return value:
|
|
|
|
* !=0 on success
|
|
|
|
*/
|
|
|
|
static int gigaset_initbcshw(struct bc_state *bcs)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct bas_bc_state *ubc;
|
|
|
|
|
|
|
|
bcs->hw.bas = ubc = kmalloc(sizeof(struct bas_bc_state), GFP_KERNEL);
|
|
|
|
if (!ubc) {
|
2008-12-26 09:21:29 +00:00
|
|
|
pr_err("out of memory\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-02-06 09:38:28 +00:00
|
|
|
ubc->running = 0;
|
2006-03-26 09:38:34 +00:00
|
|
|
atomic_set(&ubc->corrbytes, 0);
|
|
|
|
spin_lock_init(&ubc->isooutlock);
|
|
|
|
for (i = 0; i < BAS_OUTURBS; ++i) {
|
|
|
|
ubc->isoouturbs[i].urb = NULL;
|
|
|
|
ubc->isoouturbs[i].bcs = bcs;
|
|
|
|
}
|
|
|
|
ubc->isooutdone = ubc->isooutfree = ubc->isooutovfl = NULL;
|
|
|
|
ubc->numsub = 0;
|
2009-10-25 09:30:37 +00:00
|
|
|
ubc->isooutbuf = kmalloc(sizeof(struct isowbuf_t), GFP_KERNEL);
|
|
|
|
if (!ubc->isooutbuf) {
|
2008-12-26 09:21:29 +00:00
|
|
|
pr_err("out of memory\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
kfree(ubc);
|
|
|
|
bcs->hw.bas = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
tasklet_init(&ubc->sent_tasklet,
|
2009-11-19 09:55:53 +00:00
|
|
|
write_iso_tasklet, (unsigned long) bcs);
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
spin_lock_init(&ubc->isoinlock);
|
|
|
|
for (i = 0; i < BAS_INURBS; ++i)
|
|
|
|
ubc->isoinurbs[i] = NULL;
|
|
|
|
ubc->isoindone = NULL;
|
|
|
|
ubc->loststatus = -EINPROGRESS;
|
|
|
|
ubc->isoinlost = 0;
|
|
|
|
ubc->seqlen = 0;
|
|
|
|
ubc->inbyte = 0;
|
|
|
|
ubc->inbits = 0;
|
|
|
|
ubc->goodbytes = 0;
|
|
|
|
ubc->alignerrs = 0;
|
|
|
|
ubc->fcserrs = 0;
|
|
|
|
ubc->frameerrs = 0;
|
|
|
|
ubc->giants = 0;
|
|
|
|
ubc->runts = 0;
|
|
|
|
ubc->aborts = 0;
|
|
|
|
ubc->shared0s = 0;
|
|
|
|
ubc->stolen0s = 0;
|
|
|
|
tasklet_init(&ubc->rcvd_tasklet,
|
2009-11-19 09:55:53 +00:00
|
|
|
read_iso_tasklet, (unsigned long) bcs);
|
2006-03-26 09:38:34 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gigaset_reinitbcshw(struct bc_state *bcs)
|
|
|
|
{
|
|
|
|
struct bas_bc_state *ubc = bcs->hw.bas;
|
|
|
|
|
2008-02-06 09:38:28 +00:00
|
|
|
bcs->hw.bas->running = 0;
|
2006-03-26 09:38:34 +00:00
|
|
|
atomic_set(&bcs->hw.bas->corrbytes, 0);
|
|
|
|
bcs->hw.bas->numsub = 0;
|
|
|
|
spin_lock_init(&ubc->isooutlock);
|
|
|
|
spin_lock_init(&ubc->isoinlock);
|
|
|
|
ubc->loststatus = -EINPROGRESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gigaset_freecshw(struct cardstate *cs)
|
|
|
|
{
|
2006-04-22 09:35:30 +00:00
|
|
|
/* timers, URBs and rcvbuf are disposed of in disconnect */
|
2009-03-19 06:44:23 +00:00
|
|
|
kfree(cs->hw.bas->int_in_buf);
|
2006-03-26 09:38:34 +00:00
|
|
|
kfree(cs->hw.bas);
|
2006-04-22 09:35:30 +00:00
|
|
|
cs->hw.bas = NULL;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int gigaset_initcshw(struct cardstate *cs)
|
|
|
|
{
|
|
|
|
struct bas_cardstate *ucs;
|
|
|
|
|
|
|
|
cs->hw.bas = ucs = kmalloc(sizeof *ucs, GFP_KERNEL);
|
2008-12-26 09:21:29 +00:00
|
|
|
if (!ucs) {
|
|
|
|
pr_err("out of memory\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
return 0;
|
2008-12-26 09:21:29 +00:00
|
|
|
}
|
2009-03-19 06:44:23 +00:00
|
|
|
ucs->int_in_buf = kmalloc(IP_MSGSIZE, GFP_KERNEL);
|
|
|
|
if (!ucs->int_in_buf) {
|
|
|
|
kfree(ucs);
|
|
|
|
pr_err("out of memory\n");
|
|
|
|
return 0;
|
|
|
|
}
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
ucs->urb_cmd_in = NULL;
|
|
|
|
ucs->urb_cmd_out = NULL;
|
|
|
|
ucs->rcvbuf = NULL;
|
|
|
|
ucs->rcvbuf_size = 0;
|
|
|
|
|
|
|
|
spin_lock_init(&ucs->lock);
|
|
|
|
ucs->pending = 0;
|
|
|
|
|
2008-02-06 09:38:28 +00:00
|
|
|
ucs->basstate = 0;
|
2006-03-26 09:38:34 +00:00
|
|
|
init_timer(&ucs->timer_ctrl);
|
|
|
|
init_timer(&ucs->timer_atrdy);
|
|
|
|
init_timer(&ucs->timer_cmd_in);
|
2008-02-06 09:38:26 +00:00
|
|
|
init_waitqueue_head(&ucs->waitqueue);
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* freeurbs
|
|
|
|
* unlink and deallocate all URBs unconditionally
|
|
|
|
* caller must make sure that no commands are still in progress
|
|
|
|
* parameter:
|
|
|
|
* cs controller state structure
|
|
|
|
*/
|
|
|
|
static void freeurbs(struct cardstate *cs)
|
|
|
|
{
|
2006-04-11 05:55:08 +00:00
|
|
|
struct bas_cardstate *ucs = cs->hw.bas;
|
2006-03-26 09:38:34 +00:00
|
|
|
struct bas_bc_state *ubc;
|
|
|
|
int i, j;
|
|
|
|
|
2006-12-13 08:33:52 +00:00
|
|
|
gig_dbg(DEBUG_INIT, "%s: killing URBs", __func__);
|
2008-02-06 09:38:24 +00:00
|
|
|
for (j = 0; j < BAS_CHANNELS; ++j) {
|
2006-03-26 09:38:34 +00:00
|
|
|
ubc = cs->bcs[j].hw.bas;
|
2006-12-13 08:33:52 +00:00
|
|
|
for (i = 0; i < BAS_OUTURBS; ++i) {
|
|
|
|
usb_kill_urb(ubc->isoouturbs[i].urb);
|
|
|
|
usb_free_urb(ubc->isoouturbs[i].urb);
|
|
|
|
ubc->isoouturbs[i].urb = NULL;
|
|
|
|
}
|
|
|
|
for (i = 0; i < BAS_INURBS; ++i) {
|
|
|
|
usb_kill_urb(ubc->isoinurbs[i]);
|
|
|
|
usb_free_urb(ubc->isoinurbs[i]);
|
|
|
|
ubc->isoinurbs[i] = NULL;
|
|
|
|
}
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
2006-12-13 08:33:52 +00:00
|
|
|
usb_kill_urb(ucs->urb_int_in);
|
|
|
|
usb_free_urb(ucs->urb_int_in);
|
|
|
|
ucs->urb_int_in = NULL;
|
|
|
|
usb_kill_urb(ucs->urb_cmd_out);
|
|
|
|
usb_free_urb(ucs->urb_cmd_out);
|
|
|
|
ucs->urb_cmd_out = NULL;
|
|
|
|
usb_kill_urb(ucs->urb_cmd_in);
|
|
|
|
usb_free_urb(ucs->urb_cmd_in);
|
|
|
|
ucs->urb_cmd_in = NULL;
|
|
|
|
usb_kill_urb(ucs->urb_ctrl);
|
|
|
|
usb_free_urb(ucs->urb_ctrl);
|
|
|
|
ucs->urb_ctrl = NULL;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* gigaset_probe
|
|
|
|
* This function is called when a new USB device is connected.
|
|
|
|
* It checks whether the new device is handled by this driver.
|
|
|
|
*/
|
|
|
|
static int gigaset_probe(struct usb_interface *interface,
|
|
|
|
const struct usb_device_id *id)
|
|
|
|
{
|
|
|
|
struct usb_host_interface *hostif;
|
|
|
|
struct usb_device *udev = interface_to_usbdev(interface);
|
|
|
|
struct cardstate *cs = NULL;
|
|
|
|
struct bas_cardstate *ucs = NULL;
|
|
|
|
struct bas_bc_state *ubc;
|
|
|
|
struct usb_endpoint_descriptor *endpoint;
|
|
|
|
int i, j;
|
2006-04-22 09:35:30 +00:00
|
|
|
int rc;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ANY,
|
|
|
|
"%s: Check if device matches .. (Vendor: 0x%x, Product: 0x%x)",
|
|
|
|
__func__, le16_to_cpu(udev->descriptor.idVendor),
|
|
|
|
le16_to_cpu(udev->descriptor.idProduct));
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
/* set required alternate setting */
|
|
|
|
hostif = interface->cur_altsetting;
|
|
|
|
if (hostif->desc.bAlternateSetting != 3) {
|
2006-04-11 05:55:04 +00:00
|
|
|
gig_dbg(DEBUG_ANY,
|
|
|
|
"%s: wrong alternate setting %d - trying to switch",
|
|
|
|
__func__, hostif->desc.bAlternateSetting);
|
2009-10-25 09:30:37 +00:00
|
|
|
if (usb_set_interface(udev, hostif->desc.bInterfaceNumber, 3)
|
|
|
|
< 0) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(&udev->dev, "usb_set_interface failed, "
|
|
|
|
"device %d interface %d altsetting %d\n",
|
|
|
|
udev->devnum, hostif->desc.bInterfaceNumber,
|
|
|
|
hostif->desc.bAlternateSetting);
|
2006-03-26 09:38:34 +00:00
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
hostif = interface->cur_altsetting;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Reject application specific interfaces
|
|
|
|
*/
|
|
|
|
if (hostif->desc.bInterfaceClass != 255) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_warn(&udev->dev, "%s: bInterfaceClass == %d\n",
|
|
|
|
__func__, hostif->desc.bInterfaceClass);
|
2006-03-26 09:38:34 +00:00
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_info(&udev->dev,
|
|
|
|
"%s: Device matched (Vendor: 0x%x, Product: 0x%x)\n",
|
|
|
|
__func__, le16_to_cpu(udev->descriptor.idVendor),
|
|
|
|
le16_to_cpu(udev->descriptor.idProduct));
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2008-02-06 09:38:29 +00:00
|
|
|
/* allocate memory for our device state and intialize it */
|
|
|
|
cs = gigaset_initcs(driver, BAS_CHANNELS, 0, 0, cidmode,
|
|
|
|
GIGASET_MODULENAME);
|
|
|
|
if (!cs)
|
2006-03-26 09:38:34 +00:00
|
|
|
return -ENODEV;
|
|
|
|
ucs = cs->hw.bas;
|
2006-04-11 05:55:04 +00:00
|
|
|
|
|
|
|
/* save off device structure ptrs for later use */
|
|
|
|
usb_get_dev(udev);
|
2006-03-26 09:38:34 +00:00
|
|
|
ucs->udev = udev;
|
|
|
|
ucs->interface = interface;
|
2006-04-11 05:55:07 +00:00
|
|
|
cs->dev = &interface->dev;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
/* allocate URBs:
|
|
|
|
* - one for the interrupt pipe
|
|
|
|
* - three for the different uses of the default control pipe
|
|
|
|
* - three for each isochronous pipe
|
|
|
|
*/
|
2006-12-07 04:33:17 +00:00
|
|
|
if (!(ucs->urb_int_in = usb_alloc_urb(0, GFP_KERNEL)) ||
|
|
|
|
!(ucs->urb_cmd_in = usb_alloc_urb(0, GFP_KERNEL)) ||
|
|
|
|
!(ucs->urb_cmd_out = usb_alloc_urb(0, GFP_KERNEL)) ||
|
|
|
|
!(ucs->urb_ctrl = usb_alloc_urb(0, GFP_KERNEL)))
|
2006-04-22 09:35:30 +00:00
|
|
|
goto allocerr;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2008-02-06 09:38:24 +00:00
|
|
|
for (j = 0; j < BAS_CHANNELS; ++j) {
|
2006-03-26 09:38:34 +00:00
|
|
|
ubc = cs->bcs[j].hw.bas;
|
2006-04-22 09:35:30 +00:00
|
|
|
for (i = 0; i < BAS_OUTURBS; ++i)
|
|
|
|
if (!(ubc->isoouturbs[i].urb =
|
2006-12-07 04:33:17 +00:00
|
|
|
usb_alloc_urb(BAS_NUMFRAMES, GFP_KERNEL)))
|
2006-04-22 09:35:30 +00:00
|
|
|
goto allocerr;
|
|
|
|
for (i = 0; i < BAS_INURBS; ++i)
|
|
|
|
if (!(ubc->isoinurbs[i] =
|
2006-12-07 04:33:17 +00:00
|
|
|
usb_alloc_urb(BAS_NUMFRAMES, GFP_KERNEL)))
|
2006-04-22 09:35:30 +00:00
|
|
|
goto allocerr;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ucs->rcvbuf = NULL;
|
|
|
|
ucs->rcvbuf_size = 0;
|
|
|
|
|
|
|
|
/* Fill the interrupt urb and send it to the core */
|
|
|
|
endpoint = &hostif->endpoint[0].desc;
|
|
|
|
usb_fill_int_urb(ucs->urb_int_in, udev,
|
2006-04-11 05:55:04 +00:00
|
|
|
usb_rcvintpipe(udev,
|
|
|
|
(endpoint->bEndpointAddress) & 0x0f),
|
2009-03-19 06:44:23 +00:00
|
|
|
ucs->int_in_buf, IP_MSGSIZE, read_int_callback, cs,
|
2006-04-11 05:55:04 +00:00
|
|
|
endpoint->bInterval);
|
2009-10-25 09:30:37 +00:00
|
|
|
rc = usb_submit_urb(ucs->urb_int_in, GFP_KERNEL);
|
|
|
|
if (rc != 0) {
|
2006-04-11 05:55:04 +00:00
|
|
|
dev_err(cs->dev, "could not submit interrupt URB: %s\n",
|
2006-04-22 09:35:30 +00:00
|
|
|
get_usb_rcmsg(rc));
|
2006-03-26 09:38:34 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* tell the device that the driver is ready */
|
2009-10-25 09:30:37 +00:00
|
|
|
rc = req_submit(cs->bcs, HD_DEVICE_INIT_ACK, 0, 0);
|
|
|
|
if (rc != 0)
|
2006-03-26 09:38:34 +00:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* tell common part that the device is ready */
|
|
|
|
if (startmode == SM_LOCKED)
|
2008-02-06 09:38:28 +00:00
|
|
|
cs->mstate = MS_LOCKED;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
/* save address of controller structure */
|
|
|
|
usb_set_intfdata(interface, cs);
|
|
|
|
|
2006-04-11 05:55:07 +00:00
|
|
|
if (!gigaset_start(cs))
|
|
|
|
goto error;
|
|
|
|
|
2006-03-26 09:38:34 +00:00
|
|
|
return 0;
|
|
|
|
|
2006-04-22 09:35:30 +00:00
|
|
|
allocerr:
|
|
|
|
dev_err(cs->dev, "could not allocate URBs\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
error:
|
|
|
|
freeurbs(cs);
|
2006-04-11 05:55:16 +00:00
|
|
|
usb_set_intfdata(interface, NULL);
|
2008-02-06 09:38:29 +00:00
|
|
|
gigaset_freecs(cs);
|
2006-03-26 09:38:34 +00:00
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* gigaset_disconnect
|
|
|
|
* This function is called when the Gigaset base is unplugged.
|
|
|
|
*/
|
|
|
|
static void gigaset_disconnect(struct usb_interface *interface)
|
|
|
|
{
|
|
|
|
struct cardstate *cs;
|
|
|
|
struct bas_cardstate *ucs;
|
2006-04-22 09:35:30 +00:00
|
|
|
int j;
|
2006-03-26 09:38:34 +00:00
|
|
|
|
|
|
|
cs = usb_get_intfdata(interface);
|
|
|
|
|
|
|
|
ucs = cs->hw.bas;
|
|
|
|
|
2006-04-11 05:55:07 +00:00
|
|
|
dev_info(cs->dev, "disconnecting Gigaset base\n");
|
2006-04-22 09:35:30 +00:00
|
|
|
|
|
|
|
/* mark base as not ready, all channels disconnected */
|
2008-02-06 09:38:28 +00:00
|
|
|
ucs->basstate = 0;
|
2006-04-22 09:35:30 +00:00
|
|
|
|
|
|
|
/* tell LL all channels are down */
|
2008-02-06 09:38:24 +00:00
|
|
|
for (j = 0; j < BAS_CHANNELS; ++j)
|
2006-04-22 09:35:30 +00:00
|
|
|
gigaset_bchannel_down(cs->bcs + j);
|
|
|
|
|
|
|
|
/* stop driver (common part) */
|
2006-03-26 09:38:34 +00:00
|
|
|
gigaset_stop(cs);
|
2006-04-22 09:35:30 +00:00
|
|
|
|
|
|
|
/* stop timers and URBs, free ressources */
|
|
|
|
del_timer_sync(&ucs->timer_ctrl);
|
|
|
|
del_timer_sync(&ucs->timer_atrdy);
|
|
|
|
del_timer_sync(&ucs->timer_cmd_in);
|
2006-03-26 09:38:34 +00:00
|
|
|
freeurbs(cs);
|
2006-04-11 05:55:07 +00:00
|
|
|
usb_set_intfdata(interface, NULL);
|
2006-03-26 09:38:34 +00:00
|
|
|
kfree(ucs->rcvbuf);
|
|
|
|
ucs->rcvbuf = NULL;
|
|
|
|
ucs->rcvbuf_size = 0;
|
2006-04-11 05:55:07 +00:00
|
|
|
usb_put_dev(ucs->udev);
|
|
|
|
ucs->interface = NULL;
|
|
|
|
ucs->udev = NULL;
|
|
|
|
cs->dev = NULL;
|
2008-02-06 09:38:29 +00:00
|
|
|
gigaset_freecs(cs);
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
2008-02-06 09:38:26 +00:00
|
|
|
/* gigaset_suspend
|
|
|
|
* This function is called before the USB connection is suspended.
|
|
|
|
*/
|
|
|
|
static int gigaset_suspend(struct usb_interface *intf, pm_message_t message)
|
|
|
|
{
|
|
|
|
struct cardstate *cs = usb_get_intfdata(intf);
|
|
|
|
struct bas_cardstate *ucs = cs->hw.bas;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
/* set suspend flag; this stops AT command/response traffic */
|
|
|
|
if (update_basstate(ucs, BS_SUSPEND, 0) & BS_SUSPEND) {
|
|
|
|
gig_dbg(DEBUG_SUSPEND, "already suspended");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* wait a bit for blocking conditions to go away */
|
|
|
|
rc = wait_event_timeout(ucs->waitqueue,
|
2008-02-06 09:38:28 +00:00
|
|
|
!(ucs->basstate &
|
2008-02-06 09:38:26 +00:00
|
|
|
(BS_B1OPEN|BS_B2OPEN|BS_ATRDPEND|BS_ATWRPEND)),
|
|
|
|
BAS_TIMEOUT*HZ/10);
|
|
|
|
gig_dbg(DEBUG_SUSPEND, "wait_event_timeout() -> %d", rc);
|
|
|
|
|
|
|
|
/* check for conditions preventing suspend */
|
2008-02-06 09:38:28 +00:00
|
|
|
if (ucs->basstate & (BS_B1OPEN|BS_B2OPEN|BS_ATRDPEND|BS_ATWRPEND)) {
|
2008-02-06 09:38:26 +00:00
|
|
|
dev_warn(cs->dev, "cannot suspend:\n");
|
2008-02-06 09:38:28 +00:00
|
|
|
if (ucs->basstate & BS_B1OPEN)
|
2008-02-06 09:38:26 +00:00
|
|
|
dev_warn(cs->dev, " B channel 1 open\n");
|
2008-02-06 09:38:28 +00:00
|
|
|
if (ucs->basstate & BS_B2OPEN)
|
2008-02-06 09:38:26 +00:00
|
|
|
dev_warn(cs->dev, " B channel 2 open\n");
|
2008-02-06 09:38:28 +00:00
|
|
|
if (ucs->basstate & BS_ATRDPEND)
|
2008-02-06 09:38:26 +00:00
|
|
|
dev_warn(cs->dev, " receiving AT reply\n");
|
2008-02-06 09:38:28 +00:00
|
|
|
if (ucs->basstate & BS_ATWRPEND)
|
2008-02-06 09:38:26 +00:00
|
|
|
dev_warn(cs->dev, " sending AT command\n");
|
|
|
|
update_basstate(ucs, 0, BS_SUSPEND);
|
|
|
|
return -EBUSY;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* close AT channel if open */
|
2008-02-06 09:38:28 +00:00
|
|
|
if (ucs->basstate & BS_ATOPEN) {
|
2008-02-06 09:38:26 +00:00
|
|
|
gig_dbg(DEBUG_SUSPEND, "closing AT channel");
|
|
|
|
rc = req_submit(cs->bcs, HD_CLOSE_ATCHANNEL, 0, 0);
|
|
|
|
if (rc) {
|
|
|
|
update_basstate(ucs, 0, BS_SUSPEND);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
wait_event_timeout(ucs->waitqueue, !ucs->pending,
|
|
|
|
BAS_TIMEOUT*HZ/10);
|
|
|
|
/* in case of timeout, proceed anyway */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* kill all URBs and timers that might still be pending */
|
|
|
|
usb_kill_urb(ucs->urb_ctrl);
|
|
|
|
usb_kill_urb(ucs->urb_int_in);
|
|
|
|
del_timer_sync(&ucs->timer_ctrl);
|
|
|
|
|
|
|
|
gig_dbg(DEBUG_SUSPEND, "suspend complete");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* gigaset_resume
|
|
|
|
* This function is called after the USB connection has been resumed.
|
|
|
|
*/
|
|
|
|
static int gigaset_resume(struct usb_interface *intf)
|
|
|
|
{
|
|
|
|
struct cardstate *cs = usb_get_intfdata(intf);
|
|
|
|
struct bas_cardstate *ucs = cs->hw.bas;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
/* resubmit interrupt URB for spontaneous messages from base */
|
|
|
|
rc = usb_submit_urb(ucs->urb_int_in, GFP_KERNEL);
|
|
|
|
if (rc) {
|
|
|
|
dev_err(cs->dev, "could not resubmit interrupt URB: %s\n",
|
|
|
|
get_usb_rcmsg(rc));
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* clear suspend flag to reallow activity */
|
|
|
|
update_basstate(ucs, 0, BS_SUSPEND);
|
|
|
|
|
|
|
|
gig_dbg(DEBUG_SUSPEND, "resume complete");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* gigaset_pre_reset
|
|
|
|
* This function is called before the USB connection is reset.
|
|
|
|
*/
|
|
|
|
static int gigaset_pre_reset(struct usb_interface *intf)
|
|
|
|
{
|
|
|
|
/* handle just like suspend */
|
|
|
|
return gigaset_suspend(intf, PMSG_ON);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* gigaset_post_reset
|
|
|
|
* This function is called after the USB connection has been reset.
|
|
|
|
*/
|
|
|
|
static int gigaset_post_reset(struct usb_interface *intf)
|
|
|
|
{
|
|
|
|
/* FIXME: send HD_DEVICE_INIT_ACK? */
|
|
|
|
|
|
|
|
/* resume operations */
|
|
|
|
return gigaset_resume(intf);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-03-29 08:20:34 +00:00
|
|
|
static const struct gigaset_ops gigops = {
|
2006-03-26 09:38:34 +00:00
|
|
|
gigaset_write_cmd,
|
|
|
|
gigaset_write_room,
|
|
|
|
gigaset_chars_in_buffer,
|
|
|
|
gigaset_brkchars,
|
|
|
|
gigaset_init_bchannel,
|
|
|
|
gigaset_close_bchannel,
|
|
|
|
gigaset_initbcshw,
|
|
|
|
gigaset_freebcshw,
|
|
|
|
gigaset_reinitbcshw,
|
|
|
|
gigaset_initcshw,
|
|
|
|
gigaset_freecshw,
|
|
|
|
gigaset_set_modem_ctrl,
|
|
|
|
gigaset_baud_rate,
|
|
|
|
gigaset_set_line_ctrl,
|
|
|
|
gigaset_isoc_send_skb,
|
|
|
|
gigaset_isoc_input,
|
|
|
|
};
|
|
|
|
|
|
|
|
/* bas_gigaset_init
|
|
|
|
* This function is called after the kernel module is loaded.
|
|
|
|
*/
|
|
|
|
static int __init bas_gigaset_init(void)
|
|
|
|
{
|
|
|
|
int result;
|
|
|
|
|
|
|
|
/* allocate memory for our driver state and intialize it */
|
2009-10-25 09:30:37 +00:00
|
|
|
driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
|
|
|
|
GIGASET_MODULENAME, GIGASET_DEVNAME,
|
|
|
|
&gigops, THIS_MODULE);
|
|
|
|
if (driver == NULL)
|
2006-03-26 09:38:34 +00:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* register this driver with the USB subsystem */
|
|
|
|
result = usb_register(&gigaset_usb_driver);
|
|
|
|
if (result < 0) {
|
2008-12-26 09:21:29 +00:00
|
|
|
pr_err("error %d registering USB driver\n", -result);
|
2006-03-26 09:38:34 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2008-12-26 09:21:29 +00:00
|
|
|
pr_info(DRIVER_DESC "\n");
|
2006-03-26 09:38:34 +00:00
|
|
|
return 0;
|
|
|
|
|
2008-02-06 09:38:29 +00:00
|
|
|
error:
|
2006-03-26 09:38:34 +00:00
|
|
|
if (driver)
|
|
|
|
gigaset_freedriver(driver);
|
|
|
|
driver = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* bas_gigaset_exit
|
|
|
|
* This function is called before the kernel module is unloaded.
|
|
|
|
*/
|
|
|
|
static void __exit bas_gigaset_exit(void)
|
|
|
|
{
|
2008-02-06 09:38:29 +00:00
|
|
|
struct bas_cardstate *ucs;
|
|
|
|
int i;
|
2006-04-22 09:35:30 +00:00
|
|
|
|
2006-03-26 09:38:34 +00:00
|
|
|
gigaset_blockdriver(driver); /* => probe will fail
|
2006-04-11 05:55:04 +00:00
|
|
|
* => no gigaset_start any more
|
|
|
|
*/
|
2006-03-26 09:38:34 +00:00
|
|
|
|
2008-02-06 09:38:29 +00:00
|
|
|
/* stop all connected devices */
|
|
|
|
for (i = 0; i < driver->minors; i++) {
|
|
|
|
if (gigaset_shutdown(driver->cs + i) < 0)
|
|
|
|
continue; /* no device */
|
|
|
|
/* from now on, no isdn callback should be possible */
|
|
|
|
|
|
|
|
/* close all still open channels */
|
|
|
|
ucs = driver->cs[i].hw.bas;
|
|
|
|
if (ucs->basstate & BS_B1OPEN) {
|
|
|
|
gig_dbg(DEBUG_INIT, "closing B1 channel");
|
|
|
|
usb_control_msg(ucs->udev,
|
|
|
|
usb_sndctrlpipe(ucs->udev, 0),
|
|
|
|
HD_CLOSE_B1CHANNEL, OUT_VENDOR_REQ,
|
|
|
|
0, 0, NULL, 0, BAS_TIMEOUT);
|
|
|
|
}
|
|
|
|
if (ucs->basstate & BS_B2OPEN) {
|
|
|
|
gig_dbg(DEBUG_INIT, "closing B2 channel");
|
|
|
|
usb_control_msg(ucs->udev,
|
|
|
|
usb_sndctrlpipe(ucs->udev, 0),
|
|
|
|
HD_CLOSE_B2CHANNEL, OUT_VENDOR_REQ,
|
|
|
|
0, 0, NULL, 0, BAS_TIMEOUT);
|
|
|
|
}
|
|
|
|
if (ucs->basstate & BS_ATOPEN) {
|
|
|
|
gig_dbg(DEBUG_INIT, "closing AT channel");
|
|
|
|
usb_control_msg(ucs->udev,
|
|
|
|
usb_sndctrlpipe(ucs->udev, 0),
|
|
|
|
HD_CLOSE_ATCHANNEL, OUT_VENDOR_REQ,
|
|
|
|
0, 0, NULL, 0, BAS_TIMEOUT);
|
|
|
|
}
|
|
|
|
ucs->basstate = 0;
|
2006-03-26 09:38:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* deregister this driver with the USB subsystem */
|
|
|
|
usb_deregister(&gigaset_usb_driver);
|
|
|
|
/* this will call the disconnect-callback */
|
|
|
|
/* from now on, no disconnect/probe callback should be running */
|
|
|
|
|
|
|
|
gigaset_freedriver(driver);
|
|
|
|
driver = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
module_init(bas_gigaset_init);
|
|
|
|
module_exit(bas_gigaset_exit);
|
|
|
|
|
|
|
|
MODULE_AUTHOR(DRIVER_AUTHOR);
|
|
|
|
MODULE_DESCRIPTION(DRIVER_DESC);
|
|
|
|
MODULE_LICENSE("GPL");
|