Commit 576c352e authored by David S. Miller's avatar David S. Miller Committed by David S. Miller

[SBUS]: Rewrite and plug into of_device framework.

I severely apologize, I was still learning how to program
in C when I wrote this stuff 10 years ago...
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fd531431
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/vaddrs.h> #include <asm/vaddrs.h>
#include <asm/oplib.h> #include <asm/oplib.h>
#include <asm/prom.h>
#include <asm/sbus.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/dma.h> #include <asm/dma.h>
...@@ -458,6 +460,89 @@ void sbus_dma_sync_sg_for_device(struct sbus_dev *sdev, struct scatterlist *sg, ...@@ -458,6 +460,89 @@ void sbus_dma_sync_sg_for_device(struct sbus_dev *sdev, struct scatterlist *sg,
{ {
printk("sbus_dma_sync_sg_for_device: not implemented yet\n"); printk("sbus_dma_sync_sg_for_device: not implemented yet\n");
} }
/* Support code for sbus_init(). */
/*
* XXX This functions appears to be a distorted version of
* prom_sbus_ranges_init(), with all sun4d stuff cut away.
* Ask DaveM what is going on here, how is sun4d supposed to work... XXX
*/
/* added back sun4d patch from Thomas Bogendoerfer - should be OK (crn) */
void __init sbus_arch_bus_ranges_init(struct device_node *pn, struct sbus_bus *sbus)
{
int parent_node = pn->node;
if (sparc_cpu_model == sun4d) {
struct linux_prom_ranges iounit_ranges[PROMREG_MAX];
int num_iounit_ranges, len;
len = prom_getproperty(parent_node, "ranges",
(char *) iounit_ranges,
sizeof (iounit_ranges));
if (len != -1) {
num_iounit_ranges =
(len / sizeof(struct linux_prom_ranges));
prom_adjust_ranges(sbus->sbus_ranges,
sbus->num_sbus_ranges,
iounit_ranges, num_iounit_ranges);
}
}
}
void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)
{
struct device_node *parent = dp->parent;
if (sparc_cpu_model != sun4d &&
parent != NULL &&
!strcmp(parent->name, "iommu")) {
extern void iommu_init(int iommu_node, struct sbus_bus *sbus);
iommu_init(parent->node, sbus);
}
if (sparc_cpu_model == sun4d) {
extern void iounit_init(int sbi_node, int iounit_node,
struct sbus_bus *sbus);
iounit_init(dp->node, parent->node, sbus);
}
}
void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp)
{
if (sparc_cpu_model == sun4d) {
struct device_node *parent = dp->parent;
sbus->devid = of_getintprop_default(parent, "device-id", 0);
sbus->board = of_getintprop_default(parent, "board#", 0);
}
}
int __init sbus_arch_preinit(void)
{
extern void register_proc_sparc_ioport(void);
register_proc_sparc_ioport();
#ifdef CONFIG_SUN4
{
extern void sun4_dvma_init(void);
sun4_dvma_init();
}
return 1;
#else
return 0;
#endif
}
void __init sbus_arch_postinit(void)
{
if (sparc_cpu_model == sun4d) {
extern void sun4d_init_sbi_irq(void);
sun4d_init_sbi_irq();
}
}
#endif /* CONFIG_SBUS */ #endif /* CONFIG_SBUS */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
......
...@@ -1099,7 +1099,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus) ...@@ -1099,7 +1099,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)
} }
/* Boot time initialization. */ /* Boot time initialization. */
void __init sbus_iommu_init(int __node, struct sbus_bus *sbus) static void __init sbus_iommu_init(int __node, struct sbus_bus *sbus)
{ {
struct linux_prom64_registers *pr; struct linux_prom64_registers *pr;
struct device_node *dp; struct device_node *dp;
...@@ -1247,3 +1247,32 @@ void sbus_fill_device_irq(struct sbus_dev *sdev) ...@@ -1247,3 +1247,32 @@ void sbus_fill_device_irq(struct sbus_dev *sdev)
sdev->irqs[0] = sbus_build_irq(sdev->bus, pri); sdev->irqs[0] = sbus_build_irq(sdev->bus, pri);
} }
} }
void __init sbus_arch_bus_ranges_init(struct device_node *pn, struct sbus_bus *sbus)
{
}
void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)
{
sbus_iommu_init(dp->node, sbus);
}
void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp)
{
}
int __init sbus_arch_preinit(void)
{
return 0;
}
void __init sbus_arch_postinit(void)
{
extern void firetruck_init(void);
extern void auxio_probe(void);
extern void clock_probe(void);
firetruck_init();
auxio_probe();
clock_probe();
}
This diff is collapsed.
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <asm/oplib.h> #include <asm/oplib.h>
/* #include <asm/iommu.h> */ /* Unused since we use opaque iommu (|io-unit) */ #include <asm/prom.h>
#include <asm/of_device.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
/* We scan which devices are on the SBus using the PROM node device /* We scan which devices are on the SBus using the PROM node device
...@@ -42,18 +43,19 @@ struct sbus_bus; ...@@ -42,18 +43,19 @@ struct sbus_bus;
/* Linux SBUS device tables */ /* Linux SBUS device tables */
struct sbus_dev { struct sbus_dev {
struct sbus_bus *bus; /* Back ptr to sbus */ struct of_device ofdev;
struct sbus_dev *next; /* next device on this SBus or null */ struct sbus_bus *bus;
struct sbus_dev *child; /* For ledma and espdma on sun4m */ struct sbus_dev *next;
struct sbus_dev *parent; /* Parent device if not toplevel */ struct sbus_dev *child;
int prom_node; /* PROM device tree node for this device */ struct sbus_dev *parent;
char prom_name[64]; /* PROM device name */ int prom_node;
char prom_name[64];
int slot; int slot;
struct resource resource[PROMREG_MAX]; struct resource resource[PROMREG_MAX];
struct linux_prom_registers reg_addrs[PROMREG_MAX]; struct linux_prom_registers reg_addrs[PROMREG_MAX];
int num_registers, ranges_applied; int num_registers;
struct linux_prom_ranges device_ranges[PROMREG_MAX]; struct linux_prom_ranges device_ranges[PROMREG_MAX];
int num_device_ranges; int num_device_ranges;
...@@ -61,9 +63,11 @@ struct sbus_dev { ...@@ -61,9 +63,11 @@ struct sbus_dev {
unsigned int irqs[4]; unsigned int irqs[4];
int num_irqs; int num_irqs;
}; };
#define to_sbus_device(d) container_of(d, struct sbus_dev, ofdev.dev)
/* This struct describes the SBus(s) found on this machine. */ /* This struct describes the SBus(s) found on this machine. */
struct sbus_bus { struct sbus_bus {
struct of_device ofdev;
void *iommu; /* Opaque IOMMU cookie */ void *iommu; /* Opaque IOMMU cookie */
struct sbus_dev *devices; /* Link to devices on this SBus */ struct sbus_dev *devices; /* Link to devices on this SBus */
struct sbus_bus *next; /* next SBus, if more than one SBus */ struct sbus_bus *next; /* next SBus, if more than one SBus */
...@@ -77,6 +81,7 @@ struct sbus_bus { ...@@ -77,6 +81,7 @@ struct sbus_bus {
int devid; int devid;
int board; int board;
}; };
#define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev)
extern struct sbus_bus *sbus_root; extern struct sbus_bus *sbus_root;
...@@ -140,4 +145,10 @@ extern void sbus_dma_sync_sg_for_device(struct sbus_dev *, struct scatterlist *, ...@@ -140,4 +145,10 @@ extern void sbus_dma_sync_sg_for_device(struct sbus_dev *, struct scatterlist *,
BTFIXUPDEF_CALL(unsigned int, sbint_to_irq, struct sbus_dev *sdev, unsigned int) BTFIXUPDEF_CALL(unsigned int, sbint_to_irq, struct sbus_dev *sdev, unsigned int)
#define sbint_to_irq(sdev, sbint) BTFIXUP_CALL(sbint_to_irq)(sdev, sbint) #define sbint_to_irq(sdev, sbint) BTFIXUP_CALL(sbint_to_irq)(sdev, sbint)
extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *);
extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *);
extern void sbus_setup_arch_props(struct sbus_bus *, struct device_node *);
extern int sbus_arch_preinit(void);
extern void sbus_arch_postinit(void);
#endif /* !(_SPARC_SBUS_H) */ #endif /* !(_SPARC_SBUS_H) */
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <asm/oplib.h> #include <asm/oplib.h>
#include <asm/prom.h>
#include <asm/of_device.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
...@@ -42,18 +44,19 @@ struct sbus_bus; ...@@ -42,18 +44,19 @@ struct sbus_bus;
/* Linux SBUS device tables */ /* Linux SBUS device tables */
struct sbus_dev { struct sbus_dev {
struct sbus_bus *bus; /* Our toplevel parent SBUS */ struct of_device ofdev;
struct sbus_dev *next; /* Chain of siblings */ struct sbus_bus *bus;
struct sbus_dev *child; /* Chain of children */ struct sbus_dev *next;
struct sbus_dev *parent;/* Parent device if not toplevel*/ struct sbus_dev *child;
int prom_node; /* OBP node of this device */ struct sbus_dev *parent;
char prom_name[64]; /* OBP device name property */ int prom_node;
int slot; /* SBUS slot number */ char prom_name[64];
int slot;
struct resource resource[PROMREG_MAX]; struct resource resource[PROMREG_MAX];
struct linux_prom_registers reg_addrs[PROMREG_MAX]; struct linux_prom_registers reg_addrs[PROMREG_MAX];
int num_registers, ranges_applied; int num_registers;
struct linux_prom_ranges device_ranges[PROMREG_MAX]; struct linux_prom_ranges device_ranges[PROMREG_MAX];
int num_device_ranges; int num_device_ranges;
...@@ -61,9 +64,11 @@ struct sbus_dev { ...@@ -61,9 +64,11 @@ struct sbus_dev {
unsigned int irqs[4]; unsigned int irqs[4];
int num_irqs; int num_irqs;
}; };
#define to_sbus_device(d) container_of(d, struct sbus_dev, ofdev.dev)
/* This struct describes the SBus(s) found on this machine. */ /* This struct describes the SBus(s) found on this machine. */
struct sbus_bus { struct sbus_bus {
struct of_device ofdev;
void *iommu; /* Opaque IOMMU cookie */ void *iommu; /* Opaque IOMMU cookie */
struct sbus_dev *devices; /* Tree of SBUS devices */ struct sbus_dev *devices; /* Tree of SBUS devices */
struct sbus_bus *next; /* Next SBUS in system */ struct sbus_bus *next; /* Next SBUS in system */
...@@ -77,6 +82,7 @@ struct sbus_bus { ...@@ -77,6 +82,7 @@ struct sbus_bus {
int portid; int portid;
void *starfire_cookie; void *starfire_cookie;
}; };
#define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev)
extern struct sbus_bus *sbus_root; extern struct sbus_bus *sbus_root;
...@@ -120,4 +126,10 @@ extern void sbus_dma_sync_sg_for_cpu(struct sbus_dev *, struct scatterlist *, in ...@@ -120,4 +126,10 @@ extern void sbus_dma_sync_sg_for_cpu(struct sbus_dev *, struct scatterlist *, in
#define sbus_dma_sync_sg sbus_dma_sync_sg_for_cpu #define sbus_dma_sync_sg sbus_dma_sync_sg_for_cpu
extern void sbus_dma_sync_sg_for_device(struct sbus_dev *, struct scatterlist *, int, int); extern void sbus_dma_sync_sg_for_device(struct sbus_dev *, struct scatterlist *, int, int);
extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *);
extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *);
extern void sbus_setup_arch_props(struct sbus_bus *, struct device_node *);
extern int sbus_arch_preinit(void);
extern void sbus_arch_postinit(void);
#endif /* !(_SPARC64_SBUS_H) */ #endif /* !(_SPARC64_SBUS_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