Skip to contentSkip to conversation

move of_device common code to of_device_common

PATCH Applied Robert Reif 3 participants 3 messages Jan 20, 2009 – Jun 4, 2009 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 move of_device common code to of_device_common

This patch moves code common to of_device_32.c and of_device_64.c into of_device_common.h and of_device_common.c.

The only functional difference is in sparc32 where of_bus_default_map is used in place of of_bus_sbus_map because they are equivelent.

There is still room for further code consolidation with some minor refactoring.

Boot tested on sparc32 and compile tested on sparc64.

 arch/sparc/kernel/Makefile           |    1 +
 arch/sparc/kernel/of_device_32.c     |  178 +---------------------------------
 arch/sparc/kernel/of_device_64.c     |  172 +--------------------------------
 arch/sparc/kernel/of_device_common.c |  157 ++++++++++++++++++++++++++++++
 arch/sparc/kernel/of_device_common.h |   36 +++++++
 5 files changed, 199 insertions(+), 345 deletions(-)
arch/sparc/kernel/Makefile +1 -0
index 53adcaa..ef902e7 100644
@@ -37,6 +37,7 @@ obj-y                   += una_asm_$(BITS).o
 obj-$(CONFIG_SPARC32)   += muldiv.o
 obj-y                   += prom_common.o
 obj-y                   += prom_$(BITS).o
+obj-y                   += of_device_common.o
 obj-y                   += of_device_$(BITS).o
 obj-$(CONFIG_SPARC64)   += prom_irqtrans.o
 
arch/sparc/kernel/of_device_32.c +3 -175

199 lines not on this page · raw message

arch/sparc/kernel/of_device_64.c +2 -170

190 lines not on this page · raw message

arch/sparc/kernel/of_device_common.c new file +157 -0

157 lines not on this page · raw message

arch/sparc/kernel/of_device_common.h new file +36 -0
new file mode 100644
index 0000000..cdfd239
@@ -0,0 +1,36 @@
+#ifndef _OF_DEVICE_COMMON_H
+#define _OF_DEVICE_COMMON_H
+
+static inline u64 of_read_addr(const u32 *cell, int size)
+{
+	u64 r = 0;
+	while (size--)
+		r = (r << 32) | *(cell++);
+	return r;
+}
+
+void of_bus_default_count_cells(struct device_node *dev, int *addrc,
+				int *sizec);
+int of_out_of_range(const u32 *addr, const u32 *base,
+		    const u32 *size, int na, int ns);
+int of_bus_default_map(u32 *addr, const u32 *range, int na, int ns, int pna);
+unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags);
+
+int of_bus_sbus_match(struct device_node *np);
+void of_bus_sbus_count_cells(struct device_node *child, int *addrc, int *sizec);
+
+/* Max address size we deal with */
+#define OF_MAX_ADDR_CELLS	4
+
+struct of_bus {
+	const char	*name;
+	const char	*addr_prop_name;
+	int		(*match)(struct device_node *parent);
+	void		(*count_cells)(struct device_node *child,
+				       int *addrc, int *sizec);
+	int		(*map)(u32 *addr, const u32 *range,
+			       int na, int ns, int pna);
+	unsigned long	(*get_flags)(const u32 *addr, unsigned long);
+};
+
+#endif /* _OF_DEVICE_COMMON_H */
#1 lore raw
Quoted 6 lines · Robert Reif

This patch moves code common to of_device_32.c and of_device_64.c into of_device_common.h and of_device_common.c.

The only functional difference is in sparc32 where of_bus_default_map is used in place of of_bus_sbus_map because they are equivelent.

Quoted 6 lines

There is still room for further code consolidation with some minor refactoring.

Boot tested on sparc32 and compile tested on sparc64.

Hi Robert.
I browsed the patch and it looks good.

Sam

maintainer Applied
#2 lore raw
In reply to Robert Reif

From: Robert Reif <[email protected]>
Date: Mon, 19 Jan 2009 22:21:08 -0500

Quoted 6 lines

This patch moves code common to of_device_32.c and of_device_64.c into of_device_common.h and of_device_common.c.

The only functional difference is in sparc32 where of_bus_default_map is used in place of of_bus_sbus_map because they are equivelent.

Quoted 6 lines

There is still room for further code consolidation with some minor refactoring.

Boot tested on sparc32 and compile tested on sparc64.

Applied to sparc-next-2.6, thanks Robert!