Skip to content

Commit

Permalink
powerpc/fsl_pci: Store the pci ctlr device ptr in the pci ctlr struct
Browse files Browse the repository at this point in the history
The pci controller structure has a provision to store the device structure
pointer of the corresponding platform device. Currently this information is
not stored during fsl pci controller initialization. This information is
required while dealing with iommu groups for pci devices connected to the
fsl pci controller. For the case where the pci devices can't be paritioned,
they would fall under the same device group as the pci controller.

This patch stores the platform device information in the pci controller
structure during initialization.

Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  • Loading branch information
Varun Sethi authored and Kumar Gala committed Feb 15, 2013
1 parent e0e8398 commit 52c5aff
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
9 changes: 7 additions & 2 deletions arch/powerpc/sysdev/fsl_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -421,13 +421,16 @@ void fsl_pcibios_fixup_bus(struct pci_bus *bus)
}
}

int __init fsl_add_bridge(struct device_node *dev, int is_primary)
int __init fsl_add_bridge(struct platform_device *pdev, int is_primary)
{
int len;
struct pci_controller *hose;
struct resource rsrc;
const int *bus_range;
u8 hdr_type, progif;
struct device_node *dev;

dev = pdev->dev.of_node;

if (!of_device_is_available(dev)) {
pr_warning("%s: disabled\n", dev->full_name);
Expand All @@ -453,6 +456,8 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary)
if (!hose)
return -ENOMEM;

/* set platform device as the parent */
hose->parent = &pdev->dev;
hose->first_busno = bus_range ? bus_range[0] : 0x0;
hose->last_busno = bus_range ? bus_range[1] : 0xff;

Expand Down Expand Up @@ -885,7 +890,7 @@ static int fsl_pci_probe(struct platform_device *pdev)
#endif

node = pdev->dev.of_node;
ret = fsl_add_bridge(node, fsl_pci_primary == node);
ret = fsl_add_bridge(pdev, fsl_pci_primary == node);

#ifdef CONFIG_SWIOTLB
if (ret == 0) {
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/sysdev/fsl_pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ struct ccsr_pci {
__be32 pex_err_cap_r3; /* 0x.e34 - PCIE error capture register 0 */
};

extern int fsl_add_bridge(struct device_node *dev, int is_primary);
extern int fsl_add_bridge(struct platform_device *pdev, int is_primary);
extern void fsl_pcibios_fixup_bus(struct pci_bus *bus);
extern int mpc83xx_add_bridge(struct device_node *dev);
u64 fsl_pci_immrbar_base(struct pci_controller *hose);
Expand Down

0 comments on commit 52c5aff

Please sign in to comment.