From patchwork Thu Jul 7 17:22:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajvi Jingar X-Patchwork-Id: 589714 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 0CB82CCA479 for ; Thu, 7 Jul 2022 17:22:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236345AbiGGRWO (ORCPT ); Thu, 7 Jul 2022 13:22:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236406AbiGGRWM (ORCPT ); Thu, 7 Jul 2022 13:22:12 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4526133A23; Thu, 7 Jul 2022 10:22:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657214531; x=1688750531; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=dgCPOoH+hXfK+iqKwqQrHEg8bHUcSkmFz7OpBodBAww=; b=OfL8ZsgQvJj29IKfgYwxa/OW6O1cud71Kk2wWy6/B7liV6jo9tUJMEy8 o4rIIGWBpZs4xCYN8sENbskPNenuXCaPIqQE1Axi7itMVDywmUM6kD3wq F6PRQ0/aOIgQU1khgObfQ0kCCFrtGDBBx0FZYWnG6zV1xYQy0KNYcz4AF f1aUCyWt+hgrRbcVZBzmy+Sq7XLcdMUmk5EQvLXV0Kyyg4dYgFJ5TFZbJ CvK3QtCep2CUzlOxw4Zjk+EHqPEm7MAn5z2wSnVBcdRDHDznQ0iCKX8SB 5eKzb0YHhs7zSxElZd5CgeoH4ZVvHWz0nRy0F2eFOMsBnY+QHsep9faO5 w==; X-IronPort-AV: E=McAfee;i="6400,9594,10401"; a="282832819" X-IronPort-AV: E=Sophos;i="5.92,253,1650956400"; d="scan'208";a="282832819" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2022 10:22:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,253,1650956400"; d="scan'208";a="651219178" Received: from linux.intel.com ([10.54.29.200]) by fmsmga008.fm.intel.com with ESMTP; 07 Jul 2022 10:22:09 -0700 Received: from rjingar-desk5.amr.corp.intel.com (bodunhu-mobl2.amr.corp.intel.com [10.212.24.246]) by linux.intel.com (Postfix) with ESMTP id 4D6EA5805BD; Thu, 7 Jul 2022 10:22:09 -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 1/2] PCI/PM: refactor pci_pm_suspend_noirq() Date: Thu, 7 Jul 2022 10:22:04 -0700 Message-Id: <20220707172205.3205110-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 --- This patch is a resend of https://lkml.org/lkml/2022/6/8/1462 --- 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 7 17:22:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajvi Jingar X-Patchwork-Id: 588394 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 EEF70CCA47F for ; Thu, 7 Jul 2022 17:22:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236550AbiGGRWP (ORCPT ); Thu, 7 Jul 2022 13:22:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236534AbiGGRWO (ORCPT ); Thu, 7 Jul 2022 13:22:14 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DEDD3334E; Thu, 7 Jul 2022 10:22: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=1657214532; x=1688750532; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HUimZf7HoEWGh+Aq/BPcPg5jvGhcXWpO39wKqcUuszU=; b=a30fx40e2eSDksIjpXvqz2eNyBuxP03GkyjnzjyNJOAhKoZG6OfMvRjz SjbI2b58w3FM3mKS9IzEegS+4g3fVnVXHPw9LYuZRCmzvo1fBY86piEX8 9NzOkW0RktC15oEGJ6hq3E6HcquwTtVudEW98TguOGYN9ShSWL5mWVv/a qtb3BiPh7WYeoAUCiIEFjoN61f/aQMRf8R7fwW97PCqTwPrR//wP5XVvI 4F/tjH3yGtJ+mTYlNY8KbTJQ05kGGEUbBmEnr9Si2c851JicoMY+39CYZ yiLZZinhWMGmT9dKElxfdeANbYSHxj3IfFNpHhd1cIwmxvgc6sgjW2Ah7 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10401"; a="348063772" X-IronPort-AV: E=Sophos;i="5.92,253,1650956400"; d="scan'208";a="348063772" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2022 10:22:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,253,1650956400"; d="scan'208";a="626393546" Received: from linux.intel.com ([10.54.29.200]) by orsmga001.jf.intel.com with ESMTP; 07 Jul 2022 10:22:11 -0700 Received: from rjingar-desk5.amr.corp.intel.com (bodunhu-mobl2.amr.corp.intel.com [10.212.24.246]) by linux.intel.com (Postfix) with ESMTP id C7A81580BE9; Thu, 7 Jul 2022 10:22: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 2/2] PCI/PTM: fix in pci_disable_ptm() Date: Thu, 7 Jul 2022 10:22:05 -0700 Message-Id: <20220707172205.3205110-2-rajvi.jingar@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220707172205.3205110-1-rajvi.jingar@linux.intel.com> References: <20220707172205.3205110-1-rajvi.jingar@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Set ptm_enabled from 'struct pci_dev' to 0 in pci_ptm_disable() to save the disabled PTM state for the device. Fixes: a697f072f5da ("PCI: Disable PTM during suspend to save power") Signed-off-by: Rajvi Jingar --- drivers/pci/pcie/ptm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pci/pcie/ptm.c b/drivers/pci/pcie/ptm.c index 368a254e3124..746e29779c27 100644 --- a/drivers/pci/pcie/ptm.c +++ b/drivers/pci/pcie/ptm.c @@ -44,6 +44,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)