Received: by 10.213.65.68 with SMTP id h4csp506216imn; Fri, 16 Mar 2018 09:49:39 -0700 (PDT) X-Google-Smtp-Source: AG47ELvxlUFYqKyvUbAdLtwvC1xA6p4krUC6k/1BUqsCwp+ncGQEx2Gl+COCKByf/6lzZnnuzWvp X-Received: by 2002:a17:902:650e:: with SMTP id b14-v6mr693826plk.147.1521218979202; Fri, 16 Mar 2018 09:49:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521218979; cv=none; d=google.com; s=arc-20160816; b=dSkDDxr+dnJOTQNdeNLOXHWak0sXxKQ0I+B37R5PRVrIOfwgeR++mil/FTcKo/tYES XF/SO/4VOQbMExAYmHy/8Xjg3al/lZej/e7I6iwFR/VSgd8kO+Ku9oaEWE7KEEZJa1Ap 7SYnj1bw7MpBekGGF527bhm+wdjcUE3Zoz6YqbgpAsoCEDdB807IZa0GAP0Vzlc4rgIR uO5RBOWFB30GAWuaOxirupVTyHYjNalV5tZF+3T1Q3LoVnQcQR7bGXnqmqcKNW1uXz+1 Lub5EUWzrIpI6405IECZ/s2BSx+3UEF0dTEbPxxJuegYqK9TFogINPWw/FqWheBWxc0Z jA8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Yxpap60CwzPJsSSXFlsenjZFmSOrqH09U03rjVfUAl4=; b=oLrpdWQ3Z/6cun6cqePbQsAf6JTuZx3xy7sIkWsLEjujJaHEAGmIbT0EpH27TynerY OwcnL6bGeBsTR0j6nZEGXIyNWPkk2uGJGhCKWpmVJqoHkKc7yGktUOwiQku/U/WgJzQD CkeJWGeDoG97V2xXtOBPhnx7nXG4a5JpFl30qY2rEoeqQI+k2Z0TGwfI5m56EcQVVFpp SCbtjeGaLwJBrEdUOP5iNXT1vYfvSLmvf9YHcMnyhCMX9vca6WLzgyaM99w39OmJTbak H9FMuF8XY3buFQRHvBfAS9itkbiHgNguhNYMrTfMMnvzWD+gJZsTHx63Frf1UWmg1Jlk P6mA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ba10-v6si6422498plb.5.2018.03.16.09.49.25; Fri, 16 Mar 2018 09:49:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934108AbeCPPfP (ORCPT + 99 others); Fri, 16 Mar 2018 11:35:15 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:39726 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934026AbeCPPfL (ORCPT ); Fri, 16 Mar 2018 11:35:11 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id B030A1065; Fri, 16 Mar 2018 15:35:10 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kai-Heng Feng , Mathias Nyman Subject: [PATCH 4.14 009/109] xhci: Fix front USB ports on ASUS PRIME B350M-A Date: Fri, 16 Mar 2018 16:22:38 +0100 Message-Id: <20180316152330.341561997@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180316152329.844663293@linuxfoundation.org> References: <20180316152329.844663293@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kai-Heng Feng commit 191edc5e2e515aab1075a3f0ef23599e80be5f59 upstream. When a USB device gets plugged on ASUS PRIME B350M-A's front ports, the xHC stops working: [ 549.114587] xhci_hcd 0000:02:00.0: WARN: xHC CMD_RUN timeout [ 549.114608] suspend_common(): xhci_pci_suspend+0x0/0xc0 returns -110 [ 549.114638] xhci_hcd 0000:02:00.0: can't suspend (hcd_pci_runtime_suspend returned -110) Delay before running xHC command CMD_RUN can workaround the issue. Use a new quirk to make the delay only targets to the affected xHC. Signed-off-by: Kai-Heng Feng Signed-off-by: Mathias Nyman Cc: stable Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-pci.c | 3 +++ drivers/usb/host/xhci.c | 3 +++ drivers/usb/host/xhci.h | 1 + 3 files changed, 7 insertions(+) --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -134,6 +134,9 @@ static void xhci_pci_quirks(struct devic if (pdev->vendor == PCI_VENDOR_ID_AMD && usb_amd_find_chipset_info()) xhci->quirks |= XHCI_AMD_PLL_FIX; + if (pdev->vendor == PCI_VENDOR_ID_AMD && pdev->device == 0x43bb) + xhci->quirks |= XHCI_SUSPEND_DELAY; + if (pdev->vendor == PCI_VENDOR_ID_AMD) xhci->quirks |= XHCI_TRUST_TX_LENGTH; --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -887,6 +887,9 @@ int xhci_suspend(struct xhci_hcd *xhci, clear_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags); del_timer_sync(&xhci->shared_hcd->rh_timer); + if (xhci->quirks & XHCI_SUSPEND_DELAY) + usleep_range(1000, 1500); + spin_lock_irq(&xhci->lock); clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); clear_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags); --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1830,6 +1830,7 @@ struct xhci_hcd { #define XHCI_LIMIT_ENDPOINT_INTERVAL_7 (1 << 26) /* Reserved. It was XHCI_U2_DISABLE_WAKE */ #define XHCI_ASMEDIA_MODIFY_FLOWCONTROL (1 << 28) +#define XHCI_SUSPEND_DELAY (1 << 30) unsigned int num_active_eps; unsigned int limit_active_eps;