Commit e272a186 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: Add support for Mobilcom Debitel USB UMTS Surf-Stick to option driver
  USB: work around for EHCI with quirky periodic schedules
  USB: musb: Fix CPPI IRQs not being signaled
  USB: musb: respect usb_request->zero in control requests
  USB: musb: fix ISOC Tx programming for CPPI DMAs
  USB: musb: Remove unwanted message in boot log
  usb: amd5536udc: fixed shared interrupt bug and warning oops
  USB: ftdi_sio: Keep going when write errors are encountered.
  USB: musb_gadget: fix STALL handling
  USB: EHCI: don't send Clear-TT-Buffer following a STALL
parents e8ed34ce 0ec86483

drivers/usb/core/hub.c

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ resubmit: 
static inline int

hub_clear_tt_buffer (struct usb_device *hdev, u16 devinfo, u16 tt)

{

	return usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),

	return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),

			       HUB_CLEAR_TT_BUFFER, USB_RT_PORT, devinfo,

			       tt, NULL, 0, 1000);

}

drivers/usb/gadget/amd5536udc.c

+30 −19
Original line number Diff line number Diff line
@@ -1213,6 +1213,11 @@ udc_queue(struct usb_ep *usbep, struct usb_request *usbreq, gfp_t gfp) 
				tmp &= AMD_UNMASK_BIT(ep->num);

				writel(tmp, &dev->regs->ep_irqmsk);

			}

		} else if (ep->in) {

				/* enable ep irq */

				tmp = readl(&dev->regs->ep_irqmsk);

				tmp &= AMD_UNMASK_BIT(ep->num);

				writel(tmp, &dev->regs->ep_irqmsk);

			}



	} else if (ep->dma) {
@@ -2005,18 +2010,17 @@ __acquires(dev->lock) 
{

	int tmp;



	/* empty queues and init hardware */

	udc_basic_init(dev);

	for (tmp = 0; tmp < UDC_EP_NUM; tmp++) {

		empty_req_queue(&dev->ep[tmp]);

	}



	if (dev->gadget.speed != USB_SPEED_UNKNOWN) {

		spin_unlock(&dev->lock);

		driver->disconnect(&dev->gadget);

		spin_lock(&dev->lock);

	}

	/* init */



	/* empty queues and init hardware */

	udc_basic_init(dev);

	for (tmp = 0; tmp < UDC_EP_NUM; tmp++)

		empty_req_queue(&dev->ep[tmp]);



	udc_setup_endpoints(dev);

}
@@ -2472,6 +2476,13 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix) 
				}

			}



		} else if (!use_dma && ep->in) {

			/* disable interrupt */

			tmp = readl(

				&dev->regs->ep_irqmsk);

			tmp |= AMD_BIT(ep->num);

			writel(tmp,

				&dev->regs->ep_irqmsk);

		}

	}

	/* clear status bits */
@@ -3279,6 +3290,17 @@ static int udc_pci_probe( 
		goto finished;

	}



	spin_lock_init(&dev->lock);

	/* udc csr registers base */

	dev->csr = dev->virt_addr + UDC_CSR_ADDR;

	/* dev registers base */

	dev->regs = dev->virt_addr + UDC_DEVCFG_ADDR;

	/* ep registers base */

	dev->ep_regs = dev->virt_addr + UDC_EPREGS_ADDR;

	/* fifo's base */

	dev->rxfifo = (u32 __iomem *)(dev->virt_addr + UDC_RXFIFO_ADDR);

	dev->txfifo = (u32 __iomem *)(dev->virt_addr + UDC_TXFIFO_ADDR);



	if (request_irq(pdev->irq, udc_irq, IRQF_SHARED, name, dev) != 0) {

		dev_dbg(&dev->pdev->dev, "request_irq(%d) fail\n", pdev->irq);

		kfree(dev);
@@ -3331,7 +3353,6 @@ static int udc_probe(struct udc *dev) 
	udc_pollstall_timer.data = 0;



	/* device struct setup */

	spin_lock_init(&dev->lock);

	dev->gadget.ops = &udc_ops;



	dev_set_name(&dev->gadget.dev, "gadget");
@@ -3340,16 +3361,6 @@ static int udc_probe(struct udc *dev) 
	dev->gadget.name = name;

	dev->gadget.is_dualspeed = 1;



	/* udc csr registers base */

	dev->csr = dev->virt_addr + UDC_CSR_ADDR;

	/* dev registers base */

	dev->regs = dev->virt_addr + UDC_DEVCFG_ADDR;

	/* ep registers base */

	dev->ep_regs = dev->virt_addr + UDC_EPREGS_ADDR;

	/* fifo's base */

	dev->rxfifo = (u32 __iomem *)(dev->virt_addr + UDC_RXFIFO_ADDR);

	dev->txfifo = (u32 __iomem *)(dev->virt_addr + UDC_TXFIFO_ADDR);



	/* init registers, interrupts, ... */

	startup_registers(dev);

drivers/usb/host/ehci-hcd.c

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/errno.h>

#include <linux/init.h>

#include <linux/timer.h>

#include <linux/ktime.h>

#include <linux/list.h>

#include <linux/interrupt.h>

#include <linux/usb.h>
@@ -676,6 +677,7 @@ static int ehci_run (struct usb_hcd *hcd) 
	ehci_readl(ehci, &ehci->regs->command);	/* unblock posted writes */

	msleep(5);

	up_write(&ehci_cf_port_reset_rwsem);

	ehci->last_periodic_enable = ktime_get_real();



	temp = HC_VERSION(ehci_readl(ehci, &ehci->caps->hc_capbase));

	ehci_info (ehci,

drivers/usb/host/ehci-pci.c

+4 −0
Original line number Diff line number Diff line
@@ -111,6 +111,10 @@ static int ehci_pci_setup(struct usb_hcd *hcd) 
	switch (pdev->vendor) {

	case PCI_VENDOR_ID_INTEL:

		ehci->need_io_watchdog = 0;

		if (pdev->device == 0x27cc) {

			ehci->broken_periodic = 1;

			ehci_info(ehci, "using broken periodic workaround\n");

		}

		break;

	case PCI_VENDOR_ID_TDI:

		if (pdev->device == PCI_DEVICE_ID_TDI_EHCI) {

drivers/usb/host/ehci-q.c

+14 −2
Original line number Diff line number Diff line
@@ -487,8 +487,20 @@ halt: 
			 * we must clear the TT buffer (11.17.5).

			 */

			if (unlikely(last_status != -EINPROGRESS &&

					last_status != -EREMOTEIO))

				ehci_clear_tt_buffer(ehci, qh, urb, token);

					last_status != -EREMOTEIO)) {

				/* The TT's in some hubs malfunction when they

				 * receive this request following a STALL (they

				 * stop sending isochronous packets).  Since a

				 * STALL can't leave the TT buffer in a busy

				 * state (if you believe Figures 11-48 - 11-51

				 * in the USB 2.0 spec), we won't clear the TT

				 * buffer in this case.  Strictly speaking this

				 * is a violation of the spec.

				 */

				if (last_status != -EPIPE)

					ehci_clear_tt_buffer(ehci, qh, urb,

							token);

			}

		}



		/* if we're removing something not at the queue head,

CRA Git | Maintained and supported by SUSTech CRA and CCSE