From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0486D26B96B; Tue, 8 Apr 2025 12:33:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744115614; cv=none; b=S+ggn3lyuItFjUc9ssPmfmaRmpvV6QgVzJ4/BJJvKGxyMZsCituHjJ0wbhscszk46VLcGKpB3aTw0yqJCiiiwrKQZnrp4n2gn9/GDbDEcBLntnItz5Ix0chWayCSovjXRB12BoyIKhMauEk1GdN7gvoa5gTbpiephx4hX/4P2F4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744115614; c=relaxed/simple; bh=TZ1Hxuk7FHCVo/oAEbVD9qaiuiGFiiNdHBv0SFdwk8w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YLpTk5DSVvUDvrj4oC8G5jAeIYrDF1VvcKzZcinXCeJzcstuMM1cg7MhE4cGJD7kvNQrmmtRikekZZ478EmXPqrJEphlkK2UimroN//1Ty7YJzIiAFbJvIwE2SXDlIEq/jlB3a7pnU/AqHhD6rrReI/LbRREyXDcbwSbwIVVk1U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0HFiTZ9h; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0HFiTZ9h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B3C9C4CEE5; Tue, 8 Apr 2025 12:33:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744115613; bh=TZ1Hxuk7FHCVo/oAEbVD9qaiuiGFiiNdHBv0SFdwk8w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0HFiTZ9h3kBgm8obk6xI2Ohoy06Lxl+XVpvnwAyIDNTBwul37FBi1VN8aOx5rYe5E r/hsDeUvrqfmZHXW6GM8AIDQyIbs2I7MzKKtcQpusNvFjCJ16cWL3XKjvw6AMeyW8M q55UWI/OoOUbENiNO1lK5NfKnOgnqjFm54UFiKvY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jim Quinlan , Florian Fainelli , Manivannan Sadhasivam , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Sasha Levin Subject: [PATCH 6.1 040/204] PCI: brcmstb: Fix potential premature regulator disabling Date: Tue, 8 Apr 2025 12:49:30 +0200 Message-ID: <20250408104821.522938232@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.266892317@linuxfoundation.org> References: <20250408104820.266892317@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jim Quinlan [ 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 Reviewed-by: Florian Fainelli Reviewed-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/20250214173944.47506-6-james.quinlan@broadcom.com [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński Signed-off-by: Sasha Levin --- drivers/pci/controller/pcie-brcmstb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 016ea0e79c3ad..3056e9b7223ec 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -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)) -- 2.39.5