Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3510c816 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-4.1-rc1' of... 

Merge tag 'usb-serial-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-next

Johan writes:

USB-serial updates for v4.1-rc1

Fix up the f81232 driver, which up to this point has mostly been a
placeholder without a proper implementation.

Included is also a minor clean up of ch341.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents 8b86ed07 65dd82ae

drivers/usb/serial/ch341.c

+0 −1
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port) 
	if (r) {

		dev_err(&port->dev, "%s - failed to submit interrupt urb: %d\n",

			__func__, r);

		ch341_close(port);

		goto out;

	}

drivers/usb/serial/f81232.c

+459 −99
Original line number Diff line number Diff line
@@ -19,10 +19,11 @@ 
#include <linux/serial.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/spinlock.h>

#include <linux/mutex.h>

#include <linux/uaccess.h>

#include <linux/usb.h>

#include <linux/usb/serial.h>

#include <linux/serial_reg.h>



static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(0x1934, 0x0706) },
@@ -30,37 +31,218 @@ static const struct usb_device_id id_table[] = { 
};

MODULE_DEVICE_TABLE(usb, id_table);



#define CONTROL_DTR			0x01

#define CONTROL_RTS			0x02

/* Maximum baudrate for F81232 */

#define F81232_MAX_BAUDRATE		115200



#define UART_STATE			0x08

#define UART_STATE_TRANSIENT_MASK	0x74

#define UART_DCD			0x01

#define UART_DSR			0x02

#define UART_BREAK_ERROR		0x04

#define UART_RING			0x08

#define UART_FRAME_ERROR		0x10

#define UART_PARITY_ERROR		0x20

#define UART_OVERRUN_ERROR		0x40

#define UART_CTS			0x80

/* USB Control EP parameter */

#define F81232_REGISTER_REQUEST		0xa0

#define F81232_GET_REGISTER		0xc0

#define F81232_SET_REGISTER		0x40



#define SERIAL_BASE_ADDRESS		0x0120

#define RECEIVE_BUFFER_REGISTER		(0x00 + SERIAL_BASE_ADDRESS)

#define INTERRUPT_ENABLE_REGISTER	(0x01 + SERIAL_BASE_ADDRESS)

#define FIFO_CONTROL_REGISTER		(0x02 + SERIAL_BASE_ADDRESS)

#define LINE_CONTROL_REGISTER		(0x03 + SERIAL_BASE_ADDRESS)

#define MODEM_CONTROL_REGISTER		(0x04 + SERIAL_BASE_ADDRESS)

#define MODEM_STATUS_REGISTER		(0x06 + SERIAL_BASE_ADDRESS)



struct f81232_private {

	spinlock_t lock;

	u8 line_control;

	u8 line_status;

	struct mutex lock;

	u8 modem_control;

	u8 modem_status;

	struct work_struct interrupt_work;

	struct usb_serial_port *port;

};



static int calc_baud_divisor(speed_t baudrate)

{

	return DIV_ROUND_CLOSEST(F81232_MAX_BAUDRATE, baudrate);

}



static int f81232_get_register(struct usb_serial_port *port, u16 reg, u8 *val)

{

	int status;

	u8 *tmp;

	struct usb_device *dev = port->serial->dev;



	tmp = kmalloc(sizeof(*val), GFP_KERNEL);

	if (!tmp)

		return -ENOMEM;



	status = usb_control_msg(dev,

				usb_rcvctrlpipe(dev, 0),

				F81232_REGISTER_REQUEST,

				F81232_GET_REGISTER,

				reg,

				0,

				tmp,

				sizeof(*val),

				USB_CTRL_GET_TIMEOUT);

	if (status != sizeof(*val)) {

		dev_err(&port->dev, "%s failed status: %d\n", __func__, status);



		if (status < 0)

			status = usb_translate_errors(status);

		else

			status = -EIO;

	} else {

		status = 0;

		*val = *tmp;

	}



	kfree(tmp);

	return status;

}



static int f81232_set_register(struct usb_serial_port *port, u16 reg, u8 val)

{

	int status;

	u8 *tmp;

	struct usb_device *dev = port->serial->dev;



	tmp = kmalloc(sizeof(val), GFP_KERNEL);

	if (!tmp)

		return -ENOMEM;



	*tmp = val;



	status = usb_control_msg(dev,

				usb_sndctrlpipe(dev, 0),

				F81232_REGISTER_REQUEST,

				F81232_SET_REGISTER,

				reg,

				0,

				tmp,

				sizeof(val),

				USB_CTRL_SET_TIMEOUT);

	if (status != sizeof(val)) {

		dev_err(&port->dev, "%s failed status: %d\n", __func__, status);



		if (status < 0)

			status = usb_translate_errors(status);

		else

			status = -EIO;

	} else {

		status = 0;

	}



	kfree(tmp);

	return status;

}



static void f81232_read_msr(struct usb_serial_port *port)

{

	int status;

	u8 current_msr;

	struct tty_struct *tty;

	struct f81232_private *priv = usb_get_serial_port_data(port);



	mutex_lock(&priv->lock);

	status = f81232_get_register(port, MODEM_STATUS_REGISTER,

			&current_msr);

	if (status) {

		dev_err(&port->dev, "%s fail, status: %d\n", __func__, status);

		mutex_unlock(&priv->lock);

		return;

	}



	if (!(current_msr & UART_MSR_ANY_DELTA)) {

		mutex_unlock(&priv->lock);

		return;

	}



	priv->modem_status = current_msr;



	if (current_msr & UART_MSR_DCTS)

		port->icount.cts++;

	if (current_msr & UART_MSR_DDSR)

		port->icount.dsr++;

	if (current_msr & UART_MSR_TERI)

		port->icount.rng++;

	if (current_msr & UART_MSR_DDCD) {

		port->icount.dcd++;

		tty = tty_port_tty_get(&port->port);

		if (tty) {

			usb_serial_handle_dcd_change(port, tty,

					current_msr & UART_MSR_DCD);



			tty_kref_put(tty);

		}

	}



	wake_up_interruptible(&port->port.delta_msr_wait);

	mutex_unlock(&priv->lock);

}



static int f81232_set_mctrl(struct usb_serial_port *port,

					   unsigned int set, unsigned int clear)

{

	u8 val;

	int status;

	struct f81232_private *priv = usb_get_serial_port_data(port);



	if (((set | clear) & (TIOCM_DTR | TIOCM_RTS)) == 0)

		return 0;	/* no change */



	/* 'set' takes precedence over 'clear' */

	clear &= ~set;



	/* force enable interrupt with OUT2 */

	mutex_lock(&priv->lock);

	val = UART_MCR_OUT2 | priv->modem_control;



	if (clear & TIOCM_DTR)

		val &= ~UART_MCR_DTR;



	if (clear & TIOCM_RTS)

		val &= ~UART_MCR_RTS;



	if (set & TIOCM_DTR)

		val |= UART_MCR_DTR;



	if (set & TIOCM_RTS)

		val |= UART_MCR_RTS;



	dev_dbg(&port->dev, "%s new:%02x old:%02x\n", __func__,

			val, priv->modem_control);



	status = f81232_set_register(port, MODEM_CONTROL_REGISTER, val);

	if (status) {

		dev_err(&port->dev, "%s set MCR status < 0\n", __func__);

		mutex_unlock(&priv->lock);

		return status;

	}



	priv->modem_control = val;

	mutex_unlock(&priv->lock);



	return 0;

}



static void f81232_update_line_status(struct usb_serial_port *port,

				      unsigned char *data,

				      unsigned int actual_length)

				      size_t actual_length)

{

	/*

	 * FIXME: Update port->icount, and call

	 *

	 *		wake_up_interruptible(&port->port.delta_msr_wait);

	 *

	 *	  on MSR changes.

	 */

	struct f81232_private *priv = usb_get_serial_port_data(port);



	if (!actual_length)

		return;



	switch (data[0] & 0x07) {

	case 0x00: /* msr change */

		dev_dbg(&port->dev, "IIR: MSR Change: %02x\n", data[0]);

		schedule_work(&priv->interrupt_work);

		break;

	case 0x02: /* tx-empty */

		break;

	case 0x04: /* rx data available */

		break;

	case 0x06: /* lsr change */

		/* we can forget it. the LSR will read from bulk-in */

		dev_dbg(&port->dev, "IIR: LSR Change: %02x\n", data[0]);

		break;

	}

}



static void f81232_read_int_callback(struct urb *urb)
@@ -104,53 +286,53 @@ static void f81232_read_int_callback(struct urb *urb) 
static void f81232_process_read_urb(struct urb *urb)

{

	struct usb_serial_port *port = urb->context;

	struct f81232_private *priv = usb_get_serial_port_data(port);

	unsigned char *data = urb->transfer_buffer;

	char tty_flag = TTY_NORMAL;

	unsigned long flags;

	u8 line_status;

	int i;



	/* update line status */

	spin_lock_irqsave(&priv->lock, flags);

	line_status = priv->line_status;

	priv->line_status &= ~UART_STATE_TRANSIENT_MASK;

	spin_unlock_irqrestore(&priv->lock, flags);



	if (!urb->actual_length)

	char tty_flag;

	unsigned int i;

	u8 lsr;



	/*

	 * When opening the port we get a 1-byte packet with the current LSR,

	 * which we discard.

	 */

	if ((urb->actual_length < 2) || (urb->actual_length % 2))

		return;



	/* break takes precedence over parity, */

	/* which takes precedence over framing errors */

	if (line_status & UART_BREAK_ERROR)

	/* bulk-in data: [LSR(1Byte)+DATA(1Byte)][LSR(1Byte)+DATA(1Byte)]... */



	for (i = 0; i < urb->actual_length; i += 2) {

		tty_flag = TTY_NORMAL;

		lsr = data[i];



		if (lsr & UART_LSR_BRK_ERROR_BITS) {

			if (lsr & UART_LSR_BI) {

				tty_flag = TTY_BREAK;

	else if (line_status & UART_PARITY_ERROR)

				port->icount.brk++;

				usb_serial_handle_break(port);

			} else if (lsr & UART_LSR_PE) {

				tty_flag = TTY_PARITY;

	else if (line_status & UART_FRAME_ERROR)

				port->icount.parity++;

			} else if (lsr & UART_LSR_FE) {

				tty_flag = TTY_FRAME;

	dev_dbg(&port->dev, "%s - tty_flag = %d\n", __func__, tty_flag);

				port->icount.frame++;

			}



	/* overrun is special, not associated with a char */

	if (line_status & UART_OVERRUN_ERROR)

		tty_insert_flip_char(&port->port, 0, TTY_OVERRUN);

			if (lsr & UART_LSR_OE) {

				port->icount.overrun++;

				tty_insert_flip_char(&port->port, 0,

						TTY_OVERRUN);

			}

		}



		if (port->port.console && port->sysrq) {

		for (i = 0; i < urb->actual_length; ++i)

			if (!usb_serial_handle_sysrq_char(port, data[i]))

				tty_insert_flip_char(&port->port, data[i],

						tty_flag);

	} else {

		tty_insert_flip_string_fixed_flag(&port->port, data, tty_flag,

							urb->actual_length);

			if (usb_serial_handle_sysrq_char(port, data[i + 1]))

				continue;

		}



	tty_flip_buffer_push(&port->port);

		tty_insert_flip_char(&port->port, data[i + 1], tty_flag);

	}



static int set_control_lines(struct usb_device *dev, u8 value)

{

	/* FIXME - Stubbed out for now */

	return 0;

	tty_flip_buffer_push(&port->port);

}



static void f81232_break_ctl(struct tty_struct *tty, int break_state)
@@ -164,37 +346,198 @@ static void f81232_break_ctl(struct tty_struct *tty, int break_state) 
	 */

}



static void f81232_set_baudrate(struct usb_serial_port *port, speed_t baudrate)

{

	u8 lcr;

	int divisor;

	int status = 0;



	divisor = calc_baud_divisor(baudrate);



	status = f81232_get_register(port, LINE_CONTROL_REGISTER,

			 &lcr); /* get LCR */

	if (status) {

		dev_err(&port->dev, "%s failed to get LCR: %d\n",

			__func__, status);

		return;

	}



	status = f81232_set_register(port, LINE_CONTROL_REGISTER,

			 lcr | UART_LCR_DLAB); /* Enable DLAB */

	if (status) {

		dev_err(&port->dev, "%s failed to set DLAB: %d\n",

			__func__, status);

		return;

	}



	status = f81232_set_register(port, RECEIVE_BUFFER_REGISTER,

			 divisor & 0x00ff); /* low */

	if (status) {

		dev_err(&port->dev, "%s failed to set baudrate MSB: %d\n",

			__func__, status);

		goto reapply_lcr;

	}



	status = f81232_set_register(port, INTERRUPT_ENABLE_REGISTER,

			 (divisor & 0xff00) >> 8); /* high */

	if (status) {

		dev_err(&port->dev, "%s failed to set baudrate LSB: %d\n",

			__func__, status);

	}



reapply_lcr:

	status = f81232_set_register(port, LINE_CONTROL_REGISTER,

			lcr & ~UART_LCR_DLAB);

	if (status) {

		dev_err(&port->dev, "%s failed to set DLAB: %d\n",

			__func__, status);

	}

}



static int f81232_port_enable(struct usb_serial_port *port)

{

	u8 val;

	int status;



	/* fifo on, trigger8, clear TX/RX*/

	val = UART_FCR_TRIGGER_8 | UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR |

			UART_FCR_CLEAR_XMIT;



	status = f81232_set_register(port, FIFO_CONTROL_REGISTER, val);

	if (status) {

		dev_err(&port->dev, "%s failed to set FCR: %d\n",

			__func__, status);

		return status;

	}



	/* MSR Interrupt only, LSR will read from Bulk-in odd byte */

	status = f81232_set_register(port, INTERRUPT_ENABLE_REGISTER,

			UART_IER_MSI);

	if (status) {

		dev_err(&port->dev, "%s failed to set IER: %d\n",

			__func__, status);

		return status;

	}



	return 0;

}



static int f81232_port_disable(struct usb_serial_port *port)

{

	int status;



	status = f81232_set_register(port, INTERRUPT_ENABLE_REGISTER, 0);

	if (status) {

		dev_err(&port->dev, "%s failed to set IER: %d\n",

			__func__, status);

		return status;

	}



	return 0;

}



static void f81232_set_termios(struct tty_struct *tty,

		struct usb_serial_port *port, struct ktermios *old_termios)

{

	/* FIXME - Stubbed out for now */

	u8 new_lcr = 0;

	int status = 0;

	speed_t baudrate;



	/* Don't change anything if nothing has changed */

	if (old_termios && !tty_termios_hw_change(&tty->termios, old_termios))

		return;



	/* Do the real work here... */

	if (old_termios)

		tty_termios_copy_hw(&tty->termios, old_termios);

	if (C_BAUD(tty) == B0)

		f81232_set_mctrl(port, 0, TIOCM_DTR | TIOCM_RTS);

	else if (old_termios && (old_termios->c_cflag & CBAUD) == B0)

		f81232_set_mctrl(port, TIOCM_DTR | TIOCM_RTS, 0);



	baudrate = tty_get_baud_rate(tty);

	if (baudrate > 0) {

		if (baudrate > F81232_MAX_BAUDRATE) {

			baudrate = F81232_MAX_BAUDRATE;

			tty_encode_baud_rate(tty, baudrate, baudrate);

		}

		f81232_set_baudrate(port, baudrate);

	}



	if (C_PARENB(tty)) {

		new_lcr |= UART_LCR_PARITY;



		if (!C_PARODD(tty))

			new_lcr |= UART_LCR_EPAR;



		if (C_CMSPAR(tty))

			new_lcr |= UART_LCR_SPAR;

	}



	if (C_CSTOPB(tty))

		new_lcr |= UART_LCR_STOP;



	switch (C_CSIZE(tty)) {

	case CS5:

		new_lcr |= UART_LCR_WLEN5;

		break;

	case CS6:

		new_lcr |= UART_LCR_WLEN6;

		break;

	case CS7:

		new_lcr |= UART_LCR_WLEN7;

		break;

	default:

	case CS8:

		new_lcr |= UART_LCR_WLEN8;

		break;

	}



	status = f81232_set_register(port, LINE_CONTROL_REGISTER, new_lcr);

	if (status) {

		dev_err(&port->dev, "%s failed to set LCR: %d\n",

			__func__, status);

	}

}



static int f81232_tiocmget(struct tty_struct *tty)

{

	/* FIXME - Stubbed out for now */

	return 0;

	int r;

	struct usb_serial_port *port = tty->driver_data;

	struct f81232_private *port_priv = usb_get_serial_port_data(port);

	u8 mcr, msr;



	/* force get current MSR changed state */

	f81232_read_msr(port);



	mutex_lock(&port_priv->lock);

	mcr = port_priv->modem_control;

	msr = port_priv->modem_status;

	mutex_unlock(&port_priv->lock);



	r = (mcr & UART_MCR_DTR ? TIOCM_DTR : 0) |

		(mcr & UART_MCR_RTS ? TIOCM_RTS : 0) |

		(msr & UART_MSR_CTS ? TIOCM_CTS : 0) |

		(msr & UART_MSR_DCD ? TIOCM_CAR : 0) |

		(msr & UART_MSR_RI ? TIOCM_RI : 0) |

		(msr & UART_MSR_DSR ? TIOCM_DSR : 0);



	return r;

}



static int f81232_tiocmset(struct tty_struct *tty,

			unsigned int set, unsigned int clear)

{

	/* FIXME - Stubbed out for now */

	return 0;

	struct usb_serial_port *port = tty->driver_data;



	return f81232_set_mctrl(port, set, clear);

}



static int f81232_open(struct tty_struct *tty, struct usb_serial_port *port)

{

	int result;



	result = f81232_port_enable(port);

	if (result)

		return result;



	/* Setup termios */

	if (tty)

		f81232_set_termios(tty, port, NULL);
@@ -217,59 +560,73 @@ static int f81232_open(struct tty_struct *tty, struct usb_serial_port *port) 


static void f81232_close(struct usb_serial_port *port)

{

	f81232_port_disable(port);

	usb_serial_generic_close(port);

	usb_kill_urb(port->interrupt_in_urb);

}



static void f81232_dtr_rts(struct usb_serial_port *port, int on)

{

	struct f81232_private *priv = usb_get_serial_port_data(port);

	unsigned long flags;

	u8 control;



	spin_lock_irqsave(&priv->lock, flags);

	/* Change DTR and RTS */

	if (on)

		priv->line_control |= (CONTROL_DTR | CONTROL_RTS);

		f81232_set_mctrl(port, TIOCM_DTR | TIOCM_RTS, 0);

	else

		priv->line_control &= ~(CONTROL_DTR | CONTROL_RTS);

	control = priv->line_control;

	spin_unlock_irqrestore(&priv->lock, flags);

	set_control_lines(port->serial->dev, control);

		f81232_set_mctrl(port, 0, TIOCM_DTR | TIOCM_RTS);

}



static int f81232_carrier_raised(struct usb_serial_port *port)

{

	u8 msr;

	struct f81232_private *priv = usb_get_serial_port_data(port);

	if (priv->line_status & UART_DCD)



	mutex_lock(&priv->lock);

	msr = priv->modem_status;

	mutex_unlock(&priv->lock);



	if (msr & UART_MSR_DCD)

		return 1;

	return 0;

}



static int f81232_ioctl(struct tty_struct *tty,

			unsigned int cmd, unsigned long arg)

static int f81232_get_serial_info(struct usb_serial_port *port,

		unsigned long arg)

{

	struct serial_struct ser;

	struct usb_serial_port *port = tty->driver_data;



	switch (cmd) {

	case TIOCGSERIAL:

		memset(&ser, 0, sizeof ser);

		ser.type = PORT_16654;

	memset(&ser, 0, sizeof(ser));



	ser.type = PORT_16550A;

	ser.line = port->minor;

	ser.port = port->port_number;

		ser.baud_base = 460800;

	ser.baud_base = F81232_MAX_BAUDRATE;



		if (copy_to_user((void __user *)arg, &ser, sizeof ser))

	if (copy_to_user((void __user *)arg, &ser, sizeof(ser)))

		return -EFAULT;



	return 0;

}



static int f81232_ioctl(struct tty_struct *tty,

			unsigned int cmd, unsigned long arg)

{

	struct usb_serial_port *port = tty->driver_data;



	switch (cmd) {

	case TIOCGSERIAL:

		return f81232_get_serial_info(port, arg);

	default:

		break;

	}

	return -ENOIOCTLCMD;

}



static void  f81232_interrupt_work(struct work_struct *work)

{

	struct f81232_private *priv =

		container_of(work, struct f81232_private, interrupt_work);



	f81232_read_msr(priv->port);

}



static int f81232_port_probe(struct usb_serial_port *port)

{

	struct f81232_private *priv;
@@ -278,11 +635,13 @@ static int f81232_port_probe(struct usb_serial_port *port) 
	if (!priv)

		return -ENOMEM;



	spin_lock_init(&priv->lock);

	mutex_init(&priv->lock);

	INIT_WORK(&priv->interrupt_work,  f81232_interrupt_work);



	usb_set_serial_port_data(port, priv);



	port->port.drain_delay = 256;

	priv->port = port;



	return 0;

}
@@ -330,5 +689,6 @@ static struct usb_serial_driver * const serial_drivers[] = { 
module_usb_serial_driver(serial_drivers, id_table);



MODULE_DESCRIPTION("Fintek F81232 USB to serial adaptor driver");

MODULE_AUTHOR("Greg Kroah-Hartman <gregkh@linuxfoundation.org");

MODULE_AUTHOR("Greg Kroah-Hartman <gregkh@linuxfoundation.org>");

MODULE_AUTHOR("Peter Hong <peter_hong@fintek.com.tw>");

MODULE_LICENSE("GPL v2");