Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2240503ybg; Sun, 27 Oct 2019 14:10:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqzBAK2BdrtHIgbw/3XTP4eCyivJ7IOEAjNDagUrriPaE8+akV20RWIUDZ1xhmtIuSZrbrzr X-Received: by 2002:aa7:cc95:: with SMTP id p21mr16079260edt.189.1572210614769; Sun, 27 Oct 2019 14:10:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572210614; cv=none; d=google.com; s=arc-20160816; b=nUW1/eqog5kn9CjUEpl/fWR0tBhvwdGqkaRVVSGCTyCtmkmVeOcPZT8YT1AeyV+uzK r9AJKJXzUlCHRfw3DYs/pdC93/CGqrDEiDGMp6bomqJrqWV0hSCDbp+et593A5co9wlt Y8qPjkclYLJRjs0MlZ3X4A8yMcYOI7/6S6EjTRFPKoFdLk+hSXYr+ZhNSfRjlx1j2BD1 yOda3pFwNsvjINsodDZv7hxKjI381uq/aV2BreXANiSqL2EhelSWm0KlV0AQlZUve2B8 NsCkpD4dVgd7repH6lVF8c7DVNmDCBgsnkahdnCTO0qFDZqCgAcUOBaobfHhMjMUS/mS BLCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=B23ZEKeNHvDTT4FvQ/6kRkURPbWpRxpauDCMNZseMBI=; b=pL1ahhKBqP84IlU4ik6FzgDctqe4UFi7HFxhXOGq69z5ErRSP4Ag5U7J+1H4YZSFdT TIIyZFvpKbmShxnR0ui9rTRmUUtVXFczEzt+QVWtdzwGJhOJ1TTrxvxLRO72GdhA1DcQ t0BDyYCXsOzl0W+/0It5DdRqMDXLc6bQgcUgep6aifuPgfAJj5ZKZr2CLFQRNYzbFaM8 ebOwi1JaR4a26df929TVCudZn1nHZMqkDLSCFpWqRhUuLwt+uDSXTyRBmRA6nBRTDIsB n/Mxi/fvad05VtA1iNNwLmduD5nQ/gRH6vSNaVem2BI9tZdsiPidtOqcc7cxpYi2H3x2 Ma0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=A83qr1HJ; 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 k23si5158845ejr.298.2019.10.27.14.09.51; Sun, 27 Oct 2019 14:10:14 -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; dkim=pass header.i=@kernel.org header.s=default header.b=A83qr1HJ; 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 S1729010AbfJ0VG2 (ORCPT + 99 others); Sun, 27 Oct 2019 17:06:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:52380 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727503AbfJ0VGY (ORCPT ); Sun, 27 Oct 2019 17:06:24 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 1B26221783; Sun, 27 Oct 2019 21:06:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210383; bh=4kpBjFVHBtSenIMSIQp2j0JOTMmGi0qrCsyJrZ/a9kY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A83qr1HJLlwNb5J4CcpDNu9UyJYDtdc+WeaGfCFRU7z59YGeHImNSKwmUHxd74Ne8 zDKZvsZn2Rc+wjyhXxfQaz4jnFVaLUUQFG1wmnmbdI980huJCqg0/wb083mGUm9efj fK82wnZQ+8n58bEAMC+HjN/Hl9WF8vFAXKH8v5oI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Drake , "Rafael J. Wysocki" , Bjorn Helgaas Subject: [PATCH 4.9 47/49] PCI: PM: Fix pci_power_up() Date: Sun, 27 Oct 2019 22:01:25 +0100 Message-Id: <20191027203205.369411821@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203119.468466356@linuxfoundation.org> References: <20191027203119.468466356@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki commit 45144d42f299455911cc29366656c7324a3a7c97 upstream. There is an arbitrary difference between the system resume and runtime resume code paths for PCI devices regarding the delay to apply when switching the devices from D3cold to D0. Namely, pci_restore_standard_config() used in the runtime resume code path calls pci_set_power_state() which in turn invokes __pci_start_power_transition() to power up the device through the platform firmware and that function applies the transition delay (as per PCI Express Base Specification Revision 2.0, Section 6.6.1). However, pci_pm_default_resume_early() used in the system resume code path calls pci_power_up() which doesn't apply the delay at all and that causes issues to occur during resume from suspend-to-idle on some systems where the delay is required. Since there is no reason for that difference to exist, modify pci_power_up() to follow pci_set_power_state() more closely and invoke __pci_start_power_transition() from there to call the platform firmware to power up the device (in case that's necessary). Fixes: db288c9c5f9d ("PCI / PM: restore the original behavior of pci_set_power_state()") Reported-by: Daniel Drake Tested-by: Daniel Drake Link: https://lore.kernel.org/linux-pm/CAD8Lp44TYxrMgPLkHCqF9hv6smEurMXvmmvmtyFhZ6Q4SE+dig@mail.gmail.com/T/#m21be74af263c6a34f36e0fc5c77c5449d9406925 Signed-off-by: Rafael J. Wysocki Acked-by: Bjorn Helgaas Cc: 3.10+ # 3.10+ Signed-off-by: Greg Kroah-Hartman --- drivers/pci/pci.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -754,19 +754,6 @@ void pci_update_current_state(struct pci } /** - * pci_power_up - Put the given device into D0 forcibly - * @dev: PCI device to power up - */ -void pci_power_up(struct pci_dev *dev) -{ - if (platform_pci_power_manageable(dev)) - platform_pci_set_power_state(dev, PCI_D0); - - pci_raw_set_power_state(dev, PCI_D0); - pci_update_current_state(dev, PCI_D0); -} - -/** * pci_platform_power_transition - Use platform to change device power state * @dev: PCI device to handle. * @state: State to put the device into. @@ -942,6 +929,17 @@ int pci_set_power_state(struct pci_dev * EXPORT_SYMBOL(pci_set_power_state); /** + * pci_power_up - Put the given device into D0 forcibly + * @dev: PCI device to power up + */ +void pci_power_up(struct pci_dev *dev) +{ + __pci_start_power_transition(dev, PCI_D0); + pci_raw_set_power_state(dev, PCI_D0); + pci_update_current_state(dev, PCI_D0); +} + +/** * pci_choose_state - Choose the power state of a PCI device * @dev: PCI device to be suspended * @state: target sleep state for the whole system. This is the value