xhci cleanups and fixes for usb-next
Subsystems (3)
v2 cover xhci cleanups and fixes for usb-next
Hi Greg
One more set of xhci fetures and fixes for usb-next.
In addition to some cleanups there are some fixes that would be nice to get into 5.18-rc1
All fixes are for old issues, so nothing urgent.
Thanks
-Mathias
v2: adjust incorrectly placed stable tag in patch 3/9 commit message
Anssi Hannula (2):
xhci: fix garbage USBSTS being logged in some cases
xhci: fix uninitialized string returned by xhci_decode_ctrl_ctx()
Henry Lin (1):
xhci: fix runtime PM imbalance in USB2 resume
Linyu Yuan (5):
usb: host: xhci: use ffs() in xhci_mem_init()
usb: host: xhci: fix a comment typo in xhci_mem_init()
usb: host: xhci: update hci_version operation in xhci_gen_setup()
usb: host: xhci: add blank line in xhci_halt()
usb: host: xhci: Remove some unnecessary return value initializations
Mathias Nyman (1):
xhci: make xhci_handshake timeout for xhci_reset() adjustable
drivers/usb/host/xhci-hub.c | 5 ++++- drivers/usb/host/xhci-mem.c | 10 +++------- drivers/usb/host/xhci.c | 34 +++++++++++++++++----------------- drivers/usb/host/xhci.h | 14 +++++++++++--- 4 files changed, 35 insertions(+), 28 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/9 xhci: make xhci_handshake timeout for xhci_reset() adjustable
xhci_reset() timeout was increased from 250ms to 10 seconds in order to give Renesas 720201 xHC enough time to get ready in probe.
xhci_reset() is called with interrupts disabled in other places, and waiting for 10 seconds there is not acceptable.
Add a timeout parameter to xhci_reset(), and adjust it back to 250ms when called from xhci_stop() or xhci_shutdown() where interrupts are disabled, and successful reset isn't that critical.
This solves issues when deactivating host mode on platforms like SM8450.
For now don't change the timeout if xHC is reset in xhci_resume(). No issues are reported for it, and we need the reset to succeed. Locking around that reset needs to be revisited later.
Additionally change the signed integer timeout parameter in xhci_handshake() to a u64 to match the timeout value we pass to readl_poll_timeout_atomic()
--- drivers/usb/host/xhci-hub.c | 2 +- drivers/usb/host/xhci-mem.c | 2 +- drivers/usb/host/xhci.c | 20 +++++++++----------- drivers/usb/host/xhci.h | 7 +++++-- 4 files changed, 16 insertions(+), 15 deletions(-)
drivers/usb/host/xhci-hub.c +1 -1
@@ -762,7 +762,7 @@ static int xhci_exit_test_mode(struct xhci_hcd *xhci) }pm_runtime_allow (xhci_to_hcd (xhci)->self.controller); xhci->test_mode =0 ; -return xhci_reset (xhci); +return xhci_reset (xhci,XHCI_RESET_SHORT_USEC ); } void xhci_set_link_state(struct xhci_hcd *xhci, struct xhci_port *port,
drivers/usb/host/xhci-mem.c +1 -1
@@ -2575,7 +2575,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) fail:xhci_halt (xhci); -xhci_reset (xhci); +xhci_reset (xhci,XHCI_RESET_SHORT_USEC );xhci_mem_cleanup (xhci);return -ENOMEM ; }
drivers/usb/host/xhci.c +9 -11
@@ -65,7 +65,7 @@ static bool td_on_ring(struct xhci_td *td, struct xhci_ring *ring)* handshake done). There are two failure modes: "usec" have passed (major * hardware flakeout), or the register reads as all-ones (hardware removed). */ -int xhci_handshake (void __iomem *ptr,u32 mask,u32 done,int usec) +int xhci_handshake (void __iomem *ptr,u32 mask,u32 done,u64 timeout_us) {u32 result;int ret;
@@ -73,7 +73,7 @@ int xhci_handshake(void __iomem *ptr, u32 mask, u32 done, int usec) ret =readl_poll_timeout_atomic (ptr, result, (result & mask) == done || result ==U32_MAX , -1 , usec); +1 , timeout_us);if (result ==U32_MAX )/* card removed */ return -ENODEV ;
@@ -162,7 +162,7 @@ int xhci_start(struct xhci_hcd *xhci)* Transactions will be terminated immediately, and operational registers * will be set to their defaults. */ -int xhci_reset (struct xhci_hcd *xhci) +int xhci_reset (struct xhci_hcd *xhci,u64 timeout_us) {u32 command;u32 state;
@@ -195,8 +195,7 @@ int xhci_reset(struct xhci_hcd *xhci)if (xhci->quirks &XHCI_INTEL_HOST )udelay (1000 ); - ret =xhci_handshake (&xhci->op_regs->command, -CMD_RESET ,0 ,10 *1000 *1000 ); + ret =xhci_handshake (&xhci->op_regs->command,CMD_RESET ,0 , timeout_us);if (ret)return ret;
@@ -209,8 +208,7 @@ int xhci_reset(struct xhci_hcd *xhci)* xHCI cannot write to any doorbells or operational registers other * than status until the "Controller Not Ready" flag is cleared. */ - ret =xhci_handshake (&xhci->op_regs->status, -STS_CNR ,0 ,10 *1000 *1000 ); + ret =xhci_handshake (&xhci->op_regs->status,STS_CNR ,0 , timeout_us); xhci->usb2_rhub.bus_state.port_c_suspend =0 ; xhci->usb2_rhub.bus_state.suspended_ports =0 ;
@@ -731,7 +729,7 @@ static void xhci_stop(struct usb_hcd *hcd) xhci->xhc_state |=XHCI_STATE_HALTED ; xhci->cmd_ring_state =CMD_RING_STATE_STOPPED ;xhci_halt (xhci); -xhci_reset (xhci); +xhci_reset (xhci,XHCI_RESET_SHORT_USEC );spin_unlock_irq (&xhci->lock);xhci_cleanup_msix (xhci);
@@ -784,7 +782,7 @@ void xhci_shutdown(struct usb_hcd *hcd)xhci_halt (xhci);/* Workaround for spurious wakeups at shutdown with HSW */ if (xhci->quirks &XHCI_SPURIOUS_WAKEUP ) -xhci_reset (xhci); +xhci_reset (xhci,XHCI_RESET_SHORT_USEC );spin_unlock_irq (&xhci->lock);xhci_cleanup_msix (xhci);
@@ -1170,7 +1168,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)xhci_dbg (xhci,"Stop HCD\n" );xhci_halt (xhci);xhci_zero_64b_regs (xhci); - retval =xhci_reset (xhci); + retval =xhci_reset (xhci,XHCI_RESET_LONG_USEC );spin_unlock_irq (&xhci->lock);if (retval)return retval;
@@ -5307,7 +5305,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)xhci_dbg (xhci,"Resetting HCD\n" );/* Reset the internal HC memory state and registers. */ - retval =xhci_reset (xhci); + retval =xhci_reset (xhci,XHCI_RESET_LONG_USEC );if (retval)return retval;xhci_dbg (xhci,"Reset complete\n" );
drivers/usb/host/xhci.h +5 -2
@@ -229,6 +229,9 @@ struct xhci_op_regs {#define CMD_ETE (1 << 14)/* bits 15:31 are reserved (and should be preserved on writes). */ +#define XHCI_RESET_LONG_USEC (10 * 1000 * 1000) +#define XHCI_RESET_SHORT_USEC (250 * 1000) +/* IMAN - Interrupt Management Register */ #define IMAN_IE (1 << 1)#define IMAN_IP (1 << 0)
@@ -2081,11 +2084,11 @@ void xhci_free_container_ctx(struct xhci_hcd *xhci,/* xHCI host controller glue */ typedef void (*xhci_get_quirks_t )(struct device *,struct xhci_hcd *); -int xhci_handshake (void __iomem *ptr,u32 mask,u32 done,int usec); +int xhci_handshake (void __iomem *ptr,u32 mask,u32 done,u64 timeout_us);void xhci_quiesce (struct xhci_hcd *xhci);int xhci_halt (struct xhci_hcd *xhci);int xhci_start (struct xhci_hcd *xhci); -int xhci_reset (struct xhci_hcd *xhci); +int xhci_reset (struct xhci_hcd *xhci,u64 timeout_us);int xhci_run (struct usb_hcd *hcd);int xhci_gen_setup (struct usb_hcd *hcd,xhci_get_quirks_t get_quirks);void xhci_shutdown (struct usb_hcd *hcd);
Signature · 1 line
2.25.1
PATCH v2 2/9 xhci: fix garbage USBSTS being logged in some cases
In reply to Mathias NymanFrom: Anssi Hannula <[email protected]>
xhci_decode_usbsts() is expected to return a zero-terminated string by its only caller, xhci_stop_endpoint_command_watchdog(), which directly logs the return value:
xhci_warn(xhci, "USBSTS:%s\n", xhci_decode_usbsts(str, usbsts));
However, if no recognized bits are set in usbsts, the function will return without having called any sprintf() and therefore return an untouched non-zero-terminated caller-provided buffer, causing garbage to be output to log.
Fix that by always including the raw value in the output.
Note that before commit 4843b4b5ec64 ("xhci: fix even more unsafe memory usage in xhci tracing") the result effect in the failure case was different as a static buffer was used here, but the code still worked incorrectly.
--- drivers/usb/host/xhci.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/host/xhci.h +4 -1
@@ -2625,8 +2625,11 @@ static inline const char *xhci_decode_usbsts(char *str, u32 usbsts) {int ret =0 ; + ret =sprintf (str," 0x%08x" , usbsts); +if (usbsts == ~(u32 )0 ) -return " 0xffffffff" ; +return str; +if (usbsts &STS_HALT ) ret +=sprintf (str + ret," HCHalted" );if (usbsts &STS_FATAL )
Signature · 1 line
2.25.1
PATCH v2 3/9 xhci: fix uninitialized string returned by xhci_decode_ctrl_ctx()
In reply to Mathias NymanFrom: Anssi Hannula <[email protected]>
xhci_decode_ctrl_ctx() returns the untouched buffer as-is if both "drop" and "add" parameters are zero.
Fix the function to return an empty string in that case.
It was not immediately clear from the possible call chains whether this issue is currently actually triggerable or not.
Note that before commit 4843b4b5ec64 ("xhci: fix even more unsafe memory usage in xhci tracing") the result effect in the failure case was different as a static buffer was used here, but the code still worked incorrectly.
commit 4843b4b5ec64 ("xhci: fix even more unsafe memory usage in xhci tracing")
--- drivers/usb/host/xhci.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/host/xhci.h +2 -0
@@ -2468,6 +2468,8 @@ static inline const char *xhci_decode_ctrl_ctx(char *str,unsigned int bit;int ret =0 ; + str[0 ] ='\0' ; +if (drop) { ret =sprintf (str,"Drop:" );for_each_set_bit (bit, &drop,32 )
Signature · 1 line
2.25.1
PATCH v2 4/9 xhci: fix runtime PM imbalance in USB2 resume
In reply to Mathias NymanFrom: Henry Lin <[email protected]>
A race between system resume and device-initiated resume may result in runtime PM imbalance on USB2 root hub. If a device-initiated resume starts and system resume xhci_bus_resume() directs U0 before hub driver sees the resuming device in RESUME state, device-initiated resume will not be finished in xhci_handle_usb2_port_link_resume(). In this case, usb_hcd_end_port_resume() call is missing.
This changes calls usb_hcd_end_port_resume() if resuming device reaches U0 to keep runtime PM balance.
--- drivers/usb/host/xhci-hub.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/host/xhci-hub.c +3 -0
@@ -1088,6 +1088,9 @@ static void xhci_get_usb2_port_status(struct xhci_port *port, u32 *status,if (link_state ==XDEV_U2 ) *status |=USB_PORT_STAT_L1 ;if (link_state ==XDEV_U0 ) { +if (bus_state->resume_done[portnum]) +usb_hcd_end_port_resume (&port->rhub->hcd->self, + portnum); bus_state->resume_done[portnum] =0 ;clear_bit (portnum, &bus_state->resuming_ports);if (bus_state->suspended_ports & (1 << portnum)) {
Signature · 1 line
2.25.1
PATCH v2 5/9 usb: host: xhci: use ffs() in xhci_mem_init()
In reply to Mathias NymanFrom: Linyu Yuan <[email protected]>
The for loop to find page size bit can be replaced with ffs().
--- drivers/usb/host/xhci-mem.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/usb/host/xhci-mem.c +1 -5
@@ -2391,11 +2391,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) page_size =readl (&xhci->op_regs->page_size);xhci_dbg_trace (xhci, trace_xhci_dbg_init,"Supported page size register = 0x%x" , page_size); -for (i =0 ; i <16 ; i++) { -if ((0x1 & page_size) !=0 ) -break ; - page_size = page_size >>1 ; - } + i =ffs (page_size);if (i <16 )xhci_dbg_trace (xhci, trace_xhci_dbg_init,"Supported page size of %iK" , (1 << (i+12 )) /1024 );
Signature · 1 line
2.25.1
PATCH v2 6/9 usb: host: xhci: fix a comment typo in xhci_mem_init()
In reply to Mathias NymanFrom: Linyu Yuan <[email protected]>
It should be Device Context, not doorbell.
--- drivers/usb/host/xhci-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-mem.c +1 -1
@@ -2417,7 +2417,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)writel (val, &xhci->op_regs->config_reg);/* -* xHCI section 5.4.6 - doorbell array must be +* xHCI section 5.4.6 - Device Context array must be * "physically contiguous and 64-byte (cache line) aligned". */ xhci->dcbaa = dma_alloc_coherent(dev, sizeof(*xhci->dcbaa), &dma,
Signature · 1 line
2.25.1
PATCH v2 7/9 usb: host: xhci: update hci_version operation in xhci_gen_setup()
In reply to Mathias NymanFrom: Linyu Yuan <[email protected]>
There is no need to store temperary value in hcc_params.
--- drivers/usb/host/xhci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/host/xhci.c +1 -2
@@ -5279,8 +5279,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks) xhci->hcs_params1 =readl (&xhci->cap_regs->hcs_params1); xhci->hcs_params2 =readl (&xhci->cap_regs->hcs_params2); xhci->hcs_params3 =readl (&xhci->cap_regs->hcs_params3); - xhci->hcc_params =readl (&xhci->cap_regs->hc_capbase); - xhci->hci_version =HC_VERSION (xhci->hcc_params); + xhci->hci_version =HC_VERSION (readl (&xhci->cap_regs->hc_capbase)); xhci->hcc_params =readl (&xhci->cap_regs->hcc_params);if (xhci->hci_version >0x100 ) xhci->hcc_params2 =readl (&xhci->cap_regs->hcc_params2);
Signature · 1 line
2.25.1
PATCH v2 8/9 usb: host: xhci: add blank line in xhci_halt()
In reply to Mathias NymanFrom: Linyu Yuan <[email protected]>
It is more readable to add blank lines.
--- drivers/usb/host/xhci.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/host/xhci.c +3 -0
@@ -110,6 +110,7 @@ void xhci_quiesce(struct xhci_hcd *xhci)int xhci_halt (struct xhci_hcd *xhci) {int ret; +xhci_dbg_trace (xhci, trace_xhci_dbg_init,"// Halt the HC" );xhci_quiesce (xhci);
@@ -119,8 +120,10 @@ int xhci_halt(struct xhci_hcd *xhci)xhci_warn (xhci,"Host halt failed, %d\n" , ret);return ret; } + xhci->xhc_state |=XHCI_STATE_HALTED ; xhci->cmd_ring_state =CMD_RING_STATE_STOPPED ; +return ret; }
Signature · 1 line
2.25.1
PATCH v2 9/9 usb: host: xhci: Remove some unnecessary return value initializations
In reply to Mathias NymanFrom: Linyu Yuan <[email protected]>
The ret/retval will be set when it used, no need to init at definition.
--- drivers/usb/host/xhci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/usb/host/xhci.c +4 -4
@@ -325,7 +325,7 @@ static int xhci_setup_msi(struct xhci_hcd *xhci)*/ static int xhci_setup_msix (struct xhci_hcd *xhci) { -int i, ret =0 ; +int i, ret;struct usb_hcd *hcd =xhci_to_hcd (xhci);struct pci_dev *pdev =to_pci_dev (hcd->self.controller);
@@ -579,7 +579,7 @@ static int xhci_all_ports_seen_u0(struct xhci_hcd *xhci)static int xhci_init (struct usb_hcd *hcd) {struct xhci_hcd *xhci =hcd_to_xhci (hcd); -int retval =0 ; +int retval;xhci_dbg_trace (xhci, trace_xhci_dbg_init,"xhci_init" );spin_lock_init (&xhci->lock);
@@ -3975,7 +3975,7 @@ int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id)struct xhci_command *command;unsigned long flags;u32 state; -int ret =0 ; +int ret; command =xhci_alloc_command (xhci, true,GFP_KERNEL );if (!command)
@@ -4011,7 +4011,7 @@ int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id)xhci_free_command (xhci, command); -return ret; +return 0 ; }/*
Signature · 1 line
2.25.1