]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
PCI: brcmstb: Fix potential premature regulator disabling
authorJim Quinlan <james.quinlan@broadcom.com>
Fri, 14 Feb 2025 17:39:33 +0000 (12:39 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:33:32 +0000 (14:33 +0200)
[ Upstream commit b7de1b60ecab2f7b6f05d8116e93228a0bbb8563 ]

The platform supports enabling and disabling regulators only on
ports below the Root Complex.

Thus, we need to verify this both when adding and removing the bus,
otherwise regulators may be disabled prematurely when a bus further
down the topology is removed.

Fixes: 9e6be018b263 ("PCI: brcmstb: Enable child bus device regulators from DT")
Signed-off-by: Jim Quinlan <james.quinlan@broadcom.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20250214173944.47506-6-james.quinlan@broadcom.com
[kwilczynski: commit log]
Signed-off-by: Krzysztof WilczyƄski <kwilczynski@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pci/controller/pcie-brcmstb.c

index 016ea0e79c3ad81890ce97c55b54491954cd98e6..3056e9b7223ec1970edb10ed216abe17a0c54b01 100644 (file)
@@ -1141,7 +1141,7 @@ static void brcm_pcie_remove_bus(struct pci_bus *bus)
        struct subdev_regulators *sr = pcie->sr;
        struct device *dev = &bus->dev;
 
-       if (!sr)
+       if (!sr || !bus->parent || !pci_is_root_bus(bus->parent))
                return;
 
        if (regulator_bulk_disable(sr->num_supplies, sr->supplies))