Skip to contentSkip to conversation

Added support for AMBA bus

PATCH In review Konrad Eisele 2 participants 2 messages Jun 9, 2009 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore
#0 lore raw

PATCH 5/7 Added support for AMBA bus

From 1c076b182a3bc3e6c332df7c4f4436d69e7fa3b6 Mon Sep 17 00:00:00 2001
From: Konrad Eisele <[email protected]>
Date: Tue, 9 Jun 2009 13:03:50 +0200
Subject: [PATCH 5/7] Added support for AMBA bus. The device is a AMBA bus if it is a child of prom node "ambapp" (AMBA plug and play).
Two functions leon_trans_init() and leon_node_init()
(defined in sparc/kernel/leon.c) are called in the prom_build_tree() path if CONFIG_LEON is defined. leon_node_init() will build up the device tree using
AMBA plug and play.

---
 arch/sparc/kernel/of_device_32.c |   50 +++++++++++++++++++++++++++++++++++++-
 arch/sparc/kernel/prom_32.c      |   42 ++++++++++++++++++++++++++++++++
 arch/sparc/kernel/prom_common.c  |   20 ++++++++++++++-
 3 files changed, 109 insertions(+), 3 deletions(-)
arch/sparc/kernel/of_device_32.c +49 -1
index 0a83bd7..1d1e75a 100644
@@ -8,6 +8,9 @@ #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
+#if defined(CONFIG_LEON)
+#include <asm/leon.h>
+#endif
 
 static int node_match(struct device *dev, void *data)
 {
@@ -125,7 +128,10 @@ static int of_out_of_range(const u32 *ad
 	return 0;
 }
 
-static int of_bus_default_map(u32 *addr, const u32 *range,
+#if !defined(CONFIG_LEON)
+static
+#endif
+int of_bus_default_map(u32 *addr, const u32 *range,
 			      int na, int ns, int pna)
 {
 	u32 result[OF_MAX_ADDR_CELLS];
@@ -269,6 +275,37 @@ static unsigned long of_bus_sbus_get_fla
 	return IORESOURCE_MEM;
 }
 
+#if defined(CONFIG_LEON)
+
+ /*
+ * AMBAPP bus specific translator
+ */
+
+int of_bus_ambapp_match(struct device_node *np)
+{
+	return !strcmp(np->name, "ambapp");
+}
+
+void of_bus_ambapp_count_cells(struct device_node *child,
+				      int *addrc, int *sizec)
+{
+	if (addrc)
+		*addrc = 1;
+	if (sizec)
+		*sizec = 1;
+}
+
+int of_bus_ambapp_map(u32 *addr, const u32 *range, int na, int ns, int pna)
+{
+	return of_bus_default_map(addr, range, na, ns, pna);
+}
+
+unsigned long of_bus_ambapp_get_flags(const u32 *addr, unsigned long flags)
+{
+	return IORESOURCE_MEM;
+}
+
+#endif
 
 /*
  * Array of bus specific translators
@@ -293,6 +330,17 @@ static struct of_bus of_busses[] = {
 		.map = of_bus_sbus_map,
 		.get_flags = of_bus_sbus_get_flags,
 	},
+#if defined(CONFIG_LEON)
+	/* AMBA */
+	{
+		.name = "ambapp",
+		.addr_prop_name = "reg",
+		.match = of_bus_ambapp_match,
+		.count_cells = of_bus_ambapp_count_cells,
+		.map = of_bus_ambapp_map,
+		.get_flags = of_bus_ambapp_get_flags,
+	},
+#endif
 	/* Default */
 	{
 		.name = "default",
arch/sparc/kernel/prom_32.c +42 -0

54 lines not on this page · raw message

arch/sparc/kernel/prom_common.c +18 -2
index 0fb5789..d865b65 100644
@@ -22,6 +22,11 @@ #include <linux/slab.h>
 #include <linux/of.h>
 #include <asm/prom.h>
 #include <asm/oplib.h>
+#if defined(CONFIG_LEON)
+extern void __init leon_trans_init(struct device_node *dp);
+extern void __init leon_node_init(struct device_node *dp,
+				  struct device_node ***nextp);
+#endif
 
 #include "prom.h"
 
@@ -161,7 +166,7 @@ static struct property * __init build_on
 			name = prom_nextprop(node, prev, p->name);
 		}
 
-		if (strlen(name) == 0) {
+		if (!name || strlen(name) == 0) {
 			tmp = p;
 			return NULL;
 		}
@@ -237,12 +242,19 @@ static struct device_node * __init prom_
 
 	dp->properties = build_prop_list(node);
 
+#if defined(CONFIG_LEON)
+	leon_trans_init(dp);
+#endif
 	irq_trans_init(dp);
 
 	return dp;
 }
 
-static char * __init build_full_name(struct device_node *dp)
+#if !defined(CONFIG_LEON)
+static
+#else
+char * __init build_full_name(struct device_node *dp)
+#endif
 {
 	int len, ourlen, plen;
 	char *n;
@@ -289,6 +301,10 @@ static struct device_node * __init prom_
 
 		dp->child = prom_build_tree(dp, prom_getchild(node), nextp);
 
+#if defined(CONFIG_LEON)
+		leon_node_init(dp, nextp);
+#endif
+
 		node = prom_getsibling(node);
 	}
 
Signature · 1 line
1.4.2.1

From 1c076b182a3bc3e6c332df7c4f4436d69e7fa3b6 Mon Sep 17 00:00:00 2001
From: Konrad Eisele <[email protected]>
Date: Tue, 9 Jun 2009 13:03:50 +0200
Subject: [PATCH 5/7] Added support for AMBA bus. The device is a AMBA bus if it is a child of prom node "ambapp" (AMBA plug and play).
Two functions leon_trans_init() and leon_node_init()
(defined in sparc/kernel/leon.c) are called in the prom_build_tree() path if CONFIG_LEON is defined. leon_node_init() will build up the device tree using
AMBA plug and play.

---
 arch/sparc/kernel/of_device_32.c |   50 +++++++++++++++++++++++++++++++++++++-
 arch/sparc/kernel/prom_32.c      |   42 ++++++++++++++++++++++++++++++++
 arch/sparc/kernel/prom_common.c  |   20 ++++++++++++++-
 3 files changed, 109 insertions(+), 3 deletions(-)
arch/sparc/kernel/of_device_32.c +49 -1

74 lines not on this page · raw message

arch/sparc/kernel/prom_32.c +42 -0

54 lines not on this page · raw message

arch/sparc/kernel/prom_common.c +18 -2
index 0fb5789..d865b65 100644
@@ -22,6 +22,11 @@ #include <linux/slab.h>
 #include <linux/of.h>
 #include <asm/prom.h>
 #include <asm/oplib.h>
+#if defined(CONFIG_LEON)
+extern void __init leon_trans_init(struct device_node *dp);
+extern void __init leon_node_init(struct device_node *dp,
+				  struct device_node ***nextp);
+#endif
 
 #include "prom.h"
 
@@ -161,7 +166,7 @@ static struct property * __init build_on
 			name = prom_nextprop(node, prev, p->name);
 		}
 
-		if (strlen(name) == 0) {
+		if (!name || strlen(name) == 0) {
 			tmp = p;
 			return NULL;
 		}
@@ -237,12 +242,19 @@ static struct device_node * __init prom_
 
 	dp->properties = build_prop_list(node);
 
+#if defined(CONFIG_LEON)
+	leon_trans_init(dp);
+#endif
 	irq_trans_init(dp);
 
 	return dp;
 }
 
-static char * __init build_full_name(struct device_node *dp)
+#if !defined(CONFIG_LEON)
+static
+#else
+char * __init build_full_name(struct device_node *dp)
+#endif
 {
 	int len, ourlen, plen;
 	char *n;
@@ -289,6 +301,10 @@ static struct device_node * __init prom_
 
 		dp->child = prom_build_tree(dp, prom_getchild(node), nextp);
 
+#if defined(CONFIG_LEON)
+		leon_node_init(dp, nextp);
+#endif
+
 		node = prom_getsibling(node);
 	}
 
Signature · 1 line
1.4.2.1
#1 lore raw
Quoted 25 lines · Konrad Eisele

From 1c076b182a3bc3e6c332df7c4f4436d69e7fa3b6 Mon Sep 17 00:00:00 2001
From: Konrad Eisele <[email protected]>
Date: Tue, 9 Jun 2009 13:03:50 +0200
Subject: [PATCH 5/7] Added support for AMBA bus. The device is a AMBA bus if it is a child of prom node "ambapp" (AMBA plug and play).
Two functions leon_trans_init() and leon_node_init()
(defined in sparc/kernel/leon.c) are called in the prom_build_tree() path if CONFIG_LEON is defined. leon_node_init() will build up the device tree using
AMBA plug and play.

---
 arch/sparc/kernel/of_device_32.c |   50 
 +++++++++++++++++++++++++++++++++++++-
 arch/sparc/kernel/prom_32.c      |   42 ++++++++++++++++++++++++++++++++
 arch/sparc/kernel/prom_common.c  |   20 ++++++++++++++-
 3 files changed, 109 insertions(+), 3 deletions(-)
arch/sparc/kernel/of_device_32.c +0 -0
index 0a83bd7..1d1e75a 100644

arch/sparc/kernel/of_device_32.c #include <linux/slab.h> · line 13

Quoted 6 lines
arch/sparc/kernel/of_device_32.c +3 -0
@@ -8,6 +8,9 @@ #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
+#if defined(CONFIG_LEON)
+#include <asm/leon.h>
+#endif

We use unconditional includes. The protection needs to be in the .h file as needed.

Quoted 4 lines
arch/sparc/kernel/of_device_32.c +0 -0
 static int node_match(struct device *dev, void *data)
 {

arch/sparc/kernel/of_device_32.c static int of_out_of_range(const u32 *ad · line 136

Quoted 10 lines
arch/sparc/kernel/of_device_32.c +4 -1
@@ -125,7 +128,10 @@ static int of_out_of_range(const u32 *ad
 	return 0;
 }
 
-static int of_bus_default_map(u32 *addr, const u32 *range,
+#if !defined(CONFIG_LEON)
+static
+#endif
+int of_bus_default_map(u32 *addr, const u32 *range,
 			      int na, int ns, int pna)
 {

This is just too ugly.
Please rework so we can use the same prototype with and without leon.

Quoted 6 lines
arch/sparc/kernel/of_device_32.c +4 -0
+
+struct amba_prom_registers {
+	unsigned int phys_addr;	/* The physical address of this register */
+	unsigned int reg_size;	/* How many bytes does this register take 

up? */
+};

We had this in leon.h too?

Quoted 75 lines
arch/sparc/kernel/of_device_32.c +3 -0
+
+/* "name@irq,addrlo" */
+static void __init ambapp_path_component(struct device_node *dp, char 

*tmp_buf)

arch/sparc/kernel/of_device_32.c +33 -0
+{
+	struct amba_prom_registers *regs; unsigned int *intr;
+	unsigned int *device, *vendor;
+	struct property *prop;
+
+	prop = of_find_property(dp, "reg", NULL);
+	if (!prop)
+		return;
+	regs = prop->value;
+	prop = of_find_property(dp, "interrupts", NULL);
+	if (!prop)
+		return;
+	intr = prop->value;
+	prop = of_find_property(dp, "vendor", NULL);
+	if (!prop)
+		return;
+	vendor = prop->value;
+	prop = of_find_property(dp, "device", NULL);
+	if (!prop)
+		return;
+	device = prop->value;
+
+	sprintf(tmp_buf, "%s:%d:%d@%x,%x",
+		dp->name, *vendor, *device,
+		*intr, regs->phys_addr);
+}
+
+#endif
+
 static void __init __build_path_component(struct device_node *dp, char 
 *tmp_buf)
 {
 	struct device_node *parent = dp->parent;
@@ -143,6 +181,10 @@ static void __init __build_path_componen
 			return sbus_path_component(dp, tmp_buf);
 		if (!strcmp(parent->type, "ebus"))
 			return ebus_path_component(dp, tmp_buf);
+#if defined(CONFIG_LEON)
+		if (!strcmp(parent->type, "ambapp"))
+			return ambapp_path_component(dp, tmp_buf);
+#endif
 
 		/* "isa" is handled with platform naming */
 	}
arch/sparc/kernel/prom_common.c +6 -1
index 0fb5789..d865b65 100644
@@ -22,6 +22,11 @@ #include <linux/slab.h>
 #include <linux/of.h>
 #include <asm/prom.h>
 #include <asm/oplib.h>
+#if defined(CONFIG_LEON)
+extern void __init leon_trans_init(struct device_node *dp);
+extern void __init leon_node_init(struct device_node *dp,
+				  struct device_node ***nextp);
+#endif
 
 #include "prom.h"
 
@@ -161,7 +166,7 @@ static struct property * __init build_on
 			name = prom_nextprop(node, prev, p->name);
 		}
 
-		if (strlen(name) = 0) {
+		if (!name || strlen(name) = 0) {
 			tmp = p;
 			return NULL;
 		}

arch/sparc/kernel/prom_common.c static struct device_node * __init prom_ · line 248

Quoted 7 lines
arch/sparc/kernel/prom_common.c +3 -0
@@ -237,12 +242,19 @@ static struct device_node * __init prom_
 
 	dp->properties = build_prop_list(node);
 
+#if defined(CONFIG_LEON)
+	leon_trans_init(dp);
+#endif
 	irq_trans_init(dp);

Why we cannot share the function?

arch/sparc/kernel/prom_common.c static struct device_node * __init prom_ · line 258

Quoted 11 lines
arch/sparc/kernel/prom_common.c +5 -1
 	return dp;
 }
 
-static char * __init build_full_name(struct device_node *dp)
+#if !defined(CONFIG_LEON)
+static
+#else
+char * __init build_full_name(struct device_node *dp)
+#endif
 {

NO - find a way to do this better.

arch/sparc/kernel/prom_common.c static struct device_node * __init prom_ · line 310

Quoted 13 lines
arch/sparc/kernel/prom_common.c +4 -0
 	int len, ourlen, plen;
 	char *n;
@@ -289,6 +301,10 @@ static struct device_node * __init prom_
 
 		dp->child = prom_build_tree(dp, prom_getchild(node), nextp);
 
+#if defined(CONFIG_LEON)
+		leon_node_init(dp, nextp);
+#endif
+
 		node = prom_getsibling(node);
 	}
 

This file give me the impression that more effort could have been put into consolidating more of this code.
David & Robert already did a gret effort for 32 + 64 bit sparc here. So please do not ruin it.

In these code path you need to justify each and every single use of ifdef/endif. What we have here is not good enough..

I know this is hard words but this stuff needs to be maintainable also in three years from now.

Sam