mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mario Limonciello <mario.limonciello@amd.com>
To: "Rafael J . Wysocki" <rafael@kernel.org>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	Bjorn Helgaas <helgaas@kernel.org>
Cc: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
	<linux-acpi@vger.kernel.org>,
	Kuppuswamy Sathyanarayanan 
	<sathyanarayanan.kuppuswamy@linux.intel.com>,
	"Iain Lane" <iain@orangesquash.org.uk>,
	Shyam-sundar S-k <Shyam-sundar.S-k@amd.com>,
	Mario Limonciello <mario.limonciello@amd.com>
Subject: [PATCH v11 8/9] PCI: Split PME state selection into a local static function
Date: Wed, 9 Aug 2023 13:54:52 -0500	[thread overview]
Message-ID: <20230809185453.40916-9-mario.limonciello@amd.com> (raw)
In-Reply-To: <20230809185453.40916-1-mario.limonciello@amd.com>

When a device is not power manageable by the platform, and not already
in a low power state pci_target_state() will find the deepest state
that PME is supported and use this to select the wakeup state.

Simplify this logic and split it out to a local function. No intended
functional changes.

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
v10->v11:
 * New patch split from existing patch in v10
---
 drivers/pci/pci.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 60230da957e0c..693f4ca90452b 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2660,6 +2660,20 @@ int pci_wake_from_d3(struct pci_dev *dev, bool enable)
 }
 EXPORT_SYMBOL(pci_wake_from_d3);
 
+/*
+ * Find the deepest state from which the device can generate
+ * PME#.
+ */
+static inline pci_power_t pci_get_wake_pme_state(struct pci_dev *dev)
+{
+	pci_power_t state = PCI_D3hot;
+
+	while (state && !(dev->pme_support & (1 << state)))
+		state--;
+
+	return state;
+}
+
 /**
  * pci_target_state - find an appropriate low power state for a given PCI dev
  * @dev: PCI device
@@ -2701,21 +2715,8 @@ static pci_power_t pci_target_state(struct pci_dev *dev, bool wakeup)
 	else if (!dev->pm_cap)
 		return PCI_D0;
 
-	if (wakeup && dev->pme_support) {
-		pci_power_t state = PCI_D3hot;
-
-		/*
-		 * Find the deepest state from which the device can generate
-		 * PME#.
-		 */
-		while (state && !(dev->pme_support & (1 << state)))
-			state--;
-
-		if (state)
-			return state;
-		else if (dev->pme_support & 1)
-			return PCI_D0;
-	}
+	if (wakeup && dev->pme_support)
+		return pci_get_wake_pme_state(dev);
 
 	return PCI_D3hot;
 }
-- 
2.34.1


  parent reply	other threads:[~2023-08-09 19:48 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-09 18:54 [PATCH v11 0/9] Fix wakeup problems on some AMD platforms Mario Limonciello
2023-08-09 18:54 ` [PATCH v11 1/9] ACPI: Add comments to clarify some #ifdef statements Mario Limonciello
2023-08-09 18:54 ` [PATCH v11 2/9] ACPI: Adjust #ifdef for *_lps0_dev use Mario Limonciello
2023-08-15 18:28   ` Bjorn Helgaas
2023-08-15 18:32     ` Mario Limonciello
2023-08-16 16:57       ` Bjorn Helgaas
2023-08-09 18:54 ` [PATCH v11 3/9] ACPI: x86: s2idle: Fix a logic error parsing AMD constraints table Mario Limonciello
2023-08-15 19:20   ` Bjorn Helgaas
2023-08-09 18:54 ` [PATCH v11 4/9] ACPI: x86: s2idle: Add more debugging for AMD constraints parsing Mario Limonciello
2023-08-09 18:54 ` [PATCH v11 5/9] ACPI: x86: s2idle: Store if constraint is enabled Mario Limonciello
2023-08-09 18:54 ` [PATCH v11 6/9] ACPI: x86: s2idle: Add a function to get constraints for a device Mario Limonciello
2023-08-10 15:47   ` Andy Shevchenko
2023-08-10 15:54     ` Limonciello, Mario
2023-08-10 15:58       ` Andy Shevchenko
2023-08-10 16:01     ` [PATCH v1 1/1] ACPI: x86: s2idle: Add for_each_lpi_constraint() helper Andy Shevchenko
2023-08-09 18:54 ` [PATCH v11 7/9] PCI: ACPI: Add helper functions for converting ACPI <->PCI states Mario Limonciello
2023-08-09 18:54 ` Mario Limonciello [this message]
2023-08-10 16:21   ` [PATCH v11 8/9] PCI: Split PME state selection into a local static function Andy Shevchenko
2023-08-10 16:29     ` Limonciello, Mario
2023-08-11  8:55       ` Andy Shevchenko
2023-08-11 12:40         ` Limonciello, Mario
2023-08-09 18:54 ` [PATCH v11 9/9] PCI: ACPI: Use device constraints to decide PCI target state fallback policy Mario Limonciello
2023-08-15 23:48   ` Bjorn Helgaas
2023-08-16 12:57     ` Limonciello, Mario
2023-08-16 22:38       ` Bjorn Helgaas
2023-08-17  1:26         ` Limonciello, Mario
2023-08-17 12:13           ` Rafael J. Wysocki
2023-08-17 18:31             ` Limonciello, Mario

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230809185453.40916-9-mario.limonciello@amd.com \
    --to=mario.limonciello@amd.com \
    --cc=Shyam-sundar.S-k@amd.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=helgaas@kernel.org \
    --cc=iain@orangesquash.org.uk \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=mika.westerberg@linux.intel.com \
    --cc=rafael@kernel.org \
    --cc=sathyanarayanan.kuppuswamy@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®