Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d125562 authored by Andres Salomon's avatar Andres Salomon Committed by Grant Likely
Browse files

of/sparc: convert various prom_* functions to use phandle 



Rather than passing around ints everywhere, use the
phandle type where appropriate for the various functions
that talk to the PROM.

Signed-off-by: default avatarAndres Salomon <dilinger@queued.net>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 4e13efc9

arch/sparc/include/asm/floppy_32.h

+2 −1
Original line number Diff line number Diff line
@@ -304,7 +304,8 @@ static struct linux_prom_registers fd_regs[2]; 
static int sun_floppy_init(void)

{

	char state[128];

	int tnode, fd_node, num_regs;

	phandle tnode, fd_node;

	int num_regs;

	struct resource r;



	use_virtual_dma = 1;

arch/sparc/include/asm/openprom.h

+9 −7
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#define LINUX_OPPROM_MAGIC      0x10010407



#ifndef __ASSEMBLY__

#include <linux/of.h>



/* V0 prom device operations. */

struct linux_dev_v0_funcs {

	int (*v0_devopen)(char *device_str);
@@ -26,7 +28,7 @@ struct linux_dev_v0_funcs { 


/* V2 and later prom device operations. */

struct linux_dev_v2_funcs {

	int (*v2_inst2pkg)(int d);	/* Convert ihandle to phandle */

	phandle (*v2_inst2pkg)(int d);	/* Convert ihandle to phandle */

	char * (*v2_dumb_mem_alloc)(char *va, unsigned sz);

	void (*v2_dumb_mem_free)(char *va, unsigned sz);
@@ -168,12 +170,12 @@ struct linux_romvec { 


/* Routines for traversing the prom device tree. */

struct linux_nodeops {

	int (*no_nextnode)(int node);

	int (*no_child)(int node);

	int (*no_proplen)(int node, const char *name);

	int (*no_getprop)(int node, const char *name, char *val);

	int (*no_setprop)(int node, const char *name, char *val, int len);

	char * (*no_nextprop)(int node, char *name);

	phandle (*no_nextnode)(phandle node);

	phandle (*no_child)(phandle node);

	int (*no_proplen)(phandle node, const char *name);

	int (*no_getprop)(phandle node, const char *name, char *val);

	int (*no_setprop)(phandle node, const char *name, char *val, int len);

	char * (*no_nextprop)(phandle node, char *name);

};



/* More fun PROM structures for device probing. */

arch/sparc/include/asm/oplib_32.h

+22 −22
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ extern unsigned int prom_rev, prom_prev; 
/* Root node of the prom device tree, this stays constant after

 * initialization is complete.

 */

extern int prom_root_node;

extern phandle prom_root_node;



/* Pointer to prom structure containing the device tree traversal

 * and usage utility functions.  Only prom-lib should use these,
@@ -178,68 +178,68 @@ extern void prom_putsegment(int context, unsigned long virt_addr, 
/* PROM device tree traversal functions... */



/* Get the child node of the given node, or zero if no child exists. */

extern int prom_getchild(int parent_node);

extern phandle prom_getchild(phandle parent_node);



/* Get the next sibling node of the given node, or zero if no further

 * siblings exist.

 */

extern int prom_getsibling(int node);

extern phandle prom_getsibling(phandle node);



/* Get the length, at the passed node, of the given property type.

 * Returns -1 on error (ie. no such property at this node).

 */

extern int prom_getproplen(int thisnode, const char *property);

extern int prom_getproplen(phandle thisnode, const char *property);



/* Fetch the requested property using the given buffer.  Returns

 * the number of bytes the prom put into your buffer or -1 on error.

 */

extern int __must_check prom_getproperty(int thisnode, const char *property,

extern int __must_check prom_getproperty(phandle thisnode, const char *property,

					 char *prop_buffer, int propbuf_size);



/* Acquire an integer property. */

extern int prom_getint(int node, char *property);

extern int prom_getint(phandle node, char *property);



/* Acquire an integer property, with a default value. */

extern int prom_getintdefault(int node, char *property, int defval);

extern int prom_getintdefault(phandle node, char *property, int defval);



/* Acquire a boolean property, 0=FALSE 1=TRUE. */

extern int prom_getbool(int node, char *prop);

extern int prom_getbool(phandle node, char *prop);



/* Acquire a string property, null string on error. */

extern void prom_getstring(int node, char *prop, char *buf, int bufsize);

extern void prom_getstring(phandle node, char *prop, char *buf, int bufsize);



/* Does the passed node have the given "name"? YES=1 NO=0 */

extern int prom_nodematch(int thisnode, char *name);

extern int prom_nodematch(phandle thisnode, char *name);



/* Search all siblings starting at the passed node for "name" matching

 * the given string.  Returns the node on success, zero on failure.

 */

extern int prom_searchsiblings(int node_start, char *name);

extern phandle prom_searchsiblings(phandle node_start, char *name);



/* Return the first property type, as a string, for the given node.

 * Returns a null string on error.

 */

extern char *prom_firstprop(int node, char *buffer);

extern char *prom_firstprop(phandle node, char *buffer);



/* Returns the next property after the passed property for the given

 * node.  Returns null string on failure.

 */

extern char *prom_nextprop(int node, char *prev_property, char *buffer);

extern char *prom_nextprop(phandle node, char *prev_property, char *buffer);



/* Returns phandle of the path specified */

extern int prom_finddevice(char *name);

extern phandle prom_finddevice(char *name);



/* Returns 1 if the specified node has given property. */

extern int prom_node_has_property(int node, char *property);

extern int prom_node_has_property(phandle node, char *property);



/* Set the indicated property at the given node with the passed value.

 * Returns the number of bytes of your value that the prom took.

 */

extern int prom_setprop(int node, const char *prop_name, char *prop_value,

extern int prom_setprop(phandle node, const char *prop_name, char *prop_value,

			int value_size);



extern int prom_pathtoinode(char *path);

extern int prom_inst2pkg(int);

extern phandle prom_pathtoinode(char *path);

extern phandle prom_inst2pkg(int);



/* Dorking with Bus ranges... */
@@ -247,13 +247,13 @@ extern int prom_inst2pkg(int); 
extern void prom_apply_obio_ranges(struct linux_prom_registers *obioregs, int nregs);



/* Apply ranges of any prom node (and optionally parent node as well) to registers. */

extern void prom_apply_generic_ranges(int node, int parent,

extern void prom_apply_generic_ranges(phandle node, phandle parent,

				      struct linux_prom_registers *sbusregs, int nregs);



/* CPU probing helpers.  */

int cpu_find_by_instance(int instance, int *prom_node, int *mid);

int cpu_find_by_mid(int mid, int *prom_node);

int cpu_get_hwmid(int prom_node);

int cpu_find_by_instance(int instance, phandle *prom_node, int *mid);

int cpu_find_by_mid(int mid, phandle *prom_node);

int cpu_get_hwmid(phandle prom_node);



extern spinlock_t prom_lock;

arch/sparc/include/asm/oplib_64.h

+20 −19
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ extern char prom_version[]; 
/* Root node of the prom device tree, this stays constant after

 * initialization is complete.

 */

extern int prom_root_node;

extern phandle prom_root_node;



/* PROM stdin and stdout */

extern int prom_stdin, prom_stdout;
@@ -24,7 +24,7 @@ extern int prom_stdin, prom_stdout; 
/* /chosen node of the prom device tree, this stays constant after

 * initialization is complete.

 */

extern int prom_chosen_node;

extern phandle prom_chosen_node;



/* Helper values and strings in arch/sparc64/kernel/head.S */

extern const char prom_peer_name[];
@@ -218,68 +218,69 @@ extern void prom_unmap(unsigned long size, unsigned long vaddr); 
/* PROM device tree traversal functions... */



/* Get the child node of the given node, or zero if no child exists. */

extern int prom_getchild(int parent_node);

extern phandle prom_getchild(phandle parent_node);



/* Get the next sibling node of the given node, or zero if no further

 * siblings exist.

 */

extern int prom_getsibling(int node);

extern phandle prom_getsibling(phandle node);



/* Get the length, at the passed node, of the given property type.

 * Returns -1 on error (ie. no such property at this node).

 */

extern int prom_getproplen(int thisnode, const char *property);

extern int prom_getproplen(phandle thisnode, const char *property);



/* Fetch the requested property using the given buffer.  Returns

 * the number of bytes the prom put into your buffer or -1 on error.

 */

extern int prom_getproperty(int thisnode, const char *property,

extern int prom_getproperty(phandle thisnode, const char *property,

			    char *prop_buffer, int propbuf_size);



/* Acquire an integer property. */

extern int prom_getint(int node, const char *property);

extern int prom_getint(phandle node, const char *property);



/* Acquire an integer property, with a default value. */

extern int prom_getintdefault(int node, const char *property, int defval);

extern int prom_getintdefault(phandle node, const char *property, int defval);



/* Acquire a boolean property, 0=FALSE 1=TRUE. */

extern int prom_getbool(int node, const char *prop);

extern int prom_getbool(phandle node, const char *prop);



/* Acquire a string property, null string on error. */

extern void prom_getstring(int node, const char *prop, char *buf, int bufsize);

extern void prom_getstring(phandle node, const char *prop, char *buf,

			   int bufsize);



/* Does the passed node have the given "name"? YES=1 NO=0 */

extern int prom_nodematch(int thisnode, const char *name);

extern int prom_nodematch(phandle thisnode, const char *name);



/* Search all siblings starting at the passed node for "name" matching

 * the given string.  Returns the node on success, zero on failure.

 */

extern int prom_searchsiblings(int node_start, const char *name);

extern phandle prom_searchsiblings(phandle node_start, const char *name);



/* Return the first property type, as a string, for the given node.

 * Returns a null string on error. Buffer should be at least 32B long.

 */

extern char *prom_firstprop(int node, char *buffer);

extern char *prom_firstprop(phandle node, char *buffer);



/* Returns the next property after the passed property for the given

 * node.  Returns null string on failure. Buffer should be at least 32B long.

 */

extern char *prom_nextprop(int node, const char *prev_property, char *buffer);

extern char *prom_nextprop(phandle node, const char *prev_property, char *buf);



/* Returns 1 if the specified node has given property. */

extern int prom_node_has_property(int node, const char *property);

extern int prom_node_has_property(phandle node, const char *property);



/* Returns phandle of the path specified */

extern int prom_finddevice(const char *name);

extern phandle prom_finddevice(const char *name);



/* Set the indicated property at the given node with the passed value.

 * Returns the number of bytes of your value that the prom took.

 */

extern int prom_setprop(int node, const char *prop_name, char *prop_value,

extern int prom_setprop(phandle node, const char *prop_name, char *prop_value,

			int value_size);



extern int prom_pathtoinode(const char *path);

extern int prom_inst2pkg(int);

extern phandle prom_pathtoinode(const char *path);

extern phandle prom_inst2pkg(int);

extern int prom_service_exists(const char *service_name);

extern void prom_sun4v_guest_soft_state(void);

arch/sparc/kernel/auxio_32.c

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ static DEFINE_SPINLOCK(auxio_lock); 


void __init auxio_probe(void)

{

	int node, auxio_nd;

	phandle node, auxio_nd;

	struct linux_prom_registers auxregs[1];

	struct resource r;
@@ -113,7 +113,7 @@ volatile unsigned char * auxio_power_register = NULL; 
void __init auxio_power_probe(void)

{

	struct linux_prom_registers regs;

	int node;

	phandle node;

	struct resource r;



	/* Attempt to find the sun4m power control node. */