]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
PCI/pwrctrl: Create pwrctrl devices only for PCI device nodes
authorManivannan Sadhasivam <manivannan.sadhasivam@oss.qualcomm.com>
Mon, 23 Feb 2026 14:46:00 +0000 (20:16 +0530)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 16 Mar 2026 22:30:43 +0000 (17:30 -0500)
A PCI host bridge node can have non-PCI child nodes (OPP tables, USB
hub, etc.) as well as PCI device child nodes.

Ensure that pwrctrl devices are only created for PCI device nodes by
checking for the 'pci' prefix in the compatible property.

Fixes: 4c4132489201 ("PCI/pwrctrl: Add APIs to create, destroy pwrctrl devices")
Reported-by: Bjorn Andersson <bjorn.andersson@oss.qualcomm.com>
Closes: https://lore.kernel.org/all/20260212-rb3gen2-upd-gl3590-v1-1-18fb04bb32b0@oss.qualcomm.com
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@oss.qualcomm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patch.msgid.link/20260223-pwrctrl-fixes-7-0-v2-2-97566dfb1809@oss.qualcomm.com
drivers/pci/pwrctrl/core.c

index 8325858cc379217f988e90781d0f25adf107ba51..7754baed67f229e90081a802cdba1254c7053d91 100644 (file)
@@ -272,7 +272,8 @@ EXPORT_SYMBOL_GPL(pci_pwrctrl_power_on_devices);
  * Check whether the pwrctrl device really needs to be created or not. The
  * pwrctrl device will only be created if the node satisfies below requirements:
  *
- * 1. Presence of compatible property to match against the pwrctrl driver (AND)
+ * 1. Presence of compatible property with "pci" prefix to match against the
+ *    pwrctrl driver (AND)
  * 2. At least one of the power supplies defined in the devicetree node of the
  *    device (OR) in the remote endpoint parent node to indicate pwrctrl
  *    requirement.
@@ -280,8 +281,14 @@ EXPORT_SYMBOL_GPL(pci_pwrctrl_power_on_devices);
 static bool pci_pwrctrl_is_required(struct device_node *np)
 {
        struct device_node *endpoint;
+       const char *compat;
+       int ret;
+
+       ret = of_property_read_string(np, "compatible", &compat);
+       if (ret < 0)
+               return false;
 
-       if (!of_property_present(np, "compatible"))
+       if (!strstarts(compat, "pci"))
                return false;
 
        if (of_pci_supply_present(np))