Commit 6168efbe authored by Mayank Rana's avatar Mayank Rana Committed by Bjorn Helgaas
Browse files

PCI: starfive: Enable controller runtime PM before probing host bridge 

A PCI controller device, e.g., StarFive, is parent to PCI host bridge
device. We must enable runtime PM of the controller before enabling runtime
PM of the host bridge, which will happen in pci_host_probe(), to avoid this
warning:

  pcie-starfive 940000000.pcie: Enabling runtime PM for inactive device with active children

Fix this issue by enabling StarFive controller device's runtime PM before
calling pci_host_probe() in plda_pcie_host_init().

Link: https://lore.kernel.org/r/20241111-runtime_pm-v7-1-9c164eefcd87@quicinc.com


Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarMayank Rana <quic_mrana@quicinc.com>
[bhelgaas: commit log]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
parent 9852d85e

drivers/pci/controller/plda/pcie-starfive.c

+7 −3
Original line number Diff line number Diff line
@@ -404,6 +404,9 @@ static int starfive_pcie_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	pm_runtime_enable(&pdev->dev);

	pm_runtime_get_sync(&pdev->dev);



	plda->host_ops = &sf_host_ops;

	plda->num_events = PLDA_MAX_EVENT_NUM;

	/* mask doorbell event */
@@ -413,11 +416,12 @@ static int starfive_pcie_probe(struct platform_device *pdev) 
	plda->events_bitmap <<= PLDA_NUM_DMA_EVENTS;

	ret = plda_pcie_host_init(&pcie->plda, &starfive_pcie_ops,

				  &stf_pcie_event);

	if (ret)

	if (ret) {

		pm_runtime_put_sync(&pdev->dev);

		pm_runtime_disable(&pdev->dev);

		return ret;

	}



	pm_runtime_enable(&pdev->dev);

	pm_runtime_get_sync(&pdev->dev);

	platform_set_drvdata(pdev, pcie);



	return 0;