From patchwork Wed Aug 23 07:51:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Nyman X-Patchwork-Id: 9916789 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B5BA360327 for ; Wed, 23 Aug 2017 07:48:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7173274D1 for ; Wed, 23 Aug 2017 07:48:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B8E52870B; Wed, 23 Aug 2017 07:48:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D481274D1 for ; Wed, 23 Aug 2017 07:48:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753416AbdHWHsl (ORCPT ); Wed, 23 Aug 2017 03:48:41 -0400 Received: from mga07.intel.com ([134.134.136.100]:19806 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753386AbdHWHsk (ORCPT ); Wed, 23 Aug 2017 03:48:40 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP; 23 Aug 2017 00:48:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,415,1498546800"; d="scan'208";a="1209297573" Received: from mattu-haswell.fi.intel.com (HELO [10.237.72.164]) ([10.237.72.164]) by fmsmga002.fm.intel.com with ESMTP; 23 Aug 2017 00:48:16 -0700 Subject: Re: Possible regression between 4.9 and 4.13 To: Felipe Balbi , Mason , linux-pci , linux-usb , Linux ARM References: <4dee5523-2d76-e731-6e81-f3027e88827f@free.fr> <87a82qbyv5.fsf@linux.intel.com> Cc: Bjorn Helgaas , Alan Stern , Greg Kroah-Hartman From: Mathias Nyman Message-ID: <599D3410.9050504@intel.com> Date: Wed, 23 Aug 2017 10:51:44 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <87a82qbyv5.fsf@linux.intel.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 23.08.2017 09:07, Felipe Balbi wrote: > > Hi, > > Mason writes: >> Hello, >> >> The driver for my system's PCIe host bridge landed recently >> (in 4.13) but it was developed on 4.9 >> >> I tested the PCIe host bridge by plugging a 4-port USB3 adapter >> into the PCIe slot (system at rest) and plugging an USB3 Flash >> drive into the USB3 adapter (at run-time). >> >> On 4.9, the setup works (almost perfectly, see below). >> On 4.13, once I unplug the Flash drive, the controller port >> remains unresponsive. >> >> >> On 4.9, I said *almost* perfectly, because the pcieport driver >> does report a few non-fatal errors when I unplug: >> >> [ 193.838504] usb 2-2: new SuperSpeed USB device number 2 using xhci_hcd >> [ 193.878081] usb-storage 2-2:1.0: USB Mass Storage device detected >> [ 193.884547] scsi host0: usb-storage 2-2:1.0 >> [ 194.907936] scsi 0:0:0:0: Direct-Access Kingston DataTraveler 3.0 PQ: 0 ANSI: 6 >> [ 194.920296] sd 0:0:0:0: [sda] 15109516 512-byte logical blocks: (7.74 GB/7.20 GiB) >> [ 194.928666] sd 0:0:0:0: [sda] Write Protect is off >> [ 194.933755] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA >> [ 194.946074] sda: sda1 >> [ 194.953608] sd 0:0:0:0: [sda] Attached SCSI removable disk >> >> [ 208.930260] pcieport 0000:00:00.0: AER: Uncorrected (Non-Fatal) error received: id=0000 >> [ 208.938342] pcieport 0000:00:00.0: PCIe Bus Error: severity=Uncorrected (Non-Fatal), type=Transaction Layer, id=0000(Requester ID) >> [ 208.950163] pcieport 0000:00:00.0: device [1105:0024] error status/mask=00004000/00000000 >> [ 208.958577] pcieport 0000:00:00.0: [14] Completion Timeout (First) >> [ 208.965432] pcieport 0000:00:00.0: AER: Device recovery failed >> [ 209.663733] xhci_hcd 0000:01:00.0: Cannot set link state. >> [ 209.669194] usb usb2-port2: cannot disable (err = -32) >> [ 209.674376] usb 2-2: USB disconnect, device number 2 >> [ 209.680481] pcieport 0000:00:00.0: AER: Uncorrected (Non-Fatal) error received: id=0000 >> [ 209.688689] pcieport 0000:00:00.0: PCIe Bus Error: severity=Uncorrected (Non-Fatal), type=Transaction Layer, id=0000(Requester ID) >> [ 209.700555] pcieport 0000:00:00.0: device [1105:0024] error status/mask=00004000/00000000 >> [ 209.708978] pcieport 0000:00:00.0: [14] Completion Timeout (First) >> [ 209.715845] pcieport 0000:00:00.0: AER: Device recovery failed >> [ 209.721722] pcieport 0000:00:00.0: AER: Uncorrected (Non-Fatal) error received: id=0000 >> [ 209.729785] pcieport 0000:00:00.0: PCIe Bus Error: severity=Uncorrected (Non-Fatal), type=Transaction Layer, id=0000(Requester ID) >> [ 209.741602] pcieport 0000:00:00.0: device [1105:0024] error status/mask=00004000/00000000 >> [ 209.750027] pcieport 0000:00:00.0: [14] Completion Timeout (First) >> [ 209.756866] pcieport 0000:00:00.0: AER: Device recovery failed >> >> After that, I can still plug the drive into the same port. >> >> But on 4.13, I get >> >> [ 27.330378] usb 2-2: new SuperSpeed USB device number 2 using xhci_hcd >> [ 27.369383] usb-storage 2-2:1.0: USB Mass Storage device detected >> [ 27.375840] scsi host0: usb-storage 2-2:1.0 >> [ 28.403035] scsi 0:0:0:0: Direct-Access Kingston DataTraveler 3.0 PQ: 0 ANSI: 6 >> [ 28.413326] sd 0:0:0:0: [sda] 15109516 512-byte logical blocks: (7.74 GB/7.20 GiB) >> [ 28.423653] sd 0:0:0:0: [sda] Write Protect is off >> [ 28.429139] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA >> [ 28.441529] sda: sda1 >> [ 28.449431] sd 0:0:0:0: [sda] Attached SCSI removable disk >> >> [ 90.592134] xhci_hcd 0000:01:00.0: xHCI host controller not responding, assume dead >> [ 90.599857] xhci_hcd 0000:01:00.0: HC died; cleaning up >> [ 90.605336] usb 2-2: USB disconnect, device number 2 >> [ 90.630414] udevd[955]: inotify_add_watch(6, /dev/sda, 10) failed: No such file or directory >> >> Trying to replug into the same port = nothing happens >> (Linux did say "assume dead") >> >> Any idea what could have changed between 4.9 and 4.13 ? >> > > Quite a bit: > > $ git rev-list --no-merges --count v4.13-rc6 ^v4.9 -- drivers/usb/host/xhci drivers/usb/core/ > 58 > very likely cause is the more aggressive detection of pci removed xhci hosts See commit d9f11ba9f107aa335091ab8d7ba5eea714e46e8b xhci: Rework how we handle unresponsive or hoptlug removed hosts It checks if a xhci register reads returns 0xffffffff and assumes xhci died in that case. Could you add something like the below to check which what is killing the host? Or a BUG()/WARN() in xhci_hc_died() to get a backtrace of who called it. Thanks Mathias diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 51cd4b8..ade2ad6 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -922,7 +922,8 @@ void xhci_hc_died(struct xhci_hcd *xhci) if (xhci->xhc_state & XHCI_STATE_DYING) return; - xhci_err(xhci, "xHCI host controller not responding, assume dead\n"); + xhci_err(xhci, "xHC not responding in %pf, assume controller is dead\n", + __builtin_return_address(0)); xhci->xhc_state |= XHCI_STATE_DYING; xhci_cleanup_command_queue(xhci);