diff options
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/include/asm/mmu_context_mm.h | 2 | ||||
-rw-r--r-- | arch/microblaze/include/asm/pci-bridge.h | 10 | ||||
-rw-r--r-- | arch/microblaze/include/asm/pci.h | 3 | ||||
-rw-r--r-- | arch/microblaze/include/asm/prom.h | 17 | ||||
-rw-r--r-- | arch/microblaze/include/asm/ptrace.h | 2 | ||||
-rw-r--r-- | arch/microblaze/kernel/module.c | 35 | ||||
-rw-r--r-- | arch/microblaze/pci/Makefile | 2 | ||||
-rw-r--r-- | arch/microblaze/pci/pci-common.c | 114 | ||||
-rw-r--r-- | arch/microblaze/pci/pci_32.c | 432 |
9 files changed, 117 insertions, 500 deletions
diff --git a/arch/microblaze/include/asm/mmu_context_mm.h b/arch/microblaze/include/asm/mmu_context_mm.h index 3e5c254e8d1c..d68647746448 100644 --- a/arch/microblaze/include/asm/mmu_context_mm.h +++ b/arch/microblaze/include/asm/mmu_context_mm.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #ifndef _ASM_MICROBLAZE_MMU_CONTEXT_H | 11 | #ifndef _ASM_MICROBLAZE_MMU_CONTEXT_H |
12 | #define _ASM_MICROBLAZE_MMU_CONTEXT_H | 12 | #define _ASM_MICROBLAZE_MMU_CONTEXT_H |
13 | 13 | ||
14 | #include <asm/atomic.h> | 14 | #include <linux/atomic.h> |
15 | #include <asm/bitops.h> | 15 | #include <asm/bitops.h> |
16 | #include <asm/mmu.h> | 16 | #include <asm/mmu.h> |
17 | #include <asm-generic/mm_hooks.h> | 17 | #include <asm-generic/mm_hooks.h> |
diff --git a/arch/microblaze/include/asm/pci-bridge.h b/arch/microblaze/include/asm/pci-bridge.h index 4cae1d590130..32764cd077c6 100644 --- a/arch/microblaze/include/asm/pci-bridge.h +++ b/arch/microblaze/include/asm/pci-bridge.h | |||
@@ -98,16 +98,6 @@ static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus) | |||
98 | return bus->sysdata; | 98 | return bus->sysdata; |
99 | } | 99 | } |
100 | 100 | ||
101 | static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus) | ||
102 | { | ||
103 | struct pci_controller *host; | ||
104 | |||
105 | if (bus->self) | ||
106 | return pci_device_to_OF_node(bus->self); | ||
107 | host = pci_bus_to_host(bus); | ||
108 | return host ? host->dn : NULL; | ||
109 | } | ||
110 | |||
111 | static inline int isa_vaddr_is_ioport(void __iomem *address) | 101 | static inline int isa_vaddr_is_ioport(void __iomem *address) |
112 | { | 102 | { |
113 | /* No specific ISA handling on ppc32 at this stage, it | 103 | /* No specific ISA handling on ppc32 at this stage, it |
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index ba65cf472544..1dd9d6b1e275 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h | |||
@@ -40,8 +40,7 @@ struct pci_dev; | |||
40 | * Set this to 1 if you want the kernel to re-assign all PCI | 40 | * Set this to 1 if you want the kernel to re-assign all PCI |
41 | * bus numbers (don't do that on ppc64 yet !) | 41 | * bus numbers (don't do that on ppc64 yet !) |
42 | */ | 42 | */ |
43 | #define pcibios_assign_all_busses() \ | 43 | #define pcibios_assign_all_busses() 0 |
44 | (pci_has_flag(PCI_REASSIGN_ALL_BUS)) | ||
45 | 44 | ||
46 | static inline void pcibios_set_master(struct pci_dev *dev) | 45 | static inline void pcibios_set_master(struct pci_dev *dev) |
47 | { | 46 | { |
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index d0890d36ef61..9ad567e2d425 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | #include <linux/types.h> | 22 | #include <linux/types.h> |
23 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
24 | #include <asm/atomic.h> | 24 | #include <linux/atomic.h> |
25 | 25 | ||
26 | #define HAVE_ARCH_DEVTREE_FIXUPS | 26 | #define HAVE_ARCH_DEVTREE_FIXUPS |
27 | 27 | ||
@@ -29,21 +29,6 @@ | |||
29 | extern int early_uartlite_console(void); | 29 | extern int early_uartlite_console(void); |
30 | extern int early_uart16550_console(void); | 30 | extern int early_uart16550_console(void); |
31 | 31 | ||
32 | #ifdef CONFIG_PCI | ||
33 | /* | ||
34 | * PCI <-> OF matching functions | ||
35 | * (XXX should these be here?) | ||
36 | */ | ||
37 | struct pci_bus; | ||
38 | struct pci_dev; | ||
39 | extern int pci_device_from_OF_node(struct device_node *node, | ||
40 | u8 *bus, u8 *devfn); | ||
41 | extern struct device_node *pci_busdev_to_OF_node(struct pci_bus *bus, | ||
42 | int devfn); | ||
43 | extern struct device_node *pci_device_to_OF_node(struct pci_dev *dev); | ||
44 | extern void pci_create_OF_bus_map(void); | ||
45 | #endif | ||
46 | |||
47 | /* | 32 | /* |
48 | * OF address retreival & translation | 33 | * OF address retreival & translation |
49 | */ | 34 | */ |
diff --git a/arch/microblaze/include/asm/ptrace.h b/arch/microblaze/include/asm/ptrace.h index d9b66304d5dd..816bee64b196 100644 --- a/arch/microblaze/include/asm/ptrace.h +++ b/arch/microblaze/include/asm/ptrace.h | |||
@@ -61,8 +61,6 @@ struct pt_regs { | |||
61 | #define instruction_pointer(regs) ((regs)->pc) | 61 | #define instruction_pointer(regs) ((regs)->pc) |
62 | #define profile_pc(regs) instruction_pointer(regs) | 62 | #define profile_pc(regs) instruction_pointer(regs) |
63 | 63 | ||
64 | void show_regs(struct pt_regs *); | ||
65 | |||
66 | #else /* __KERNEL__ */ | 64 | #else /* __KERNEL__ */ |
67 | 65 | ||
68 | /* pt_regs offsets used by gdbserver etc in ptrace syscalls */ | 66 | /* pt_regs offsets used by gdbserver etc in ptrace syscalls */ |
diff --git a/arch/microblaze/kernel/module.c b/arch/microblaze/kernel/module.c index 0e73f6606547..142426f631bb 100644 --- a/arch/microblaze/kernel/module.c +++ b/arch/microblaze/kernel/module.c | |||
@@ -18,37 +18,6 @@ | |||
18 | #include <asm/pgtable.h> | 18 | #include <asm/pgtable.h> |
19 | #include <asm/cacheflush.h> | 19 | #include <asm/cacheflush.h> |
20 | 20 | ||
21 | void *module_alloc(unsigned long size) | ||
22 | { | ||
23 | void *ret; | ||
24 | ret = (size == 0) ? NULL : vmalloc(size); | ||
25 | pr_debug("module_alloc (%08lx@%08lx)\n", size, (unsigned long int)ret); | ||
26 | return ret; | ||
27 | } | ||
28 | |||
29 | void module_free(struct module *module, void *region) | ||
30 | { | ||
31 | pr_debug("module_free(%s,%08lx)\n", module->name, | ||
32 | (unsigned long)region); | ||
33 | vfree(region); | ||
34 | } | ||
35 | |||
36 | int module_frob_arch_sections(Elf_Ehdr *hdr, | ||
37 | Elf_Shdr *sechdrs, | ||
38 | char *secstrings, | ||
39 | struct module *mod) | ||
40 | { | ||
41 | return 0; | ||
42 | } | ||
43 | |||
44 | int apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, | ||
45 | unsigned int symindex, unsigned int relsec, struct module *module) | ||
46 | { | ||
47 | printk(KERN_ERR "module %s: ADD RELOCATION unsupported\n", | ||
48 | module->name); | ||
49 | return -ENOEXEC; | ||
50 | } | ||
51 | |||
52 | int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab, | 21 | int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab, |
53 | unsigned int symindex, unsigned int relsec, struct module *module) | 22 | unsigned int symindex, unsigned int relsec, struct module *module) |
54 | { | 23 | { |
@@ -155,7 +124,3 @@ int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs, | |||
155 | flush_dcache(); | 124 | flush_dcache(); |
156 | return 0; | 125 | return 0; |
157 | } | 126 | } |
158 | |||
159 | void module_arch_cleanup(struct module *mod) | ||
160 | { | ||
161 | } | ||
diff --git a/arch/microblaze/pci/Makefile b/arch/microblaze/pci/Makefile index 9889cc2e1294..d1114fbd4780 100644 --- a/arch/microblaze/pci/Makefile +++ b/arch/microblaze/pci/Makefile | |||
@@ -2,5 +2,5 @@ | |||
2 | # Makefile | 2 | # Makefile |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-$(CONFIG_PCI) += pci_32.o pci-common.o indirect_pci.o iomap.o | 5 | obj-$(CONFIG_PCI) += pci-common.o indirect_pci.o iomap.o |
6 | obj-$(CONFIG_PCI_XILINX) += xilinx_pci.o | 6 | obj-$(CONFIG_PCI_XILINX) += xilinx_pci.o |
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 53599067d2f9..4cfae20f1067 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c | |||
@@ -50,6 +50,11 @@ unsigned int pci_flags; | |||
50 | 50 | ||
51 | static struct dma_map_ops *pci_dma_ops = &dma_direct_ops; | 51 | static struct dma_map_ops *pci_dma_ops = &dma_direct_ops; |
52 | 52 | ||
53 | unsigned long isa_io_base; | ||
54 | unsigned long pci_dram_offset; | ||
55 | static int pci_bus_count; | ||
56 | |||
57 | |||
53 | void set_pci_dma_ops(struct dma_map_ops *dma_ops) | 58 | void set_pci_dma_ops(struct dma_map_ops *dma_ops) |
54 | { | 59 | { |
55 | pci_dma_ops = dma_ops; | 60 | pci_dma_ops = dma_ops; |
@@ -89,7 +94,7 @@ void pcibios_free_controller(struct pci_controller *phb) | |||
89 | 94 | ||
90 | static resource_size_t pcibios_io_size(const struct pci_controller *hose) | 95 | static resource_size_t pcibios_io_size(const struct pci_controller *hose) |
91 | { | 96 | { |
92 | return hose->io_resource.end - hose->io_resource.start + 1; | 97 | return resource_size(&hose->io_resource); |
93 | } | 98 | } |
94 | 99 | ||
95 | int pcibios_vaddr_is_ioport(void __iomem *address) | 100 | int pcibios_vaddr_is_ioport(void __iomem *address) |
@@ -1558,6 +1563,112 @@ void __devinit pcibios_setup_phb_resources(struct pci_controller *hose) | |||
1558 | (unsigned long)hose->io_base_virt - _IO_BASE); | 1563 | (unsigned long)hose->io_base_virt - _IO_BASE); |
1559 | } | 1564 | } |
1560 | 1565 | ||
1566 | struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus) | ||
1567 | { | ||
1568 | struct pci_controller *hose = bus->sysdata; | ||
1569 | |||
1570 | return of_node_get(hose->dn); | ||
1571 | } | ||
1572 | |||
1573 | static void __devinit pcibios_scan_phb(struct pci_controller *hose) | ||
1574 | { | ||
1575 | struct pci_bus *bus; | ||
1576 | struct device_node *node = hose->dn; | ||
1577 | unsigned long io_offset; | ||
1578 | struct resource *res = &hose->io_resource; | ||
1579 | |||
1580 | pr_debug("PCI: Scanning PHB %s\n", | ||
1581 | node ? node->full_name : "<NO NAME>"); | ||
1582 | |||
1583 | /* Create an empty bus for the toplevel */ | ||
1584 | bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops, hose); | ||
1585 | if (bus == NULL) { | ||
1586 | printk(KERN_ERR "Failed to create bus for PCI domain %04x\n", | ||
1587 | hose->global_number); | ||
1588 | return; | ||
1589 | } | ||
1590 | bus->secondary = hose->first_busno; | ||
1591 | hose->bus = bus; | ||
1592 | |||
1593 | /* Fixup IO space offset */ | ||
1594 | io_offset = (unsigned long)hose->io_base_virt - isa_io_base; | ||
1595 | res->start = (res->start + io_offset) & 0xffffffffu; | ||
1596 | res->end = (res->end + io_offset) & 0xffffffffu; | ||
1597 | |||
1598 | /* Wire up PHB bus resources */ | ||
1599 | pcibios_setup_phb_resources(hose); | ||
1600 | |||
1601 | /* Scan children */ | ||
1602 | hose->last_busno = bus->subordinate = pci_scan_child_bus(bus); | ||
1603 | } | ||
1604 | |||
1605 | static int __init pcibios_init(void) | ||
1606 | { | ||
1607 | struct pci_controller *hose, *tmp; | ||
1608 | int next_busno = 0; | ||
1609 | |||
1610 | printk(KERN_INFO "PCI: Probing PCI hardware\n"); | ||
1611 | |||
1612 | /* Scan all of the recorded PCI controllers. */ | ||
1613 | list_for_each_entry_safe(hose, tmp, &hose_list, list_node) { | ||
1614 | hose->last_busno = 0xff; | ||
1615 | pcibios_scan_phb(hose); | ||
1616 | printk(KERN_INFO "calling pci_bus_add_devices()\n"); | ||
1617 | pci_bus_add_devices(hose->bus); | ||
1618 | if (next_busno <= hose->last_busno) | ||
1619 | next_busno = hose->last_busno + 1; | ||
1620 | } | ||
1621 | pci_bus_count = next_busno; | ||
1622 | |||
1623 | /* Call common code to handle resource allocation */ | ||
1624 | pcibios_resource_survey(); | ||
1625 | |||
1626 | return 0; | ||
1627 | } | ||
1628 | |||
1629 | subsys_initcall(pcibios_init); | ||
1630 | |||
1631 | static struct pci_controller *pci_bus_to_hose(int bus) | ||
1632 | { | ||
1633 | struct pci_controller *hose, *tmp; | ||
1634 | |||
1635 | list_for_each_entry_safe(hose, tmp, &hose_list, list_node) | ||
1636 | if (bus >= hose->first_busno && bus <= hose->last_busno) | ||
1637 | return hose; | ||
1638 | return NULL; | ||
1639 | } | ||
1640 | |||
1641 | /* Provide information on locations of various I/O regions in physical | ||
1642 | * memory. Do this on a per-card basis so that we choose the right | ||
1643 | * root bridge. | ||
1644 | * Note that the returned IO or memory base is a physical address | ||
1645 | */ | ||
1646 | |||
1647 | long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn) | ||
1648 | { | ||
1649 | struct pci_controller *hose; | ||
1650 | long result = -EOPNOTSUPP; | ||
1651 | |||
1652 | hose = pci_bus_to_hose(bus); | ||
1653 | if (!hose) | ||
1654 | return -ENODEV; | ||
1655 | |||
1656 | switch (which) { | ||
1657 | case IOBASE_BRIDGE_NUMBER: | ||
1658 | return (long)hose->first_busno; | ||
1659 | case IOBASE_MEMORY: | ||
1660 | return (long)hose->pci_mem_offset; | ||
1661 | case IOBASE_IO: | ||
1662 | return (long)hose->io_base_phys; | ||
1663 | case IOBASE_ISA_IO: | ||
1664 | return (long)isa_io_base; | ||
1665 | case IOBASE_ISA_MEM: | ||
1666 | return (long)isa_mem_base; | ||
1667 | } | ||
1668 | |||
1669 | return result; | ||
1670 | } | ||
1671 | |||
1561 | /* | 1672 | /* |
1562 | * Null PCI config access functions, for the case when we can't | 1673 | * Null PCI config access functions, for the case when we can't |
1563 | * find a hose. | 1674 | * find a hose. |
@@ -1626,3 +1737,4 @@ int early_find_capability(struct pci_controller *hose, int bus, int devfn, | |||
1626 | { | 1737 | { |
1627 | return pci_bus_find_capability(fake_pci_bus(hose, bus), devfn, cap); | 1738 | return pci_bus_find_capability(fake_pci_bus(hose, bus), devfn, cap); |
1628 | } | 1739 | } |
1740 | |||
diff --git a/arch/microblaze/pci/pci_32.c b/arch/microblaze/pci/pci_32.c deleted file mode 100644 index 92728a6cfd80..000000000000 --- a/arch/microblaze/pci/pci_32.c +++ /dev/null | |||
@@ -1,432 +0,0 @@ | |||
1 | /* | ||
2 | * Common pmac/prep/chrp pci routines. -- Cort | ||
3 | */ | ||
4 | |||
5 | #include <linux/kernel.h> | ||
6 | #include <linux/pci.h> | ||
7 | #include <linux/delay.h> | ||
8 | #include <linux/string.h> | ||
9 | #include <linux/init.h> | ||
10 | #include <linux/capability.h> | ||
11 | #include <linux/sched.h> | ||
12 | #include <linux/errno.h> | ||
13 | #include <linux/bootmem.h> | ||
14 | #include <linux/irq.h> | ||
15 | #include <linux/list.h> | ||
16 | #include <linux/of.h> | ||
17 | #include <linux/slab.h> | ||
18 | |||
19 | #include <asm/processor.h> | ||
20 | #include <asm/io.h> | ||
21 | #include <asm/prom.h> | ||
22 | #include <asm/sections.h> | ||
23 | #include <asm/pci-bridge.h> | ||
24 | #include <asm/byteorder.h> | ||
25 | #include <asm/uaccess.h> | ||
26 | |||
27 | #undef DEBUG | ||
28 | |||
29 | unsigned long isa_io_base; | ||
30 | unsigned long pci_dram_offset; | ||
31 | int pcibios_assign_bus_offset = 1; | ||
32 | |||
33 | static u8 *pci_to_OF_bus_map; | ||
34 | |||
35 | /* By default, we don't re-assign bus numbers. We do this only on | ||
36 | * some pmacs | ||
37 | */ | ||
38 | static int pci_assign_all_buses; | ||
39 | |||
40 | static int pci_bus_count; | ||
41 | |||
42 | /* | ||
43 | * Functions below are used on OpenFirmware machines. | ||
44 | */ | ||
45 | static void | ||
46 | make_one_node_map(struct device_node *node, u8 pci_bus) | ||
47 | { | ||
48 | const int *bus_range; | ||
49 | int len; | ||
50 | |||
51 | if (pci_bus >= pci_bus_count) | ||
52 | return; | ||
53 | bus_range = of_get_property(node, "bus-range", &len); | ||
54 | if (bus_range == NULL || len < 2 * sizeof(int)) { | ||
55 | printk(KERN_WARNING "Can't get bus-range for %s, " | ||
56 | "assuming it starts at 0\n", node->full_name); | ||
57 | pci_to_OF_bus_map[pci_bus] = 0; | ||
58 | } else | ||
59 | pci_to_OF_bus_map[pci_bus] = bus_range[0]; | ||
60 | |||
61 | for_each_child_of_node(node, node) { | ||
62 | struct pci_dev *dev; | ||
63 | const unsigned int *class_code, *reg; | ||
64 | |||
65 | class_code = of_get_property(node, "class-code", NULL); | ||
66 | if (!class_code || | ||
67 | ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI && | ||
68 | (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) | ||
69 | continue; | ||
70 | reg = of_get_property(node, "reg", NULL); | ||
71 | if (!reg) | ||
72 | continue; | ||
73 | dev = pci_get_bus_and_slot(pci_bus, ((reg[0] >> 8) & 0xff)); | ||
74 | if (!dev || !dev->subordinate) { | ||
75 | pci_dev_put(dev); | ||
76 | continue; | ||
77 | } | ||
78 | make_one_node_map(node, dev->subordinate->number); | ||
79 | pci_dev_put(dev); | ||
80 | } | ||
81 | } | ||
82 | |||
83 | void | ||
84 | pcibios_make_OF_bus_map(void) | ||
85 | { | ||
86 | int i; | ||
87 | struct pci_controller *hose, *tmp; | ||
88 | struct property *map_prop; | ||
89 | struct device_node *dn; | ||
90 | |||
91 | pci_to_OF_bus_map = kmalloc(pci_bus_count, GFP_KERNEL); | ||
92 | if (!pci_to_OF_bus_map) { | ||
93 | printk(KERN_ERR "Can't allocate OF bus map !\n"); | ||
94 | return; | ||
95 | } | ||
96 | |||
97 | /* We fill the bus map with invalid values, that helps | ||
98 | * debugging. | ||
99 | */ | ||
100 | for (i = 0; i < pci_bus_count; i++) | ||
101 | pci_to_OF_bus_map[i] = 0xff; | ||
102 | |||
103 | /* For each hose, we begin searching bridges */ | ||
104 | list_for_each_entry_safe(hose, tmp, &hose_list, list_node) { | ||
105 | struct device_node *node = hose->dn; | ||
106 | |||
107 | if (!node) | ||
108 | continue; | ||
109 | make_one_node_map(node, hose->first_busno); | ||
110 | } | ||
111 | dn = of_find_node_by_path("/"); | ||
112 | map_prop = of_find_property(dn, "pci-OF-bus-map", NULL); | ||
113 | if (map_prop) { | ||
114 | BUG_ON(pci_bus_count > map_prop->length); | ||
115 | memcpy(map_prop->value, pci_to_OF_bus_map, pci_bus_count); | ||
116 | } | ||
117 | of_node_put(dn); | ||
118 | #ifdef DEBUG | ||
119 | printk(KERN_INFO "PCI->OF bus map:\n"); | ||
120 | for (i = 0; i < pci_bus_count; i++) { | ||
121 | if (pci_to_OF_bus_map[i] == 0xff) | ||
122 | continue; | ||
123 | printk(KERN_INFO "%d -> %d\n", i, pci_to_OF_bus_map[i]); | ||
124 | } | ||
125 | #endif | ||
126 | } | ||
127 | |||
128 | typedef int (*pci_OF_scan_iterator)(struct device_node *node, void *data); | ||
129 | |||
130 | static struct device_node *scan_OF_pci_childs(struct device_node *parent, | ||
131 | pci_OF_scan_iterator filter, void *data) | ||
132 | { | ||
133 | struct device_node *node; | ||
134 | struct device_node *sub_node; | ||
135 | |||
136 | for_each_child_of_node(parent, node) { | ||
137 | const unsigned int *class_code; | ||
138 | |||
139 | if (filter(node, data)) { | ||
140 | of_node_put(node); | ||
141 | return node; | ||
142 | } | ||
143 | |||
144 | /* For PCI<->PCI bridges or CardBus bridges, we go down | ||
145 | * Note: some OFs create a parent node "multifunc-device" as | ||
146 | * a fake root for all functions of a multi-function device, | ||
147 | * we go down them as well. | ||
148 | */ | ||
149 | class_code = of_get_property(node, "class-code", NULL); | ||
150 | if ((!class_code || | ||
151 | ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI && | ||
152 | (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) && | ||
153 | strcmp(node->name, "multifunc-device")) | ||
154 | continue; | ||
155 | sub_node = scan_OF_pci_childs(node, filter, data); | ||
156 | if (sub_node) { | ||
157 | of_node_put(node); | ||
158 | return sub_node; | ||
159 | } | ||
160 | } | ||
161 | return NULL; | ||
162 | } | ||
163 | |||
164 | static struct device_node *scan_OF_for_pci_dev(struct device_node *parent, | ||
165 | unsigned int devfn) | ||
166 | { | ||
167 | struct device_node *np, *cnp; | ||
168 | const u32 *reg; | ||
169 | unsigned int psize; | ||
170 | |||
171 | for_each_child_of_node(parent, np) { | ||
172 | reg = of_get_property(np, "reg", &psize); | ||
173 | if (reg && psize >= 4 && ((reg[0] >> 8) & 0xff) == devfn) | ||
174 | return np; | ||
175 | |||
176 | /* Note: some OFs create a parent node "multifunc-device" as | ||
177 | * a fake root for all functions of a multi-function device, | ||
178 | * we go down them as well. */ | ||
179 | if (!strcmp(np->name, "multifunc-device")) { | ||
180 | cnp = scan_OF_for_pci_dev(np, devfn); | ||
181 | if (cnp) | ||
182 | return cnp; | ||
183 | } | ||
184 | } | ||
185 | return NULL; | ||
186 | } | ||
187 | |||
188 | |||
189 | static struct device_node *scan_OF_for_pci_bus(struct pci_bus *bus) | ||
190 | { | ||
191 | struct device_node *parent, *np; | ||
192 | |||
193 | /* Are we a root bus ? */ | ||
194 | if (bus->self == NULL || bus->parent == NULL) { | ||
195 | struct pci_controller *hose = pci_bus_to_host(bus); | ||
196 | if (hose == NULL) | ||
197 | return NULL; | ||
198 | return of_node_get(hose->dn); | ||
199 | } | ||
200 | |||
201 | /* not a root bus, we need to get our parent */ | ||
202 | parent = scan_OF_for_pci_bus(bus->parent); | ||
203 | if (parent == NULL) | ||
204 | return NULL; | ||
205 | |||
206 | /* now iterate for children for a match */ | ||
207 | np = scan_OF_for_pci_dev(parent, bus->self->devfn); | ||
208 | of_node_put(parent); | ||
209 | |||
210 | return np; | ||
211 | } | ||
212 | |||
213 | /* | ||
214 | * Scans the OF tree for a device node matching a PCI device | ||
215 | */ | ||
216 | struct device_node * | ||
217 | pci_busdev_to_OF_node(struct pci_bus *bus, int devfn) | ||
218 | { | ||
219 | struct device_node *parent, *np; | ||
220 | |||
221 | pr_debug("pci_busdev_to_OF_node(%d,0x%x)\n", bus->number, devfn); | ||
222 | parent = scan_OF_for_pci_bus(bus); | ||
223 | if (parent == NULL) | ||
224 | return NULL; | ||
225 | pr_debug(" parent is %s\n", parent ? parent->full_name : "<NULL>"); | ||
226 | np = scan_OF_for_pci_dev(parent, devfn); | ||
227 | of_node_put(parent); | ||
228 | pr_debug(" result is %s\n", np ? np->full_name : "<NULL>"); | ||
229 | |||
230 | /* XXX most callers don't release the returned node | ||
231 | * mostly because ppc64 doesn't increase the refcount, | ||
232 | * we need to fix that. | ||
233 | */ | ||
234 | return np; | ||
235 | } | ||
236 | EXPORT_SYMBOL(pci_busdev_to_OF_node); | ||
237 | |||
238 | struct device_node* | ||
239 | pci_device_to_OF_node(struct pci_dev *dev) | ||
240 | { | ||
241 | return pci_busdev_to_OF_node(dev->bus, dev->devfn); | ||
242 | } | ||
243 | EXPORT_SYMBOL(pci_device_to_OF_node); | ||
244 | |||
245 | static int | ||
246 | find_OF_pci_device_filter(struct device_node *node, void *data) | ||
247 | { | ||
248 | return ((void *)node == data); | ||
249 | } | ||
250 | |||
251 | /* | ||
252 | * Returns the PCI device matching a given OF node | ||
253 | */ | ||
254 | int | ||
255 | pci_device_from_OF_node(struct device_node *node, u8 *bus, u8 *devfn) | ||
256 | { | ||
257 | const unsigned int *reg; | ||
258 | struct pci_controller *hose; | ||
259 | struct pci_dev *dev = NULL; | ||
260 | |||
261 | /* Make sure it's really a PCI device */ | ||
262 | hose = pci_find_hose_for_OF_device(node); | ||
263 | if (!hose || !hose->dn) | ||
264 | return -ENODEV; | ||
265 | if (!scan_OF_pci_childs(hose->dn, | ||
266 | find_OF_pci_device_filter, (void *)node)) | ||
267 | return -ENODEV; | ||
268 | reg = of_get_property(node, "reg", NULL); | ||
269 | if (!reg) | ||
270 | return -ENODEV; | ||
271 | *bus = (reg[0] >> 16) & 0xff; | ||
272 | *devfn = ((reg[0] >> 8) & 0xff); | ||
273 | |||
274 | /* Ok, here we need some tweak. If we have already renumbered | ||
275 | * all busses, we can't rely on the OF bus number any more. | ||
276 | * the pci_to_OF_bus_map is not enough as several PCI busses | ||
277 | * may match the same OF bus number. | ||
278 | */ | ||
279 | if (!pci_to_OF_bus_map) | ||
280 | return 0; | ||
281 | |||
282 | for_each_pci_dev(dev) | ||
283 | if (pci_to_OF_bus_map[dev->bus->number] == *bus && | ||
284 | dev->devfn == *devfn) { | ||
285 | *bus = dev->bus->number; | ||
286 | pci_dev_put(dev); | ||
287 | return 0; | ||
288 | } | ||
289 | |||
290 | return -ENODEV; | ||
291 | } | ||
292 | EXPORT_SYMBOL(pci_device_from_OF_node); | ||
293 | |||
294 | /* We create the "pci-OF-bus-map" property now so it appears in the | ||
295 | * /proc device tree | ||
296 | */ | ||
297 | void __init | ||
298 | pci_create_OF_bus_map(void) | ||
299 | { | ||
300 | struct property *of_prop; | ||
301 | struct device_node *dn; | ||
302 | |||
303 | of_prop = (struct property *) alloc_bootmem(sizeof(struct property) + \ | ||
304 | 256); | ||
305 | if (!of_prop) | ||
306 | return; | ||
307 | dn = of_find_node_by_path("/"); | ||
308 | if (dn) { | ||
309 | memset(of_prop, -1, sizeof(struct property) + 256); | ||
310 | of_prop->name = "pci-OF-bus-map"; | ||
311 | of_prop->length = 256; | ||
312 | of_prop->value = &of_prop[1]; | ||
313 | prom_add_property(dn, of_prop); | ||
314 | of_node_put(dn); | ||
315 | } | ||
316 | } | ||
317 | |||
318 | static void __devinit pcibios_scan_phb(struct pci_controller *hose) | ||
319 | { | ||
320 | struct pci_bus *bus; | ||
321 | struct device_node *node = hose->dn; | ||
322 | unsigned long io_offset; | ||
323 | struct resource *res = &hose->io_resource; | ||
324 | |||
325 | pr_debug("PCI: Scanning PHB %s\n", | ||
326 | node ? node->full_name : "<NO NAME>"); | ||
327 | |||
328 | /* Create an empty bus for the toplevel */ | ||
329 | bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops, hose); | ||
330 | if (bus == NULL) { | ||
331 | printk(KERN_ERR "Failed to create bus for PCI domain %04x\n", | ||
332 | hose->global_number); | ||
333 | return; | ||
334 | } | ||
335 | bus.dev->of_node = of_node_get(node); | ||
336 | bus->secondary = hose->first_busno; | ||
337 | hose->bus = bus; | ||
338 | |||
339 | /* Fixup IO space offset */ | ||
340 | io_offset = (unsigned long)hose->io_base_virt - isa_io_base; | ||
341 | res->start = (res->start + io_offset) & 0xffffffffu; | ||
342 | res->end = (res->end + io_offset) & 0xffffffffu; | ||
343 | |||
344 | /* Wire up PHB bus resources */ | ||
345 | pcibios_setup_phb_resources(hose); | ||
346 | |||
347 | /* Scan children */ | ||
348 | hose->last_busno = bus->subordinate = pci_scan_child_bus(bus); | ||
349 | } | ||
350 | |||
351 | static int __init pcibios_init(void) | ||
352 | { | ||
353 | struct pci_controller *hose, *tmp; | ||
354 | int next_busno = 0; | ||
355 | |||
356 | printk(KERN_INFO "PCI: Probing PCI hardware\n"); | ||
357 | |||
358 | if (pci_flags & PCI_REASSIGN_ALL_BUS) { | ||
359 | printk(KERN_INFO "setting pci_asign_all_busses\n"); | ||
360 | pci_assign_all_buses = 1; | ||
361 | } | ||
362 | |||
363 | /* Scan all of the recorded PCI controllers. */ | ||
364 | list_for_each_entry_safe(hose, tmp, &hose_list, list_node) { | ||
365 | if (pci_assign_all_buses) | ||
366 | hose->first_busno = next_busno; | ||
367 | hose->last_busno = 0xff; | ||
368 | pcibios_scan_phb(hose); | ||
369 | printk(KERN_INFO "calling pci_bus_add_devices()\n"); | ||
370 | pci_bus_add_devices(hose->bus); | ||
371 | if (pci_assign_all_buses || next_busno <= hose->last_busno) | ||
372 | next_busno = hose->last_busno + \ | ||
373 | pcibios_assign_bus_offset; | ||
374 | } | ||
375 | pci_bus_count = next_busno; | ||
376 | |||
377 | /* OpenFirmware based machines need a map of OF bus | ||
378 | * numbers vs. kernel bus numbers since we may have to | ||
379 | * remap them. | ||
380 | */ | ||
381 | if (pci_assign_all_buses) | ||
382 | pcibios_make_OF_bus_map(); | ||
383 | |||
384 | /* Call common code to handle resource allocation */ | ||
385 | pcibios_resource_survey(); | ||
386 | |||
387 | return 0; | ||
388 | } | ||
389 | |||
390 | subsys_initcall(pcibios_init); | ||
391 | |||
392 | static struct pci_controller* | ||
393 | pci_bus_to_hose(int bus) | ||
394 | { | ||
395 | struct pci_controller *hose, *tmp; | ||
396 | |||
397 | list_for_each_entry_safe(hose, tmp, &hose_list, list_node) | ||
398 | if (bus >= hose->first_busno && bus <= hose->last_busno) | ||
399 | return hose; | ||
400 | return NULL; | ||
401 | } | ||
402 | |||
403 | /* Provide information on locations of various I/O regions in physical | ||
404 | * memory. Do this on a per-card basis so that we choose the right | ||
405 | * root bridge. | ||
406 | * Note that the returned IO or memory base is a physical address | ||
407 | */ | ||
408 | |||
409 | long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn) | ||
410 | { | ||
411 | struct pci_controller *hose; | ||
412 | long result = -EOPNOTSUPP; | ||
413 | |||
414 | hose = pci_bus_to_hose(bus); | ||
415 | if (!hose) | ||
416 | return -ENODEV; | ||
417 | |||
418 | switch (which) { | ||
419 | case IOBASE_BRIDGE_NUMBER: | ||
420 | return (long)hose->first_busno; | ||
421 | case IOBASE_MEMORY: | ||
422 | return (long)hose->pci_mem_offset; | ||
423 | case IOBASE_IO: | ||
424 | return (long)hose->io_base_phys; | ||
425 | case IOBASE_ISA_IO: | ||
426 | return (long)isa_io_base; | ||
427 | case IOBASE_ISA_MEM: | ||
428 | return (long)isa_mem_base; | ||
429 | } | ||
430 | |||
431 | return result; | ||
432 | } | ||