* [PATCH v10 0/2] usb: xhci: Add Clear_TT_Buffer
@ 2019-05-16 14:40 Jim Lin
2019-05-16 14:40 ` [PATCH v10 1/2] usb: xhci : Add devaddr in struct usb_device Jim Lin
2019-05-16 14:40 ` [PATCH v10 2/2] usb: xhci: Add Clear_TT_Buffer Jim Lin
0 siblings, 2 replies; 6+ messages in thread
From: Jim Lin @ 2019-05-16 14:40 UTC (permalink / raw)
To: gregkh, mathias.nyman, stern, kai.heng.feng, drinkcat, keescook,
nsaenzjulienne, jflat, malat
Cc: linux-usb, linux-kernel, Jim Lin
USB 2.0 specification chapter 11.17.5 says "as part of endpoint halt
processing for full-/low-speed endpoints connected via a TT, the host
software must use the Clear_TT_Buffer request to the TT to ensure
that the buffer is not in the busy state".
In our case, a full-speed speaker (ConferenceCam) is behind a high-
speed hub (ConferenceCam Connect), sometimes once we get STALL on a
request we may continue to get STALL with the folllowing requests,
like Set_Interface.
Solution is to invoke usb_hub_clear_tt_buffer() to send
Clear_TT_Buffer request to the hub of the device for the following
Set_Interface requests to the device to get ACK successfully.
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 have two patches.
One is to add devaddr in struct usb_device for
usb_hub_clear_tt_buffer() to use.
Another is to invoke usb_hub_clear_tt_buffer() for halt processing.
Signed-off-by: Jim Lin <jilin@nvidia.com>
Jim Lin (2):
usb: xhci : Add devaddr in struct usb_device
usb: xhci: Add Clear_TT_Buffer
drivers/usb/core/hub.c | 4 +++-
drivers/usb/host/xhci-ring.c | 27 ++++++++++++++++++++++++++-
drivers/usb/host/xhci.c | 18 ++++++++++++++++++
drivers/usb/host/xhci.h | 5 +++++
include/linux/usb.h | 2 ++
5 files changed, 54 insertions(+), 2 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v10 1/2] usb: xhci : Add devaddr in struct usb_device
2019-05-16 14:40 [PATCH v10 0/2] usb: xhci: Add Clear_TT_Buffer Jim Lin
@ 2019-05-16 14:40 ` Jim Lin
2019-05-16 14:56 ` Alan Stern
2019-05-16 14:40 ` [PATCH v10 2/2] usb: xhci: Add Clear_TT_Buffer Jim Lin
1 sibling, 1 reply; 6+ messages in thread
From: Jim Lin @ 2019-05-16 14:40 UTC (permalink / raw)
To: gregkh, mathias.nyman, stern, kai.heng.feng, drinkcat, keescook,
nsaenzjulienne, jflat, malat
Cc: linux-usb, linux-kernel, Jim Lin
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>
---
v2: xhci_clear_tt_buffer_complete: add static, shorter indentation
, remove its claiming in xhci.h
v3: Add description for clearing_tt (xhci.h)
v4: Remove clearing_tt flag because hub_tt_work has hub->tt.lock
to protect for Clear_TT_Buffer to be run serially.
Remove xhci_clear_tt_buffer_complete as it's not necessary.
Same reason as the above.
Extend usb_hub_clear_tt_buffer parameter
v5: Not extending usb_hub_clear_tt_buffer parameter
Add description.
v6: Remove unused parameter slot_id from xhci_clear_hub_tt_buffer
v7: Add devaddr field in "struct usb_device"
v8: split as two patches, change type from int to u8 for devaddr.
v9: Use pahole to find place to put devaddr in struct usb_device.
Remove space between type cast and variable.
hub.c changed from v8
clear->devinfo |= (u16) (udev->devaddr << 4);
to
clear->devinfo |= ((u16)udev->devaddr) << 4;
to solve a problem if devaddr is larger than 16.
v10 Initialize devaddr in xhci_setup_device()
Move devaddr to be below "u8 level"
drivers/usb/core/hub.c | 4 +++-
drivers/usb/host/xhci.c | 1 +
include/linux/usb.h | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 15a2934dc29d..0d4b289be103 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -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)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 7fa58c99f126..68b393e5a453 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -4096,6 +4096,7 @@ 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;
+ 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",
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 4229eb74bd2c..af68e31118f8 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -580,6 +580,7 @@ struct usb3_lpm_parameters {
* @bus_mA: Current available from the bus
* @portnum: parent port number (origin 1)
* @level: number of USB hub ancestors
+ * @devaddr: device address, XHCI: assigned by HW, others: same as devnum
* @can_submit: URBs may be submitted
* @persist_enabled: USB_PERSIST enabled for this device
* @have_langid: whether string_langid is valid
@@ -663,6 +664,7 @@ struct usb_device {
unsigned short bus_mA;
u8 portnum;
u8 level;
+ u8 devaddr;
unsigned can_submit:1;
unsigned persist_enabled:1;
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v10 2/2] usb: xhci: Add Clear_TT_Buffer
2019-05-16 14:40 [PATCH v10 0/2] usb: xhci: Add Clear_TT_Buffer Jim Lin
2019-05-16 14:40 ` [PATCH v10 1/2] usb: xhci : Add devaddr in struct usb_device Jim Lin
@ 2019-05-16 14:40 ` Jim Lin
2019-05-17 14:10 ` Mathias Nyman
1 sibling, 1 reply; 6+ messages in thread
From: Jim Lin @ 2019-05-16 14:40 UTC (permalink / raw)
To: gregkh, mathias.nyman, stern, kai.heng.feng, drinkcat, keescook,
nsaenzjulienne, jflat, malat
Cc: linux-usb, linux-kernel, Jim Lin
USB 2.0 specification chapter 11.17.5 says "as part of endpoint halt
processing for full-/low-speed endpoints connected via a TT, the host
software must use the Clear_TT_Buffer request to the TT to ensure
that the buffer is not in the busy state".
In our case, a full-speed speaker (ConferenceCam) is behind a high-
speed hub (ConferenceCam Connect), sometimes once we get STALL on a
request we may continue to get STALL with the folllowing requests,
like Set_Interface.
Here we invoke usb_hub_clear_tt_buffer() to send Clear_TT_Buffer
request to the hub of the device for the following Set_Interface
requests to the device to get ACK successfully.
Signed-off-by: Jim Lin <jilin@nvidia.com>
---
v2: xhci_clear_tt_buffer_complete: add static, shorter indentation
, remove its claiming in xhci.h
v3: Add description for clearing_tt (xhci.h)
v4: Remove clearing_tt flag because hub_tt_work has hub->tt.lock
to protect for Clear_TT_Buffer to be run serially.
Remove xhci_clear_tt_buffer_complete as it's not necessary.
Same reason as the above.
Extend usb_hub_clear_tt_buffer parameter
v5: Not extending usb_hub_clear_tt_buffer parameter
Add description.
v6: Remove unused parameter slot_id from xhci_clear_hub_tt_buffer
v7: Add devaddr field in "struct usb_device"
v8: split as two patches
v9: no change flag
v10: Add EP_CLEARING_TT flag
drivers/usb/host/xhci-ring.c | 27 ++++++++++++++++++++++++++-
drivers/usb/host/xhci.c | 17 +++++++++++++++++
drivers/usb/host/xhci.h | 5 +++++
3 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 9215a28dad40..11d498b6c09b 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -399,7 +399,7 @@ void xhci_ring_ep_doorbell(struct xhci_hcd *xhci,
* stream once the endpoint is on the HW schedule.
*/
if ((ep_state & EP_STOP_CMD_PENDING) || (ep_state & SET_DEQ_PENDING) ||
- (ep_state & EP_HALTED))
+ (ep_state & EP_HALTED) || (ep_state & EP_CLEARING_TT))
return;
writel(DB_VALUE(ep_index, stream_id), db_addr);
/* The CPU has better things to do at this point than wait for a
@@ -433,6 +433,13 @@ static void ring_doorbell_for_active_rings(struct xhci_hcd *xhci,
}
}
+void xhci_ring_doorbell_for_active_rings(struct xhci_hcd *xhci,
+ unsigned int slot_id,
+ unsigned int ep_index)
+{
+ ring_doorbell_for_active_rings(xhci, slot_id, ep_index);
+}
+
/* Get the right ring for the given slot_id, ep_index and stream_id.
* If the endpoint supports streams, boundary check the URB's stream ID.
* If the endpoint doesn't support streams, return the singular endpoint ring.
@@ -1786,6 +1793,23 @@ struct xhci_segment *trb_in_td(struct xhci_hcd *xhci,
return NULL;
}
+static void xhci_clear_hub_tt_buffer(struct xhci_hcd *xhci, struct xhci_td *td,
+ struct xhci_virt_ep *ep)
+{
+ /*
+ * As part of low/full-speed endpoint-halt processing
+ * we must clear the TT buffer (USB 2.0 specification 11.17.5).
+ */
+ if (td->urb->dev->tt && !usb_pipeint(td->urb->pipe) &&
+ (td->urb->dev->tt->hub != xhci_to_hcd(xhci)->self.root_hub) &&
+ !(ep->ep_state & EP_CLEARING_TT)) {
+ ep->ep_state |= EP_CLEARING_TT;
+ td->urb->ep->hcpriv = td->urb->dev;
+ if (usb_hub_clear_tt_buffer(td->urb))
+ ep->ep_state &= ~EP_CLEARING_TT;
+ }
+}
+
static void xhci_cleanup_halted_endpoint(struct xhci_hcd *xhci,
unsigned int slot_id, unsigned int ep_index,
unsigned int stream_id, struct xhci_td *td,
@@ -1804,6 +1828,7 @@ static void xhci_cleanup_halted_endpoint(struct xhci_hcd *xhci,
if (reset_type == EP_HARD_RESET) {
ep->ep_state |= EP_HARD_CLEAR_TOGGLE;
xhci_cleanup_stalled_ring(xhci, ep_index, stream_id, td);
+ xhci_clear_hub_tt_buffer(xhci, td, ep);
}
xhci_ring_cmd_db(xhci);
}
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 68b393e5a453..0dc108e61a89 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -5133,6 +5133,22 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
}
EXPORT_SYMBOL_GPL(xhci_gen_setup);
+static void xhci_clear_tt_buffer_complete(struct usb_hcd *hcd,
+ struct usb_host_endpoint *ep)
+{
+ struct xhci_hcd *xhci;
+ struct usb_device *udev;
+ unsigned int slot_id;
+ unsigned int ep_index;
+
+ xhci = hcd_to_xhci(hcd);
+ udev = (struct usb_device *)ep->hcpriv;
+ slot_id = udev->slot_id;
+ ep_index = xhci_get_endpoint_index(&ep->desc);
+ xhci->devs[slot_id]->eps[ep_index].ep_state &= ~EP_CLEARING_TT;
+ xhci_ring_doorbell_for_active_rings(xhci, slot_id, ep_index);
+}
+
static const struct hc_driver xhci_hc_driver = {
.description = "xhci-hcd",
.product_desc = "xHCI Host Controller",
@@ -5193,6 +5209,7 @@ static const struct hc_driver xhci_hc_driver = {
.enable_usb3_lpm_timeout = xhci_enable_usb3_lpm_timeout,
.disable_usb3_lpm_timeout = xhci_disable_usb3_lpm_timeout,
.find_raw_port_number = xhci_find_raw_port_number,
+ .clear_tt_buffer_complete = xhci_clear_tt_buffer_complete,
};
void xhci_init_driver(struct hc_driver *drv,
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 9334cdee382a..dbe7eb46c1d8 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -936,6 +936,8 @@ struct xhci_virt_ep {
#define EP_GETTING_NO_STREAMS (1 << 5)
#define EP_HARD_CLEAR_TOGGLE (1 << 6)
#define EP_SOFT_CLEAR_TOGGLE (1 << 7)
+/* usb_hub_clear_tt_buffer is in progress */
+#define EP_CLEARING_TT (1 << 8)
/* ---- Related to URB cancellation ---- */
struct list_head cancelled_td_list;
/* Watchdog timer for stop endpoint command to cancel URBs */
@@ -2100,6 +2102,9 @@ void xhci_handle_command_timeout(struct work_struct *work);
void xhci_ring_ep_doorbell(struct xhci_hcd *xhci, unsigned int slot_id,
unsigned int ep_index, unsigned int stream_id);
+void xhci_ring_doorbell_for_active_rings(struct xhci_hcd *xhci,
+ unsigned int slot_id,
+ unsigned int ep_index);
void xhci_cleanup_command_queue(struct xhci_hcd *xhci);
void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring);
unsigned int count_trbs(u64 addr, u64 len);
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v10 1/2] usb: xhci : Add devaddr in struct usb_device
2019-05-16 14:40 ` [PATCH v10 1/2] usb: xhci : Add devaddr in struct usb_device Jim Lin
@ 2019-05-16 14:56 ` Alan Stern
2019-05-17 13:37 ` Jim Lin
0 siblings, 1 reply; 6+ messages in thread
From: Alan Stern @ 2019-05-16 14:56 UTC (permalink / raw)
To: Jim Lin
Cc: gregkh, mathias.nyman, kai.heng.feng, drinkcat, keescook,
nsaenzjulienne, jflat, malat, linux-usb, linux-kernel
On Thu, 16 May 2019, Jim Lin wrote:
> 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>
> ---
Aside from the "xhci:" part of the Subject line (it's not really
appropriate because this is a modification of the USB core more than of
the xhci-hcd driver),
Acked-by: Alan Stern <stern@rowland.harvard.edu>
> v2: xhci_clear_tt_buffer_complete: add static, shorter indentation
> , remove its claiming in xhci.h
> v3: Add description for clearing_tt (xhci.h)
> v4: Remove clearing_tt flag because hub_tt_work has hub->tt.lock
> to protect for Clear_TT_Buffer to be run serially.
> Remove xhci_clear_tt_buffer_complete as it's not necessary.
> Same reason as the above.
> Extend usb_hub_clear_tt_buffer parameter
> v5: Not extending usb_hub_clear_tt_buffer parameter
> Add description.
> v6: Remove unused parameter slot_id from xhci_clear_hub_tt_buffer
> v7: Add devaddr field in "struct usb_device"
> v8: split as two patches, change type from int to u8 for devaddr.
> v9: Use pahole to find place to put devaddr in struct usb_device.
> Remove space between type cast and variable.
> hub.c changed from v8
> clear->devinfo |= (u16) (udev->devaddr << 4);
> to
> clear->devinfo |= ((u16)udev->devaddr) << 4;
> to solve a problem if devaddr is larger than 16.
> v10 Initialize devaddr in xhci_setup_device()
> Move devaddr to be below "u8 level"
>
> drivers/usb/core/hub.c | 4 +++-
> drivers/usb/host/xhci.c | 1 +
> include/linux/usb.h | 2 ++
> 3 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
> index 15a2934dc29d..0d4b289be103 100644
> --- a/drivers/usb/core/hub.c
> +++ b/drivers/usb/core/hub.c
> @@ -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)
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index 7fa58c99f126..68b393e5a453 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -4096,6 +4096,7 @@ 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;
> + 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",
> diff --git a/include/linux/usb.h b/include/linux/usb.h
> index 4229eb74bd2c..af68e31118f8 100644
> --- a/include/linux/usb.h
> +++ b/include/linux/usb.h
> @@ -580,6 +580,7 @@ struct usb3_lpm_parameters {
> * @bus_mA: Current available from the bus
> * @portnum: parent port number (origin 1)
> * @level: number of USB hub ancestors
> + * @devaddr: device address, XHCI: assigned by HW, others: same as devnum
> * @can_submit: URBs may be submitted
> * @persist_enabled: USB_PERSIST enabled for this device
> * @have_langid: whether string_langid is valid
> @@ -663,6 +664,7 @@ struct usb_device {
> unsigned short bus_mA;
> u8 portnum;
> u8 level;
> + u8 devaddr;
>
> unsigned can_submit:1;
> unsigned persist_enabled:1;
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v10 1/2] usb: xhci : Add devaddr in struct usb_device
2019-05-16 14:56 ` Alan Stern
@ 2019-05-17 13:37 ` Jim Lin
0 siblings, 0 replies; 6+ messages in thread
From: Jim Lin @ 2019-05-17 13:37 UTC (permalink / raw)
To: Alan Stern
Cc: gregkh, mathias.nyman, kai.heng.feng, drinkcat, keescook,
nsaenzjulienne, jflat, malat, linux-usb, linux-kernel
Sorry, something went wrong.
The result is not as expected in one of the tests.
Abandon this series of patches.
Will debug and resubmit later.
Jim
On 2019年05月16日 22:56, Alan Stern wrote:
> On Thu, 16 May 2019, Jim Lin wrote:
>
>> 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>
>> ---
> Aside from the "xhci:" part of the Subject line (it's not really
> appropriate because this is a modification of the USB core more than of
> the xhci-hcd driver),
>
> Acked-by: Alan Stern <stern@rowland.harvard.edu>
>
>
>> v2: xhci_clear_tt_buffer_complete: add static, shorter indentation
>> , remove its claiming in xhci.h
>> v3: Add description for clearing_tt (xhci.h)
>> v4: Remove clearing_tt flag because hub_tt_work has hub->tt.lock
>> to protect for Clear_TT_Buffer to be run serially.
>> Remove xhci_clear_tt_buffer_complete as it's not necessary.
>> Same reason as the above.
>> Extend usb_hub_clear_tt_buffer parameter
>> v5: Not extending usb_hub_clear_tt_buffer parameter
>> Add description.
>> v6: Remove unused parameter slot_id from xhci_clear_hub_tt_buffer
>> v7: Add devaddr field in "struct usb_device"
>> v8: split as two patches, change type from int to u8 for devaddr.
>> v9: Use pahole to find place to put devaddr in struct usb_device.
>> Remove space between type cast and variable.
>> hub.c changed from v8
>> clear->devinfo |= (u16) (udev->devaddr << 4);
>> to
>> clear->devinfo |= ((u16)udev->devaddr) << 4;
>> to solve a problem if devaddr is larger than 16.
>> v10 Initialize devaddr in xhci_setup_device()
>> Move devaddr to be below "u8 level"
>>
>> drivers/usb/core/hub.c | 4 +++-
>> drivers/usb/host/xhci.c | 1 +
>> include/linux/usb.h | 2 ++
>> 3 files changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
>> index 15a2934dc29d..0d4b289be103 100644
>> --- a/drivers/usb/core/hub.c
>> +++ b/drivers/usb/core/hub.c
>> @@ -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)
>> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
>> index 7fa58c99f126..68b393e5a453 100644
>> --- a/drivers/usb/host/xhci.c
>> +++ b/drivers/usb/host/xhci.c
>> @@ -4096,6 +4096,7 @@ 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;
>> + 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",
>> diff --git a/include/linux/usb.h b/include/linux/usb.h
>> index 4229eb74bd2c..af68e31118f8 100644
>> --- a/include/linux/usb.h
>> +++ b/include/linux/usb.h
>> @@ -580,6 +580,7 @@ struct usb3_lpm_parameters {
>> * @bus_mA: Current available from the bus
>> * @portnum: parent port number (origin 1)
>> * @level: number of USB hub ancestors
>> + * @devaddr: device address, XHCI: assigned by HW, others: same as devnum
>> * @can_submit: URBs may be submitted
>> * @persist_enabled: USB_PERSIST enabled for this device
>> * @have_langid: whether string_langid is valid
>> @@ -663,6 +664,7 @@ struct usb_device {
>> unsigned short bus_mA;
>> u8 portnum;
>> u8 level;
>> + u8 devaddr;
>>
>> unsigned can_submit:1;
>> unsigned persist_enabled:1;
>>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v10 2/2] usb: xhci: Add Clear_TT_Buffer
2019-05-16 14:40 ` [PATCH v10 2/2] usb: xhci: Add Clear_TT_Buffer Jim Lin
@ 2019-05-17 14:10 ` Mathias Nyman
0 siblings, 0 replies; 6+ messages in thread
From: Mathias Nyman @ 2019-05-17 14:10 UTC (permalink / raw)
To: Jim Lin, gregkh, mathias.nyman, stern, kai.heng.feng, drinkcat,
keescook, nsaenzjulienne, jflat, malat
Cc: linux-usb, linux-kernel
On 16.5.2019 17.40, Jim Lin wrote:
> USB 2.0 specification chapter 11.17.5 says "as part of endpoint halt
> processing for full-/low-speed endpoints connected via a TT, the host
> software must use the Clear_TT_Buffer request to the TT to ensure
> that the buffer is not in the busy state".
>
> In our case, a full-speed speaker (ConferenceCam) is behind a high-
> speed hub (ConferenceCam Connect), sometimes once we get STALL on a
> request we may continue to get STALL with the folllowing requests,
> like Set_Interface.
>
> Here we invoke usb_hub_clear_tt_buffer() to send Clear_TT_Buffer
> request to the hub of the device for the following Set_Interface
> requests to the device to get ACK successfully.
>
> Signed-off-by: Jim Lin <jilin@nvidia.com>
> ---
> v2: xhci_clear_tt_buffer_complete: add static, shorter indentation
> , remove its claiming in xhci.h
> v3: Add description for clearing_tt (xhci.h)
> v4: Remove clearing_tt flag because hub_tt_work has hub->tt.lock
> to protect for Clear_TT_Buffer to be run serially.
> Remove xhci_clear_tt_buffer_complete as it's not necessary.
> Same reason as the above.
> Extend usb_hub_clear_tt_buffer parameter
> v5: Not extending usb_hub_clear_tt_buffer parameter
> Add description.
> v6: Remove unused parameter slot_id from xhci_clear_hub_tt_buffer
> v7: Add devaddr field in "struct usb_device"
> v8: split as two patches
> v9: no change flag
> v10: Add EP_CLEARING_TT flag
>
> drivers/usb/host/xhci-ring.c | 27 ++++++++++++++++++++++++++-
> drivers/usb/host/xhci.c | 17 +++++++++++++++++
> drivers/usb/host/xhci.h | 5 +++++
> 3 files changed, 48 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
> index 9215a28dad40..11d498b6c09b 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -399,7 +399,7 @@ void xhci_ring_ep_doorbell(struct xhci_hcd *xhci,
> * stream once the endpoint is on the HW schedule.
> */
> if ((ep_state & EP_STOP_CMD_PENDING) || (ep_state & SET_DEQ_PENDING) ||
> - (ep_state & EP_HALTED))
> + (ep_state & EP_HALTED) || (ep_state & EP_CLEARING_TT))
> return;
> writel(DB_VALUE(ep_index, stream_id), db_addr);
> /* The CPU has better things to do at this point than wait for a
> @@ -433,6 +433,13 @@ static void ring_doorbell_for_active_rings(struct xhci_hcd *xhci,
> }
> }
>
> +void xhci_ring_doorbell_for_active_rings(struct xhci_hcd *xhci,
> + unsigned int slot_id,
> + unsigned int ep_index)
> +{
> + ring_doorbell_for_active_rings(xhci, slot_id, ep_index);
> +}
> +
> /* Get the right ring for the given slot_id, ep_index and stream_id.
> * If the endpoint supports streams, boundary check the URB's stream ID.
> * If the endpoint doesn't support streams, return the singular endpoint ring.
> @@ -1786,6 +1793,23 @@ struct xhci_segment *trb_in_td(struct xhci_hcd *xhci,
> return NULL;
> }
>
> +static void xhci_clear_hub_tt_buffer(struct xhci_hcd *xhci, struct xhci_td *td,
> + struct xhci_virt_ep *ep)
> +{
> + /*
> + * As part of low/full-speed endpoint-halt processing
> + * we must clear the TT buffer (USB 2.0 specification 11.17.5).
> + */
> + if (td->urb->dev->tt && !usb_pipeint(td->urb->pipe) &&
> + (td->urb->dev->tt->hub != xhci_to_hcd(xhci)->self.root_hub) &&
> + !(ep->ep_state & EP_CLEARING_TT)) {
> + ep->ep_state |= EP_CLEARING_TT;
> + td->urb->ep->hcpriv = td->urb->dev;
> + if (usb_hub_clear_tt_buffer(td->urb))
> + ep->ep_state &= ~EP_CLEARING_TT;
> + }
> +}
> +
> static void xhci_cleanup_halted_endpoint(struct xhci_hcd *xhci,
> unsigned int slot_id, unsigned int ep_index,
> unsigned int stream_id, struct xhci_td *td,
> @@ -1804,6 +1828,7 @@ static void xhci_cleanup_halted_endpoint(struct xhci_hcd *xhci,
> if (reset_type == EP_HARD_RESET) {
> ep->ep_state |= EP_HARD_CLEAR_TOGGLE;
> xhci_cleanup_stalled_ring(xhci, ep_index, stream_id, td);
> + xhci_clear_hub_tt_buffer(xhci, td, ep);
> }
> xhci_ring_cmd_db(xhci);
> }
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index 68b393e5a453..0dc108e61a89 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -5133,6 +5133,22 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
> }
> EXPORT_SYMBOL_GPL(xhci_gen_setup);
>
> +static void xhci_clear_tt_buffer_complete(struct usb_hcd *hcd,
> + struct usb_host_endpoint *ep)
> +{
> + struct xhci_hcd *xhci;
> + struct usb_device *udev;
> + unsigned int slot_id;
> + unsigned int ep_index;
> +
> + xhci = hcd_to_xhci(hcd);
> + udev = (struct usb_device *)ep->hcpriv;
> + slot_id = udev->slot_id;
> + ep_index = xhci_get_endpoint_index(&ep->desc);
spin_lock_irqsave(&xhci->lock, flags); (protecting ep_state)
> + xhci->devs[slot_id]->eps[ep_index].ep_state &= ~EP_CLEARING_TT;
> + xhci_ring_doorbell_for_active_rings(xhci, slot_id, ep_index);
unlock
note:
lock is already taken in xhci_cleanup_halted_endpoint()
so no need to take lock for xhci_clear_hub_tt_buffer()
Other than that this looks good to me.
-Mathias
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-05-17 14:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-16 14:40 [PATCH v10 0/2] usb: xhci: Add Clear_TT_Buffer Jim Lin
2019-05-16 14:40 ` [PATCH v10 1/2] usb: xhci : Add devaddr in struct usb_device Jim Lin
2019-05-16 14:56 ` Alan Stern
2019-05-17 13:37 ` Jim Lin
2019-05-16 14:40 ` [PATCH v10 2/2] usb: xhci: Add Clear_TT_Buffer Jim Lin
2019-05-17 14:10 ` Mathias Nyman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.