USB fixes for 3.8-rc3
Here are a bunch of USB fixes for your 3.8-rc3 tree. They all either fix problems that have been reported (like the xhci/hub changes) or add new device ids to existing drivers. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlDzjz0ACgkQMUfUDdst+yn5YwCeOyqqCgQvyuP2JsacN/2a4wRN Wn4AoM/Pg+b+B8M7Z/SBO10DRzj24xYj =Kkq8 -----END PGP SIGNATURE----- Merge tag 'usb-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb Pull USB fixes from Greg Kroah-Hartman: "Here are a bunch of USB fixes for your 3.8-rc3 tree. They all either fix problems that have been reported (like the xhci/hub changes) or add new device ids to existing drivers. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'usb-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (39 commits) usb: ftdi_sio: Crucible Technologies COMET Caller ID - pid added usb: host: ohci-tmio: fix compile warning USB: Add device quirk for Microsoft VX700 webcam USB: ehci-fsl: fix regression on mpc5121e usb: chipidea: Allow disabling streaming not only in udc mode USB: fsl-mph-dr-of: fix regression on mpc5121e USB: select USB_ARCH_HAS_EHCI for MXS USB: hub: handle claim of enabled remote wakeup after reset USB: cdc-acm: Add support for "PSC Scanning, Magellan 800i" USB: option: add Nexpring NP10T terminal id USB: option: add Telekom Speedstick LTE II USB: option: blacklist network interface on ZTE MF880 usb: imx21-hcd: Include missing linux/module.h USB: option: Add new MEDIATEK PID support USB: ehci: make debug port in-use detection functional again USB: usbtest: fix test number in log message xhci: Avoid "dead ports", add roothub port polling. USB: Handle warm reset failure on empty port. USB: Ignore port state until reset completes. USB: Increase reset timeout. ...
This commit is contained in:
commit
46fed0a57c
|
@ -37,6 +37,7 @@ config USB_ARCH_HAS_EHCI
|
|||
default y if ARCH_W90X900
|
||||
default y if ARCH_AT91
|
||||
default y if ARCH_MXC
|
||||
default y if ARCH_MXS
|
||||
default y if ARCH_OMAP3
|
||||
default y if ARCH_CNS3XXX
|
||||
default y if ARCH_VT8500
|
||||
|
|
|
@ -70,6 +70,9 @@ static int host_start(struct ci13xxx *ci)
|
|||
else
|
||||
ci->hcd = hcd;
|
||||
|
||||
if (ci->platdata->flags & CI13XXX_DISABLE_STREAMING)
|
||||
hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS, USBMODE_CI_SDIS);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -1602,6 +1602,9 @@ static const struct usb_device_id acm_ids[] = {
|
|||
{ USB_DEVICE(0x0572, 0x1340), /* Conexant CX93010-2x UCMxx */
|
||||
.driver_info = NO_UNION_NORMAL,
|
||||
},
|
||||
{ USB_DEVICE(0x05f9, 0x4002), /* PSC Scanning, Magellan 800i */
|
||||
.driver_info = NO_UNION_NORMAL,
|
||||
},
|
||||
{ USB_DEVICE(0x1bbb, 0x0003), /* Alcatel OT-I650 */
|
||||
.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */
|
||||
},
|
||||
|
|
|
@ -877,6 +877,60 @@ static int hub_hub_status(struct usb_hub *hub,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int hub_set_port_link_state(struct usb_hub *hub, int port1,
|
||||
unsigned int link_status)
|
||||
{
|
||||
return set_port_feature(hub->hdev,
|
||||
port1 | (link_status << 3),
|
||||
USB_PORT_FEAT_LINK_STATE);
|
||||
}
|
||||
|
||||
/*
|
||||
* If USB 3.0 ports are placed into the Disabled state, they will no longer
|
||||
* detect any device connects or disconnects. This is generally not what the
|
||||
* USB core wants, since it expects a disabled port to produce a port status
|
||||
* change event when a new device connects.
|
||||
*
|
||||
* Instead, set the link state to Disabled, wait for the link to settle into
|
||||
* that state, clear any change bits, and then put the port into the RxDetect
|
||||
* state.
|
||||
*/
|
||||
static int hub_usb3_port_disable(struct usb_hub *hub, int port1)
|
||||
{
|
||||
int ret;
|
||||
int total_time;
|
||||
u16 portchange, portstatus;
|
||||
|
||||
if (!hub_is_superspeed(hub->hdev))
|
||||
return -EINVAL;
|
||||
|
||||
ret = hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_SS_DISABLED);
|
||||
if (ret) {
|
||||
dev_err(hub->intfdev, "cannot disable port %d (err = %d)\n",
|
||||
port1, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Wait for the link to enter the disabled state. */
|
||||
for (total_time = 0; ; total_time += HUB_DEBOUNCE_STEP) {
|
||||
ret = hub_port_status(hub, port1, &portstatus, &portchange);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if ((portstatus & USB_PORT_STAT_LINK_STATE) ==
|
||||
USB_SS_PORT_LS_SS_DISABLED)
|
||||
break;
|
||||
if (total_time >= HUB_DEBOUNCE_TIMEOUT)
|
||||
break;
|
||||
msleep(HUB_DEBOUNCE_STEP);
|
||||
}
|
||||
if (total_time >= HUB_DEBOUNCE_TIMEOUT)
|
||||
dev_warn(hub->intfdev, "Could not disable port %d after %d ms\n",
|
||||
port1, total_time);
|
||||
|
||||
return hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_RX_DETECT);
|
||||
}
|
||||
|
||||
static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
|
||||
{
|
||||
struct usb_device *hdev = hub->hdev;
|
||||
|
@ -885,8 +939,13 @@ static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
|
|||
if (hub->ports[port1 - 1]->child && set_state)
|
||||
usb_set_device_state(hub->ports[port1 - 1]->child,
|
||||
USB_STATE_NOTATTACHED);
|
||||
if (!hub->error && !hub_is_superspeed(hub->hdev))
|
||||
ret = clear_port_feature(hdev, port1, USB_PORT_FEAT_ENABLE);
|
||||
if (!hub->error) {
|
||||
if (hub_is_superspeed(hub->hdev))
|
||||
ret = hub_usb3_port_disable(hub, port1);
|
||||
else
|
||||
ret = clear_port_feature(hdev, port1,
|
||||
USB_PORT_FEAT_ENABLE);
|
||||
}
|
||||
if (ret)
|
||||
dev_err(hub->intfdev, "cannot disable port %d (err = %d)\n",
|
||||
port1, ret);
|
||||
|
@ -2440,7 +2499,7 @@ static unsigned hub_is_wusb(struct usb_hub *hub)
|
|||
#define HUB_SHORT_RESET_TIME 10
|
||||
#define HUB_BH_RESET_TIME 50
|
||||
#define HUB_LONG_RESET_TIME 200
|
||||
#define HUB_RESET_TIMEOUT 500
|
||||
#define HUB_RESET_TIMEOUT 800
|
||||
|
||||
static int hub_port_reset(struct usb_hub *hub, int port1,
|
||||
struct usb_device *udev, unsigned int delay, bool warm);
|
||||
|
@ -2475,6 +2534,10 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
|
|||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
/* The port state is unknown until the reset completes. */
|
||||
if ((portstatus & USB_PORT_STAT_RESET))
|
||||
goto delay;
|
||||
|
||||
/*
|
||||
* Some buggy devices require a warm reset to be issued even
|
||||
* when the port appears not to be connected.
|
||||
|
@ -2520,11 +2583,7 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
|
|||
if ((portchange & USB_PORT_STAT_C_CONNECTION))
|
||||
return -ENOTCONN;
|
||||
|
||||
/* if we`ve finished resetting, then break out of
|
||||
* the loop
|
||||
*/
|
||||
if (!(portstatus & USB_PORT_STAT_RESET) &&
|
||||
(portstatus & USB_PORT_STAT_ENABLE)) {
|
||||
if ((portstatus & USB_PORT_STAT_ENABLE)) {
|
||||
if (hub_is_wusb(hub))
|
||||
udev->speed = USB_SPEED_WIRELESS;
|
||||
else if (hub_is_superspeed(hub->hdev))
|
||||
|
@ -2538,10 +2597,15 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
|
|||
return 0;
|
||||
}
|
||||
} else {
|
||||
if (portchange & USB_PORT_STAT_C_BH_RESET)
|
||||
return 0;
|
||||
if (!(portstatus & USB_PORT_STAT_CONNECTION) ||
|
||||
hub_port_warm_reset_required(hub,
|
||||
portstatus))
|
||||
return -ENOTCONN;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
delay:
|
||||
/* switch to the long delay after two short delay failures */
|
||||
if (delay_time >= 2 * HUB_SHORT_RESET_TIME)
|
||||
delay = HUB_LONG_RESET_TIME;
|
||||
|
@ -2565,14 +2629,11 @@ static void hub_port_finish_reset(struct usb_hub *hub, int port1,
|
|||
msleep(10 + 40);
|
||||
update_devnum(udev, 0);
|
||||
hcd = bus_to_hcd(udev->bus);
|
||||
if (hcd->driver->reset_device) {
|
||||
*status = hcd->driver->reset_device(hcd, udev);
|
||||
if (*status < 0) {
|
||||
dev_err(&udev->dev, "Cannot reset "
|
||||
"HCD device state\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* The xHC may think the device is already reset,
|
||||
* so ignore the status.
|
||||
*/
|
||||
if (hcd->driver->reset_device)
|
||||
hcd->driver->reset_device(hcd, udev);
|
||||
}
|
||||
/* FALL THROUGH */
|
||||
case -ENOTCONN:
|
||||
|
@ -2580,16 +2641,16 @@ static void hub_port_finish_reset(struct usb_hub *hub, int port1,
|
|||
clear_port_feature(hub->hdev,
|
||||
port1, USB_PORT_FEAT_C_RESET);
|
||||
/* FIXME need disconnect() for NOTATTACHED device */
|
||||
if (warm) {
|
||||
if (hub_is_superspeed(hub->hdev)) {
|
||||
clear_port_feature(hub->hdev, port1,
|
||||
USB_PORT_FEAT_C_BH_PORT_RESET);
|
||||
clear_port_feature(hub->hdev, port1,
|
||||
USB_PORT_FEAT_C_PORT_LINK_STATE);
|
||||
} else {
|
||||
}
|
||||
if (!warm)
|
||||
usb_set_device_state(udev, *status
|
||||
? USB_STATE_NOTATTACHED
|
||||
: USB_STATE_DEFAULT);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -2939,7 +3000,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
|
|||
static int finish_port_resume(struct usb_device *udev)
|
||||
{
|
||||
int status = 0;
|
||||
u16 devstatus;
|
||||
u16 devstatus = 0;
|
||||
|
||||
/* caller owns the udev device lock */
|
||||
dev_dbg(&udev->dev, "%s\n",
|
||||
|
@ -2984,7 +3045,13 @@ static int finish_port_resume(struct usb_device *udev)
|
|||
if (status) {
|
||||
dev_dbg(&udev->dev, "gone after usb resume? status %d\n",
|
||||
status);
|
||||
} else if (udev->actconfig) {
|
||||
/*
|
||||
* There are a few quirky devices which violate the standard
|
||||
* by claiming to have remote wakeup enabled after a reset,
|
||||
* which crash if the feature is cleared, hence check for
|
||||
* udev->reset_resume
|
||||
*/
|
||||
} else if (udev->actconfig && !udev->reset_resume) {
|
||||
le16_to_cpus(&devstatus);
|
||||
if (devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP)) {
|
||||
status = usb_control_msg(udev,
|
||||
|
@ -4638,9 +4705,14 @@ static void hub_events(void)
|
|||
* SS.Inactive state.
|
||||
*/
|
||||
if (hub_port_warm_reset_required(hub, portstatus)) {
|
||||
int status;
|
||||
|
||||
dev_dbg(hub_dev, "warm reset port %d\n", i);
|
||||
hub_port_reset(hub, i, NULL,
|
||||
status = hub_port_reset(hub, i, NULL,
|
||||
HUB_BH_RESET_TIME, true);
|
||||
if (status < 0)
|
||||
hub_port_disable(hub, i, 1);
|
||||
connect_change = 0;
|
||||
}
|
||||
|
||||
if (connect_change)
|
||||
|
|
|
@ -43,6 +43,9 @@ static const struct usb_device_id usb_quirk_list[] = {
|
|||
/* Creative SB Audigy 2 NX */
|
||||
{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||
|
||||
/* Microsoft LifeCam-VX700 v2.0 */
|
||||
{ USB_DEVICE(0x045e, 0x0770), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||
|
||||
/* Logitech Quickcam Fusion */
|
||||
{ USB_DEVICE(0x046d, 0x08c1), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
#define dump_register(nm) \
|
||||
{ \
|
||||
.name = __stringify(nm), \
|
||||
.offset = DWC3_ ##nm, \
|
||||
.offset = DWC3_ ##nm - DWC3_GLOBALS_REGS_START, \
|
||||
}
|
||||
|
||||
static const struct debugfs_reg32 dwc3_regs[] = {
|
||||
|
|
|
@ -3231,7 +3231,7 @@ static int udc_pci_probe(
|
|||
}
|
||||
|
||||
if (!pdev->irq) {
|
||||
dev_err(&dev->pdev->dev, "irq not set\n");
|
||||
dev_err(&pdev->dev, "irq not set\n");
|
||||
kfree(dev);
|
||||
dev = NULL;
|
||||
retval = -ENODEV;
|
||||
|
@ -3250,7 +3250,7 @@ static int udc_pci_probe(
|
|||
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);
|
||||
dev_dbg(&pdev->dev, "request_irq(%d) fail\n", pdev->irq);
|
||||
kfree(dev);
|
||||
dev = NULL;
|
||||
retval = -EBUSY;
|
||||
|
|
|
@ -130,10 +130,7 @@ static const char ep0name[] = "ep0";
|
|||
static const char *const ep_name[] = {
|
||||
ep0name, /* everyone has ep0 */
|
||||
|
||||
/* act like a net2280: high speed, six configurable endpoints */
|
||||
"ep-a", "ep-b", "ep-c", "ep-d", "ep-e", "ep-f",
|
||||
|
||||
/* or like pxa250: fifteen fixed function endpoints */
|
||||
/* act like a pxa250: fifteen fixed function endpoints */
|
||||
"ep1in-bulk", "ep2out-bulk", "ep3in-iso", "ep4out-iso", "ep5in-int",
|
||||
"ep6in-bulk", "ep7out-bulk", "ep8in-iso", "ep9out-iso", "ep10in-int",
|
||||
"ep11in-bulk", "ep12out-bulk", "ep13in-iso", "ep14out-iso",
|
||||
|
@ -141,6 +138,10 @@ static const char *const ep_name[] = {
|
|||
|
||||
/* or like sa1100: two fixed function endpoints */
|
||||
"ep1out-bulk", "ep2in-bulk",
|
||||
|
||||
/* and now some generic EPs so we have enough in multi config */
|
||||
"ep3out", "ep4in", "ep5out", "ep6out", "ep7in", "ep8out", "ep9in",
|
||||
"ep10out", "ep11out", "ep12in", "ep13out", "ep14in", "ep15out",
|
||||
};
|
||||
#define DUMMY_ENDPOINTS ARRAY_SIZE(ep_name)
|
||||
|
||||
|
|
|
@ -1012,7 +1012,7 @@ static void udc_clock_enable(struct mv_udc *udc)
|
|||
unsigned int i;
|
||||
|
||||
for (i = 0; i < udc->clknum; i++)
|
||||
clk_enable(udc->clk[i]);
|
||||
clk_prepare_enable(udc->clk[i]);
|
||||
}
|
||||
|
||||
static void udc_clock_disable(struct mv_udc *udc)
|
||||
|
@ -1020,7 +1020,7 @@ static void udc_clock_disable(struct mv_udc *udc)
|
|||
unsigned int i;
|
||||
|
||||
for (i = 0; i < udc->clknum; i++)
|
||||
clk_disable(udc->clk[i]);
|
||||
clk_disable_unprepare(udc->clk[i]);
|
||||
}
|
||||
|
||||
static void udc_stop(struct mv_udc *udc)
|
||||
|
|
|
@ -3477,12 +3477,11 @@ static void s3c_hsotg_delete_debug(struct s3c_hsotg *hsotg)
|
|||
/**
|
||||
* s3c_hsotg_release - release callback for hsotg device
|
||||
* @dev: Device to for which release is called
|
||||
*
|
||||
* Nothing to do as the resource is allocated using devm_ API.
|
||||
*/
|
||||
static void s3c_hsotg_release(struct device *dev)
|
||||
{
|
||||
struct s3c_hsotg *hsotg = dev_get_drvdata(dev);
|
||||
|
||||
kfree(hsotg);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1794,9 +1794,10 @@ static int tcm_usbg_drop_nexus(struct usbg_tpg *tpg)
|
|||
tpg->tpg_nexus = NULL;
|
||||
|
||||
kfree(tv_nexus);
|
||||
ret = 0;
|
||||
out:
|
||||
mutex_unlock(&tpg->tpg_mutex);
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ssize_t tcm_usbg_tpg_store_nexus(
|
||||
|
|
|
@ -887,7 +887,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
|
|||
pr_debug("gs_close: ttyGS%d (%p,%p) done!\n",
|
||||
port->port_num, tty, file);
|
||||
|
||||
wake_up_interruptible(&port->port.close_wait);
|
||||
wake_up(&port->port.close_wait);
|
||||
exit:
|
||||
spin_unlock_irq(&port->port_lock);
|
||||
}
|
||||
|
|
|
@ -230,7 +230,7 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
|
|||
|
||||
switch (phy_mode) {
|
||||
case FSL_USB2_PHY_ULPI:
|
||||
if (pdata->controller_ver) {
|
||||
if (pdata->have_sysif_regs && pdata->controller_ver) {
|
||||
/* controller version 1.6 or above */
|
||||
setbits32(non_ehci + FSL_SOC_USB_CTRL,
|
||||
ULPI_PHY_CLK_SEL);
|
||||
|
@ -251,7 +251,7 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
|
|||
portsc |= PORT_PTS_PTW;
|
||||
/* fall through */
|
||||
case FSL_USB2_PHY_UTMI:
|
||||
if (pdata->controller_ver) {
|
||||
if (pdata->have_sysif_regs && pdata->controller_ver) {
|
||||
/* controller version 1.6 or above */
|
||||
setbits32(non_ehci + FSL_SOC_USB_CTRL, UTMI_PHY_EN);
|
||||
mdelay(FSL_UTMI_PHY_DLY); /* Delay for UTMI PHY CLK to
|
||||
|
@ -267,7 +267,8 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
|
|||
break;
|
||||
}
|
||||
|
||||
if (pdata->controller_ver && (phy_mode == FSL_USB2_PHY_ULPI)) {
|
||||
if (pdata->have_sysif_regs && pdata->controller_ver &&
|
||||
(phy_mode == FSL_USB2_PHY_ULPI)) {
|
||||
/* check PHY_CLK_VALID to get phy clk valid */
|
||||
if (!spin_event_timeout(in_be32(non_ehci + FSL_SOC_USB_CTRL) &
|
||||
PHY_CLK_VALID, FSL_USB_PHY_CLK_TIMEOUT, 0)) {
|
||||
|
@ -278,7 +279,7 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
|
|||
|
||||
ehci_writel(ehci, portsc, &ehci->regs->port_status[port_offset]);
|
||||
|
||||
if (phy_mode != FSL_USB2_PHY_ULPI)
|
||||
if (phy_mode != FSL_USB2_PHY_ULPI && pdata->have_sysif_regs)
|
||||
setbits32(non_ehci + FSL_SOC_USB_CTRL, USB_CTRL_USB_EN);
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -43,7 +43,7 @@ static void ehci_clock_enable(struct ehci_hcd_mv *ehci_mv)
|
|||
unsigned int i;
|
||||
|
||||
for (i = 0; i < ehci_mv->clknum; i++)
|
||||
clk_enable(ehci_mv->clk[i]);
|
||||
clk_prepare_enable(ehci_mv->clk[i]);
|
||||
}
|
||||
|
||||
static void ehci_clock_disable(struct ehci_hcd_mv *ehci_mv)
|
||||
|
@ -51,7 +51,7 @@ static void ehci_clock_disable(struct ehci_hcd_mv *ehci_mv)
|
|||
unsigned int i;
|
||||
|
||||
for (i = 0; i < ehci_mv->clknum; i++)
|
||||
clk_disable(ehci_mv->clk[i]);
|
||||
clk_disable_unprepare(ehci_mv->clk[i]);
|
||||
}
|
||||
|
||||
static int mv_ehci_enable(struct ehci_hcd_mv *ehci_mv)
|
||||
|
|
|
@ -200,6 +200,26 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
|
|||
break;
|
||||
}
|
||||
|
||||
/* optional debug port, normally in the first BAR */
|
||||
temp = pci_find_capability(pdev, PCI_CAP_ID_DBG);
|
||||
if (temp) {
|
||||
pci_read_config_dword(pdev, temp, &temp);
|
||||
temp >>= 16;
|
||||
if (((temp >> 13) & 7) == 1) {
|
||||
u32 hcs_params = ehci_readl(ehci,
|
||||
&ehci->caps->hcs_params);
|
||||
|
||||
temp &= 0x1fff;
|
||||
ehci->debug = hcd->regs + temp;
|
||||
temp = ehci_readl(ehci, &ehci->debug->control);
|
||||
ehci_info(ehci, "debug port %d%s\n",
|
||||
HCS_DEBUG_PORT(hcs_params),
|
||||
(temp & DBGP_ENABLED) ? " IN USE" : "");
|
||||
if (!(temp & DBGP_ENABLED))
|
||||
ehci->debug = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
retval = ehci_setup(hcd);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
@ -228,25 +248,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
|
|||
break;
|
||||
}
|
||||
|
||||
/* optional debug port, normally in the first BAR */
|
||||
temp = pci_find_capability(pdev, 0x0a);
|
||||
if (temp) {
|
||||
pci_read_config_dword(pdev, temp, &temp);
|
||||
temp >>= 16;
|
||||
if ((temp & (3 << 13)) == (1 << 13)) {
|
||||
temp &= 0x1fff;
|
||||
ehci->debug = hcd->regs + temp;
|
||||
temp = ehci_readl(ehci, &ehci->debug->control);
|
||||
ehci_info(ehci, "debug port %d%s\n",
|
||||
HCS_DEBUG_PORT(ehci->hcs_params),
|
||||
(temp & DBGP_ENABLED)
|
||||
? " IN USE"
|
||||
: "");
|
||||
if (!(temp & DBGP_ENABLED))
|
||||
ehci->debug = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/* at least the Genesys GL880S needs fixup here */
|
||||
temp = HCS_N_CC(ehci->hcs_params) * HCS_N_PCC(ehci->hcs_params);
|
||||
temp &= 0x0f;
|
||||
|
|
|
@ -142,6 +142,9 @@ static int usb_get_ver_info(struct device_node *np)
|
|||
return ver;
|
||||
}
|
||||
|
||||
if (of_device_is_compatible(np, "fsl,mpc5121-usb2-dr"))
|
||||
return FSL_USB_VER_OLD;
|
||||
|
||||
if (of_device_is_compatible(np, "fsl-usb2-mph")) {
|
||||
if (of_device_is_compatible(np, "fsl-usb2-mph-v1.6"))
|
||||
ver = FSL_USB_VER_1_6;
|
||||
|
|
|
@ -58,6 +58,7 @@
|
|||
#include <linux/usb.h>
|
||||
#include <linux/usb/hcd.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#include "imx21-hcd.h"
|
||||
|
||||
|
|
|
@ -128,7 +128,8 @@ static void tmio_start_hc(struct platform_device *dev)
|
|||
tmio_iowrite8(2, tmio->ccr + CCR_INTC);
|
||||
|
||||
dev_info(&dev->dev, "revision %d @ 0x%08llx, irq %d\n",
|
||||
tmio_ioread8(tmio->ccr + CCR_REVID), hcd->rsrc_start, hcd->irq);
|
||||
tmio_ioread8(tmio->ccr + CCR_REVID),
|
||||
(u64) hcd->rsrc_start, hcd->irq);
|
||||
}
|
||||
|
||||
static int ohci_tmio_start(struct usb_hcd *hcd)
|
||||
|
|
|
@ -761,12 +761,39 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
|
|||
break;
|
||||
case USB_PORT_FEAT_LINK_STATE:
|
||||
temp = xhci_readl(xhci, port_array[wIndex]);
|
||||
|
||||
/* Disable port */
|
||||
if (link_state == USB_SS_PORT_LS_SS_DISABLED) {
|
||||
xhci_dbg(xhci, "Disable port %d\n", wIndex);
|
||||
temp = xhci_port_state_to_neutral(temp);
|
||||
/*
|
||||
* Clear all change bits, so that we get a new
|
||||
* connection event.
|
||||
*/
|
||||
temp |= PORT_CSC | PORT_PEC | PORT_WRC |
|
||||
PORT_OCC | PORT_RC | PORT_PLC |
|
||||
PORT_CEC;
|
||||
xhci_writel(xhci, temp | PORT_PE,
|
||||
port_array[wIndex]);
|
||||
temp = xhci_readl(xhci, port_array[wIndex]);
|
||||
break;
|
||||
}
|
||||
|
||||
/* Put link in RxDetect (enable port) */
|
||||
if (link_state == USB_SS_PORT_LS_RX_DETECT) {
|
||||
xhci_dbg(xhci, "Enable port %d\n", wIndex);
|
||||
xhci_set_link_state(xhci, port_array, wIndex,
|
||||
link_state);
|
||||
temp = xhci_readl(xhci, port_array[wIndex]);
|
||||
break;
|
||||
}
|
||||
|
||||
/* Software should not attempt to set
|
||||
* port link state above '5' (Rx.Detect) and the port
|
||||
* port link state above '3' (U3) and the port
|
||||
* must be enabled.
|
||||
*/
|
||||
if ((temp & PORT_PE) == 0 ||
|
||||
(link_state > USB_SS_PORT_LS_RX_DETECT)) {
|
||||
(link_state > USB_SS_PORT_LS_U3)) {
|
||||
xhci_warn(xhci, "Cannot set link state.\n");
|
||||
goto error;
|
||||
}
|
||||
|
@ -957,6 +984,7 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
|
|||
int max_ports;
|
||||
__le32 __iomem **port_array;
|
||||
struct xhci_bus_state *bus_state;
|
||||
bool reset_change = false;
|
||||
|
||||
max_ports = xhci_get_ports(hcd, &port_array);
|
||||
bus_state = &xhci->bus_state[hcd_index(hcd)];
|
||||
|
@ -988,6 +1016,12 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
|
|||
buf[(i + 1) / 8] |= 1 << (i + 1) % 8;
|
||||
status = 1;
|
||||
}
|
||||
if ((temp & PORT_RC))
|
||||
reset_change = true;
|
||||
}
|
||||
if (!status && !reset_change) {
|
||||
xhci_dbg(xhci, "%s: stopping port polling.\n", __func__);
|
||||
clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);
|
||||
}
|
||||
spin_unlock_irqrestore(&xhci->lock, flags);
|
||||
return status ? retval : 0;
|
||||
|
|
|
@ -1250,6 +1250,8 @@ static unsigned int xhci_microframes_to_exponent(struct usb_device *udev,
|
|||
static unsigned int xhci_parse_microframe_interval(struct usb_device *udev,
|
||||
struct usb_host_endpoint *ep)
|
||||
{
|
||||
if (ep->desc.bInterval == 0)
|
||||
return 0;
|
||||
return xhci_microframes_to_exponent(udev, ep,
|
||||
ep->desc.bInterval, 0, 15);
|
||||
}
|
||||
|
|
|
@ -1725,6 +1725,15 @@ cleanup:
|
|||
if (bogus_port_status)
|
||||
return;
|
||||
|
||||
/*
|
||||
* xHCI port-status-change events occur when the "or" of all the
|
||||
* status-change bits in the portsc register changes from 0 to 1.
|
||||
* New status changes won't cause an event if any other change
|
||||
* bits are still set. When an event occurs, switch over to
|
||||
* polling to avoid losing status changes.
|
||||
*/
|
||||
xhci_dbg(xhci, "%s: starting port polling.\n", __func__);
|
||||
set_bit(HCD_FLAG_POLL_RH, &hcd->flags);
|
||||
spin_unlock(&xhci->lock);
|
||||
/* Pass this up to the core */
|
||||
usb_hcd_poll_rh_status(hcd);
|
||||
|
|
|
@ -884,6 +884,11 @@ int xhci_suspend(struct xhci_hcd *xhci)
|
|||
xhci->shared_hcd->state != HC_STATE_SUSPENDED)
|
||||
return -EINVAL;
|
||||
|
||||
/* Don't poll the roothubs on bus suspend. */
|
||||
xhci_dbg(xhci, "%s: stopping port polling.\n", __func__);
|
||||
clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);
|
||||
del_timer_sync(&hcd->rh_timer);
|
||||
|
||||
spin_lock_irq(&xhci->lock);
|
||||
clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
|
||||
clear_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);
|
||||
|
@ -1069,6 +1074,11 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
|
|||
if (xhci->quirks & XHCI_COMP_MODE_QUIRK)
|
||||
compliance_mode_recovery_timer_init(xhci);
|
||||
|
||||
/* Re-enable port polling. */
|
||||
xhci_dbg(xhci, "%s: starting port polling.\n", __func__);
|
||||
set_bit(HCD_FLAG_POLL_RH, &hcd->flags);
|
||||
usb_hcd_poll_rh_status(hcd);
|
||||
|
||||
return retval;
|
||||
}
|
||||
#endif /* CONFIG_PM */
|
||||
|
|
|
@ -2179,7 +2179,7 @@ usbtest_ioctl(struct usb_interface *intf, unsigned int code, void *buf)
|
|||
if (dev->out_pipe == 0 || !param->length || param->sglen < 4)
|
||||
break;
|
||||
retval = 0;
|
||||
dev_info(&intf->dev, "TEST 17: unlink from %d queues of "
|
||||
dev_info(&intf->dev, "TEST 24: unlink from %d queues of "
|
||||
"%d %d-byte writes\n",
|
||||
param->iterations, param->sglen, param->length);
|
||||
for (i = param->iterations; retval == 0 && i > 0; --i) {
|
||||
|
|
|
@ -2298,10 +2298,7 @@ static int __init musb_init(void)
|
|||
if (usb_disabled())
|
||||
return 0;
|
||||
|
||||
pr_info("%s: version " MUSB_VERSION ", "
|
||||
"?dma?"
|
||||
", "
|
||||
"otg (peripheral+host)",
|
||||
pr_info("%s: version " MUSB_VERSION ", ?dma?, otg (peripheral+host)\n",
|
||||
musb_driver_name);
|
||||
return platform_driver_register(&musb_driver);
|
||||
}
|
||||
|
|
|
@ -134,6 +134,11 @@ static const resource_size_t dsps_control_module_phys[] = {
|
|||
DSPS_AM33XX_CONTROL_MODULE_PHYS_1,
|
||||
};
|
||||
|
||||
#define USBPHY_CM_PWRDN (1 << 0)
|
||||
#define USBPHY_OTG_PWRDN (1 << 1)
|
||||
#define USBPHY_OTGVDET_EN (1 << 19)
|
||||
#define USBPHY_OTGSESSEND_EN (1 << 20)
|
||||
|
||||
/**
|
||||
* musb_dsps_phy_control - phy on/off
|
||||
* @glue: struct dsps_glue *
|
||||
|
|
|
@ -110,7 +110,7 @@ config AB8500_USB
|
|||
|
||||
config FSL_USB2_OTG
|
||||
bool "Freescale USB OTG Transceiver Driver"
|
||||
depends on USB_EHCI_FSL && USB_GADGET_FSL_USB2 && USB_SUSPEND
|
||||
depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_SUSPEND
|
||||
select USB_OTG
|
||||
select USB_OTG_UTILS
|
||||
help
|
||||
|
|
|
@ -240,7 +240,7 @@ static void otg_clock_enable(struct mv_otg *mvotg)
|
|||
unsigned int i;
|
||||
|
||||
for (i = 0; i < mvotg->clknum; i++)
|
||||
clk_enable(mvotg->clk[i]);
|
||||
clk_prepare_enable(mvotg->clk[i]);
|
||||
}
|
||||
|
||||
static void otg_clock_disable(struct mv_otg *mvotg)
|
||||
|
@ -248,7 +248,7 @@ static void otg_clock_disable(struct mv_otg *mvotg)
|
|||
unsigned int i;
|
||||
|
||||
for (i = 0; i < mvotg->clknum; i++)
|
||||
clk_disable(mvotg->clk[i]);
|
||||
clk_disable_unprepare(mvotg->clk[i]);
|
||||
}
|
||||
|
||||
static int mv_otg_enable_internal(struct mv_otg *mvotg)
|
||||
|
|
|
@ -545,15 +545,6 @@ static int usbhsg_pipe_disable(struct usbhsg_uep *uep)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void usbhsg_uep_init(struct usbhsg_gpriv *gpriv)
|
||||
{
|
||||
int i;
|
||||
struct usbhsg_uep *uep;
|
||||
|
||||
usbhsg_for_each_uep_with_dcp(uep, gpriv, i)
|
||||
uep->pipe = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
* usb_ep_ops
|
||||
|
@ -610,7 +601,12 @@ static int usbhsg_ep_disable(struct usb_ep *ep)
|
|||
{
|
||||
struct usbhsg_uep *uep = usbhsg_ep_to_uep(ep);
|
||||
|
||||
return usbhsg_pipe_disable(uep);
|
||||
usbhsg_pipe_disable(uep);
|
||||
|
||||
uep->pipe->mod_private = NULL;
|
||||
uep->pipe = NULL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct usb_request *usbhsg_ep_alloc_request(struct usb_ep *ep,
|
||||
|
@ -761,9 +757,8 @@ static int usbhsg_try_start(struct usbhs_priv *priv, u32 status)
|
|||
usbhs_pipe_init(priv,
|
||||
usbhsg_dma_map_ctrl);
|
||||
usbhs_fifo_init(priv);
|
||||
usbhsg_uep_init(gpriv);
|
||||
|
||||
/* dcp init */
|
||||
/* dcp init instead of usbhsg_ep_enable() */
|
||||
dcp->pipe = usbhs_dcp_malloc(priv);
|
||||
dcp->pipe->mod_private = dcp;
|
||||
usbhs_pipe_config_update(dcp->pipe, 0, 0, 64);
|
||||
|
@ -825,7 +820,7 @@ static int usbhsg_try_stop(struct usbhs_priv *priv, u32 status)
|
|||
usbhs_sys_set_test_mode(priv, 0);
|
||||
usbhs_sys_function_ctrl(priv, 0);
|
||||
|
||||
usbhsg_pipe_disable(dcp);
|
||||
usbhsg_ep_disable(&dcp->ep);
|
||||
|
||||
dev_dbg(dev, "stop gadget\n");
|
||||
|
||||
|
@ -998,6 +993,7 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv)
|
|||
*/
|
||||
usbhsg_for_each_uep_with_dcp(uep, gpriv, i) {
|
||||
uep->gpriv = gpriv;
|
||||
uep->pipe = NULL;
|
||||
snprintf(uep->ep_name, EP_NAME_SIZE, "ep%d", i);
|
||||
|
||||
uep->ep.name = uep->ep_name;
|
||||
|
|
|
@ -661,9 +661,10 @@ static void usbhsh_queue_done(struct usbhs_priv *priv, struct usbhs_pkt *pkt)
|
|||
status = -ESHUTDOWN;
|
||||
|
||||
urb->actual_length = pkt->actual;
|
||||
usbhsh_ureq_free(hpriv, ureq);
|
||||
|
||||
usbhsh_endpoint_sequence_save(hpriv, urb, pkt);
|
||||
usbhsh_ureq_free(hpriv, ureq);
|
||||
|
||||
usbhsh_pipe_detach(hpriv, usbhsh_ep_to_uep(urb->ep));
|
||||
|
||||
usb_hcd_unlink_urb_from_ep(hcd, urb);
|
||||
|
|
|
@ -875,6 +875,8 @@ static struct usb_device_id id_table_combined [] = {
|
|||
{ USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID),
|
||||
.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) },
|
||||
/* Crucible Devices */
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) },
|
||||
{ }, /* Optional parameter entry */
|
||||
{ } /* Terminating entry */
|
||||
};
|
||||
|
|
|
@ -1259,3 +1259,9 @@
|
|||
* ATI command output: Cinterion MC55i
|
||||
*/
|
||||
#define FTDI_CINTERION_MC55I_PID 0xA951
|
||||
|
||||
/*
|
||||
* Product: Comet Caller ID decoder
|
||||
* Manufacturer: Crucible Technologies
|
||||
*/
|
||||
#define FTDI_CT_COMET_PID 0x8e08
|
||||
|
|
|
@ -288,6 +288,7 @@ static void option_instat_callback(struct urb *urb);
|
|||
#define ALCATEL_VENDOR_ID 0x1bbb
|
||||
#define ALCATEL_PRODUCT_X060S_X200 0x0000
|
||||
#define ALCATEL_PRODUCT_X220_X500D 0x0017
|
||||
#define ALCATEL_PRODUCT_L100V 0x011e
|
||||
|
||||
#define PIRELLI_VENDOR_ID 0x1266
|
||||
#define PIRELLI_PRODUCT_C100_1 0x1002
|
||||
|
@ -429,9 +430,12 @@ static void option_instat_callback(struct urb *urb);
|
|||
#define MEDIATEK_VENDOR_ID 0x0e8d
|
||||
#define MEDIATEK_PRODUCT_DC_1COM 0x00a0
|
||||
#define MEDIATEK_PRODUCT_DC_4COM 0x00a5
|
||||
#define MEDIATEK_PRODUCT_DC_4COM2 0x00a7
|
||||
#define MEDIATEK_PRODUCT_DC_5COM 0x00a4
|
||||
#define MEDIATEK_PRODUCT_7208_1COM 0x7101
|
||||
#define MEDIATEK_PRODUCT_7208_2COM 0x7102
|
||||
#define MEDIATEK_PRODUCT_7103_2COM 0x7103
|
||||
#define MEDIATEK_PRODUCT_7106_2COM 0x7106
|
||||
#define MEDIATEK_PRODUCT_FP_1COM 0x0003
|
||||
#define MEDIATEK_PRODUCT_FP_2COM 0x0023
|
||||
#define MEDIATEK_PRODUCT_FPDC_1COM 0x0043
|
||||
|
@ -441,6 +445,10 @@ static void option_instat_callback(struct urb *urb);
|
|||
#define CELLIENT_VENDOR_ID 0x2692
|
||||
#define CELLIENT_PRODUCT_MEN200 0x9005
|
||||
|
||||
/* Hyundai Petatel Inc. products */
|
||||
#define PETATEL_VENDOR_ID 0x1ff4
|
||||
#define PETATEL_PRODUCT_NP10T 0x600e
|
||||
|
||||
/* some devices interfaces need special handling due to a number of reasons */
|
||||
enum option_blacklist_reason {
|
||||
OPTION_BLACKLIST_NONE = 0,
|
||||
|
@ -923,7 +931,8 @@ static const struct usb_device_id option_ids[] = {
|
|||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0257, 0xff, 0xff, 0xff), /* ZTE MF821 */
|
||||
.driver_info = (kernel_ulong_t)&net_intf3_blacklist },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff), /* ZTE MF880 */
|
||||
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0317, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0326, 0xff, 0xff, 0xff),
|
||||
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
|
||||
|
@ -1190,6 +1199,8 @@ static const struct usb_device_id option_ids[] = {
|
|||
.driver_info = (kernel_ulong_t)&alcatel_x200_blacklist
|
||||
},
|
||||
{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) },
|
||||
{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V),
|
||||
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
|
||||
{ USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
|
||||
{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
|
||||
{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
|
||||
|
@ -1294,7 +1305,12 @@ static const struct usb_device_id option_ids[] = {
|
|||
{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FP_2COM, 0x0a, 0x00, 0x00) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FPDC_1COM, 0x0a, 0x00, 0x00) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FPDC_2COM, 0x0a, 0x00, 0x00) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_7103_2COM, 0xff, 0x00, 0x00) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_7106_2COM, 0x02, 0x02, 0x01) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x02, 0x01) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x00, 0x00) },
|
||||
{ USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) },
|
||||
{ USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) },
|
||||
{ } /* Terminating entry */
|
||||
};
|
||||
MODULE_DEVICE_TABLE(usb, option_ids);
|
||||
|
|
Loading…
Reference in a new issue