p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Ray Jui <rjui@broadcom.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Ray Jui <rjui@broadcom.com>
This commit is contained in:
Hauke Mehrtens 2015-05-24 22:37:02 +02:00 committed by Bjorn Helgaas
parent 4785ffbdc9
commit 18c4342aa5
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pci/host/pcie-iproc-bcma.c
View File

@ -62,11 +62,9 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev)
res_mem.flags = IORESOURCE_MEM; res_mem.flags = IORESOURCE_MEM;
pci_add_resource(&res, &res_mem); pci_add_resource(&res, &res_mem);
pcie->resources = &res;
pcie->map_irq = iproc_pcie_bcma_map_irq; pcie->map_irq = iproc_pcie_bcma_map_irq;
ret = iproc_pcie_setup(pcie); ret = iproc_pcie_setup(pcie, &res);
if (ret) { if (ret) {
dev_err(pcie->dev, "PCIe controller setup failed\n"); dev_err(pcie->dev, "PCIe controller setup failed\n");
return ret; return ret;

4
drivers/pci/host/pcie-iproc-platform.c
View File

@ -69,11 +69,9 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
return ret; return ret;
} }
pcie->resources = &res;
pcie->map_irq = of_irq_parse_and_map_pci; pcie->map_irq = of_irq_parse_and_map_pci;
ret = iproc_pcie_setup(pcie); ret = iproc_pcie_setup(pcie, &res);
if (ret) { if (ret) {
dev_err(pcie->dev, "PCIe controller setup failed\n"); dev_err(pcie->dev, "PCIe controller setup failed\n");
return ret; return ret;

4
drivers/pci/host/pcie-iproc.c
View File

@ -183,7 +183,7 @@ static void iproc_pcie_enable(struct iproc_pcie *pcie)
writel(SYS_RC_INTX_MASK, pcie->base + SYS_RC_INTX_EN); 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; int ret;
struct pci_bus *bus; struct pci_bus *bus;
@ -211,7 +211,7 @@ int iproc_pcie_setup(struct iproc_pcie *pcie)
pcie->sysdata.private_data = pcie; pcie->sysdata.private_data = pcie;
bus = pci_create_root_bus(pcie->dev, 0, &iproc_pcie_ops, bus = pci_create_root_bus(pcie->dev, 0, &iproc_pcie_ops,
&pcie->sysdata, pcie->resources); &pcie->sysdata, res);
if (!bus) { if (!bus) {
dev_err(pcie->dev, "unable to create PCI root bus\n"); dev_err(pcie->dev, "unable to create PCI root bus\n");
ret = -ENOMEM; ret = -ENOMEM;

3
drivers/pci/host/pcie-iproc.h
View File

@ -29,7 +29,6 @@
struct iproc_pcie { struct iproc_pcie {
struct device *dev; struct device *dev;
void __iomem *base; void __iomem *base;
struct list_head *resources;
struct pci_sys_data sysdata; struct pci_sys_data sysdata;
struct pci_bus *root_bus; struct pci_bus *root_bus;
struct phy *phy; struct phy *phy;
@ -37,7 +36,7 @@ struct iproc_pcie {
int (*map_irq)(const struct pci_dev *, u8, u8); 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); int iproc_pcie_remove(struct iproc_pcie *pcie);
#endif /* _PCIE_IPROC_H */ #endif /* _PCIE_IPROC_H */