linux-next: manual merge of the usb tree with the ttydev tree

linux-next: manual merge of the usb tree with the ttydev tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/cp210x.c between commit
7219905ae9bb14e9c8f7a7ab434b70363b904a7c ("cp210x-func-renames") from the
ttydev tree and commit 8a5870836006ec7dd112082a39e0057b49e5bd91 ("USB:
usb-serial: replace shutdown with disconnect, release") from the usb tree.

I love churn!  :-)

I fixed this up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/serial/cp210x.c
index 16a154d,cf5093f..0000000
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@@ -33,24 -33,25 +33,24 @@@
  /*
   * Function Prototypes
   */
 -static int cp2101_open(struct tty_struct *, struct usb_serial_port *,
 +static int cp210x_open(struct tty_struct *, struct usb_serial_port *,
  							struct file *);
 -static void cp2101_cleanup(struct usb_serial_port *);
 -static void cp2101_close(struct tty_struct *, struct usb_serial_port *,
 -							struct file*);
 -static void cp2101_get_termios(struct tty_struct *,
 +static void cp210x_cleanup(struct usb_serial_port *);
 +static void cp210x_close(struct usb_serial_port *);
 +static void cp210x_get_termios(struct tty_struct *,
  	struct usb_serial_port *port);
 -static void cp2101_get_termios_port(struct usb_serial_port *port,
 +static void cp210x_get_termios_port(struct usb_serial_port *port,
  	unsigned int *cflagp, unsigned int *baudp);
 -static void cp2101_set_termios(struct tty_struct *, struct usb_serial_port *,
 +static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *,
  							struct ktermios*);
 -static int cp2101_tiocmget(struct tty_struct *, struct file *);
 -static int cp2101_tiocmset(struct tty_struct *, struct file *,
 +static int cp210x_tiocmget(struct tty_struct *, struct file *);
 +static int cp210x_tiocmset(struct tty_struct *, struct file *,
  		unsigned int, unsigned int);
 -static int cp2101_tiocmset_port(struct usb_serial_port *port, struct file *,
 +static int cp210x_tiocmset_port(struct usb_serial_port *port, struct file *,
  		unsigned int, unsigned int);
 -static void cp2101_break_ctl(struct tty_struct *, int);
 -static int cp2101_startup(struct usb_serial *);
 -static void cp2101_disconnect(struct usb_serial *);
 +static void cp210x_break_ctl(struct tty_struct *, int);
 +static int cp210x_startup(struct usb_serial *);
- static void cp210x_shutdown(struct usb_serial *);
++static void cp210x_disconnect(struct usb_serial *);
  
  static int debug;
  
@@@ -122,22 -116,22 +122,22 @@@ static struct usb_driver cp210x_driver 
  	.no_dynamic_id	= 	1,
  };
  
 -static struct usb_serial_driver cp2101_device = {
 +static struct usb_serial_driver cp210x_device = {
  	.driver = {
  		.owner =	THIS_MODULE,
 -		.name = 	"cp2101",
 +		.name = 	"cp210x",
  	},
 -	.usb_driver		= &cp2101_driver,
 +	.usb_driver		= &cp210x_driver,
  	.id_table		= id_table,
  	.num_ports		= 1,
 -	.open			= cp2101_open,
 -	.close			= cp2101_close,
 -	.break_ctl		= cp2101_break_ctl,
 -	.set_termios		= cp2101_set_termios,
 -	.tiocmget 		= cp2101_tiocmget,
 -	.tiocmset		= cp2101_tiocmset,
 -	.attach			= cp2101_startup,
 -	.disconnect		= cp2101_disconnect,
 +	.open			= cp210x_open,
 +	.close			= cp210x_close,
 +	.break_ctl		= cp210x_break_ctl,
 +	.set_termios		= cp210x_set_termios,
 +	.tiocmget 		= cp210x_tiocmget,
 +	.tiocmset		= cp210x_tiocmset,
 +	.attach			= cp210x_startup,
- 	.shutdown		= cp210x_shutdown,
++	.disconnect		= cp210x_disconnect,
  };
  
  /* Config request types */
@@@ -792,7 -773,7 +792,7 @@@ static int cp210x_startup(struct usb_se
  	return 0;
  }
  
- static void cp210x_shutdown(struct usb_serial *serial)
 -static void cp2101_disconnect(struct usb_serial *serial)
++static void cp210x_disconnect(struct usb_serial *serial)
  {
  	int i;
  

Re: linux-next: manual merge of the usb tree with the ttydev tree

[Greg KH]

On Fri, Jun 05, 2009 at 03:34:45PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/cp210x.c between commit
> 7219905ae9bb14e9c8f7a7ab434b70363b904a7c ("cp210x-func-renames") from the
> ttydev tree and commit 8a5870836006ec7dd112082a39e0057b49e5bd91 ("USB:
> usb-serial: replace shutdown with disconnect, release") from the usb tree.
> 
> I love churn!  :-)

Heh, so do I :)

> I fixed this up (see below) and can carry the fix as necessary.

Looks good to me, thanks for doing this.

greg k-h

Re: linux-next: manual merge of the usb tree with the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 956 bytes --]

Hi Alan,

On Wed, 10 Jun 2009 11:06:17 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> On Wed, 10 Jun 2009 18:41:14 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/usb/serial/sierra.c between commit
> > 968b6bc702be2b0953212f1ca56b1dc889c1c72d ("tty-usb-sierra-add-urb-funcs")
> > from the ttydev tree and various commits from the usb tree.
> > 
> > There is some overlap between the ttydev patch and the usb patches.  I
> > have just used the version of this file from USB tree (since it seems
> > that there are many more changes there).
> > 
> > Please sort this out ...
> 
> Already working on this and getting all the patches into the ttydev tree.
> Sierra are also now checking over my merge to check its ok.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the usb tree with the ttydev tree

[Alan Cox]

On Wed, 10 Jun 2009 18:41:14 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Greg, Alan,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/sierra.c between commit
> 968b6bc702be2b0953212f1ca56b1dc889c1c72d ("tty-usb-sierra-add-urb-funcs")
> from the ttydev tree and various commits from the usb tree.
> 
> There is some overlap between the ttydev patch and the usb patches.  I
> have just used the version of this file from USB tree (since it seems
> that there are many more changes there).
> 
> Please sort this out ...

Already working on this and getting all the patches into the ttydev tree.
Sierra are also now checking over my merge to check its ok.

Alan

linux-next: manual merge of the usb tree with the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 580 bytes --]

Hi Greg, Alan,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/sierra.c between commit
968b6bc702be2b0953212f1ca56b1dc889c1c72d ("tty-usb-sierra-add-urb-funcs")
from the ttydev tree and various commits from the usb tree.

There is some overlap between the ttydev patch and the usb patches.  I
have just used the version of this file from USB tree (since it seems
that there are many more changes there).

Please sort this out ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the usb tree with the ttydev tree

[Greg KH]

On Fri, Jun 05, 2009 at 03:41:18PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/kobil_sct.c between commit
> d6ba273795c1260745197dc93f64c321c80a5ecc ("tty-usb-use-port") from the
> ttydev tree and commit 8a5870836006ec7dd112082a39e0057b49e5bd91 ("USB:
> usb-serial: replace shutdown with disconnect, release") from the usb tree.
> 
> The latter removed the code (from kobil_shutdown) that the former
> modified, so I just used the latter.

That sounds correct.

thanks,

greg k-h

linux-next: manual merge of the usb tree with the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 553 bytes --]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/kobil_sct.c between commit
d6ba273795c1260745197dc93f64c321c80a5ecc ("tty-usb-use-port") from the
ttydev tree and commit 8a5870836006ec7dd112082a39e0057b49e5bd91 ("USB:
usb-serial: replace shutdown with disconnect, release") from the usb tree.

The latter removed the code (from kobil_shutdown) that the former
modified, so I just used the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the usb tree with the ttydev tree

[Greg KH]

On Wed, Jun 03, 2009 at 08:46:55PM +1000, Stephen Rothwell wrote:
> Hi Alan,
> 
> On Wed, 3 Jun 2009 09:55:47 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> >
> > > As a side issue, the last patch has no SOB from Craig in the ttydev tree.
> > 
> > Yes it does...
> > 
> >     Signed-off-by: Craig Shelley <craig@microtron.org.uk>
> >     
> >     (Fixed some collisions merging)
> >     
> >     Signed-off-by: Alan Cox <alan@linux.intel.com>
> 
> Sorry, going blind in my old age :-)
> 
> > > So, I just used the ttydev tree version on the assumption that my
> > > reasoning above is correct.
> > 
> > and the ttydev tree one is the one to use
> 
> Thanks for the confirmation.

Ok, I'll drop these three patches from my tree.

thanks,

greg k-h

Re: linux-next: manual merge of the usb tree with the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 704 bytes --]

Hi Alan,

On Wed, 3 Jun 2009 09:55:47 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> > As a side issue, the last patch has no SOB from Craig in the ttydev tree.
> 
> Yes it does...
> 
>     Signed-off-by: Craig Shelley <craig@microtron.org.uk>
>     
>     (Fixed some collisions merging)
>     
>     Signed-off-by: Alan Cox <alan@linux.intel.com>

Sorry, going blind in my old age :-)

> > So, I just used the ttydev tree version on the assumption that my
> > reasoning above is correct.
> 
> and the ttydev tree one is the one to use

Thanks for the confirmation.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the usb tree with the ttydev tree

[Alan Cox]

> As a side issue, the last patch has no SOB from Craig in the ttydev tree.

Yes it does...

    Signed-off-by: Craig Shelley <craig@microtron.org.uk>
    
    (Fixed some collisions merging)
    
    Signed-off-by: Alan Cox <alan@linux.intel.com>


> So, I just used the ttydev tree version on the assumption that my
> reasoning above is correct.

and the ttydev tree one is the one to use

linux-next: manual merge of the usb tree with the ttydev tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/ftdi_sio.c between commit
436d74ab8174ba48ad97c3de80c8de6aaff6c931 ("tty-usb-ft232-latency") from
the ttydev tree and commit ac0ceefdc8cdf4bbe6cdaf6d2175e0dfdbfd6700
("USB: ftdi_sio: fix hi-speed device packet size calculation") from the
usb tree.

Overlapping additions.  I fixed it up (see below), but have no idea if
there are higher level interactions (or the ordering is right) i.e.
please check this.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/serial/ftdi_sio.c
index 59c7501,ec20993..0000000
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@@ -1417,7 -1500,7 +1524,8 @@@ static int ftdi_sio_port_probe(struct u
  	usb_set_serial_port_data(port, priv);
  
  	ftdi_determine_type(port);
 +	read_latency_timer(port);
+ 	ftdi_set_max_packet_size(port);
  	create_sysfs_attrs(port);
  	return 0;
  }

linux-next: manual merge of the usb tree with the ttydev tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1072 bytes --]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/cp210x.c between commit
d6ba273795c1260745197dc93f64c321c80a5ecc ("tty-usb-use-port") from the
ttydev tree and commit fa9eb42aff8444a67db3136bc405a53882efb14f ("USB:
CP210X Replace CP2101 with CP210x") from the usb tree.

This is really just the same three commits being applied to both trees,
but the ttydev tree has the above commit preceding them.  Maybe Greg you
should rdop these patches ("USB: CP210X Add device IDs", "USB: CP210X Use
official request code definitions", and "USB: CP210X Replace CP2101 with
CP210x") is Craig can verify that they are indeed identical in both trees
(I know the first two are, but the last is different due to the other
changes in the ttydev tree).

As a side issue, the last patch has no SOB from Craig in the ttydev tree.

So, I just used the ttydev tree version on the assumption that my
reasoning above is correct.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the usb tree with the ttydev tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/class/cdc-acm.c between commit
255e62420b88b3788826591a9b2880d3a88ef498 ("tty-usb-acm-clean") from the
ttydev tree and commit c0c91103ffdc941959e5c7dbcd190d8229ab7922 ("USB:
support for cdc-acm of single interface devices") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/class/cdc-acm.c
index ddeb691,2afff9f..0000000
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@@ -1045,10 -1008,40 +1052,40 @@@ next_desc
  			return -ENODEV;
  		}
  	}
 -	
 +
  	if (data_interface_num != call_interface_num)
 -		dev_dbg(&intf->dev,"Separate call control interface. That is not fully supported.\n");
 +		dev_dbg(&intf->dev, "Separate call control interface. That is not fully supported.\n");
  
+ 	if (control_interface == data_interface) {
+ 		/* some broken devices designed for windows work this way */
+ 		dev_warn(&intf->dev,"Control and data interfaces are not separated!\n");
+ 		combined_interfaces = 1;
+ 		/* a popular other OS doesn't use it */
+ 		quirks |= NO_CAP_LINE;
+ 		if (data_interface->cur_altsetting->desc.bNumEndpoints != 3) {
+ 			dev_err(&intf->dev, "This needs exactly 3 endpoints\n");
+ 			return -EINVAL;
+ 		}
+ look_for_collapsed_interface:
+ 		for (i = 0; i < 3; i++) {
+ 			struct usb_endpoint_descriptor *ep;
+ 			ep = &data_interface->cur_altsetting->endpoint[i].desc;
+ 
+ 			if (usb_endpoint_is_int_in(ep))
+ 				epctrl = ep;
+ 			else if (usb_endpoint_is_bulk_out(ep))
+ 				epwrite = ep;
+ 			else if (usb_endpoint_is_bulk_in(ep))
+ 				epread = ep;
+ 			else
+ 				return -EINVAL;
+ 		}
+ 		if (!epctrl || !epread || !epwrite)
+ 			return -ENODEV;
+ 		else
+ 			goto made_compressed_probe;
+ 	}
+ 
  skip_normal_probe:
  
  	/*workaround for switched interfaces */
@@@ -1068,11 -1059,11 +1105,11 @@@
  	}
  
  	/* Accept probe requests only for the control interface */
- 	if (intf != control_interface)
+ 	if (!combined_interfaces && intf != control_interface)
  		return -ENODEV;
 -	
 +
- 	if (usb_interface_claimed(data_interface)) { /* valid in this context */
+ 	if (!combined_interfaces && usb_interface_claimed(data_interface)) { /* valid in this context */
 -		dev_dbg(&intf->dev,"The data interface isn't available\n");
 +		dev_dbg(&intf->dev, "The data interface isn't available\n");
  		return -EBUSY;
  	}
  
@@@ -1110,8 -1101,8 +1148,9 @@@ made_compressed_probe
  	}
  
  	ctrlsize = le16_to_cpu(epctrl->wMaxPacketSize);
 -	readsize = le16_to_cpu(epread->wMaxPacketSize)* ( quirks == SINGLE_RX_URB ? 1 : 2);
 +	readsize = le16_to_cpu(epread->wMaxPacketSize) *
 +				(quirks == SINGLE_RX_URB ? 1 : 2);
+ 	acm->combined_interfaces = combined_interfaces;
  	acm->writesize = le16_to_cpu(epwrite->wMaxPacketSize) * 20;
  	acm->control = control_interface;
  	acm->data = data_interface;
@@@ -1222,10 -1206,10 +1263,11 @@@
  	}
  
  skip_countries:
 -	usb_fill_int_urb(acm->ctrlurb, usb_dev, usb_rcvintpipe(usb_dev, epctrl->bEndpointAddress),
 -			 acm->ctrl_buffer, ctrlsize, acm_ctrl_irq, acm,
 +	usb_fill_int_urb(acm->ctrlurb, usb_dev,
 +			usb_rcvintpipe(usb_dev, epctrl->bEndpointAddress),
 +			acm->ctrl_buffer, ctrlsize, acm_ctrl_irq, acm,
- 			epctrl->bInterval);
+ 			 /* works around buggy devices */
+ 			 epctrl->bInterval ? epctrl->bInterval : 0xff);
  	acm->ctrlurb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
  	acm->ctrlurb->transfer_dma = acm->ctrl_dma;
  
@@@ -1308,14 -1291,14 +1350,15 @@@ static void acm_disconnect(struct usb_i
  	stop_data_traffic(acm);
  
  	acm_write_buffers_free(acm);
 -	usb_buffer_free(usb_dev, acm->ctrlsize, acm->ctrl_buffer, acm->ctrl_dma);
 +	usb_buffer_free(usb_dev, acm->ctrlsize, acm->ctrl_buffer,
 +								acm->ctrl_dma);
  	acm_read_buffers_free(acm);
  
- 	usb_driver_release_interface(&acm_driver, intf == acm->control ?
+ 	if (!acm->combined_interfaces)
+ 		usb_driver_release_interface(&acm_driver, intf == acm->control ?
  					acm->data : acm->control);
  
 -	if (!acm->used) {
 +	if (acm->port.count == 0) {
  		acm_tty_unregister(acm);
  		mutex_unlock(&open_mutex);
  		return;