Skip to content

Commit

Permalink
PCI: brcmstb: Fix missing of_node_put() in brcm_pcie_probe()
Browse files Browse the repository at this point in the history
commit 2df181e upstream.

A call to of_parse_phandle() is incrementing the refcount, and as such,
the of_node_put() must be called when the reference is no longer needed.

Thus, refactor the existing code and add a missing of_node_put() call
following the check to ensure that "msi_np" matches "pcie->np" and after
MSI initialization, but only if the MSI support is enabled system-wide.

Cc: stable@vger.kernel.org # v5.10+
Fixes: 40ca1bf ("PCI: brcmstb: Add MSI support")
Signed-off-by: Stanimir Varbanov <svarbanov@suse.de>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20250122222955.1752778-1-svarbanov@suse.de
[kwilczynski: commit log]
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Stanimir Varbanov authored and Greg Kroah-Hartman committed May 2, 2025
1 parent 2e95479 commit a2319a9
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions drivers/pci/controller/pcie-brcmstb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,7 @@ static const struct of_device_id brcm_pcie_match[] = {

static int brcm_pcie_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node, *msi_np;
struct device_node *np = pdev->dev.of_node;
struct pci_host_bridge *bridge;
const struct pcie_cfg_data *data;
struct brcm_pcie *pcie;
Expand Down Expand Up @@ -1280,9 +1280,14 @@ static int brcm_pcie_probe(struct platform_device *pdev)

pcie->hw_rev = readl(pcie->base + PCIE_MISC_REVISION);

msi_np = of_parse_phandle(pcie->np, "msi-parent", 0);
if (pci_msi_enabled() && msi_np == pcie->np) {
ret = brcm_pcie_enable_msi(pcie);
if (pci_msi_enabled()) {
struct device_node *msi_np = of_parse_phandle(pcie->np, "msi-parent", 0);

if (msi_np == pcie->np)
ret = brcm_pcie_enable_msi(pcie);

of_node_put(msi_np);

if (ret) {
dev_err(pcie->dev, "probe of internal MSI failed");
goto fail;
Expand Down

0 comments on commit a2319a9

Please sign in to comment.