usb: Add devaddr in struct usb_device
The Clear_TT_Buffer request sent to the hub includes the address of the LS/FS child device in wValue field. usb_hub_clear_tt_buffer() uses udev->devnum to set the address wValue. This won't work for devices connected to xHC. For other host controllers udev->devnum is the same as the address of the usb device, chosen and set by usb core. With xHC the controller hardware assigns the address, and won't be the same as devnum. Here we add devaddr in "struct usb_device" for usb_hub_clear_tt_buffer() to use. Signed-off-by: Jim Lin <jilin@nvidia.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

orang tua
32adeab3e3
melakukan
4998f1efd1
@@ -873,7 +873,7 @@ int usb_hub_clear_tt_buffer(struct urb *urb)
|
||||
/* info that CLEAR_TT_BUFFER needs */
|
||||
clear->tt = tt->multi ? udev->ttport : 1;
|
||||
clear->devinfo = usb_pipeendpoint (pipe);
|
||||
clear->devinfo |= udev->devnum << 4;
|
||||
clear->devinfo |= ((u16)udev->devaddr) << 4;
|
||||
clear->devinfo |= usb_pipecontrol(pipe)
|
||||
? (USB_ENDPOINT_XFER_CONTROL << 11)
|
||||
: (USB_ENDPOINT_XFER_BULK << 11);
|
||||
@@ -2125,6 +2125,8 @@ static void update_devnum(struct usb_device *udev, int devnum)
|
||||
/* The address for a WUSB device is managed by wusbcore. */
|
||||
if (!udev->wusb)
|
||||
udev->devnum = devnum;
|
||||
if (!udev->devaddr)
|
||||
udev->devaddr = (u8)devnum;
|
||||
}
|
||||
|
||||
static void hub_free_dev(struct usb_device *udev)
|
||||
|
@@ -4125,6 +4125,8 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
|
||||
/* Zero the input context control for later use */
|
||||
ctrl_ctx->add_flags = 0;
|
||||
ctrl_ctx->drop_flags = 0;
|
||||
slot_ctx = xhci_get_slot_ctx(xhci, virt_dev->out_ctx);
|
||||
udev->devaddr = (u8)(le32_to_cpu(slot_ctx->dev_state) & DEV_ADDR_MASK);
|
||||
|
||||
xhci_dbg_trace(xhci, trace_xhci_dbg_address,
|
||||
"Internal device address = %d",
|
||||
|
Reference in New Issue
Block a user