From patchwork Tue Jun 16 15:33:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 224504 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=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 1EF99C433E0 for ; Tue, 16 Jun 2020 15:43:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED0BF20C56 for ; Tue, 16 Jun 2020 15:43:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592322184; bh=GYKceUWiKTWd7buFEwn0Zq8KbhSyUZuX2hidA0mNV9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mnxfaGFTvvKZ1iCv5AVXAfxU937VrKw1bhVzKCNmEaxMYdVywl35gOGZH8mh8eTTU 5mq5szKgEZXMKEqZ8mYhAQE2ebdJ/ef4tfgZtY6jAacQRJFxShtJwPqDZrSUIdQ+LY 1LI9cydkEOQ9lsAtmeBcYE21BAsqWmdYfK7QSmeQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730324AbgFPPnA (ORCPT ); Tue, 16 Jun 2020 11:43:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:60124 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730511AbgFPPnA (ORCPT ); Tue, 16 Jun 2020 11:43:00 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 748E320C56; Tue, 16 Jun 2020 15:42:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592322180; bh=GYKceUWiKTWd7buFEwn0Zq8KbhSyUZuX2hidA0mNV9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kqoOMXbBBNrgkGuWOwSDLhd1h8ucAs7nTHzDfEmqHo5nVcfuoCHToGKr/6q+/ASbH OIFeAwDxUZjo5Vi91Y4hIEOtbru1ibD/4aLnW5duSTvm6iQwCHOclnNOmW70etRXKu vXMHV9eLgfYLpHeq6013ZO4rSyaU6naXQ9VIwDbw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bjorn Helgaas , Sasha Levin Subject: [PATCH 5.7 032/163] PCI/PM: Adjust pcie_wait_for_link_delay() for caller delay Date: Tue, 16 Jun 2020 17:33:26 +0200 Message-Id: <20200616153108.409749996@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200616153106.849127260@linuxfoundation.org> References: <20200616153106.849127260@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Helgaas [ Upstream commit f044baaff1eb7ae5aa7a36f1b7ad5bd8eeb672c4 ] The caller of pcie_wait_for_link_delay() specifies the time to wait after the link becomes active. When the downstream port doesn't support link active reporting, obviously we can't tell when the link becomes active, so we waited the worst-case time (1000 ms) plus 100 ms, ignoring the delay from the caller. Instead, wait for 1000 ms + the delay from the caller. Fixes: 4827d63891b6 ("PCI/PM: Add pcie_wait_for_link_delay()") Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- drivers/pci/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 595fcf59843f..6d3234f75692 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4673,10 +4673,10 @@ static bool pcie_wait_for_link_delay(struct pci_dev *pdev, bool active, /* * Some controllers might not implement link active reporting. In this - * case, we wait for 1000 + 100 ms. + * case, we wait for 1000 ms + any delay requested by the caller. */ if (!pdev->link_active_reporting) { - msleep(1100); + msleep(timeout + delay); return true; }