lkml.org 
[lkml]   [2017]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 065/204] USB: dummy-hcd: fix connection failures (wrong speed)
    3.16.52-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alan Stern <stern@rowland.harvard.edu>

    commit fe659bcc9b173bcfdd958ce2aec75e47651e74e1 upstream.

    The dummy-hcd UDC driver is not careful about the way it handles
    connection speeds. It ignores the module parameter that is supposed
    to govern the maximum connection speed and it doesn't set the HCD
    flags properly for the case where it ends up running at full speed.

    The result is that in many cases, gadget enumeration over dummy-hcd
    fails because the bMaxPacketSize byte in the device descriptor is set
    incorrectly. For example, the default settings call for a high-speed
    connection, but the maxpacket value for ep0 ends up being set for a
    Super-Speed connection.

    This patch fixes the problem by initializing the gadget's max_speed
    and the HCD flags correctly.

    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
    [bwh: Backported to 3.16: adjust filename]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/usb/gadget/dummy_hcd.c | 15 +++++++++++----
    1 file changed, 11 insertions(+), 4 deletions(-)

    --- a/drivers/usb/gadget/dummy_hcd.c
    +++ b/drivers/usb/gadget/dummy_hcd.c
    @@ -973,7 +973,12 @@ static int dummy_udc_probe(struct platfo
    dum = *((void **)dev_get_platdata(&pdev->dev));
    dum->gadget.name = gadget_name;
    dum->gadget.ops = &dummy_ops;
    - dum->gadget.max_speed = USB_SPEED_SUPER;
    + if (mod_data.is_super_speed)
    + dum->gadget.max_speed = USB_SPEED_SUPER;
    + else if (mod_data.is_high_speed)
    + dum->gadget.max_speed = USB_SPEED_HIGH;
    + else
    + dum->gadget.max_speed = USB_SPEED_FULL;

    dum->gadget.dev.parent = &pdev->dev;
    init_dummy_udc_hw(dum);
    @@ -2489,8 +2494,6 @@ static struct hc_driver dummy_hcd = {
    .product_desc = "Dummy host controller",
    .hcd_priv_size = sizeof(struct dummy_hcd),

    - .flags = HCD_USB3 | HCD_SHARED,
    -
    .reset = dummy_setup,
    .start = dummy_start,
    .stop = dummy_stop,
    @@ -2519,8 +2522,12 @@ static int dummy_hcd_probe(struct platfo
    dev_info(&pdev->dev, "%s, driver " DRIVER_VERSION "\n", driver_desc);
    dum = *((void **)dev_get_platdata(&pdev->dev));

    - if (!mod_data.is_super_speed)
    + if (mod_data.is_super_speed)
    + dummy_hcd.flags = HCD_USB3 | HCD_SHARED;
    + else if (mod_data.is_high_speed)
    dummy_hcd.flags = HCD_USB2;
    + else
    + dummy_hcd.flags = HCD_USB11;
    hs_hcd = usb_create_hcd(&dummy_hcd, &pdev->dev, dev_name(&pdev->dev));
    if (!hs_hcd)
    return -ENOMEM;
    \
     
     \ /
      Last update: 2017-12-28 19:00    [W:4.100 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site