Commit 942a6bdd authored by David S. Miller's avatar David S. Miller

[SPARC]: Port sparc64 in-kernel device tree code to sparc32.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a2bd4fd1
...@@ -12,7 +12,7 @@ obj-y := entry.o wof.o wuf.o etrap.o rtrap.o traps.o $(IRQ_OBJS) \ ...@@ -12,7 +12,7 @@ obj-y := entry.o wof.o wuf.o etrap.o rtrap.o traps.o $(IRQ_OBJS) \
sys_sparc.o sunos_asm.o systbls.o \ sys_sparc.o sunos_asm.o systbls.o \
time.o windows.o cpu.o devices.o sclow.o \ time.o windows.o cpu.o devices.o sclow.o \
tadpole.o tick14.o ptrace.o sys_solaris.o \ tadpole.o tick14.o ptrace.o sys_solaris.o \
unaligned.o muldiv.o semaphore.o unaligned.o muldiv.o semaphore.o prom.o
obj-$(CONFIG_PCI) += pcic.o obj-$(CONFIG_PCI) += pcic.o
obj-$(CONFIG_SUN4) += sun4setup.o obj-$(CONFIG_SUN4) += sun4setup.o
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <asm/ebus.h> #include <asm/ebus.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/oplib.h> #include <asm/oplib.h>
#include <asm/prom.h>
#include <asm/bpp.h> #include <asm/bpp.h>
struct linux_ebus *ebus_chain = NULL; struct linux_ebus *ebus_chain = NULL;
...@@ -83,79 +84,81 @@ int __init ebus_blacklist_irq(char *name) ...@@ -83,79 +84,81 @@ int __init ebus_blacklist_irq(char *name)
return 0; return 0;
} }
void __init fill_ebus_child(int node, struct linux_prom_registers *preg, void __init fill_ebus_child(struct device_node *dp,
struct linux_ebus_child *dev) struct linux_ebus_child *dev)
{ {
int regs[PROMREG_MAX]; int *regs;
int irqs[PROMREG_MAX]; int *irqs;
char lbuf[128];
int i, len; int i, len;
dev->prom_node = node; dev->prom_node = dp;
prom_getstring(node, "name", lbuf, sizeof(lbuf)); regs = of_get_property(dp, "reg", &len);
strcpy(dev->prom_name, lbuf); if (!regs)
len = 0;
len = prom_getproperty(node, "reg", (void *)regs, sizeof(regs));
if (len == -1) len = 0;
dev->num_addrs = len / sizeof(regs[0]); dev->num_addrs = len / sizeof(regs[0]);
for (i = 0; i < dev->num_addrs; i++) { for (i = 0; i < dev->num_addrs; i++) {
if (regs[i] >= dev->parent->num_addrs) { if (regs[i] >= dev->parent->num_addrs) {
prom_printf("UGH: property for %s was %d, need < %d\n", prom_printf("UGH: property for %s was %d, need < %d\n",
dev->prom_name, len, dev->parent->num_addrs); dev->prom_node->name, len,
dev->parent->num_addrs);
panic(__FUNCTION__); panic(__FUNCTION__);
} }
dev->resource[i].start = dev->parent->resource[regs[i]].start; /* XXX resource */
/* XXX resource */
dev->resource[i].start =
dev->parent->resource[regs[i]].start;
} }
for (i = 0; i < PROMINTR_MAX; i++) for (i = 0; i < PROMINTR_MAX; i++)
dev->irqs[i] = PCI_IRQ_NONE; dev->irqs[i] = PCI_IRQ_NONE;
if ((dev->irqs[0] = ebus_blacklist_irq(dev->prom_name)) != 0) { if ((dev->irqs[0] = ebus_blacklist_irq(dev->prom_node->name)) != 0) {
dev->num_irqs = 1; dev->num_irqs = 1;
} else if ((len = prom_getproperty(node, "interrupts", } else {
(char *)&irqs, sizeof(irqs))) == -1 || len == 0) { irqs = of_get_property(dp, "interrupts", &len);
if (!irqs) {
dev->num_irqs = 0; dev->num_irqs = 0;
dev->irqs[0] = 0; dev->irqs[0] = 0;
if (dev->parent->num_irqs != 0) { if (dev->parent->num_irqs != 0) {
dev->num_irqs = 1; dev->num_irqs = 1;
dev->irqs[0] = dev->parent->irqs[0]; dev->irqs[0] = dev->parent->irqs[0];
/* P3 */ /* printk("EBUS: dev %s irq %d from parent\n", dev->prom_name, dev->irqs[0]); */
} }
} else { } else {
dev->num_irqs = len / sizeof(irqs[0]); dev->num_irqs = len / sizeof(irqs[0]);
if (irqs[0] == 0 || irqs[0] >= 8) { if (irqs[0] == 0 || irqs[0] >= 8) {
/* /*
* XXX Zero is a valid pin number... * XXX Zero is a valid pin number...
* This works as long as Ebus is not wired to INTA#. * This works as long as Ebus is not wired
* to INTA#.
*/ */
printk("EBUS: %s got bad irq %d from PROM\n", printk("EBUS: %s got bad irq %d from PROM\n",
dev->prom_name, irqs[0]); dev->prom_node->name, irqs[0]);
dev->num_irqs = 0; dev->num_irqs = 0;
dev->irqs[0] = 0; dev->irqs[0] = 0;
} else { } else {
dev->irqs[0] = pcic_pin_to_irq(irqs[0], dev->prom_name); dev->irqs[0] =
pcic_pin_to_irq(irqs[0],
dev->prom_node->name);
}
} }
} }
} }
void __init fill_ebus_device(int node, struct linux_ebus_device *dev) void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *dev)
{ {
struct linux_prom_registers regs[PROMREG_MAX]; struct linux_prom_registers *regs;
struct linux_ebus_child *child; struct linux_ebus_child *child;
int irqs[PROMINTR_MAX]; int *irqs;
char lbuf[128];
int i, n, len; int i, n, len;
unsigned long baseaddr; unsigned long baseaddr;
dev->prom_node = node; dev->prom_node = dp;
prom_getstring(node, "name", lbuf, sizeof(lbuf));
strcpy(dev->prom_name, lbuf);
len = prom_getproperty(node, "reg", (void *)regs, sizeof(regs)); regs = of_get_property(dp, "reg", &len);
if (len % sizeof(struct linux_prom_registers)) { if (len % sizeof(struct linux_prom_registers)) {
prom_printf("UGH: proplen for %s was %d, need multiple of %d\n", prom_printf("UGH: proplen for %s was %d, need multiple of %d\n",
dev->prom_name, len, dev->prom_node->name, len,
(int)sizeof(struct linux_prom_registers)); (int)sizeof(struct linux_prom_registers));
panic(__FUNCTION__); panic(__FUNCTION__);
} }
...@@ -197,7 +200,7 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev) ...@@ -197,7 +200,7 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev)
if ((baseaddr = (unsigned long) ioremap(baseaddr, if ((baseaddr = (unsigned long) ioremap(baseaddr,
regs[i].reg_size)) == 0) { regs[i].reg_size)) == 0) {
panic("ebus: unable to remap dev %s", panic("ebus: unable to remap dev %s",
dev->prom_name); dev->prom_node->name);
} }
} }
dev->resource[i].start = baseaddr; /* XXX Unaligned */ dev->resource[i].start = baseaddr; /* XXX Unaligned */
...@@ -206,10 +209,11 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev) ...@@ -206,10 +209,11 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev)
for (i = 0; i < PROMINTR_MAX; i++) for (i = 0; i < PROMINTR_MAX; i++)
dev->irqs[i] = PCI_IRQ_NONE; dev->irqs[i] = PCI_IRQ_NONE;
if ((dev->irqs[0] = ebus_blacklist_irq(dev->prom_name)) != 0) { if ((dev->irqs[0] = ebus_blacklist_irq(dev->prom_node->name)) != 0) {
dev->num_irqs = 1; dev->num_irqs = 1;
} else if ((len = prom_getproperty(node, "interrupts", } else {
(char *)&irqs, sizeof(irqs))) == -1 || len == 0) { irqs = of_get_property(dp, "interrupts", &len);
if (!irqs) {
dev->num_irqs = 0; dev->num_irqs = 0;
if ((dev->irqs[0] = dev->bus->self->irq) != 0) { if ((dev->irqs[0] = dev->bus->self->irq) != 0) {
dev->num_irqs = 1; dev->num_irqs = 1;
...@@ -220,15 +224,18 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev) ...@@ -220,15 +224,18 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev)
if (irqs[0] == 0 || irqs[0] >= 8) { if (irqs[0] == 0 || irqs[0] >= 8) {
/* See above for the parent. XXX */ /* See above for the parent. XXX */
printk("EBUS: %s got bad irq %d from PROM\n", printk("EBUS: %s got bad irq %d from PROM\n",
dev->prom_name, irqs[0]); dev->prom_node->name, irqs[0]);
dev->num_irqs = 0; dev->num_irqs = 0;
dev->irqs[0] = 0; dev->irqs[0] = 0;
} else { } else {
dev->irqs[0] = pcic_pin_to_irq(irqs[0], dev->prom_name); dev->irqs[0] =
pcic_pin_to_irq(irqs[0],
dev->prom_node->name);
}
} }
} }
if ((node = prom_getchild(node))) { if ((dp = dp->child) != NULL) {
dev->children = (struct linux_ebus_child *) dev->children = (struct linux_ebus_child *)
ebus_alloc(sizeof(struct linux_ebus_child)); ebus_alloc(sizeof(struct linux_ebus_child));
...@@ -236,9 +243,9 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev) ...@@ -236,9 +243,9 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev)
child->next = NULL; child->next = NULL;
child->parent = dev; child->parent = dev;
child->bus = dev->bus; child->bus = dev->bus;
fill_ebus_child(node, &regs[0], child); fill_ebus_child(dp, child);
while ((node = prom_getsibling(node)) != 0) { while ((dp = dp->sibling) != NULL) {
child->next = (struct linux_ebus_child *) child->next = (struct linux_ebus_child *)
ebus_alloc(sizeof(struct linux_ebus_child)); ebus_alloc(sizeof(struct linux_ebus_child));
...@@ -246,51 +253,49 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev) ...@@ -246,51 +253,49 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev)
child->next = NULL; child->next = NULL;
child->parent = dev; child->parent = dev;
child->bus = dev->bus; child->bus = dev->bus;
fill_ebus_child(node, &regs[0], child); fill_ebus_child(dp, child);
} }
} }
} }
void __init ebus_init(void) void __init ebus_init(void)
{ {
struct linux_prom_pci_registers regs[PROMREG_MAX]; struct linux_prom_pci_registers *regs;
struct linux_pbm_info *pbm; struct linux_pbm_info *pbm;
struct linux_ebus_device *dev; struct linux_ebus_device *dev;
struct linux_ebus *ebus; struct linux_ebus *ebus;
struct ebus_system_entry *sp; struct ebus_system_entry *sp;
struct pci_dev *pdev; struct pci_dev *pdev;
struct pcidev_cookie *cookie; struct pcidev_cookie *cookie;
char lbuf[128]; struct device_node *dp;
unsigned long addr, *base; unsigned long addr, *base;
unsigned short pci_command; unsigned short pci_command;
int nd, len, ebusnd; int len, reg, nreg;
int reg, nreg;
int num_ebus = 0; int num_ebus = 0;
prom_getstring(prom_root_node, "name", lbuf, sizeof(lbuf)); dp = of_find_node_by_path("/");
for (sp = ebus_blacklist; sp->esname != NULL; sp++) { for (sp = ebus_blacklist; sp->esname != NULL; sp++) {
if (strcmp(lbuf, sp->esname) == 0) { if (strcmp(dp->name, sp->esname) == 0) {
ebus_blackp = sp->ipt; ebus_blackp = sp->ipt;
break; break;
} }
} }
pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, NULL); pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, NULL);
if (!pdev) { if (!pdev)
return; return;
}
cookie = pdev->sysdata; cookie = pdev->sysdata;
ebusnd = cookie->prom_node; dp = cookie->prom_node;
ebus_chain = ebus = (struct linux_ebus *) ebus_chain = ebus = (struct linux_ebus *)
ebus_alloc(sizeof(struct linux_ebus)); ebus_alloc(sizeof(struct linux_ebus));
ebus->next = NULL; ebus->next = NULL;
while (ebusnd) { while (dp) {
struct device_node *nd;
prom_getstring(ebusnd, "name", lbuf, sizeof(lbuf)); ebus->prom_node = dp;
ebus->prom_node = ebusnd;
strcpy(ebus->prom_name, lbuf);
ebus->self = pdev; ebus->self = pdev;
ebus->parent = pbm = cookie->pbm; ebus->parent = pbm = cookie->pbm;
...@@ -299,9 +304,8 @@ void __init ebus_init(void) ...@@ -299,9 +304,8 @@ void __init ebus_init(void)
pci_command |= PCI_COMMAND_MASTER; pci_command |= PCI_COMMAND_MASTER;
pci_write_config_word(pdev, PCI_COMMAND, pci_command); pci_write_config_word(pdev, PCI_COMMAND, pci_command);
len = prom_getproperty(ebusnd, "reg", (void *)regs, regs = of_get_property(dp, "reg", &len);
sizeof(regs)); if (!regs) {
if (len == 0 || len == -1) {
prom_printf("%s: can't find reg property\n", prom_printf("%s: can't find reg property\n",
__FUNCTION__); __FUNCTION__);
prom_halt(); prom_halt();
...@@ -317,7 +321,7 @@ void __init ebus_init(void) ...@@ -317,7 +321,7 @@ void __init ebus_init(void)
*base++ = addr; *base++ = addr;
} }
nd = prom_getchild(ebusnd); nd = dp->child;
if (!nd) if (!nd)
goto next_ebus; goto next_ebus;
...@@ -330,7 +334,7 @@ void __init ebus_init(void) ...@@ -330,7 +334,7 @@ void __init ebus_init(void)
dev->bus = ebus; dev->bus = ebus;
fill_ebus_device(nd, dev); fill_ebus_device(nd, dev);
while ((nd = prom_getsibling(nd)) != 0) { while ((nd = nd->sibling) != NULL) {
dev->next = (struct linux_ebus_device *) dev->next = (struct linux_ebus_device *)
ebus_alloc(sizeof(struct linux_ebus_device)); ebus_alloc(sizeof(struct linux_ebus_device));
...@@ -348,7 +352,7 @@ void __init ebus_init(void) ...@@ -348,7 +352,7 @@ void __init ebus_init(void)
break; break;
cookie = pdev->sysdata; cookie = pdev->sysdata;
ebusnd = cookie->prom_node; dp = cookie->prom_node;
ebus->next = (struct linux_ebus *) ebus->next = (struct linux_ebus *)
ebus_alloc(sizeof(struct linux_ebus)); ebus_alloc(sizeof(struct linux_ebus));
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/oplib.h> #include <asm/oplib.h>
#include <asm/prom.h>
#include <asm/pcic.h> #include <asm/pcic.h>
#include <asm/timer.h> #include <asm/timer.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -665,7 +666,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus) ...@@ -665,7 +666,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
/* cookies */ /* cookies */
pcp = pci_devcookie_alloc(); pcp = pci_devcookie_alloc();
pcp->pbm = &pcic->pbm; pcp->pbm = &pcic->pbm;
pcp->prom_node = node; pcp->prom_node = of_find_node_by_phandle(node);
dev->sysdata = pcp; dev->sysdata = pcp;
/* fixing I/O to look like memory */ /* fixing I/O to look like memory */
......
This diff is collapsed.
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <asm/vaddrs.h> #include <asm/vaddrs.h>
#include <asm/pgalloc.h> /* bug in asm-generic/tlb.h: check_pgt_cache */ #include <asm/pgalloc.h> /* bug in asm-generic/tlb.h: check_pgt_cache */
#include <asm/tlb.h> #include <asm/tlb.h>
#include <asm/prom.h>
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
...@@ -349,6 +350,7 @@ void __init paging_init(void) ...@@ -349,6 +350,7 @@ void __init paging_init(void)
protection_map[14] = PAGE_SHARED; protection_map[14] = PAGE_SHARED;
protection_map[15] = PAGE_SHARED; protection_map[15] = PAGE_SHARED;
btfixup(); btfixup();
prom_build_devicetree();
device_scan(); device_scan();
} }
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <asm/sbus.h> #include <asm/sbus.h>
#include <asm/openprom.h> #include <asm/openprom.h>
#include <asm/oplib.h> #include <asm/oplib.h>
#include <asm/prom.h>
#include <asm/auxio.h> #include <asm/auxio.h>
#ifndef __sparc_v9__ #ifndef __sparc_v9__
#include <asm/io-unit.h> #include <asm/io-unit.h>
......
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#endif #endif
#include <asm/oplib.h> #include <asm/oplib.h>
#include <asm/prom.h>
struct linux_ebus_child { struct linux_ebus_child {
struct linux_ebus_child *next; struct linux_ebus_child *next;
struct linux_ebus_device *parent; struct linux_ebus_device *parent;
struct linux_ebus *bus; struct linux_ebus *bus;
int prom_node; struct device_node *prom_node;
char prom_name[64];
struct resource resource[PROMREG_MAX]; struct resource resource[PROMREG_MAX];
int num_addrs; int num_addrs;
unsigned int irqs[PROMINTR_MAX]; unsigned int irqs[PROMINTR_MAX];
...@@ -30,8 +30,7 @@ struct linux_ebus_device { ...@@ -30,8 +30,7 @@ struct linux_ebus_device {
struct linux_ebus_device *next; struct linux_ebus_device *next;
struct linux_ebus_child *children; struct linux_ebus_child *children;
struct linux_ebus *bus; struct linux_ebus *bus;
int prom_node; struct device_node *prom_node;
char prom_name[64];
struct resource resource[PROMREG_MAX]; struct resource resource[PROMREG_MAX];
int num_addrs; int num_addrs;
unsigned int irqs[PROMINTR_MAX]; unsigned int irqs[PROMINTR_MAX];
...@@ -43,10 +42,7 @@ struct linux_ebus { ...@@ -43,10 +42,7 @@ struct linux_ebus {
struct linux_ebus_device *devices; struct linux_ebus_device *devices;
struct linux_pbm_info *parent; struct linux_pbm_info *parent;
struct pci_dev *self; struct pci_dev *self;
int prom_node; struct device_node *prom_node;
char prom_name[64];
struct linux_prom_ebus_ranges ebus_ranges[PROMREG_MAX];
int num_ebus_ranges;
}; };
struct linux_ebus_dma { struct linux_ebus_dma {
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/oplib.h> #include <asm/oplib.h>
#include <asm/prom.h>
struct linux_pbm_info { struct linux_pbm_info {
int prom_node; int prom_node;
...@@ -40,7 +41,7 @@ struct linux_pbm_info { ...@@ -40,7 +41,7 @@ struct linux_pbm_info {
*/ */
struct pcidev_cookie { struct pcidev_cookie {
struct linux_pbm_info *pbm; struct linux_pbm_info *pbm;
int prom_node; struct device_node *prom_node;
}; };
#endif /* !(__SPARC_PBM_H) */ #endif /* !(__SPARC_PBM_H) */
#ifndef _SPARC_PROM_H
#define _SPARC_PROM_H
#ifdef __KERNEL__
/*
* Definitions for talking to the Open Firmware PROM on
* Power Macintosh computers.
*
* Copyright (C) 1996-2005 Paul Mackerras.
*
* Updates for PPC64 by Peter Bergner & David Engebretsen, IBM Corp.
* Updates for SPARC32 by David S. Miller
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
#include <linux/types.h>
#include <linux/proc_fs.h>
#include <asm/atomic.h>
typedef u32 phandle;
typedef u32 ihandle;
struct interrupt_info {
int line;
int sense; /* +ve/-ve logic, edge or level, etc. */
};
struct property {
char *name;
int length;
void *value;
struct property *next;
};
struct device_node {
char *name;
char *type;
phandle node;
phandle linux_phandle;
int n_intrs;
struct interrupt_info *intrs;
char *path_component_name;
char *full_name;
struct property *properties;
struct property *deadprops; /* removed properties */
struct device_node *parent;
struct device_node *child;
struct device_node *sibling;
struct device_node *next; /* next device of same type */
struct device_node *allnext; /* next in list of all nodes */
struct proc_dir_entry *pde; /* this node's proc directory */
struct kref kref;
unsigned long _flags;
void *data;
};
static inline void set_node_proc_entry(struct device_node *dn, struct proc_dir_entry *de)
{
dn->pde = de;
}
extern struct device_node *of_find_node_by_name(struct device_node *from,
const char *name);
#define for_each_node_by_name(dn, name) \
for (dn = of_find_node_by_name(NULL, name); dn; \
dn = of_find_node_by_name(dn, name))
extern struct device_node *of_find_node_by_type(struct device_node *from,
const char *type);
#define for_each_node_by_type(dn, type) \
for (dn = of_find_node_by_type(NULL, type); dn; \
dn = of_find_node_by_type(dn, type))
extern struct device_node *of_find_compatible_node(struct device_node *from,
const char *type, const char *compat);
extern struct device_node *of_find_node_by_path(const char *path);
extern struct device_node *of_find_node_by_phandle(phandle handle);
extern struct device_node *of_get_parent(const struct device_node *node);
extern struct device_node *of_get_next_child(const struct device_node *node,
struct device_node *prev);
extern struct property *of_find_property(struct device_node *np,
const char *name,
int *lenp);
extern int of_device_is_compatible(struct device_node *device, const char *);
extern void *of_get_property(struct device_node *node, const char *name,
int *lenp);
extern int of_getintprop_default(struct device_node *np,
const char *name,
int def);
extern void prom_build_devicetree(void);
#endif /* __KERNEL__ */
#endif /* _SPARC_PROM_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment