Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18c4342a authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by Bjorn Helgaas
Browse files

PCI: iproc: Directly add PCI resources 



The struct iproc_pcie.resources member was pointing to a stack variable and
is invalid after the registration function returned.

Remove this pointer and add a parameter to the function.

Tested-by: default avatarRay Jui <rjui@broadcom.com>
Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarRay Jui <rjui@broadcom.com>
parent 4785ffbd

drivers/pci/host/pcie-iproc-bcma.c

+1 −3
Original line number Diff line number Diff line
@@ -62,11 +62,9 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev) 
	res_mem.flags = IORESOURCE_MEM;

	pci_add_resource(&res, &res_mem);



	pcie->resources = &res;



	pcie->map_irq = iproc_pcie_bcma_map_irq;



	ret = iproc_pcie_setup(pcie);

	ret = iproc_pcie_setup(pcie, &res);

	if (ret) {

		dev_err(pcie->dev, "PCIe controller setup failed\n");

		return ret;

drivers/pci/host/pcie-iproc-platform.c

+1 −3
Original line number Diff line number Diff line
@@ -69,11 +69,9 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev) 
		return ret;

	}



	pcie->resources = &res;



	pcie->map_irq = of_irq_parse_and_map_pci;



	ret = iproc_pcie_setup(pcie);

	ret = iproc_pcie_setup(pcie, &res);

	if (ret) {

		dev_err(pcie->dev, "PCIe controller setup failed\n");

		return ret;

drivers/pci/host/pcie-iproc.c

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void iproc_pcie_enable(struct iproc_pcie *pcie) 
	writel(SYS_RC_INTX_MASK, pcie->base + SYS_RC_INTX_EN);

}



int iproc_pcie_setup(struct iproc_pcie *pcie)

int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)

{

	int ret;

	struct pci_bus *bus;
@@ -211,7 +211,7 @@ int iproc_pcie_setup(struct iproc_pcie *pcie) 
	pcie->sysdata.private_data = pcie;



	bus = pci_create_root_bus(pcie->dev, 0, &iproc_pcie_ops,

				  &pcie->sysdata, pcie->resources);

				  &pcie->sysdata, res);

	if (!bus) {

		dev_err(pcie->dev, "unable to create PCI root bus\n");

		ret = -ENOMEM;

drivers/pci/host/pcie-iproc.h

+1 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
struct iproc_pcie {

	struct device *dev;

	void __iomem *base;

	struct list_head *resources;

	struct pci_sys_data sysdata;

	struct pci_bus *root_bus;

	struct phy *phy;
@@ -37,7 +36,7 @@ struct iproc_pcie { 
	int (*map_irq)(const struct pci_dev *, u8, u8);

};



int iproc_pcie_setup(struct iproc_pcie *pcie);

int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res);

int iproc_pcie_remove(struct iproc_pcie *pcie);



#endif /* _PCIE_IPROC_H */