lkml.org 
[lkml]   [2020]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 225/237] usb: gadget: composite: Fix bMaxPower for SuperSpeedPlus
    Date
    From: Jack Pham <jackp@codeaurora.org>

    commit c724417baf162bd3e035659e22cdf990cfb0d917 upstream.

    SuperSpeedPlus peripherals must report their bMaxPower of the
    configuration descriptor in units of 8mA as per the USB 3.2
    specification. The current switch statement in encode_bMaxPower()
    only checks for USB_SPEED_SUPER but not USB_SPEED_SUPER_PLUS so
    the latter falls back to USB 2.0 encoding which uses 2mA units.
    Replace the switch with a simple if/else.

    Fixes: eae5820b852f ("usb: gadget: composite: Write SuperSpeedPlus config descriptors")
    Signed-off-by: Jack Pham <jackp@codeaurora.org>
    Signed-off-by: Felipe Balbi <balbi@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/gadget/composite.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    --- a/drivers/usb/gadget/composite.c
    +++ b/drivers/usb/gadget/composite.c
    @@ -440,12 +440,10 @@ static u8 encode_bMaxPower(enum usb_devi
    val = CONFIG_USB_GADGET_VBUS_DRAW;
    if (!val)
    return 0;
    - switch (speed) {
    - case USB_SPEED_SUPER:
    - return DIV_ROUND_UP(val, 8);
    - default:
    + if (speed < USB_SPEED_SUPER)
    return DIV_ROUND_UP(val, 2);
    - }
    + else
    + return DIV_ROUND_UP(val, 8);
    }

    static int config_buf(struct usb_configuration *config,

    \
     
     \ /
      Last update: 2020-02-27 15:02    [W:4.031 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site