From: Mario Limonciello <mario.limonciello@amd.com>
To: "Rafael J . Wysocki" <rafael@kernel.org>,
Bjorn Helgaas <helgaas@kernel.org>
Cc: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Len Brown <lenb@kernel.org>, <linux-acpi@vger.kernel.org>,
Mario Limonciello <mario.limonciello@amd.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: [PATCH v7 1/2] PCI: Refactor pci_bridge_d3_possible()
Date: Mon, 10 Jul 2023 19:53:24 -0500 [thread overview]
Message-ID: <20230711005325.1499-2-mario.limonciello@amd.com> (raw)
In-Reply-To: <20230711005325.1499-1-mario.limonciello@amd.com>
All of the cases handled by pci_bridge_d3_possible() are specific
to these branches:
```
case PCI_EXP_TYPE_ROOT_PORT:
case PCI_EXP_TYPE_UPSTREAM:
case PCI_EXP_TYPE_DOWNSTREAM:
```
Drop a level of indentation by returning false in the default case
instead. No intended functional changes.
Acked-by: Rafael J. Wysocki <rafael@kernel.org>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
drivers/pci/pci.c | 68 +++++++++++++++++++++++------------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 60230da957e0c..f916fd76eba79 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -3004,48 +3004,48 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge)
case PCI_EXP_TYPE_ROOT_PORT:
case PCI_EXP_TYPE_UPSTREAM:
case PCI_EXP_TYPE_DOWNSTREAM:
- if (pci_bridge_d3_disable)
- return false;
+ break;
+ default:
+ return false;
+ }
- /*
- * Hotplug ports handled by firmware in System Management Mode
- * may not be put into D3 by the OS (Thunderbolt on non-Macs).
- */
- if (bridge->is_hotplug_bridge && !pciehp_is_native(bridge))
- return false;
+ if (pci_bridge_d3_disable)
+ return false;
- if (pci_bridge_d3_force)
- return true;
+ /*
+ * Hotplug ports handled by firmware in System Management Mode
+ * may not be put into D3 by the OS (Thunderbolt on non-Macs).
+ */
+ if (bridge->is_hotplug_bridge && !pciehp_is_native(bridge))
+ return false;
- /* Even the oldest 2010 Thunderbolt controller supports D3. */
- if (bridge->is_thunderbolt)
- return true;
+ if (pci_bridge_d3_force)
+ return true;
- /* Platform might know better if the bridge supports D3 */
- if (platform_pci_bridge_d3(bridge))
- return true;
+ /* Even the oldest 2010 Thunderbolt controller supports D3. */
+ if (bridge->is_thunderbolt)
+ return true;
- /*
- * Hotplug ports handled natively by the OS were not validated
- * by vendors for runtime D3 at least until 2018 because there
- * was no OS support.
- */
- if (bridge->is_hotplug_bridge)
- return false;
+ /* Platform might know better if the bridge supports D3 */
+ if (platform_pci_bridge_d3(bridge))
+ return true;
- if (dmi_check_system(bridge_d3_blacklist))
- return false;
+ /*
+ * Hotplug ports handled natively by the OS were not validated
+ * by vendors for runtime D3 at least until 2018 because there
+ * was no OS support.
+ */
+ if (bridge->is_hotplug_bridge)
+ return false;
- /*
- * It should be safe to put PCIe ports from 2015 or newer
- * to D3.
- */
- if (dmi_get_bios_year() >= 2015)
- return true;
- break;
- }
+ if (dmi_check_system(bridge_d3_blacklist))
+ return false;
- return false;
+ /*
+ * It should be safe to put PCIe ports from 2015 or newer
+ * to D3.
+ */
+ return dmi_get_bios_year() >= 2015;
}
static int pci_dev_check_d3cold(struct pci_dev *dev, void *data)
--
2.34.1
next prev parent reply other threads:[~2023-07-11 1:38 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-11 0:53 [PATCH v7 0/2] Fix wakeup problems on some AMD platforms Mario Limonciello
2023-07-11 0:53 ` Mario Limonciello [this message]
2023-07-11 0:53 ` [PATCH v7 2/2] PCI: Don't put non-power manageable PCIe root ports into D3 Mario Limonciello
2023-07-11 22:14 ` Bjorn Helgaas
2023-07-11 22:54 ` Mario Limonciello
2023-07-12 12:13 ` Rafael J. Wysocki
2023-07-12 16:09 ` Limonciello, Mario
2023-07-14 19:17 ` Rafael J. Wysocki
2023-07-15 0:46 ` Limonciello, Mario
2023-08-01 3:25 ` Mario Limonciello
2023-08-01 10:15 ` Rafael J. Wysocki
2023-08-02 3:17 ` Mario Limonciello
2023-08-02 5:26 ` Mika Westerberg
2023-08-02 14:10 ` Mario Limonciello
2023-08-02 14:31 ` Mika Westerberg
2023-08-02 14:35 ` Mario Limonciello
2023-08-02 15:00 ` Mika Westerberg
[not found] ` <67fa2dda-f383-1864-57b8-08b86263bd02@amd.com>
2023-08-01 9:54 ` Rafael J. Wysocki
2023-07-12 11:48 ` Rafael J. Wysocki
2023-07-12 15:23 ` Andy Shevchenko
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=20230711005325.1499-2-mario.limonciello@amd.com \
--to=mario.limonciello@amd.com \
--cc=helgaas@kernel.org \
--cc=lenb@kernel.org \
--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 \
/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