• Jeremy Kerr's avatar
    usb: gadget: aspeed_udc: fix device address configuration · dba7567c
    Jeremy Kerr authored
    In the aspeed UDC setup, we configure the UDC hardware with the assigned
    USB device address.
    
    However, we have an off-by-one in the bitmask, so we're only setting the
    lower 6 bits of the address (USB addresses being 7 bits, and the
    hardware bitmask being bits 0:6).
    
    This means that device enumeration fails if the assigned address is
    greater than 64:
    
    [  344.607255] usb 1-1: new high-speed USB device number 63 using ehci-platform
    [  344.808459] usb 1-1: New USB device found, idVendor=cc00, idProduct=cc00, bcdDevice= 6.10
    [  344.817684] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
    [  344.825671] usb 1-1: Product: Test device
    [  344.831075] usb 1-1: Manufacturer: Test vendor
    [  344.836335] usb 1-1: SerialNumber: 00
    [  349.917181] usb 1-1: USB disconnect, device number 63
    [  352.036775] usb 1-1: new high-speed USB device number 64 using ehci-platform
    [  352.249432] usb 1-1: device descriptor read/all, error -71
    [  352.696740] usb 1-1: new high-speed USB device number 65 using ehci-platform
    [  352.909431] usb 1-1: device descriptor read/all, error -71
    
    Use the correct mask of 0x7f (rather than 0x3f), and generate this
    through the GENMASK macro, so we have numbers that correspond exactly
    to the hardware register definition.
    
    Fixes: 055276c1 ("usb: gadget: add Aspeed ast2600 udc driver")
    Cc: stable@vger.kernel.org
    Reviewed-by: default avatarNeal Liu <neal_liu@aspeedtech.com>
    Reviewed-by: default avatarAndrew Jeffery <andrew@codeconstruct.com.au>
    Signed-off-by: default avatarJeremy Kerr <jk@codeconstruct.com.au>
    Link: https://lore.kernel.org/r/20240613-aspeed-udc-v2-1-29501ce9cb7a@codeconstruct.com.auSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
    dba7567c
aspeed_udc.c 39.3 KB