From patchwork Fri Jan 10 03:18:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1220768 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=lGa1yXGG; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47v7VW2TtSz9sR4; Fri, 10 Jan 2020 14:18:41 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ipkom-0003ii-Kr; Fri, 10 Jan 2020 03:18:36 +0000 Received: from mail-pj1-f67.google.com ([209.85.216.67]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ipkok-0003iE-Fk for kernel-team@lists.ubuntu.com; Fri, 10 Jan 2020 03:18:34 +0000 Received: by mail-pj1-f67.google.com with SMTP id n96so362708pjc.3 for ; Thu, 09 Jan 2020 19:18:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=SNsTG9Y3CYWRj1DZFMbqWPFu218VjadWF1BVE/Ckcdw=; b=lGa1yXGGfiBxcfSYK5gI6NFFXK79gHMGgjX+srA8rvUPv59G+FwPtttBbiE9GAGEm0 dyCRllxWcpMY1/Q0Q9VBL1kI8yM+1MDEMZBZYAbsnYyNydMs+8BKBtmSD3irD1vB8i9L yCU6xNFRS3Lkdkt2uetoeKumEdkPcOGKoIPvqlR1X8zK8ieKXzkpALdhmjWvMUYOiy00 abqCyuJINB77x7bZuRXIM2HglsYKyLYFTPzGMZHZCj5pz0gVxPfSnkvIJJYpoTvyHdik bOrA+ShFIuVjZsBAy1GoHRxlCubdGtwXixJB6QGMAKs1LxffC29L0dxxBbv5oE+Mumh1 gSCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=SNsTG9Y3CYWRj1DZFMbqWPFu218VjadWF1BVE/Ckcdw=; b=XJm8KTi4tsK0vSMKnMO0NlXmLQMQc1nG2TasfJY6ZZ1Xv/9bjHdgtLu7l7gX+6wEIT gNT+So81Qg1LXapnLHUn898f+Y6j91Q5nHtEOAsjegWA7iXsbs17GhyaVijvxSoCOTJW 2pqOSNxXrNma0B0nY9YtP0Pj2TflM7vSqYC8BvgoDkgjHXXiWmZSbRIkrAuV8EetpwW8 qlDx1+XHF4erikfxyMzjZ66/9OF13OedEGNJhd7ixLuPbJQcYo1Iss9f7OX2xWJlvE6w WlMAOJ8Tp62kOcv1/6no4Ah1/eEIDpPgOLKkb+MxE1sB3xe7XpLqQyjf5U00Jr4PJtSH Uumg== X-Gm-Message-State: APjAAAUKFTbz9A1m6Z2MMQRTdTuWH66J7UgrziGxX3i+ygPht0WwXWbn +cFlrYTNaUk5AgtuzfjjzbjpsvL9pZY= X-Google-Smtp-Source: APXvYqxBUclcl0G6aM1AYMhZP7dSsbfk2nCxb6EopEfLEBCukv7zdsq01dz1cEGJERi6OXDduSgtEQ== X-Received: by 2002:a17:902:7c95:: with SMTP id y21mr1580981pll.150.1578626312621; Thu, 09 Jan 2020 19:18:32 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id c1sm514172pfo.44.2020.01.09.19.18.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Jan 2020 19:18:32 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][B] UBUNTU: SAUCE: PCI: Avoid ASMedia XHCI USB PME# from D0 defect Date: Fri, 10 Jan 2020 11:18:25 +0800 Message-Id: <20200110031825.14925-3-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200110031825.14925-1-acelan.kao@canonical.com> References: <20200110031825.14925-1-acelan.kao@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Kai-Heng Feng BugLink: https://bugs.launchpad.net/bugs/1858988 The ASMedia USB XHCI Controller claims to support generating PME# while in D0: 01:00.0 USB controller: ASMedia Technology Inc. Device 2142 (prog-if 30 [XHCI]) Subsystem: SUNIX Co., Ltd. Device 312b Capabilities: [78] Power Management version 3 Flags: PMEClk- DSI- D1- D2- AuxCurrent=55mA PME(D0+,D1-,D2-,D3hot-,D3cold-) Status: D0 NoSoftRst+ PME-Enable+ DSel=0 DScale=0 PME- However PME# only gets asserted when plugging USB 2.0 or USB 1.1 devices, but not for USB 3.0 devices. So remove PCI_PM_CAP_PME_D0 to avoid using PME under D0. (backported from https://lkml.org/lkml/2019/12/19/1249) Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=205919 Signed-off-by: Kai-Heng Feng --- drivers/pci/quirks.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 0ef7711d3394..6131aedf6487 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4951,3 +4951,14 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY, 16, quirk_nvidia_hda); DECLARE_PCI_FIXUP_CLASS_RESUME_EARLY(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY, 16, quirk_nvidia_hda); + +/* + * Device [1b21:2142] + * When in D0, PME# doesn't get asserted when plugging USB 3.0 device. + */ +static void pci_fixup_no_d0_pme(struct pci_dev *dev) +{ + pci_info(dev, "PME# does not work under D0, disabling it\n"); + dev->pme_support &= ~(PCI_PM_CAP_PME_D0 >> PCI_PM_CAP_PME_SHIFT); +} +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x2142, pci_fixup_no_d0_pme);