Hi Tony,
Just a note that I'm queuing this patch to Greg for 3.10. I'm working
on a bug fix patch for 3.9 that includes turning off runtime PM, and
should fix the issue with the compliance timer causing list corruption
on resume.
Sarah Sharp
On Tue, Feb 19, 2013 at 08:59:35AM -0500, Tony Camuso wrote:
> There are no functional changes in this patch. However, because the
> compliance mode timer can be deleted in more than one function, it
> seemed expedient to include the function name in the debug strings.
>
> Also limited the use of capitals to the first word in the compliance
> mode debug messages, except after a function name where all words
> start with lower case, in keeping with the style prevalent elsewhere
> in xhci.c.
>
> Signed-off-by: Tony Camuso <tcamuso@xxxxxxxxxx>
> ---
> drivers/usb/host/xhci.c | 12 +++++++-----
> 1 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index 267a7b1..757b645 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -416,9 +416,9 @@ static void compliance_mode_recovery(unsigned long arg)
> * Compliance Mode Detected. Letting USB Core
> * handle the Warm Reset
> */
> - xhci_dbg(xhci, "Compliance Mode Detected->Port %d!\n",
> + xhci_dbg(xhci, "Compliance mode detected->port %d\n",
> i + 1);
> - xhci_dbg(xhci, "Attempting Recovery routine!\n");
> + xhci_dbg(xhci, "Attempting compliance mode recovery\n");
> hcd = xhci->shared_hcd;
>
> if (hcd->state == HC_STATE_SUSPENDED)
> @@ -456,7 +456,7 @@ static void compliance_mode_recovery_timer_init(struct xhci_hcd *xhci)
> set_timer_slack(&xhci->comp_mode_recovery_timer,
> msecs_to_jiffies(COMP_MODE_RCVRY_MSECS));
> add_timer(&xhci->comp_mode_recovery_timer);
> - xhci_dbg(xhci, "Compliance Mode Recovery Timer Initialized.\n");
> + xhci_dbg(xhci, "Compliance mode recovery timer initialized\n");
> }
>
> /*
> @@ -929,7 +929,8 @@ int xhci_suspend(struct xhci_hcd *xhci)
> if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) &&
> !(xhci_all_ports_seen_u0(xhci))) {
> del_timer_sync(&xhci->comp_mode_recovery_timer);
> - xhci_dbg(xhci, "Compliance Mode Recovery Timer Deleted!\n");
> + xhci_dbg(xhci, "%s: compliance mode recovery timer deleted\n",
> + __func__);
> }
>
> /* step 5: remove core well power */
> @@ -992,7 +993,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
> if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) &&
> !(xhci_all_ports_seen_u0(xhci))) {
> del_timer_sync(&xhci->comp_mode_recovery_timer);
> - xhci_dbg(xhci, "Compliance Mode Recovery Timer deleted!\n");
> + xhci_dbg(xhci, "%s: compliance mode recovery timer deleted\n",
> + __func__);
> }
>
> /* Let the USB core know _both_ roothubs lost power. */
> --
> 1.7.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
