From patchwork Wed Mar 20 14:40:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Stern X-Patchwork-Id: 229406 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 326AE2C00A4 for ; Thu, 21 Mar 2013 01:40:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756056Ab3CTOkG (ORCPT ); Wed, 20 Mar 2013 10:40:06 -0400 Received: from iolanthe.rowland.org ([192.131.102.54]:58408 "HELO iolanthe.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752379Ab3CTOkG (ORCPT ); Wed, 20 Mar 2013 10:40:06 -0400 Received: (qmail 2938 invoked by uid 2102); 20 Mar 2013 10:40:04 -0400 Received: from localhost (sendmail-bs@127.0.0.1) by localhost with SMTP; 20 Mar 2013 10:40:04 -0400 Date: Wed, 20 Mar 2013 10:40:04 -0400 (EDT) From: Alan Stern X-X-Sender: stern@iolanthe.rowland.org To: Stephen Warren , Andreas Bombe , Sven Joachim cc: "linux-tegra@vger.kernel.org" , USB list , Greg Kroah-Hartman Subject: Re: Reboot/shutdown failure due to "USB: EHCI: work around silicon bug in Intel's EHCI" In-Reply-To: <5148F7A1.2090901@wwwdotorg.org> Message-ID: MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org On Tue, 19 Mar 2013, Stephen Warren wrote: > On 03/19/2013 04:48 PM, Stephen Warren wrote: > > On 03/19/2013 02:07 PM, Alan Stern wrote: > ... > >> A dmesg log with CONFIG_USB_DEBUG enabled would be helpful. We ought > >> to be able to tell where khubd is getting stuck. > > > > Hmmm. Enabling CONFIG_USB_DEBUG appears to mask the problem. I assume > > this is some kind of timing/race condition, unless there's some code > > with required side-effects hiding under ifdef CONFIG_USB_DEBUG somehow? > > Some further information: I added some printks, which are hopefully > obvious from the text below, and in the failing case, I see: > > > [ 1.291277] single_unlink_async: qh ee31bc40 qh_state set to UNLINK_WAIT > > [ 1.297960] start_iaa_cycle: qh ee31bc40 qh_state changing UNLINK_WAIT -> UNLINK > ... > > [ 6.452331] ehci_urb_dequeue: qh ee31bc40 attempting dequeue (qh_stated 2) > > This is with CONFIG_USB_DEBUG disabled. That seems to happen to the very > first (and only) URB(?) ever issued. There should be a call to ehci_end_async_unlink shortly after start_iaa_cycle. > If I enable CONFIG_USB_DEBUG, then I see the more expected: > > > [ 1.540410] single_unlink_async: qh ee0c0300 qh_state set to UNLINK_WAIT > > [ 1.547094] start_iaa_cycle: qh ee0c0300 qh_state changing UNLINK_WAIT -> UNLINK > > [ 1.554487] start_iaa_cycle: qh ee0c0300 qh_state was UNLINK; processing > > followed by a whole slew of subsequent URBs being submitted and processed. > > Perhaps the issue is that start_iaa_cycle() (or whatever triggers it) > only happens when there's an URB in state UNLINK, but not when there's > only one in state UNLINK_WAIT, so that it only happens once rather than > the required twice? I'm not sure why a timing difference would affect > this though, unless there's some loop in the IAA processing that happens > to do both the UNLINK_WAIT->UNLINK change, and the processing of the URB > in the UNLINK state in one invocation sometimes, but not others? A possible explanation for a timing difference is that the IAA mechanism simply isn't working right on your controller, so the IAA watchdog timer expires. It's worth pointing out that your second log excerpt above has messages spaced at intervals of 7 ms, which is strange considering that the second line should get printed almost immediately after the first. Excessively long delays like this do point in the direction of a timer expiration. Anyway, there _is_ a mistake in the "work around silicon bug" patch; I forgot to update the timeout handler. Does the patch below help? You should build it without CONFIG_USB_DEBUG; I changed the ehci_vdbg to ehci_info so that it would show up in the log regardless and we can see if it gets triggered. (Sven, this patch should replace the one I sent you earlier.) Alan Stern --- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: 3.8/drivers/usb/host/ehci-timer.c =================================================================== --- 3.8.orig/drivers/usb/host/ehci-timer.c +++ 3.8/drivers/usb/host/ehci-timer.c @@ -305,7 +305,8 @@ static void ehci_iaa_watchdog(struct ehc * (a) SMP races against real IAA firing and retriggering, and * (b) clean HC shutdown, when IAA watchdog was pending. */ - if (ehci->async_iaa) { +// if (ehci->async_iaa) { + if (1) { u32 cmd, status; /* If we get here, IAA is *REALLY* late. It's barely @@ -329,7 +330,7 @@ static void ehci_iaa_watchdog(struct ehc ehci_writel(ehci, STS_IAA, &ehci->regs->status); } - ehci_vdbg(ehci, "IAA watchdog: status %x cmd %x\n", + ehci_info(ehci, "IAA watchdog: status %x cmd %x\n", status, cmd); end_unlink_async(ehci); }