From patchwork Thu Jul 14 23:16:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajvi Jingar X-Patchwork-Id: 590713 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51FB5C433EF for ; Thu, 14 Jul 2022 23:16:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240930AbiGNXQU (ORCPT ); Thu, 14 Jul 2022 19:16:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240920AbiGNXQU (ORCPT ); Thu, 14 Jul 2022 19:16:20 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6B1B70E52; Thu, 14 Jul 2022 16:16:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657840578; x=1689376578; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=FrYh3K9iwXAx6UuvS+41bwa0q58BzXMelivLnufGNBc=; b=dDipWpuB/5/6qMV0Xh9JhBItKlGvkQhthmEs4MtCASYGk0ulTBA/Vdnw +tD7sqR0Uy1315OQkuCH1768HWJZdsH+kD1lsoUjEf5YgcDI8J/8pJYuU s2wBH/tS6AZljAkzCOjL205cFYJiBLYhWx5u6JQhewBm+cS38He9vnc02 FA0jitX5RZVjrzHaUflyv4Coxu8uCD7ZD+Sfow/rzNVKWDdz+OkeiLDIq HkKo/V1yvET2vV3Hpqw5Bo4k9O2br639YO3dg9lsQ/BP3XxL1dV9KsdGX bn3hJaKlRUjCS4luVVKbqVL2UyKHxZVHWbS4R++hD7POw3EMlGl+7JQgW A==; X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="268676975" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="268676975" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 16:16:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="663970223" Received: from linux.intel.com ([10.54.29.200]) by fmsmga004.fm.intel.com with ESMTP; 14 Jul 2022 16:16:10 -0700 Received: from rjingar-desk5.amr.corp.intel.com (vicentes-mobl.amr.corp.intel.com [10.209.132.117]) by linux.intel.com (Postfix) with ESMTP id 0E86E580812; Thu, 14 Jul 2022 16:16:10 -0700 (PDT) From: Rajvi Jingar To: rafael.j.wysocki@intel.com, bhelgaas@google.com Cc: rajvi.jingar@linux.intel.com, david.e.box@linux.intel.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH v2 1/2] PCI/PM: refactor pci_pm_suspend_noirq() Date: Thu, 14 Jul 2022 16:16:08 -0700 Message-Id: <20220714231609.3962051-1-rajvi.jingar@linux.intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The state of the device is saved during pci_pm_suspend_noirq(), if it has not already been saved, regardless of the skip_bus_pm flag value. So skip_bus_pm check is removed before saving the device state. Signed-off-by: Rajvi Jingar Reviewed-by: Rafael J. Wysocki Reviewed-by: Rafael J. Wysocki --- v1->v2: no change --- drivers/pci/pci-driver.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 49238ddd39ee..1f64de3e5280 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -867,20 +867,14 @@ static int pci_pm_suspend_noirq(struct device *dev) } } - if (pci_dev->skip_bus_pm) { + if (!pci_dev->state_saved) { + pci_save_state(pci_dev); /* - * Either the device is a bridge with a child in D0 below it, or - * the function is running for the second time in a row without - * going through full resume, which is possible only during - * suspend-to-idle in a spurious wakeup case. The device should - * be in D0 at this point, but if it is a bridge, it may be - * necessary to save its state. + * If the device is a bridge with a child in D0 below it, it needs to + * stay in D0, so check skip_bus_pm to avoid putting it into a + * low-power state in that case. */ - if (!pci_dev->state_saved) - pci_save_state(pci_dev); - } else if (!pci_dev->state_saved) { - pci_save_state(pci_dev); - if (pci_power_manageable(pci_dev)) + if (!pci_dev->skip_bus_pm && pci_power_manageable(pci_dev)) pci_prepare_to_sleep(pci_dev); } From patchwork Thu Jul 14 23:16:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajvi Jingar X-Patchwork-Id: 591128 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C29AAC43334 for ; Thu, 14 Jul 2022 23:16:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240952AbiGNXQR (ORCPT ); Thu, 14 Jul 2022 19:16:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240929AbiGNXQN (ORCPT ); Thu, 14 Jul 2022 19:16:13 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9299372EEC; Thu, 14 Jul 2022 16:16:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657840572; x=1689376572; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AJL06bd9lQh2AmUSTEF0Un/ArSUeAQHW+QlFFAbUKbo=; b=k6cf54BXfmyUyXnLvxzvQIMmUCAA9P7qep2Nzj0eosegfx7L8TlZjyZK TvRmWDFMr332dgM6yF+yh3P3bqUa9SvIiqi77RqQM8kBlTcfkx+dbwa85 wNOonP9KmMqpcZxGtop2W0ZCCdTyYgdncC81W4rK1WXOpdnhnjVBi6laa xb6nfTX8Ft0CqHl7f/m78vlgc42bhDrOQX4jiJ6YeYPRaO1hV/JollrVj C/L1gf8Sq5v1rwVXbT1lmt0JVNZq8HalMbcn4vahKHVgLq8LwsV2hySEQ idGtPmBY3DD/z63sgHkV61k6TWtE0pPhu+YocudLxtX5diydMb9dj7+Wi g==; X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="268676967" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="268676967" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 16:16:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="738449838" Received: from linux.intel.com ([10.54.29.200]) by fmsmga001.fm.intel.com with ESMTP; 14 Jul 2022 16:16:11 -0700 Received: from rjingar-desk5.amr.corp.intel.com (vicentes-mobl.amr.corp.intel.com [10.209.132.117]) by linux.intel.com (Postfix) with ESMTP id 20D9958092F; Thu, 14 Jul 2022 16:16:11 -0700 (PDT) From: Rajvi Jingar To: rafael.j.wysocki@intel.com, bhelgaas@google.com Cc: rajvi.jingar@linux.intel.com, david.e.box@linux.intel.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH v2 2/2] PCI/PTM: fix to maintain pci_dev->ptm_enabled Date: Thu, 14 Jul 2022 16:16:09 -0700 Message-Id: <20220714231609.3962051-2-rajvi.jingar@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220714231609.3962051-1-rajvi.jingar@linux.intel.com> References: <20220714231609.3962051-1-rajvi.jingar@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org pci_dev->ptm_enabled needs to be maintained to reflect the current PTM state of the device. In pci_ptm_disable(), clear ptm_enabled from 'struct pci_dev' on disabling PTM state for the device. In pci_restore_ptm_state(), set dev->ptm_enabled based on the restored PTM state of the device. Also, perform ptm_enabled check in pci_ptm_disable() to avoid config space access in case if PTM is already disabled for the device. Signed-off-by: Rajvi Jingar --- v1->v2: - add ptm_enabled check in pci_ptm_disable(). - set the dev->ptm_enabled value in pci_restore_ptm_state(). --- drivers/pci/pcie/ptm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pci/pcie/ptm.c b/drivers/pci/pcie/ptm.c index 368a254e3124..8dc7d2285a0d 100644 --- a/drivers/pci/pcie/ptm.c +++ b/drivers/pci/pcie/ptm.c @@ -34,6 +34,9 @@ void pci_disable_ptm(struct pci_dev *dev) int ptm; u16 ctrl; + if (!dev->ptm_enabled) + return; + if (!pci_is_pcie(dev)) return; @@ -44,6 +47,7 @@ void pci_disable_ptm(struct pci_dev *dev) pci_read_config_word(dev, ptm + PCI_PTM_CTRL, &ctrl); ctrl &= ~(PCI_PTM_CTRL_ENABLE | PCI_PTM_CTRL_ROOT); pci_write_config_word(dev, ptm + PCI_PTM_CTRL, ctrl); + dev->ptm_enabled = 0; } void pci_save_ptm_state(struct pci_dev *dev) @@ -83,6 +87,7 @@ void pci_restore_ptm_state(struct pci_dev *dev) cap = (u16 *)&save_state->cap.data[0]; pci_write_config_word(dev, ptm + PCI_PTM_CTRL, *cap); + dev->ptm_enabled = !!(*cap & PCI_PTM_CTRL_ENABLE); } void pci_ptm_init(struct pci_dev *dev)