Commit c9f5b7e7 authored by Robert Reif's avatar Robert Reif Committed by David S. Miller
Browse files

sparc: 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.

Signed-off-by: default avatarRobert Reif <reif@earthlink.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d6986415

arch/sparc/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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 −192
Original line number Diff line number Diff line
@@ -6,159 +6,11 @@ 
#include <linux/mod_devicetable.h>

#include <linux/slab.h>

#include <linux/errno.h>

#include <linux/irq.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>



static int node_match(struct device *dev, void *data)

{

	struct of_device *op = to_of_device(dev);

	struct device_node *dp = data;



	return (op->node == dp);

}



struct of_device *of_find_device_by_node(struct device_node *dp)

{

	struct device *dev = bus_find_device(&of_platform_bus_type, NULL,

					     dp, node_match);



	if (dev)

		return to_of_device(dev);



	return NULL;

}

EXPORT_SYMBOL(of_find_device_by_node);



unsigned int irq_of_parse_and_map(struct device_node *node, int index)

{

	struct of_device *op = of_find_device_by_node(node);



	if (!op || index >= op->num_irqs)

		return 0;



	return op->irqs[index];

}

EXPORT_SYMBOL(irq_of_parse_and_map);



/* Take the archdata values for IOMMU, STC, and HOSTDATA found in

 * BUS and propagate to all child of_device objects.

 */

void of_propagate_archdata(struct of_device *bus)

{

	struct dev_archdata *bus_sd = &bus->dev.archdata;

	struct device_node *bus_dp = bus->node;

	struct device_node *dp;



	for (dp = bus_dp->child; dp; dp = dp->sibling) {

		struct of_device *op = of_find_device_by_node(dp);



		op->dev.archdata.iommu = bus_sd->iommu;

		op->dev.archdata.stc = bus_sd->stc;

		op->dev.archdata.host_controller = bus_sd->host_controller;

		op->dev.archdata.numa_node = bus_sd->numa_node;



		if (dp->child)

			of_propagate_archdata(op);

	}

}



struct bus_type of_platform_bus_type;

EXPORT_SYMBOL(of_platform_bus_type);



static inline u64 of_read_addr(const u32 *cell, int size)

{

	u64 r = 0;

	while (size--)

		r = (r << 32) | *(cell++);

	return r;

}



static void __init get_cells(struct device_node *dp,

			     int *addrc, int *sizec)

{

	if (addrc)

		*addrc = of_n_addr_cells(dp);

	if (sizec)

		*sizec = of_n_size_cells(dp);

}



/* 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);

};



/*

 * Default translator (generic bus)

 */



static void of_bus_default_count_cells(struct device_node *dev,

				       int *addrc, int *sizec)

{

	get_cells(dev, addrc, sizec);

}



/* Make sure the least significant 64-bits are in-range.  Even

 * for 3 or 4 cell values it is a good enough approximation.

 */

static int of_out_of_range(const u32 *addr, const u32 *base,

			   const u32 *size, int na, int ns)

{

	u64 a = of_read_addr(addr, na);

	u64 b = of_read_addr(base, na);



	if (a < b)

		return 1;



	b += of_read_addr(size, ns);

	if (a >= b)

		return 1;



	return 0;

}



static int of_bus_default_map(u32 *addr, const u32 *range,

			      int na, int ns, int pna)

{

	u32 result[OF_MAX_ADDR_CELLS];

	int i;



	if (ns > 2) {

		printk("of_device: Cannot handle size cells (%d) > 2.", ns);

		return -EINVAL;

	}



	if (of_out_of_range(addr, range, range + na + pna, na, ns))

		return -EINVAL;



	/* Start with the parent range base.  */

	memcpy(result, range + na, pna * 4);



	/* Add in the child address offset.  */

	for (i = 0; i < na; i++)

		result[pna - 1 - i] +=

			(addr[na - 1 - i] -

			 range[na - 1 - i]);



	memcpy(addr, result, pna * 4);



	return 0;

}



static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags)

{

	if (flags)

		return flags;

	return IORESOURCE_MEM;

}

#include "of_device_common.h"



/*

 * PCI bus specific translator
@@ -240,47 +92,6 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags) 
	return flags;

}



/*

 * SBUS bus specific translator

 */



static int of_bus_sbus_match(struct device_node *np)

{

	struct device_node *dp = np;



	while (dp) {

		if (!strcmp(dp->name, "sbus") ||

		    !strcmp(dp->name, "sbi"))

			return 1;



		/* Have a look at use_1to1_mapping().  We're trying

		 * to match SBUS if that's the top-level bus and we

		 * don't have some intervening real bus that provides

		 * ranges based translations.

		 */

		if (of_find_property(dp, "ranges", NULL) != NULL)

			break;



		dp = dp->parent;

	}



	return 0;

}



static void of_bus_sbus_count_cells(struct device_node *child,

				   int *addrc, int *sizec)

{

	if (addrc)

		*addrc = 2;

	if (sizec)

		*sizec = 1;

}



static int of_bus_sbus_map(u32 *addr, const u32 *range, int na, int ns, int pna)

{

	return of_bus_default_map(addr, range, na, ns, pna);

}



static unsigned long of_bus_sbus_get_flags(const u32 *addr, unsigned long flags)

{

	return IORESOURCE_MEM;
@@ -307,7 +118,7 @@ static struct of_bus of_busses[] = { 
		.addr_prop_name = "reg",

		.match = of_bus_sbus_match,

		.count_cells = of_bus_sbus_count_cells,

		.map = of_bus_sbus_map,

		.map = of_bus_default_map,

		.get_flags = of_bus_sbus_get_flags,

	},

	/* Default */

arch/sparc/kernel/of_device_64.c

+2 −186
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#include <linux/of_device.h>

#include <linux/of_platform.h>



#include "of_device_common.h"



void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name)

{

	unsigned long ret = res->start + offset;
@@ -35,156 +37,6 @@ void of_iounmap(struct resource *res, void __iomem *base, unsigned long size) 
}

EXPORT_SYMBOL(of_iounmap);



static int node_match(struct device *dev, void *data)

{

	struct of_device *op = to_of_device(dev);

	struct device_node *dp = data;



	return (op->node == dp);

}



struct of_device *of_find_device_by_node(struct device_node *dp)

{

	struct device *dev = bus_find_device(&of_platform_bus_type, NULL,

					     dp, node_match);



	if (dev)

		return to_of_device(dev);



	return NULL;

}

EXPORT_SYMBOL(of_find_device_by_node);



unsigned int irq_of_parse_and_map(struct device_node *node, int index)

{

	struct of_device *op = of_find_device_by_node(node);



	if (!op || index >= op->num_irqs)

		return 0;



	return op->irqs[index];

}

EXPORT_SYMBOL(irq_of_parse_and_map);



/* Take the archdata values for IOMMU, STC, and HOSTDATA found in

 * BUS and propagate to all child of_device objects.

 */

void of_propagate_archdata(struct of_device *bus)

{

	struct dev_archdata *bus_sd = &bus->dev.archdata;

	struct device_node *bus_dp = bus->node;

	struct device_node *dp;



	for (dp = bus_dp->child; dp; dp = dp->sibling) {

		struct of_device *op = of_find_device_by_node(dp);



		op->dev.archdata.iommu = bus_sd->iommu;

		op->dev.archdata.stc = bus_sd->stc;

		op->dev.archdata.host_controller = bus_sd->host_controller;

		op->dev.archdata.numa_node = bus_sd->numa_node;



		if (dp->child)

			of_propagate_archdata(op);

	}

}



struct bus_type of_platform_bus_type;

EXPORT_SYMBOL(of_platform_bus_type);



static inline u64 of_read_addr(const u32 *cell, int size)

{

	u64 r = 0;

	while (size--)

		r = (r << 32) | *(cell++);

	return r;

}



static void get_cells(struct device_node *dp, int *addrc, int *sizec)

{

	if (addrc)

		*addrc = of_n_addr_cells(dp);

	if (sizec)

		*sizec = of_n_size_cells(dp);

}



/* 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);

};



/*

 * Default translator (generic bus)

 */



static void of_bus_default_count_cells(struct device_node *dev,

				       int *addrc, int *sizec)

{

	get_cells(dev, addrc, sizec);

}



/* Make sure the least significant 64-bits are in-range.  Even

 * for 3 or 4 cell values it is a good enough approximation.

 */

static int of_out_of_range(const u32 *addr, const u32 *base,

			   const u32 *size, int na, int ns)

{

	u64 a = of_read_addr(addr, na);

	u64 b = of_read_addr(base, na);



	if (a < b)

		return 1;



	b += of_read_addr(size, ns);

	if (a >= b)

		return 1;



	return 0;

}



static int of_bus_default_map(u32 *addr, const u32 *range,

			      int na, int ns, int pna)

{

	u32 result[OF_MAX_ADDR_CELLS];

	int i;



	if (ns > 2) {

		printk("of_device: Cannot handle size cells (%d) > 2.", ns);

		return -EINVAL;

	}



	if (of_out_of_range(addr, range, range + na + pna, na, ns))

		return -EINVAL;



	/* Start with the parent range base.  */

	memcpy(result, range + na, pna * 4);



	/* Add in the child address offset.  */

	for (i = 0; i < na; i++)

		result[pna - 1 - i] +=

			(addr[na - 1 - i] -

			 range[na - 1 - i]);



	memcpy(addr, result, pna * 4);



	return 0;

}



static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags)

{

	if (flags)

		return flags;

	return IORESOURCE_MEM;

}



/*

 * PCI bus specific translator

 */
@@ -294,42 +146,6 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags) 
	return flags;

}



/*

 * SBUS bus specific translator

 */



static int of_bus_sbus_match(struct device_node *np)

{

	struct device_node *dp = np;



	while (dp) {

		if (!strcmp(dp->name, "sbus") ||

		    !strcmp(dp->name, "sbi"))

			return 1;



		/* Have a look at use_1to1_mapping().  We're trying

		 * to match SBUS if that's the top-level bus and we

		 * don't have some intervening real bus that provides

		 * ranges based translations.

		 */

		if (of_find_property(dp, "ranges", NULL) != NULL)

			break;



		dp = dp->parent;

	}



	return 0;

}



static void of_bus_sbus_count_cells(struct device_node *child,

				   int *addrc, int *sizec)

{

	if (addrc)

		*addrc = 2;

	if (sizec)

		*sizec = 1;

}



/*

 * FHC/Central bus specific translator.

 *

arch/sparc/kernel/of_device_common.c

0 → 100644
+174 −0
Original line number Diff line number Diff line 
#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/of.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/mod_devicetable.h>

#include <linux/slab.h>

#include <linux/errno.h>

#include <linux/irq.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>



#include "of_device_common.h"



static int node_match(struct device *dev, void *data)

{

	struct of_device *op = to_of_device(dev);

	struct device_node *dp = data;



	return (op->node == dp);

}



struct of_device *of_find_device_by_node(struct device_node *dp)

{

	struct device *dev = bus_find_device(&of_platform_bus_type, NULL,

					     dp, node_match);



	if (dev)

		return to_of_device(dev);



	return NULL;

}

EXPORT_SYMBOL(of_find_device_by_node);



unsigned int irq_of_parse_and_map(struct device_node *node, int index)

{

	struct of_device *op = of_find_device_by_node(node);



	if (!op || index >= op->num_irqs)

		return 0;



	return op->irqs[index];

}

EXPORT_SYMBOL(irq_of_parse_and_map);



/* Take the archdata values for IOMMU, STC, and HOSTDATA found in

 * BUS and propagate to all child of_device objects.

 */

void of_propagate_archdata(struct of_device *bus)

{

	struct dev_archdata *bus_sd = &bus->dev.archdata;

	struct device_node *bus_dp = bus->node;

	struct device_node *dp;



	for (dp = bus_dp->child; dp; dp = dp->sibling) {

		struct of_device *op = of_find_device_by_node(dp);



		op->dev.archdata.iommu = bus_sd->iommu;

		op->dev.archdata.stc = bus_sd->stc;

		op->dev.archdata.host_controller = bus_sd->host_controller;

		op->dev.archdata.numa_node = bus_sd->numa_node;



		if (dp->child)

			of_propagate_archdata(op);

	}

}



struct bus_type of_platform_bus_type;

EXPORT_SYMBOL(of_platform_bus_type);



static void get_cells(struct device_node *dp, int *addrc, int *sizec)

{

	if (addrc)

		*addrc = of_n_addr_cells(dp);

	if (sizec)

		*sizec = of_n_size_cells(dp);

}



/*

 * Default translator (generic bus)

 */



void of_bus_default_count_cells(struct device_node *dev, int *addrc, int *sizec)

{

	get_cells(dev, addrc, sizec);

}



/* Make sure the least significant 64-bits are in-range.  Even

 * for 3 or 4 cell values it is a good enough approximation.

 */

int of_out_of_range(const u32 *addr, const u32 *base,

		    const u32 *size, int na, int ns)

{

	u64 a = of_read_addr(addr, na);

	u64 b = of_read_addr(base, na);



	if (a < b)

		return 1;



	b += of_read_addr(size, ns);

	if (a >= b)

		return 1;



	return 0;

}



int of_bus_default_map(u32 *addr, const u32 *range, int na, int ns, int pna)

{

	u32 result[OF_MAX_ADDR_CELLS];

	int i;



	if (ns > 2) {

		printk("of_device: Cannot handle size cells (%d) > 2.", ns);

		return -EINVAL;

	}



	if (of_out_of_range(addr, range, range + na + pna, na, ns))

		return -EINVAL;



	/* Start with the parent range base.  */

	memcpy(result, range + na, pna * 4);



	/* Add in the child address offset.  */

	for (i = 0; i < na; i++)

		result[pna - 1 - i] +=

			(addr[na - 1 - i] -

			 range[na - 1 - i]);



	memcpy(addr, result, pna * 4);



	return 0;

}



unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags)

{

	if (flags)

		return flags;

	return IORESOURCE_MEM;

}



/*

 * SBUS bus specific translator

 */



int of_bus_sbus_match(struct device_node *np)

{

	struct device_node *dp = np;



	while (dp) {

		if (!strcmp(dp->name, "sbus") ||

		    !strcmp(dp->name, "sbi"))

			return 1;



		/* Have a look at use_1to1_mapping().  We're trying

		 * to match SBUS if that's the top-level bus and we

		 * don't have some intervening real bus that provides

		 * ranges based translations.

		 */

		if (of_find_property(dp, "ranges", NULL) != NULL)

			break;



		dp = dp->parent;

	}



	return 0;

}



void of_bus_sbus_count_cells(struct device_node *child, int *addrc, int *sizec)

{

	if (addrc)

		*addrc = 2;

	if (sizec)

		*sizec = 1;

}

arch/sparc/kernel/of_device_common.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
#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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE