On Thu, Jan 23, 2025 at 12:29:55AM +0200, Stanimir Varbanov wrote:
> A call to of_parse_phandle() is incrementing the refcount, of_node_put
> must be called when done the work on it. Add missing of_node_put() after
> the check for msi_np == np and MSI initialization.
>
> Cc: stable@xxxxxxxxxxxxxxx # v5.10+
> Fixes: 40ca1bf580ef ("PCI: brcmstb: Add MSI support")
> Signed-off-by: Stanimir Varbanov <svarbanov@xxxxxxx>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>
- Mani
> ---
> v1 -> v2:
> - Use of_node_put instead of cleanups (Florian).
> - Sent the patch separately from PCIe 2712 series (Florian).
>
> drivers/pci/controller/pcie-brcmstb.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
> index 744fe1a4cf9c..d171ee61eab3 100644
> --- a/drivers/pci/controller/pcie-brcmstb.c
> +++ b/drivers/pci/controller/pcie-brcmstb.c
> @@ -1844,7 +1844,7 @@ static struct pci_ops brcm7425_pcie_ops = {
>
> 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;
> @@ -1944,9 +1944,14 @@ static int brcm_pcie_probe(struct platform_device *pdev)
> goto fail;
> }
>
> - 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;
> --
> 2.47.0
>
--
மணிவண்ணன் சதாசிவம்
