xhci fixes for usb-linus
Subsystems (5)
cover xhci fixes for usb-linus
Hi Greg
A few xhci fixes for usb-linus that resolve a couple power management related issues, and a full-speed USB device enumeration problem.
-Mathias
Al Cooper (1):
xhci: Fix enumeration issue when setting max packet size for FS
devices.
Kai-Heng Feng (2):
xhci: Return if xHCI doesn't support LPM
xhci: Poll for U0 after disabling USB2 LPM
Macpaul Lin (1):
usb: host: xhci-mtk: avoid runtime suspend when removing hcd
Mathias Nyman (1):
xhci: Fix incorrect EP_STATE_MASK
drivers/usb/host/xhci-mtk.c | 5 +++-- drivers/usb/host/xhci.c | 9 ++++++++- drivers/usb/host/xhci.h | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/5 xhci: Fix incorrect EP_STATE_MASK
EP_STATE_MASK should be 0x7 instead of 0xf
xhci spec 6.2.3 shows that the EP state field in the endpoint context data structure consist of bits [2:0].
The old value included a bit from the next field which fortunately is a
RsvdZ region. So hopefully this hasn't caused too much harm
--- drivers/usb/host/xhci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci.h +1 -1
@@ -716,7 +716,7 @@ struct xhci_ep_ctx {* 4 - TRB error * 5-7 - reserved */ -#define EP_STATE_MASK (0xf) +#define EP_STATE_MASK (0x7)#define EP_STATE_DISABLED 0#define EP_STATE_RUNNING 1#define EP_STATE_HALTED 2
Signature · 1 line
2.17.1
PATCH 2/5 xhci: Fix enumeration issue when setting max packet size for FS devices.
In reply to Mathias NymanFrom: Al Cooper <[email protected]>
Unable to complete the enumeration of a USB TV Tuner device.
Per XHCI spec (4.6.5), the EP state field of the input context shall be cleared for a set address command. In the special case of an FS device that has "MaxPacketSize0 = 8", the Linux XHCI driver does not do this before evaluating the context. With an XHCI controller that checks the EP state field for parameter context error this causes a problem in cases such as the device getting reset again after enumeration.
When that field is cleared, the problem does not occur.
This was found and fixed by Sasi Kumar.
--- drivers/usb/host/xhci.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/xhci.c +1 -0
@@ -1430,6 +1430,7 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id, xhci->devs[slot_id]->out_ctx, ep_index); ep_ctx =xhci_get_ep_ctx (xhci, command->in_ctx, ep_index); + ep_ctx->ep_info &=cpu_to_le32 (~EP_STATE_MASK );/* must clear */ ep_ctx->ep_info2 &=cpu_to_le32 (~MAX_PACKET_MASK ); ep_ctx->ep_info2 |=cpu_to_le32 (MAX_PACKET (max_packet_size));
Signature · 1 line
2.17.1
PATCH 3/5 usb: host: xhci-mtk: avoid runtime suspend when removing hcd
In reply to Mathias NymanFrom: Macpaul Lin <[email protected]>
When runtime suspend was enabled, runtime suspend might happen when xhci is removing hcd. This might cause kernel panic when hcd has been freed but runtime pm suspend related handle need to reference it.
--- drivers/usb/host/xhci-mtk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-mtk.c +3 -2
@@ -587,6 +587,9 @@ static int xhci_mtk_remove(struct platform_device *dev)struct xhci_hcd *xhci =hcd_to_xhci (hcd);struct usb_hcd *shared_hcd = xhci->shared_hcd; +pm_runtime_put_noidle (&dev->dev); +pm_runtime_disable (&dev->dev); +usb_remove_hcd (shared_hcd); xhci->shared_hcd =NULL ;device_init_wakeup (&dev->dev, false);
@@ -597,8 +600,6 @@ static int xhci_mtk_remove(struct platform_device *dev)xhci_mtk_sch_exit (mtk);xhci_mtk_clks_disable (mtk);xhci_mtk_ldos_disable (mtk); -pm_runtime_put_sync (&dev->dev); -pm_runtime_disable (&dev->dev);return 0 ; }
Signature · 1 line
2.17.1
PATCH 4/5 xhci: Return if xHCI doesn't support LPM
In reply to Mathias NymanFrom: Kai-Heng Feng <[email protected]>
Just return if xHCI is quirked to disable LPM. We can save some time from reading registers and doing spinlocks.
Add stable tag as we want this patch together with the next one, "Poll for U0 after disabling USB2 LPM" which fixes a suspend issue for some USB2 LPM devices
--- drivers/usb/host/xhci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/host/xhci.c +4 -1
@@ -4391,6 +4391,9 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,int hird, exit_latency;int ret; +if (xhci->quirks &XHCI_HW_LPM_DISABLE ) +return -EPERM ; +if (hcd->speed >=HCD_USB3 || !xhci->hw_lpm_support || !udev->lpm_capable)return -EPERM ;
@@ -4413,7 +4416,7 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,xhci_dbg (xhci,"%s port %d USB2 hardware LPM\n" , enable ?"enable" :"disable" , port_num +1 ); -if (enable && !(xhci->quirks &XHCI_HW_LPM_DISABLE )) { +if (enable) {/* Host supports BESL timeout instead of HIRD */ if (udev->usb2_hw_lpm_besl_capable) {/* if device doesn't have a preferred BESL value use a
Signature · 1 line
2.17.1
PATCH 5/5 xhci: Poll for U0 after disabling USB2 LPM
In reply to Mathias NymanFrom: Kai-Heng Feng <[email protected]>
USB2 devices with LPM enabled may interrupt the system suspend:
[ 932.510475] usb 1-7: usb suspend, wakeup 0 [ 932.510549] hub 1-0:1.0: hub_suspend [ 932.510581] usb usb1: bus suspend, wakeup 0 [ 932.510590] xhci_hcd 0000:00:14.0: port 9 not suspended [ 932.510593] xhci_hcd 0000:00:14.0: port 8 not suspended .. [ 932.520323] xhci_hcd 0000:00:14.0: Port change event, 1-7, id 7, portsc: 0x400e03 .. [ 932.591405] PM: pci_pm_suspend(): hcd_pci_suspend+0x0/0x30 returns -16 [ 932.591414] PM: dpm_run_callback(): pci_pm_suspend+0x0/0x160 returns -16 [ 932.591418] PM: Device 0000:00:14.0 failed to suspend async: error -16
During system suspend, USB core will let HC suspends the device if it doesn't have remote wakeup enabled and doesn't have any children. However, from the log above we can see that the usb 1-7 doesn't get bus suspended due to not in U0. After a while the port finished U2 -> U0 transition, interrupts the suspend process.
The observation is that after disabling LPM, port doesn't transit to U0 immediately and can linger in U2. xHCI spec 4.23.5.2 states that the maximum exit latency for USB2 LPM should be BESL + 10us. The BESL for the affected device is advertised as 400us, which is still not enough based on my testing result.
So let's use the maximum permitted latency, 10000, to poll for U0 status to solve the issue.
--- drivers/usb/host/xhci.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/host/xhci.c +3 -0
@@ -4475,6 +4475,9 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,mutex_lock (hcd->bandwidth_mutex);xhci_change_max_exit_latency (xhci, udev,0 );mutex_unlock (hcd->bandwidth_mutex); +readl_poll_timeout (ports[port_num]->addr, pm_val, + (pm_val &PORT_PLS_MASK ) ==XDEV_U0 , +100 ,10000 );return 0 ; } }
Signature · 1 line
2.17.1