Commit 3dd2ae81 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: update for acm in quirks and debug 



this adds
better debugging output &
an update of the quirk list
to the acm driver

Signed-off-by: default avatarOliver Neukum <oliver@neukum.name>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9189bfc2

drivers/usb/class/cdc-acm.c

+26 −23
Original line number Diff line number Diff line
@@ -291,13 +291,13 @@ static void acm_read_bulk(struct urb *urb, struct pt_regs *regs) 
	struct acm_ru *rcv = urb->context;

	struct acm *acm = rcv->instance;

	int status = urb->status;

	dbg("Entering acm_read_bulk with status %d\n", urb->status);

	dbg("Entering acm_read_bulk with status %d", urb->status);



	if (!ACM_READY(acm))

		return;



	if (status)

		dev_dbg(&acm->data->dev, "bulk rx status %d\n", status);

		dev_dbg(&acm->data->dev, "bulk rx status %d", status);



	buf = rcv->buffer;

	buf->size = urb->actual_length;
@@ -343,7 +343,7 @@ next_buffer: 
	list_del(&buf->list);

	spin_unlock(&acm->read_lock);



	dbg("acm_rx_tasklet: procesing buf 0x%p, size = %d\n", buf, buf->size);

	dbg("acm_rx_tasklet: procesing buf 0x%p, size = %d", buf, buf->size);



	tty_buffer_request_room(tty, buf->size);

	if (!acm->throttle)
@@ -394,7 +394,7 @@ urbs: 
		rcv->urb->transfer_dma = buf->dma;

		rcv->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;



		dbg("acm_rx_tasklet: sending urb 0x%p, rcv 0x%p, buf 0x%p\n", rcv->urb, rcv, buf);

		dbg("acm_rx_tasklet: sending urb 0x%p, rcv 0x%p, buf 0x%p", rcv->urb, rcv, buf);



		/* This shouldn't kill the driver as unsuccessful URBs are returned to the

		   free-urbs-pool and resubmited ASAP */
@@ -413,7 +413,7 @@ static void acm_write_bulk(struct urb *urb, struct pt_regs *regs) 
{

	struct acm *acm = (struct acm *)urb->context;



	dbg("Entering acm_write_bulk with status %d\n", urb->status);

	dbg("Entering acm_write_bulk with status %d", urb->status);



	acm_write_done(acm);

	acm_write_start(acm);
@@ -424,7 +424,7 @@ static void acm_write_bulk(struct urb *urb, struct pt_regs *regs) 
static void acm_softint(void *private)

{

	struct acm *acm = private;

	dbg("Entering acm_softint.\n");

	dbg("Entering acm_softint.");

	

	if (!ACM_READY(acm))

		return;
@@ -440,7 +440,7 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp) 
	struct acm *acm;

	int rv = -EINVAL;

	int i;

	dbg("Entering acm_tty_open.\n");

	dbg("Entering acm_tty_open.");



	mutex_lock(&open_mutex);
@@ -541,7 +541,7 @@ static int acm_tty_write(struct tty_struct *tty, const unsigned char *buf, int c 
	int wbn;

	struct acm_wb *wb;



	dbg("Entering acm_tty_write to write %d bytes,\n", count);

	dbg("Entering acm_tty_write to write %d bytes,", count);



	if (!ACM_READY(acm))

		return -EINVAL;
@@ -793,7 +793,7 @@ static int acm_probe (struct usb_interface *intf, 


	if (!buflen) {

		if (intf->cur_altsetting->endpoint->extralen && intf->cur_altsetting->endpoint->extra) {

			dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint\n");

			dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint");

			buflen = intf->cur_altsetting->endpoint->extralen;

			buffer = intf->cur_altsetting->endpoint->extra;

		} else {
@@ -842,24 +842,24 @@ next_desc: 


	if (!union_header) {

		if (call_interface_num > 0) {

			dev_dbg(&intf->dev,"No union descriptor, using call management descriptor\n");

			dev_dbg(&intf->dev,"No union descriptor, using call management descriptor");

			data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num));

			control_interface = intf;

		} else {

			dev_dbg(&intf->dev,"No union descriptor, giving up\n");

			dev_dbg(&intf->dev,"No union descriptor, giving up");

			return -ENODEV;

		}

	} else {

		control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0);

		data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0));

		if (!control_interface || !data_interface) {

			dev_dbg(&intf->dev,"no interfaces\n");

			dev_dbg(&intf->dev,"no interfaces");

			return -ENODEV;

		}

	}

	

	if (data_interface_num != call_interface_num)

		dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported.\n");

		dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported.");



skip_normal_probe:
@@ -867,7 +867,7 @@ skip_normal_probe: 
	if (data_interface->cur_altsetting->desc.bInterfaceClass != CDC_DATA_INTERFACE_TYPE) {

		if (control_interface->cur_altsetting->desc.bInterfaceClass == CDC_DATA_INTERFACE_TYPE) {

			struct usb_interface *t;

			dev_dbg(&intf->dev,"Your device has switched interfaces.\n");

			dev_dbg(&intf->dev,"Your device has switched interfaces.");



			t = control_interface;

			control_interface = data_interface;
@@ -878,7 +878,7 @@ skip_normal_probe: 
	}

	

	if (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");

		return -EBUSY;

	}
@@ -895,7 +895,7 @@ skip_normal_probe: 
	if ((epread->bEndpointAddress & USB_DIR_IN) != USB_DIR_IN) {

		/* descriptors are swapped */

		struct usb_endpoint_descriptor *t;

		dev_dbg(&intf->dev,"The data interface has switched endpoints\n");

		dev_dbg(&intf->dev,"The data interface has switched endpoints");

		

		t = epread;

		epread = epwrite;
@@ -910,7 +910,7 @@ skip_normal_probe: 
	}



	if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) {

		dev_dbg(&intf->dev, "out of memory (acm kzalloc)\n");

		dev_dbg(&intf->dev, "out of memory (acm kzalloc)");

		goto alloc_fail;

	}
@@ -936,26 +936,26 @@ skip_normal_probe: 


	buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma);

	if (!buf) {

		dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)\n");

		dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)");

		goto alloc_fail2;

	}

	acm->ctrl_buffer = buf;



	if (acm_write_buffers_alloc(acm) < 0) {

		dev_dbg(&intf->dev, "out of memory (write buffer alloc)\n");

		dev_dbg(&intf->dev, "out of memory (write buffer alloc)");

		goto alloc_fail4;

	}



	acm->ctrlurb = usb_alloc_urb(0, GFP_KERNEL);

	if (!acm->ctrlurb) {

		dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)\n");

		dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)");

		goto alloc_fail5;

	}

	for (i = 0; i < num_rx_buf; i++) {

		struct acm_ru *rcv = &(acm->ru[i]);



		if (!(rcv->urb = usb_alloc_urb(0, GFP_KERNEL))) {

			dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)\n");

			dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)");

			goto alloc_fail7;

		}
@@ -966,13 +966,13 @@ skip_normal_probe: 
		struct acm_rb *buf = &(acm->rb[i]);



		if (!(buf->base = usb_buffer_alloc(acm->dev, readsize, GFP_KERNEL, &buf->dma))) {

			dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)\n");

			dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)");

			goto alloc_fail7;

		}

	}

	acm->writeurb = usb_alloc_urb(0, GFP_KERNEL);

	if (!acm->writeurb) {

		dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)\n");

		dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)");

		goto alloc_fail7;

	}
@@ -1086,6 +1086,9 @@ static struct usb_device_id acm_ids[] = { 
	{ USB_DEVICE(0x0ace, 0x1608), /* ZyDAS 56K USB MODEM */

	.driver_info = SINGLE_RX_URB, /* firmware bug */

	},

	{ USB_DEVICE(0x0ace, 0x1611), /* ZyDAS 56K USB MODEM - new version */

	.driver_info = SINGLE_RX_URB, /* firmware bug */

	},

	/* control interfaces with various AT-command sets */

	{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,

		USB_CDC_ACM_PROTO_AT_V25TER) },

CRA Git | Maintained and supported by SUSTech CRA and CCSE