From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AEDAC10F29 for ; Wed, 11 Mar 2020 04:53:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F2CB02071B for ; Wed, 11 Mar 2020 04:53:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726554AbgCKEw7 (ORCPT ); Wed, 11 Mar 2020 00:52:59 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:38339 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725813AbgCKEw7 (ORCPT ); Wed, 11 Mar 2020 00:52:59 -0400 Received: from 61-220-137-37.hinet-ip.hinet.net ([61.220.137.37] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jBtMV-000640-8p; Wed, 11 Mar 2020 04:52:55 +0000 From: Kai-Heng Feng To: bhelgaas@google.com Cc: mika.westerberg@linux.intel.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Kai-Heng Feng Subject: [PATCH] PCI/PM: Skip link training delay for S3 resume Date: Wed, 11 Mar 2020 12:52:49 +0800 Message-Id: <20200311045249.5200-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit ad9001f2f411 ("PCI/PM: Add missing link delays required by the PCIe spec") added a 1100ms delay on resume for bridges that don't support Link Active Reporting. The commit also states that the delay can be skipped for S3, as the firmware should already handled the case for us. So let's skip the link training delay for S3, to save 1100ms resume time. Signed-off-by: Kai-Heng Feng --- drivers/pci/pci-driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 0454ca0e4e3f..3050375bad04 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -916,7 +916,8 @@ static int pci_pm_resume_noirq(struct device *dev) pci_fixup_device(pci_fixup_resume_early, pci_dev); pcie_pme_root_status_cleanup(pci_dev); - if (!skip_bus_pm && prev_state == PCI_D3cold) + if (!skip_bus_pm && prev_state == PCI_D3cold + && !pm_resume_via_firmware()) pci_bridge_wait_for_secondary_bus(pci_dev); if (pci_has_legacy_pm_support(pci_dev)) -- 2.17.1