On Sun, Jan 23, 2011 at 9:28 PM, Sebastian Andrzej Siewior <bige...@linutronix.de> wrote: > From: Sebastian Andrzej Siewior <sebast...@breakpoint.cc> > > There is a tiny difference between PPC32 and PPC64. Microblaze uses the > PPC32 variant. > > Cc: devicetree-disc...@lists.ozlabs.org > Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org> > Signed-off-by: Sebastian Andrzej Siewior <sebast...@breakpoint.cc>
I've got this one in my devicetree/next branch which is pulled into linux-next. I've not received an ack from Ben yet. Michal, is this okay by you? http://git.secretlab.ca/?p=linux-2.6.git;a=commit;h=04bea68b2f0eeebb089ecc67b618795925268b4a g. > --- > arch/microblaze/include/asm/pci-bridge.h | 12 ++++ > arch/microblaze/include/asm/prom.h | 15 ----- > arch/microblaze/kernel/prom_parse.c | 77 --------------------------- > arch/microblaze/pci/pci-common.c | 1 + > arch/powerpc/include/asm/pci-bridge.h | 10 ++++ > arch/powerpc/include/asm/prom.h | 15 ----- > arch/powerpc/kernel/pci-common.c | 1 + > arch/powerpc/kernel/prom_parse.c | 84 > ------------------------------ > drivers/of/Kconfig | 6 ++ > drivers/of/Makefile | 1 + > drivers/of/of_pci.c | 80 ++++++++++++++++++++++++++++ > include/linux/of_pci.h | 20 +++++++ > 12 files changed, 131 insertions(+), 191 deletions(-) > create mode 100644 drivers/of/of_pci.c > create mode 100644 include/linux/of_pci.h > > diff --git a/arch/microblaze/include/asm/pci-bridge.h > b/arch/microblaze/include/asm/pci-bridge.h > index 0c68764..c2a40a4 100644 > --- a/arch/microblaze/include/asm/pci-bridge.h > +++ b/arch/microblaze/include/asm/pci-bridge.h > @@ -104,11 +104,22 @@ struct pci_controller { > int global_number; /* PCI domain number */ > }; > > +#ifdef CONFIG_PCI > static inline struct pci_controller *pci_bus_to_host(const struct pci_bus > *bus) > { > return bus->sysdata; > } > > +static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus) > +{ > + struct pci_controller *host; > + > + if (bus->self) > + return pci_device_to_OF_node(bus->self); > + host = pci_bus_to_host(bus); > + return host ? host->dn : NULL; > +} > + > static inline int isa_vaddr_is_ioport(void __iomem *address) > { > /* No specific ISA handling on ppc32 at this stage, it > @@ -116,6 +127,7 @@ static inline int isa_vaddr_is_ioport(void __iomem > *address) > */ > return 0; > } > +#endif > > /* These are used for config access before all the PCI probing > has been done. */ > diff --git a/arch/microblaze/include/asm/prom.h > b/arch/microblaze/include/asm/prom.h > index 2e72af0..d0890d3 100644 > --- a/arch/microblaze/include/asm/prom.h > +++ b/arch/microblaze/include/asm/prom.h > @@ -64,21 +64,6 @@ extern void kdump_move_device_tree(void); > /* CPU OF node matching */ > struct device_node *of_get_cpu_node(int cpu, unsigned int *thread); > > -/** > - * of_irq_map_pci - Resolve the interrupt for a PCI device > - * @pdev: the device whose interrupt is to be resolved > - * @out_irq: structure of_irq filled by this function > - * > - * This function resolves the PCI interrupt for a given PCI device. If a > - * device-node exists for a given pci_dev, it will use normal OF tree > - * walking. If not, it will implement standard swizzling and walk up the > - * PCI tree until an device-node is found, at which point it will finish > - * resolving using the OF tree walking. > - */ > -struct pci_dev; > -struct of_irq; > -extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq); > - > #endif /* __ASSEMBLY__ */ > #endif /* __KERNEL__ */ > > diff --git a/arch/microblaze/kernel/prom_parse.c > b/arch/microblaze/kernel/prom_parse.c > index 9ae24f4..47187cc 100644 > --- a/arch/microblaze/kernel/prom_parse.c > +++ b/arch/microblaze/kernel/prom_parse.c > @@ -2,88 +2,11 @@ > > #include <linux/kernel.h> > #include <linux/string.h> > -#include <linux/pci_regs.h> > #include <linux/module.h> > #include <linux/ioport.h> > #include <linux/etherdevice.h> > #include <linux/of_address.h> > #include <asm/prom.h> > -#include <asm/pci-bridge.h> > - > -#ifdef CONFIG_PCI > -int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) > -{ > - struct device_node *dn, *ppnode; > - struct pci_dev *ppdev; > - u32 lspec; > - u32 laddr[3]; > - u8 pin; > - int rc; > - > - /* Check if we have a device node, if yes, fallback to standard OF > - * parsing > - */ > - dn = pci_device_to_OF_node(pdev); > - if (dn) > - return of_irq_map_one(dn, 0, out_irq); > - > - /* Ok, we don't, time to have fun. Let's start by building up an > - * interrupt spec. we assume #interrupt-cells is 1, which is standard > - * for PCI. If you do different, then don't use that routine. > - */ > - rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin); > - if (rc != 0) > - return rc; > - /* No pin, exit */ > - if (pin == 0) > - return -ENODEV; > - > - /* Now we walk up the PCI tree */ > - lspec = pin; > - for (;;) { > - /* Get the pci_dev of our parent */ > - ppdev = pdev->bus->self; > - > - /* Ouch, it's a host bridge... */ > - if (ppdev == NULL) { > - struct pci_controller *host; > - host = pci_bus_to_host(pdev->bus); > - ppnode = host ? host->dn : NULL; > - /* No node for host bridge ? give up */ > - if (ppnode == NULL) > - return -EINVAL; > - } else > - /* We found a P2P bridge, check if it has a node */ > - ppnode = pci_device_to_OF_node(ppdev); > - > - /* Ok, we have found a parent with a device-node, hand over to > - * the OF parsing code. > - * We build a unit address from the linux device to be used > for > - * resolution. Note that we use the linux bus number which may > - * not match your firmware bus numbering. > - * Fortunately, in most cases, interrupt-map-mask doesn't > - * include the bus number as part of the matching. > - * You should still be careful about that though if you intend > - * to rely on this function (you ship a firmware that doesn't > - * create device nodes for all PCI devices). > - */ > - if (ppnode) > - break; > - > - /* We can only get here if we hit a P2P bridge with no node, > - * let's do standard swizzling and try again > - */ > - lspec = pci_swizzle_interrupt_pin(pdev, lspec); > - pdev = ppdev; > - } > - > - laddr[0] = (pdev->bus->number << 16) > - | (pdev->devfn << 8); > - laddr[1] = laddr[2] = 0; > - return of_irq_map_raw(ppnode, &lspec, 1, laddr, out_irq); > -} > -EXPORT_SYMBOL_GPL(of_irq_map_pci); > -#endif /* CONFIG_PCI */ > > void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop, > unsigned long *busno, unsigned long *phys, unsigned long *size) > diff --git a/arch/microblaze/pci/pci-common.c > b/arch/microblaze/pci/pci-common.c > index e363615..1e01a12 100644 > --- a/arch/microblaze/pci/pci-common.c > +++ b/arch/microblaze/pci/pci-common.c > @@ -29,6 +29,7 @@ > #include <linux/slab.h> > #include <linux/of.h> > #include <linux/of_address.h> > +#include <linux/of_pci.h> > > #include <asm/processor.h> > #include <asm/io.h> > diff --git a/arch/powerpc/include/asm/pci-bridge.h > b/arch/powerpc/include/asm/pci-bridge.h > index 51e9e6f..edeb80f 100644 > --- a/arch/powerpc/include/asm/pci-bridge.h > +++ b/arch/powerpc/include/asm/pci-bridge.h > @@ -171,6 +171,16 @@ static inline struct pci_controller > *pci_bus_to_host(const struct pci_bus *bus) > return bus->sysdata; > } > > +static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus) > +{ > + struct pci_controller *host; > + > + if (bus->self) > + return pci_device_to_OF_node(bus->self); > + host = pci_bus_to_host(bus); > + return host ? host->dn : NULL; > +} > + > static inline int isa_vaddr_is_ioport(void __iomem *address) > { > /* No specific ISA handling on ppc32 at this stage, it > diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h > index d727575..c189aa5 100644 > --- a/arch/powerpc/include/asm/prom.h > +++ b/arch/powerpc/include/asm/prom.h > @@ -70,21 +70,6 @@ static inline int of_node_to_nid(struct device_node > *device) { return 0; } > #endif > #define of_node_to_nid of_node_to_nid > > -/** > - * of_irq_map_pci - Resolve the interrupt for a PCI device > - * @pdev: the device whose interrupt is to be resolved > - * @out_irq: structure of_irq filled by this function > - * > - * This function resolves the PCI interrupt for a given PCI device. If a > - * device-node exists for a given pci_dev, it will use normal OF tree > - * walking. If not, it will implement standard swizzling and walk up the > - * PCI tree until an device-node is found, at which point it will finish > - * resolving using the OF tree walking. > - */ > -struct pci_dev; > -struct of_irq; > -extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq); > - > extern void of_instantiate_rtc(void); > > /* These includes are put at the bottom because they may contain things > diff --git a/arch/powerpc/kernel/pci-common.c > b/arch/powerpc/kernel/pci-common.c > index 10a44e6..eb341be 100644 > --- a/arch/powerpc/kernel/pci-common.c > +++ b/arch/powerpc/kernel/pci-common.c > @@ -22,6 +22,7 @@ > #include <linux/init.h> > #include <linux/bootmem.h> > #include <linux/of_address.h> > +#include <linux/of_pci.h> > #include <linux/mm.h> > #include <linux/list.h> > #include <linux/syscalls.h> > diff --git a/arch/powerpc/kernel/prom_parse.c > b/arch/powerpc/kernel/prom_parse.c > index c2b7a07..47187cc 100644 > --- a/arch/powerpc/kernel/prom_parse.c > +++ b/arch/powerpc/kernel/prom_parse.c > @@ -2,95 +2,11 @@ > > #include <linux/kernel.h> > #include <linux/string.h> > -#include <linux/pci_regs.h> > #include <linux/module.h> > #include <linux/ioport.h> > #include <linux/etherdevice.h> > #include <linux/of_address.h> > #include <asm/prom.h> > -#include <asm/pci-bridge.h> > - > -#ifdef CONFIG_PCI > -int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) > -{ > - struct device_node *dn, *ppnode; > - struct pci_dev *ppdev; > - u32 lspec; > - u32 laddr[3]; > - u8 pin; > - int rc; > - > - /* Check if we have a device node, if yes, fallback to standard OF > - * parsing > - */ > - dn = pci_device_to_OF_node(pdev); > - if (dn) { > - rc = of_irq_map_one(dn, 0, out_irq); > - if (!rc) > - return rc; > - } > - > - /* Ok, we don't, time to have fun. Let's start by building up an > - * interrupt spec. we assume #interrupt-cells is 1, which is standard > - * for PCI. If you do different, then don't use that routine. > - */ > - rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin); > - if (rc != 0) > - return rc; > - /* No pin, exit */ > - if (pin == 0) > - return -ENODEV; > - > - /* Now we walk up the PCI tree */ > - lspec = pin; > - for (;;) { > - /* Get the pci_dev of our parent */ > - ppdev = pdev->bus->self; > - > - /* Ouch, it's a host bridge... */ > - if (ppdev == NULL) { > -#ifdef CONFIG_PPC64 > - ppnode = pci_bus_to_OF_node(pdev->bus); > -#else > - struct pci_controller *host; > - host = pci_bus_to_host(pdev->bus); > - ppnode = host ? host->dn : NULL; > -#endif > - /* No node for host bridge ? give up */ > - if (ppnode == NULL) > - return -EINVAL; > - } else > - /* We found a P2P bridge, check if it has a node */ > - ppnode = pci_device_to_OF_node(ppdev); > - > - /* Ok, we have found a parent with a device-node, hand over to > - * the OF parsing code. > - * We build a unit address from the linux device to be used > for > - * resolution. Note that we use the linux bus number which may > - * not match your firmware bus numbering. > - * Fortunately, in most cases, interrupt-map-mask doesn't > include > - * the bus number as part of the matching. > - * You should still be careful about that though if you intend > - * to rely on this function (you ship a firmware that doesn't > - * create device nodes for all PCI devices). > - */ > - if (ppnode) > - break; > - > - /* We can only get here if we hit a P2P bridge with no node, > - * let's do standard swizzling and try again > - */ > - lspec = pci_swizzle_interrupt_pin(pdev, lspec); > - pdev = ppdev; > - } > - > - laddr[0] = (pdev->bus->number << 16) > - | (pdev->devfn << 8); > - laddr[1] = laddr[2] = 0; > - return of_irq_map_raw(ppnode, &lspec, 1, laddr, out_irq); > -} > -EXPORT_SYMBOL_GPL(of_irq_map_pci); > -#endif /* CONFIG_PCI */ > > void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop, > unsigned long *busno, unsigned long *phys, unsigned long *size) > diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig > index 3c6e100..c71cff1 100644 > --- a/drivers/of/Kconfig > +++ b/drivers/of/Kconfig > @@ -69,4 +69,10 @@ config OF_MDIO > help > OpenFirmware MDIO bus (Ethernet PHY) accessors > > +config OF_PCI > + def_tristate PCI > + depends on PCI && !SPARC > + help > + OpenFirmware PCI bus accessors > + > endmenu # OF > diff --git a/drivers/of/Makefile b/drivers/of/Makefile > index 3ab21a0..f7861ed 100644 > --- a/drivers/of/Makefile > +++ b/drivers/of/Makefile > @@ -9,3 +9,4 @@ obj-$(CONFIG_OF_I2C) += of_i2c.o > obj-$(CONFIG_OF_NET) += of_net.o > obj-$(CONFIG_OF_SPI) += of_spi.o > obj-$(CONFIG_OF_MDIO) += of_mdio.o > +obj-$(CONFIG_OF_PCI) += of_pci.o > diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c > new file mode 100644 > index 0000000..dd862d2 > --- /dev/null > +++ b/drivers/of/of_pci.c > @@ -0,0 +1,80 @@ > +#include <linux/kernel.h> > +#include <linux/of_pci.h> > +#include <asm/prom.h> > + > +int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) > +{ > + struct device_node *dn, *ppnode; > + struct pci_dev *ppdev; > + u32 lspec; > + __be32 lspec_be; > + __be32 laddr[3]; > + u8 pin; > + int rc; > + > + /* Check if we have a device node, if yes, fallback to standard OF > + * parsing > + */ > + dn = pci_device_to_OF_node(pdev); > + if (dn) { > + rc = of_irq_map_one(dn, 0, out_irq); > + if (!rc) > + return rc; > + } > + > + /* Ok, we don't, time to have fun. Let's start by building up an > + * interrupt spec. we assume #interrupt-cells is 1, which is standard > + * for PCI. If you do different, then don't use that routine. > + */ > + rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin); > + if (rc != 0) > + return rc; > + /* No pin, exit */ > + if (pin == 0) > + return -ENODEV; > + > + /* Now we walk up the PCI tree */ > + lspec = pin; > + for (;;) { > + /* Get the pci_dev of our parent */ > + ppdev = pdev->bus->self; > + > + /* Ouch, it's a host bridge... */ > + if (ppdev == NULL) { > + ppnode = pci_bus_to_OF_node(pdev->bus); > + > + /* No node for host bridge ? give up */ > + if (ppnode == NULL) > + return -EINVAL; > + } else { > + /* We found a P2P bridge, check if it has a node */ > + ppnode = pci_device_to_OF_node(ppdev); > + } > + > + /* Ok, we have found a parent with a device-node, hand over to > + * the OF parsing code. > + * We build a unit address from the linux device to be used > for > + * resolution. Note that we use the linux bus number which may > + * not match your firmware bus numbering. > + * Fortunately, in most cases, interrupt-map-mask doesn't > + * include the bus number as part of the matching. > + * You should still be careful about that though if you intend > + * to rely on this function (you ship a firmware that doesn't > + * create device nodes for all PCI devices). > + */ > + if (ppnode) > + break; > + > + /* We can only get here if we hit a P2P bridge with no node, > + * let's do standard swizzling and try again > + */ > + lspec = pci_swizzle_interrupt_pin(pdev, lspec); > + pdev = ppdev; > + } > + > + lspec_be = cpu_to_be32(lspec); > + laddr[0] = cpu_to_be32((pdev->bus->number << 16) | (pdev->devfn << > 8)); > + laddr[1] = laddr[2] = cpu_to_be32(0); > + return of_irq_map_raw(ppnode, &lspec_be, 1, laddr, out_irq); > +} > +EXPORT_SYMBOL_GPL(of_irq_map_pci); > diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h > new file mode 100644 > index 0000000..9b0ba67 > --- /dev/null > +++ b/include/linux/of_pci.h > @@ -0,0 +1,20 @@ > +#ifndef __OF_PCI_H > +#define __OF_PCI_H > + > +#include <linux/pci.h> > + > +/** > + * of_irq_map_pci - Resolve the interrupt for a PCI device > + * @pdev: the device whose interrupt is to be resolved > + * @out_irq: structure of_irq filled by this function > + * > + * This function resolves the PCI interrupt for a given PCI device. If a > + * device-node exists for a given pci_dev, it will use normal OF tree > + * walking. If not, it will implement standard swizzling and walk up the > + * PCI tree until an device-node is found, at which point it will finish > + * resolving using the OF tree walking. > + */ > +struct pci_dev; > +struct of_irq; > +int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq); > +#endif > -- > 1.7.3.2 > > _______________________________________________ > devicetree-discuss mailing list > devicetree-disc...@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/devicetree-discuss > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
