diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 17:54:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 17:54:02 -0400 |
commit | acb41c0f928fdb84a1c3753ac92c534a2a0f08d2 (patch) | |
tree | 4bf92f1c2b1f36fa68d3e77d646b04b863e1a7e4 /drivers/of | |
parent | 8181780c163e7111f15619067cfa044172d532e1 (diff) | |
parent | ef3b4f8cc20e80c767e47b848fb7512770ab80d7 (diff) |
Merge branch 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
pci/of: Consolidate pci_bus_to_OF_node()
pci/of: Consolidate pci_device_to_OF_node()
x86/devicetree: Use generic PCI <-> OF matching
microblaze/pci: Move the remains of pci_32.c to pci-common.c
microblaze/pci: Remove powermac originated cruft
pci/of: Match PCI devices to OF nodes dynamically
Diffstat (limited to 'drivers/of')
-rw-r--r-- | drivers/of/Kconfig | 8 | ||||
-rw-r--r-- | drivers/of/Makefile | 1 | ||||
-rw-r--r-- | drivers/of/of_pci.c | 112 | ||||
-rw-r--r-- | drivers/of/of_pci_irq.c | 92 |
4 files changed, 130 insertions, 83 deletions
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index d06a6374ed6..cac63c9f49a 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig | |||
@@ -71,8 +71,14 @@ config OF_MDIO | |||
71 | 71 | ||
72 | config OF_PCI | 72 | config OF_PCI |
73 | def_tristate PCI | 73 | def_tristate PCI |
74 | depends on PCI && (PPC || MICROBLAZE || X86) | 74 | depends on PCI |
75 | help | 75 | help |
76 | OpenFirmware PCI bus accessors | 76 | OpenFirmware PCI bus accessors |
77 | 77 | ||
78 | config OF_PCI_IRQ | ||
79 | def_tristate PCI | ||
80 | depends on OF_PCI && OF_IRQ | ||
81 | help | ||
82 | OpenFirmware PCI IRQ routing helpers | ||
83 | |||
78 | endmenu # OF | 84 | endmenu # OF |
diff --git a/drivers/of/Makefile b/drivers/of/Makefile index f7861ed2f28..dccb1176be5 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile | |||
@@ -10,3 +10,4 @@ obj-$(CONFIG_OF_NET) += of_net.o | |||
10 | obj-$(CONFIG_OF_SPI) += of_spi.o | 10 | obj-$(CONFIG_OF_SPI) += of_spi.o |
11 | obj-$(CONFIG_OF_MDIO) += of_mdio.o | 11 | obj-$(CONFIG_OF_MDIO) += of_mdio.o |
12 | obj-$(CONFIG_OF_PCI) += of_pci.o | 12 | obj-$(CONFIG_OF_PCI) += of_pci.o |
13 | obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o | ||
diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c index ac1ec54e4fd..ec7b060ae95 100644 --- a/drivers/of/of_pci.c +++ b/drivers/of/of_pci.c | |||
@@ -1,92 +1,40 @@ | |||
1 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
2 | #include <linux/of_pci.h> | 2 | #include <linux/of_pci.h> |
3 | #include <linux/of_irq.h> | ||
4 | #include <asm/prom.h> | 3 | #include <asm/prom.h> |
5 | 4 | ||
6 | /** | 5 | static inline int __of_pci_pci_compare(struct device_node *node, |
7 | * of_irq_map_pci - Resolve the interrupt for a PCI device | 6 | unsigned int devfn) |
8 | * @pdev: the device whose interrupt is to be resolved | ||
9 | * @out_irq: structure of_irq filled by this function | ||
10 | * | ||
11 | * This function resolves the PCI interrupt for a given PCI device. If a | ||
12 | * device-node exists for a given pci_dev, it will use normal OF tree | ||
13 | * walking. If not, it will implement standard swizzling and walk up the | ||
14 | * PCI tree until an device-node is found, at which point it will finish | ||
15 | * resolving using the OF tree walking. | ||
16 | */ | ||
17 | int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) | ||
18 | { | 7 | { |
19 | struct device_node *dn, *ppnode; | 8 | unsigned int size; |
20 | struct pci_dev *ppdev; | 9 | const __be32 *reg = of_get_property(node, "reg", &size); |
21 | u32 lspec; | ||
22 | __be32 lspec_be; | ||
23 | __be32 laddr[3]; | ||
24 | u8 pin; | ||
25 | int rc; | ||
26 | 10 | ||
27 | /* Check if we have a device node, if yes, fallback to standard | 11 | if (!reg || size < 5 * sizeof(__be32)) |
28 | * device tree parsing | 12 | return 0; |
29 | */ | 13 | return ((be32_to_cpup(®[0]) >> 8) & 0xff) == devfn; |
30 | dn = pci_device_to_OF_node(pdev); | 14 | } |
31 | if (dn) { | ||
32 | rc = of_irq_map_one(dn, 0, out_irq); | ||
33 | if (!rc) | ||
34 | return rc; | ||
35 | } | ||
36 | |||
37 | /* Ok, we don't, time to have fun. Let's start by building up an | ||
38 | * interrupt spec. we assume #interrupt-cells is 1, which is standard | ||
39 | * for PCI. If you do different, then don't use that routine. | ||
40 | */ | ||
41 | rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin); | ||
42 | if (rc != 0) | ||
43 | return rc; | ||
44 | /* No pin, exit */ | ||
45 | if (pin == 0) | ||
46 | return -ENODEV; | ||
47 | |||
48 | /* Now we walk up the PCI tree */ | ||
49 | lspec = pin; | ||
50 | for (;;) { | ||
51 | /* Get the pci_dev of our parent */ | ||
52 | ppdev = pdev->bus->self; | ||
53 | |||
54 | /* Ouch, it's a host bridge... */ | ||
55 | if (ppdev == NULL) { | ||
56 | ppnode = pci_bus_to_OF_node(pdev->bus); | ||
57 | |||
58 | /* No node for host bridge ? give up */ | ||
59 | if (ppnode == NULL) | ||
60 | return -EINVAL; | ||
61 | } else { | ||
62 | /* We found a P2P bridge, check if it has a node */ | ||
63 | ppnode = pci_device_to_OF_node(ppdev); | ||
64 | } | ||
65 | |||
66 | /* Ok, we have found a parent with a device-node, hand over to | ||
67 | * the OF parsing code. | ||
68 | * We build a unit address from the linux device to be used for | ||
69 | * resolution. Note that we use the linux bus number which may | ||
70 | * not match your firmware bus numbering. | ||
71 | * Fortunately, in most cases, interrupt-map-mask doesn't | ||
72 | * include the bus number as part of the matching. | ||
73 | * You should still be careful about that though if you intend | ||
74 | * to rely on this function (you ship a firmware that doesn't | ||
75 | * create device nodes for all PCI devices). | ||
76 | */ | ||
77 | if (ppnode) | ||
78 | break; | ||
79 | 15 | ||
80 | /* We can only get here if we hit a P2P bridge with no node, | 16 | struct device_node *of_pci_find_child_device(struct device_node *parent, |
81 | * let's do standard swizzling and try again | 17 | unsigned int devfn) |
18 | { | ||
19 | struct device_node *node, *node2; | ||
20 | |||
21 | for_each_child_of_node(parent, node) { | ||
22 | if (__of_pci_pci_compare(node, devfn)) | ||
23 | return node; | ||
24 | /* | ||
25 | * Some OFs create a parent node "multifunc-device" as | ||
26 | * a fake root for all functions of a multi-function | ||
27 | * device we go down them as well. | ||
82 | */ | 28 | */ |
83 | lspec = pci_swizzle_interrupt_pin(pdev, lspec); | 29 | if (!strcmp(node->name, "multifunc-device")) { |
84 | pdev = ppdev; | 30 | for_each_child_of_node(node, node2) { |
31 | if (__of_pci_pci_compare(node2, devfn)) { | ||
32 | of_node_put(node); | ||
33 | return node2; | ||
34 | } | ||
35 | } | ||
36 | } | ||
85 | } | 37 | } |
86 | 38 | return NULL; | |
87 | lspec_be = cpu_to_be32(lspec); | ||
88 | laddr[0] = cpu_to_be32((pdev->bus->number << 16) | (pdev->devfn << 8)); | ||
89 | laddr[1] = laddr[2] = cpu_to_be32(0); | ||
90 | return of_irq_map_raw(ppnode, &lspec_be, 1, laddr, out_irq); | ||
91 | } | 39 | } |
92 | EXPORT_SYMBOL_GPL(of_irq_map_pci); | 40 | EXPORT_SYMBOL_GPL(of_pci_find_child_device); |
diff --git a/drivers/of/of_pci_irq.c b/drivers/of/of_pci_irq.c new file mode 100644 index 00000000000..ac1ec54e4fd --- /dev/null +++ b/drivers/of/of_pci_irq.c | |||
@@ -0,0 +1,92 @@ | |||
1 | #include <linux/kernel.h> | ||
2 | #include <linux/of_pci.h> | ||
3 | #include <linux/of_irq.h> | ||
4 | #include <asm/prom.h> | ||
5 | |||
6 | /** | ||
7 | * of_irq_map_pci - Resolve the interrupt for a PCI device | ||
8 | * @pdev: the device whose interrupt is to be resolved | ||
9 | * @out_irq: structure of_irq filled by this function | ||
10 | * | ||
11 | * This function resolves the PCI interrupt for a given PCI device. If a | ||
12 | * device-node exists for a given pci_dev, it will use normal OF tree | ||
13 | * walking. If not, it will implement standard swizzling and walk up the | ||
14 | * PCI tree until an device-node is found, at which point it will finish | ||
15 | * resolving using the OF tree walking. | ||
16 | */ | ||
17 | int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) | ||
18 | { | ||
19 | struct device_node *dn, *ppnode; | ||
20 | struct pci_dev *ppdev; | ||
21 | u32 lspec; | ||
22 | __be32 lspec_be; | ||
23 | __be32 laddr[3]; | ||
24 | u8 pin; | ||
25 | int rc; | ||
26 | |||
27 | /* Check if we have a device node, if yes, fallback to standard | ||
28 | * device tree parsing | ||
29 | */ | ||
30 | dn = pci_device_to_OF_node(pdev); | ||
31 | if (dn) { | ||
32 | rc = of_irq_map_one(dn, 0, out_irq); | ||
33 | if (!rc) | ||
34 | return rc; | ||
35 | } | ||
36 | |||
37 | /* Ok, we don't, time to have fun. Let's start by building up an | ||
38 | * interrupt spec. we assume #interrupt-cells is 1, which is standard | ||
39 | * for PCI. If you do different, then don't use that routine. | ||
40 | */ | ||
41 | rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin); | ||
42 | if (rc != 0) | ||
43 | return rc; | ||
44 | /* No pin, exit */ | ||
45 | if (pin == 0) | ||
46 | return -ENODEV; | ||
47 | |||
48 | /* Now we walk up the PCI tree */ | ||
49 | lspec = pin; | ||
50 | for (;;) { | ||
51 | /* Get the pci_dev of our parent */ | ||
52 | ppdev = pdev->bus->self; | ||
53 | |||
54 | /* Ouch, it's a host bridge... */ | ||
55 | if (ppdev == NULL) { | ||
56 | ppnode = pci_bus_to_OF_node(pdev->bus); | ||
57 | |||
58 | /* No node for host bridge ? give up */ | ||
59 | if (ppnode == NULL) | ||
60 | return -EINVAL; | ||
61 | } else { | ||
62 | /* We found a P2P bridge, check if it has a node */ | ||
63 | ppnode = pci_device_to_OF_node(ppdev); | ||
64 | } | ||
65 | |||
66 | /* Ok, we have found a parent with a device-node, hand over to | ||
67 | * the OF parsing code. | ||
68 | * We build a unit address from the linux device to be used for | ||
69 | * resolution. Note that we use the linux bus number which may | ||
70 | * not match your firmware bus numbering. | ||
71 | * Fortunately, in most cases, interrupt-map-mask doesn't | ||
72 | * include the bus number as part of the matching. | ||
73 | * You should still be careful about that though if you intend | ||
74 | * to rely on this function (you ship a firmware that doesn't | ||
75 | * create device nodes for all PCI devices). | ||
76 | */ | ||
77 | if (ppnode) | ||
78 | break; | ||
79 | |||
80 | /* We can only get here if we hit a P2P bridge with no node, | ||
81 | * let's do standard swizzling and try again | ||
82 | */ | ||
83 | lspec = pci_swizzle_interrupt_pin(pdev, lspec); | ||
84 | pdev = ppdev; | ||
85 | } | ||
86 | |||
87 | lspec_be = cpu_to_be32(lspec); | ||
88 | laddr[0] = cpu_to_be32((pdev->bus->number << 16) | (pdev->devfn << 8)); | ||
89 | laddr[1] = laddr[2] = cpu_to_be32(0); | ||
90 | return of_irq_map_raw(ppnode, &lspec_be, 1, laddr, out_irq); | ||
91 | } | ||
92 | EXPORT_SYMBOL_GPL(of_irq_map_pci); | ||