Skip to content

L
linux
Commit b5206660 authored by Pete Zaitcev's avatar Pete Zaitcev Committed by Greg Kroah-Hartman
Browse files
Options

[PATCH] USB: Band-aid for mct_u232 in 2.6.1 

On Sun, 18 Jan 2004 00:37:44 -0800
Pete Zaitcev <zaitcev@redhat.com> wrote:

> My Magic Control Technology adapter causes an oops in the following way.
> Connect the thing, run "cat < /dev/ttyUSB0", disconnect, kill cat with ^C.
> The result looks like this:

I played with it a little more, and pretty much got everything working,
thus fixing two Fedora bugs.
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=112889
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=113700
parent 701e91c8
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 124 deletions
drivers/usb/serial/mct_u232.c
View file @ b5206660
...@@ -184,7 +184,7 @@ static struct usb_serial_device_type mct_u232_device = { ...@@ -184,7 +184,7 @@ static struct usb_serial_device_type mct_u232_device = {
struct mct_u232_private { struct mct_u232_private {
spinlock_t lock; spinlock_t lock;
unsigned long control_state; /* Modem Line Setting (TIOCM) */ unsigned int control_state; /* Modem Line Setting (TIOCM) */
unsigned char last_lcr; /* Line Control Register */ unsigned char last_lcr; /* Line Control Register */
unsigned char last_lsr; /* Line Status Register */ unsigned char last_lsr; /* Line Status Register */
unsigned char last_msr; /* Modem Status Register */ unsigned char last_msr; /* Modem Status Register */
...@@ -196,25 +196,49 @@ struct mct_u232_private { ...@@ -196,25 +196,49 @@ struct mct_u232_private {
#define WDR_TIMEOUT (HZ * 5 ) /* default urb timeout */ #define WDR_TIMEOUT (HZ * 5 ) /* default urb timeout */
/*
* Later day 2.6.0-test kernels have new baud rates like B230400 which
* we do not know how to support. We ignore them for the moment.
* XXX Rate-limit the error message, it's user triggerable.
*/
static int mct_u232_calculate_baud_rate(struct usb_serial *serial, int value) { static int mct_u232_calculate_baud_rate(struct usb_serial *serial, int value) {
if (serial->dev->descriptor.idProduct == MCT_U232_SITECOM_PID if (serial->dev->descriptor.idProduct == MCT_U232_SITECOM_PID
|| serial->dev->descriptor.idProduct == MCT_U232_BELKIN_F5U109_PID) { || serial->dev->descriptor.idProduct == MCT_U232_BELKIN_F5U109_PID) {
switch (value) { switch (value) {
case 300: return 0x01; case B300: return 0x01;
case 600: return 0x02; /* this one not tested */ case B600: return 0x02; /* this one not tested */
case 1200: return 0x03; case B1200: return 0x03;
case 2400: return 0x04; case B2400: return 0x04;
case 4800: return 0x06; case B4800: return 0x06;
case 9600: return 0x08; case B9600: return 0x08;
case 19200: return 0x09; case B19200: return 0x09;
case 38400: return 0x0a; case B38400: return 0x0a;
case 57600: return 0x0b; case B57600: return 0x0b;
case 115200: return 0x0c; case B115200: return 0x0c;
default: return -1; /* normally not reached */ default:
err("MCT USB-RS232: unsupported baudrate request 0x%x,"
" using default of B9600", value);
return 0x08;
}
} else {
switch (value) {
case B300: value = 300;
case B600: value = 600;
case B1200: value = 1200;
case B2400: value = 2400;
case B4800: value = 4800;
case B9600: value = 9600;
case B19200: value = 19200;
case B38400: value = 38400;
case B57600: value = 57600;
case B115200: value = 115200;
default:
err("MCT USB-RS232: unsupported baudrate request 0x%x,"
" using default of B9600", value);
value = 9600;
} }
return 115200/value;
} }
else
return MCT_U232_BAUD_RATE(value);
} }
static int mct_u232_set_baud_rate(struct usb_serial *serial, int value) static int mct_u232_set_baud_rate(struct usb_serial *serial, int value)
...@@ -222,7 +246,9 @@ static int mct_u232_set_baud_rate(struct usb_serial *serial, int value) ...@@ -222,7 +246,9 @@ static int mct_u232_set_baud_rate(struct usb_serial *serial, int value)
unsigned int divisor; unsigned int divisor;
int rc; int rc;
unsigned char zero_byte = 0; unsigned char zero_byte = 0;
divisor = cpu_to_le32(mct_u232_calculate_baud_rate(serial, value)); divisor = cpu_to_le32(mct_u232_calculate_baud_rate(serial, value));
rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0), rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
MCT_U232_SET_BAUD_RATE_REQUEST, MCT_U232_SET_BAUD_RATE_REQUEST,
MCT_U232_SET_REQUEST_TYPE, MCT_U232_SET_REQUEST_TYPE,
...@@ -230,7 +256,7 @@ static int mct_u232_set_baud_rate(struct usb_serial *serial, int value) ...@@ -230,7 +256,7 @@ static int mct_u232_set_baud_rate(struct usb_serial *serial, int value)
WDR_TIMEOUT); WDR_TIMEOUT);
if (rc < 0) if (rc < 0)
err("Set BAUD RATE %d failed (error = %d)", value, rc); err("Set BAUD RATE %d failed (error = %d)", value, rc);
dbg("set_baud_rate: value: %d, divisor: 0x%x", value, divisor); dbg("set_baud_rate: value: 0x%x, divisor: 0x%x", value, divisor);
/* Mimic the MCT-supplied Windows driver (version 1.21P.0104), which /* Mimic the MCT-supplied Windows driver (version 1.21P.0104), which
always sends two extra USB 'device request' messages after the always sends two extra USB 'device request' messages after the
...@@ -278,7 +304,7 @@ static int mct_u232_set_line_ctrl(struct usb_serial *serial, unsigned char lcr) ...@@ -278,7 +304,7 @@ static int mct_u232_set_line_ctrl(struct usb_serial *serial, unsigned char lcr)
} /* mct_u232_set_line_ctrl */ } /* mct_u232_set_line_ctrl */
static int mct_u232_set_modem_ctrl(struct usb_serial *serial, static int mct_u232_set_modem_ctrl(struct usb_serial *serial,
unsigned long control_state) unsigned int control_state)
{ {
int rc; int rc;
unsigned char mcr = MCT_U232_MCR_NONE; unsigned char mcr = MCT_U232_MCR_NONE;
...@@ -295,7 +321,7 @@ static int mct_u232_set_modem_ctrl(struct usb_serial *serial, ...@@ -295,7 +321,7 @@ static int mct_u232_set_modem_ctrl(struct usb_serial *serial,
WDR_TIMEOUT); WDR_TIMEOUT);
if (rc < 0) if (rc < 0)
err("Set MODEM CTRL 0x%x failed (error = %d)", mcr, rc); err("Set MODEM CTRL 0x%x failed (error = %d)", mcr, rc);
dbg("set_modem_ctrl: state=0x%lx ==> mcr=0x%x", control_state, mcr); dbg("set_modem_ctrl: state=0x%x ==> mcr=0x%x", control_state, mcr);
return rc; return rc;
} /* mct_u232_set_modem_ctrl */ } /* mct_u232_set_modem_ctrl */
...@@ -316,7 +342,7 @@ static int mct_u232_get_modem_stat(struct usb_serial *serial, unsigned char *msr ...@@ -316,7 +342,7 @@ static int mct_u232_get_modem_stat(struct usb_serial *serial, unsigned char *msr
return rc; return rc;
} /* mct_u232_get_modem_stat */ } /* mct_u232_get_modem_stat */
static void mct_u232_msr_to_state(unsigned long *control_state, unsigned char msr) static void mct_u232_msr_to_state(unsigned int *control_state, unsigned char msr)
{ {
/* Translate Control Line states */ /* Translate Control Line states */
if (msr & MCT_U232_MSR_DSR) if (msr & MCT_U232_MSR_DSR)
...@@ -335,7 +361,7 @@ static void mct_u232_msr_to_state(unsigned long *control_state, unsigned char ms ...@@ -335,7 +361,7 @@ static void mct_u232_msr_to_state(unsigned long *control_state, unsigned char ms
*control_state |= TIOCM_CD; *control_state |= TIOCM_CD;
else else
*control_state &= ~TIOCM_CD; *control_state &= ~TIOCM_CD;
dbg("msr_to_state: msr=0x%x ==> state=0x%lx", msr, *control_state); dbg("msr_to_state: msr=0x%x ==> state=0x%x", msr, *control_state);
} /* mct_u232_msr_to_state */ } /* mct_u232_msr_to_state */
/* /*
...@@ -345,6 +371,7 @@ static void mct_u232_msr_to_state(unsigned long *control_state, unsigned char ms ...@@ -345,6 +371,7 @@ static void mct_u232_msr_to_state(unsigned long *control_state, unsigned char ms
static int mct_u232_startup (struct usb_serial *serial) static int mct_u232_startup (struct usb_serial *serial)
{ {
struct mct_u232_private *priv; struct mct_u232_private *priv;
struct usb_serial_port *port, *rport;
/* allocate the private data structure */ /* allocate the private data structure */
priv = kmalloc(sizeof(struct mct_u232_private), GFP_KERNEL); priv = kmalloc(sizeof(struct mct_u232_private), GFP_KERNEL);
...@@ -359,6 +386,17 @@ static int mct_u232_startup (struct usb_serial *serial) ...@@ -359,6 +386,17 @@ static int mct_u232_startup (struct usb_serial *serial)
init_waitqueue_head(&serial->port[0]->write_wait); init_waitqueue_head(&serial->port[0]->write_wait);
/* Puh, that's dirty */
port = serial->port[0];
rport = serial->port[1];
if (port->read_urb) {
/* No unlinking, it wasn't submitted yet. */
usb_free_urb(port->read_urb);
}
port->read_urb = rport->interrupt_in_urb;
rport->interrupt_in_urb = NULL;
port->read_urb->context = port;
return (0); return (0);
} /* mct_u232_startup */ } /* mct_u232_startup */
...@@ -383,7 +421,7 @@ static int mct_u232_open (struct usb_serial_port *port, struct file *filp) ...@@ -383,7 +421,7 @@ static int mct_u232_open (struct usb_serial_port *port, struct file *filp)
struct usb_serial *serial = port->serial; struct usb_serial *serial = port->serial;
struct mct_u232_private *priv = usb_get_serial_port_data(port); struct mct_u232_private *priv = usb_get_serial_port_data(port);
int retval = 0; int retval = 0;
unsigned long control_state; unsigned int control_state;
unsigned long flags; unsigned long flags;
unsigned char last_lcr; unsigned char last_lcr;
unsigned char last_msr; unsigned char last_msr;
...@@ -425,15 +463,6 @@ static int mct_u232_open (struct usb_serial_port *port, struct file *filp) ...@@ -425,15 +463,6 @@ static int mct_u232_open (struct usb_serial_port *port, struct file *filp)
mct_u232_msr_to_state(&priv->control_state, priv->last_msr); mct_u232_msr_to_state(&priv->control_state, priv->last_msr);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
{
/* Puh, that's dirty */
struct usb_serial_port *rport;
rport = serial->port[1];
rport->tty = port->tty;
usb_set_serial_port_data(rport, usb_get_serial_port_data(port));
port->read_urb = rport->interrupt_in_urb;
}
port->read_urb->dev = port->serial->dev; port->read_urb->dev = port->serial->dev;
retval = usb_submit_urb(port->read_urb, GFP_KERNEL); retval = usb_submit_urb(port->read_urb, GFP_KERNEL);
if (retval) { if (retval) {
...@@ -662,32 +691,33 @@ static void mct_u232_read_int_callback (struct urb *urb, struct pt_regs *regs) ...@@ -662,32 +691,33 @@ static void mct_u232_read_int_callback (struct urb *urb, struct pt_regs *regs)
__FUNCTION__, status); __FUNCTION__, status);
} /* mct_u232_read_int_callback */ } /* mct_u232_read_int_callback */
static void mct_u232_set_termios (struct usb_serial_port *port, static void mct_u232_set_termios (struct usb_serial_port *port,
struct termios *old_termios) struct termios *old_termios)
{ {
struct usb_serial *serial = port->serial; struct usb_serial *serial = port->serial;
struct mct_u232_private *priv = usb_get_serial_port_data(port); struct mct_u232_private *priv = usb_get_serial_port_data(port);
unsigned int iflag = port->tty->termios->c_iflag; unsigned int iflag = port->tty->termios->c_iflag;
unsigned int old_iflag = old_termios->c_iflag;
unsigned int cflag = port->tty->termios->c_cflag; unsigned int cflag = port->tty->termios->c_cflag;
unsigned int old_cflag = old_termios->c_cflag; unsigned int old_cflag = old_termios->c_cflag;
unsigned long flags; unsigned long flags;
unsigned long control_state; unsigned int control_state, new_state;
unsigned char last_lcr; unsigned char last_lcr;
/* get a local copy of the current port settings */ /* get a local copy of the current port settings */
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
control_state = priv->control_state; control_state = priv->control_state;
last_lcr = priv->last_lcr;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
last_lcr = 0;
/* /*
* Update baud rate * Update baud rate.
* Do not attempt to cache old rates and skip settings,
* disconnects screw such tricks up completely.
* Premature optimization is the root of all evil.
*/ */
if( (cflag & CBAUD) != (old_cflag & CBAUD) ) {
/* reassert DTR and (maybe) RTS on transition from B0 */ /* reassert DTR and (maybe) RTS on transition from B0 */
if( (old_cflag & CBAUD) == B0 ) { if ((old_cflag & CBAUD) == B0) {
dbg("%s: baud was B0", __FUNCTION__); dbg("%s: baud was B0", __FUNCTION__);
control_state |= TIOCM_DTR; control_state |= TIOCM_DTR;
/* don't set RTS if using hardware flow control */ /* don't set RTS if using hardware flow control */
...@@ -697,49 +727,18 @@ static void mct_u232_set_termios (struct usb_serial_port *port, ...@@ -697,49 +727,18 @@ static void mct_u232_set_termios (struct usb_serial_port *port,
mct_u232_set_modem_ctrl(serial, control_state); mct_u232_set_modem_ctrl(serial, control_state);
} }
switch(cflag & CBAUD) { mct_u232_set_baud_rate(serial, cflag & CBAUD);
case B0: /* handled below */
break;
case B300: mct_u232_set_baud_rate(serial, 300);
break;
case B600: mct_u232_set_baud_rate(serial, 600);
break;
case B1200: mct_u232_set_baud_rate(serial, 1200);
break;
case B2400: mct_u232_set_baud_rate(serial, 2400);
break;
case B4800: mct_u232_set_baud_rate(serial, 4800);
break;
case B9600: mct_u232_set_baud_rate(serial, 9600);
break;
case B19200: mct_u232_set_baud_rate(serial, 19200);
break;
case B38400: mct_u232_set_baud_rate(serial, 38400);
break;
case B57600: mct_u232_set_baud_rate(serial, 57600);
break;
case B115200: mct_u232_set_baud_rate(serial, 115200);
break;
default: err("MCT USB-RS232 converter: unsupported baudrate request, using default of 9600");
mct_u232_set_baud_rate(serial, 9600); break;
}
if ((cflag & CBAUD) == B0 ) { if ((cflag & CBAUD) == B0 ) {
dbg("%s: baud is B0", __FUNCTION__); dbg("%s: baud is B0", __FUNCTION__);
/* Drop RTS and DTR */ /* Drop RTS and DTR */
control_state &= ~(TIOCM_DTR | TIOCM_RTS); control_state &= ~(TIOCM_DTR | TIOCM_RTS);
mct_u232_set_modem_ctrl(serial, control_state); mct_u232_set_modem_ctrl(serial, control_state);
} }
}
/* /*
* Update line control register (LCR) * Update line control register (LCR)
*/ */
if ((cflag & (PARENB|PARODD)) != (old_cflag & (PARENB|PARODD))
|| (cflag & CSIZE) != (old_cflag & CSIZE)
|| (cflag & CSTOPB) != (old_cflag & CSTOPB) ) {
last_lcr = 0;
/* set the parity */ /* set the parity */
if (cflag & PARENB) if (cflag & PARENB)
...@@ -769,22 +768,20 @@ static void mct_u232_set_termios (struct usb_serial_port *port, ...@@ -769,22 +768,20 @@ static void mct_u232_set_termios (struct usb_serial_port *port,
MCT_U232_STOP_BITS_2 : MCT_U232_STOP_BITS_1; MCT_U232_STOP_BITS_2 : MCT_U232_STOP_BITS_1;
mct_u232_set_line_ctrl(serial, last_lcr); mct_u232_set_line_ctrl(serial, last_lcr);
}
/* /*
* Set flow control: well, I do not really now how to handle DTR/RTS. * Set flow control: well, I do not really now how to handle DTR/RTS.
* Just do what we have seen with SniffUSB on Win98. * Just do what we have seen with SniffUSB on Win98.
*/ */
if( (iflag & IXOFF) != (old_iflag & IXOFF)
|| (iflag & IXON) != (old_iflag & IXON)
|| (cflag & CRTSCTS) != (old_cflag & CRTSCTS) ) {
/* Drop DTR/RTS if no flow control otherwise assert */ /* Drop DTR/RTS if no flow control otherwise assert */
if ((iflag & IXOFF) || (iflag & IXON) || (cflag & CRTSCTS) ) new_state = control_state;
control_state |= TIOCM_DTR | TIOCM_RTS; if ((iflag & IXOFF) || (iflag & IXON) || (cflag & CRTSCTS))
new_state |= TIOCM_DTR | TIOCM_RTS;
else else
control_state &= ~(TIOCM_DTR | TIOCM_RTS); new_state &= ~(TIOCM_DTR | TIOCM_RTS);
if (new_state != control_state) {
mct_u232_set_modem_ctrl(serial, control_state); mct_u232_set_modem_ctrl(serial, control_state);
control_state = new_state;
} }
/* save off the modified port settings */ /* save off the modified port settings */
...@@ -794,7 +791,6 @@ static void mct_u232_set_termios (struct usb_serial_port *port, ...@@ -794,7 +791,6 @@ static void mct_u232_set_termios (struct usb_serial_port *port,
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
} /* mct_u232_set_termios */ } /* mct_u232_set_termios */
static void mct_u232_break_ctl( struct usb_serial_port *port, int break_state ) static void mct_u232_break_ctl( struct usb_serial_port *port, int break_state )
{ {
struct usb_serial *serial = port->serial; struct usb_serial *serial = port->serial;
...@@ -818,7 +814,7 @@ static void mct_u232_break_ctl( struct usb_serial_port *port, int break_state ) ...@@ -818,7 +814,7 @@ static void mct_u232_break_ctl( struct usb_serial_port *port, int break_state )
static int mct_u232_tiocmget (struct usb_serial_port *port, struct file *file) static int mct_u232_tiocmget (struct usb_serial_port *port, struct file *file)
{ {
struct mct_u232_private *priv = usb_get_serial_port_data(port); struct mct_u232_private *priv = usb_get_serial_port_data(port);
unsigned long control_state; unsigned int control_state;
unsigned long flags; unsigned long flags;
dbg("%s", __FUNCTION__); dbg("%s", __FUNCTION__);
...@@ -835,7 +831,7 @@ static int mct_u232_tiocmset (struct usb_serial_port *port, struct file *file, ...@@ -835,7 +831,7 @@ static int mct_u232_tiocmset (struct usb_serial_port *port, struct file *file,
{ {
struct usb_serial *serial = port->serial; struct usb_serial *serial = port->serial;
struct mct_u232_private *priv = usb_get_serial_port_data(port); struct mct_u232_private *priv = usb_get_serial_port_data(port);
unsigned long control_state; unsigned int control_state;
unsigned long flags; unsigned long flags;
dbg("%s", __FUNCTION__); dbg("%s", __FUNCTION__);
......
drivers/usb/serial/mct_u232.h
View file @ b5206660
...@@ -74,8 +74,11 @@ ...@@ -74,8 +74,11 @@
/* /*
* Baud rate (divisor) * Baud rate (divisor)
* Actually, there are two of them, MCT website calls them "Philips solution"
* and "Intel solution". They are the regular MCT and "Sitecom" for us.
* This is pointless to document in the header, see the code for the bits.
*/ */
#define MCT_U232_BAUD_RATE(b) (115200/b) static int mct_u232_calculate_baud_rate(struct usb_serial *serial, int value);
/* /*
* Line Control Register (LCR) * Line Control Register (LCR)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7