| Message ID | 1376687156-6737-10-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
<insert which new helpers here> I think this is also reimplementing the internals of some existing dt_match_foo? And changing set_val into dt_set_cell. IOW there seems to be more changes than the single line changelog would suggest. Are any of these just sync'd from Linux? On Fri, 2013-08-16 at 22:05 +0100, Julien Grall wrote: > @@ -295,11 +341,29 @@ struct dt_device_node *dt_find_compatible_node(struct dt_device_node *from, > /** > * Find a property with a given name for a given node > * and return the value. > - */ > + */ Oops. > const void *dt_get_property(const struct dt_device_node *np, > const char *name, u32 *lenp); > > /** > + * dt_property_read_string - Find and read a string from a property > + * @np: Device node from which the property value is to be read > + * @propname: Name of the property to be searched > + * @out_string: Pointer to null terminated return string, modified only > + * if return value if 0. > + * > + * Search for a property in a device tree node and retrieve a null > + * terminated string value (pointer to data, not a copy). Returns 0 on > + * sucess, -EINVAL if the property does not exist, -ENODATA if property success > + * doest not have value, and -EILSEQ if the string is not > + * null-terminated with the length of the property data. > + * > + * The out_string pointer is modifed only if a valid string can be decoded. modified > + */ > +int dt_property_read_string(const struct dt_device_node *np, > + const char *propname, const char **out_string); > + > +/** > * Checks if the given "compat" string matches one of the strings in > * the device's "compatible" property > */ > @@ -433,4 +497,71 @@ int dt_n_size_cells(const struct dt_device_node *np); > */ > int dt_n_addr_cells(const struct dt_device_node *np); > > -#endif > +/** > + * dt_device_is_available - Check if a device is available for use > + * > + * @device: Node to check for availability > + * > + * Returns true if the status property is absent or set to "okay" or "ok", > + * false otherwise. > + */ > +bool_t dt_device_is_available(const struct dt_device_node *device); > + > +/** > + * dt_match_node - Tell if a device_node has a matching of dt_device_match > + * @matches: array of dt_device_match structures to search in > + * @node: the dt_device_node structure to match against > + * > + * Returns true if the device node match one of dt_device_match. > + */ > +bool_t dt_match_node(const struct dt_device_match *matches, > + const struct dt_device_node *node); > + > +/** > + * dt_find_matching_node - Find a node based on an dt_device_match match table > + * @from: The node to start searching from or NULL, the node you pass > + * will not be searched, only the next one will; typically, you pass > + * what the returned call returned > + * @matches: array of dt_device_match structures to search in > + * > + * Returns a node pointer. > + */ > +struct dt_device_node * > +dt_find_matching_node(struct dt_device_node *from, > + const struct dt_device_match *matches); > + > +/** > + * dt_set_cell - Write a value into a serie of cells series > + * > + * @cellp: Pointer to cells > + * > + * Write a value into a series of cells and update cellp to point to the > + * cell just after. > + */ > +void dt_set_cell(__be32 **cellp, int size, u64 val); > + > +/** > + * dt_set_range - Write range into a serie of cells > + * > + * @cellp: Pointer to cells > + * @np: Node which contains the encoding for the address and > + * the size > + * @address: Start of range > + * @size: Size of the range > + * > + * Write a range into a serie of cells and update cellp to point to the series > + * cell just after. > + */ > +void dt_set_range(__be32 **cellp, const struct dt_device_node *np, > + u64 address, u64 size); > + > +#endif /* __XEN_DEVICE_TREE_H */ > + > +/* > + * Local variables: > + * mode: C > + * c-file-style: "BSD" > + * c-basic-offset: 4 > + * indent-tabs-mode: nil > + * End: > + */
On 08/22/2013 02:21 PM, Ian Campbell wrote: > <insert which new helpers here> I will update the commit message on the next patch series. > I think this is also reimplementing the internals of some existing > dt_match_foo? And changing set_val into dt_set_cell. IOW there seems to > be more changes than the single line changelog would suggest. Except set_val which was rename and exported to __dt_set_cell, nothing has changed. All the functions are new. > > Are any of these just sync'd from Linux? Most of them. > On Fri, 2013-08-16 at 22:05 +0100, Julien Grall wrote: >> @@ -295,11 +341,29 @@ struct dt_device_node *dt_find_compatible_node(struct dt_device_node *from, >> /** >> * Find a property with a given name for a given node >> * and return the value. >> - */ >> + */ > > Oops. > >> const void *dt_get_property(const struct dt_device_node *np, >> const char *name, u32 *lenp); >> >> /** >> + * dt_property_read_string - Find and read a string from a property >> + * @np: Device node from which the property value is to be read >> + * @propname: Name of the property to be searched >> + * @out_string: Pointer to null terminated return string, modified only >> + * if return value if 0. >> + * >> + * Search for a property in a device tree node and retrieve a null >> + * terminated string value (pointer to data, not a copy). Returns 0 on >> + * sucess, -EINVAL if the property does not exist, -ENODATA if property > > success > >> + * doest not have value, and -EILSEQ if the string is not >> + * null-terminated with the length of the property data. >> + * >> + * The out_string pointer is modifed only if a valid string can be decoded. > > modified > >> + */ >> +int dt_property_read_string(const struct dt_device_node *np, >> + const char *propname, const char **out_string); >> + >> +/** >> * Checks if the given "compat" string matches one of the strings in >> * the device's "compatible" property >> */ >> @@ -433,4 +497,71 @@ int dt_n_size_cells(const struct dt_device_node *np); >> */ >> int dt_n_addr_cells(const struct dt_device_node *np); >> >> -#endif >> +/** >> + * dt_device_is_available - Check if a device is available for use >> + * >> + * @device: Node to check for availability >> + * >> + * Returns true if the status property is absent or set to "okay" or "ok", >> + * false otherwise. >> + */ >> +bool_t dt_device_is_available(const struct dt_device_node *device); >> + >> +/** >> + * dt_match_node - Tell if a device_node has a matching of dt_device_match >> + * @matches: array of dt_device_match structures to search in >> + * @node: the dt_device_node structure to match against >> + * >> + * Returns true if the device node match one of dt_device_match. >> + */ >> +bool_t dt_match_node(const struct dt_device_match *matches, >> + const struct dt_device_node *node); >> + >> +/** >> + * dt_find_matching_node - Find a node based on an dt_device_match match table >> + * @from: The node to start searching from or NULL, the node you pass >> + * will not be searched, only the next one will; typically, you pass >> + * what the returned call returned >> + * @matches: array of dt_device_match structures to search in >> + * >> + * Returns a node pointer. >> + */ >> +struct dt_device_node * >> +dt_find_matching_node(struct dt_device_node *from, >> + const struct dt_device_match *matches); >> + >> +/** >> + * dt_set_cell - Write a value into a serie of cells > > series > >> + * >> + * @cellp: Pointer to cells >> + * >> + * Write a value into a series of cells and update cellp to point to the >> + * cell just after. >> + */ >> +void dt_set_cell(__be32 **cellp, int size, u64 val); >> + >> +/** >> + * dt_set_range - Write range into a serie of cells >> + * >> + * @cellp: Pointer to cells >> + * @np: Node which contains the encoding for the address and >> + * the size >> + * @address: Start of range >> + * @size: Size of the range >> + * >> + * Write a range into a serie of cells and update cellp to point to the > > series > >> + * cell just after. >> + */ >> +void dt_set_range(__be32 **cellp, const struct dt_device_node *np, >> + u64 address, u64 size); >> + >> +#endif /* __XEN_DEVICE_TREE_H */ >> + >> +/* >> + * Local variables: >> + * mode: C >> + * c-file-style: "BSD" >> + * c-basic-offset: 4 >> + * indent-tabs-mode: nil >> + * End: >> + */ > >
On Thu, 2013-08-22 at 14:48 +0100, Julien Grall wrote: > On 08/22/2013 02:21 PM, Ian Campbell wrote: > > <insert which new helpers here> > > I will update the commit message on the next patch series. > > > I think this is also reimplementing the internals of some existing > > dt_match_foo? And changing set_val into dt_set_cell. IOW there seems to > > be more changes than the single line changelog would suggest. > > Except set_val which was rename and exported to __dt_set_cell, nothing > has changed. All the functions are new. OK. > > > > Are any of these just sync'd from Linux? > > Most of them. THIs is worth mentioning in the commit message, along with a rough Linux version number, in case we come back and need to sync bug fixes or something > > > On Fri, 2013-08-16 at 22:05 +0100, Julien Grall wrote: > >> @@ -295,11 +341,29 @@ struct dt_device_node *dt_find_compatible_node(struct dt_device_node *from, > >> /** > >> * Find a property with a given name for a given node > >> * and return the value. > >> - */ > >> + */ > > > > Oops. > > > >> const void *dt_get_property(const struct dt_device_node *np, > >> const char *name, u32 *lenp); > >> > >> /** > >> + * dt_property_read_string - Find and read a string from a property > >> + * @np: Device node from which the property value is to be read > >> + * @propname: Name of the property to be searched > >> + * @out_string: Pointer to null terminated return string, modified only > >> + * if return value if 0. > >> + * > >> + * Search for a property in a device tree node and retrieve a null > >> + * terminated string value (pointer to data, not a copy). Returns 0 on > >> + * sucess, -EINVAL if the property does not exist, -ENODATA if property > > > > success > > > >> + * doest not have value, and -EILSEQ if the string is not > >> + * null-terminated with the length of the property data. > >> + * > >> + * The out_string pointer is modifed only if a valid string can be decoded. > > > > modified > > > >> + */ > >> +int dt_property_read_string(const struct dt_device_node *np, > >> + const char *propname, const char **out_string); > >> + > >> +/** > >> * Checks if the given "compat" string matches one of the strings in > >> * the device's "compatible" property > >> */ > >> @@ -433,4 +497,71 @@ int dt_n_size_cells(const struct dt_device_node *np); > >> */ > >> int dt_n_addr_cells(const struct dt_device_node *np); > >> > >> -#endif > >> +/** > >> + * dt_device_is_available - Check if a device is available for use > >> + * > >> + * @device: Node to check for availability > >> + * > >> + * Returns true if the status property is absent or set to "okay" or "ok", > >> + * false otherwise. > >> + */ > >> +bool_t dt_device_is_available(const struct dt_device_node *device); > >> + > >> +/** > >> + * dt_match_node - Tell if a device_node has a matching of dt_device_match > >> + * @matches: array of dt_device_match structures to search in > >> + * @node: the dt_device_node structure to match against > >> + * > >> + * Returns true if the device node match one of dt_device_match. > >> + */ > >> +bool_t dt_match_node(const struct dt_device_match *matches, > >> + const struct dt_device_node *node); > >> + > >> +/** > >> + * dt_find_matching_node - Find a node based on an dt_device_match match table > >> + * @from: The node to start searching from or NULL, the node you pass > >> + * will not be searched, only the next one will; typically, you pass > >> + * what the returned call returned > >> + * @matches: array of dt_device_match structures to search in > >> + * > >> + * Returns a node pointer. > >> + */ > >> +struct dt_device_node * > >> +dt_find_matching_node(struct dt_device_node *from, > >> + const struct dt_device_match *matches); > >> + > >> +/** > >> + * dt_set_cell - Write a value into a serie of cells > > > > series > > > >> + * > >> + * @cellp: Pointer to cells > >> + * > >> + * Write a value into a series of cells and update cellp to point to the > >> + * cell just after. > >> + */ > >> +void dt_set_cell(__be32 **cellp, int size, u64 val); > >> + > >> +/** > >> + * dt_set_range - Write range into a serie of cells > >> + * > >> + * @cellp: Pointer to cells > >> + * @np: Node which contains the encoding for the address and > >> + * the size > >> + * @address: Start of range > >> + * @size: Size of the range > >> + * > >> + * Write a range into a serie of cells and update cellp to point to the > > > > series > > > >> + * cell just after. > >> + */ > >> +void dt_set_range(__be32 **cellp, const struct dt_device_node *np, > >> + u64 address, u64 size); > >> + > >> +#endif /* __XEN_DEVICE_TREE_H */ > >> + > >> +/* > >> + * Local variables: > >> + * mode: C > >> + * c-file-style: "BSD" > >> + * c-basic-offset: 4 > >> + * indent-tabs-mode: nil > >> + * End: > >> + */ > > > > > >
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 315b284..95635f0 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -182,23 +182,31 @@ void __init device_tree_get_reg(const u32 **cell, u32 address_cells, get_val(cell, size_cells, size); } -static void __init set_val(u32 **cell, u32 cells, u64 val) +void dt_set_cell(__be32 **cellp, int size, u64 val) { - u32 c = cells; + int cells = size; - while ( c-- ) + while ( size-- ) { - (*cell)[c] = cpu_to_fdt32(val); + (*cellp)[size] = cpu_to_fdt32(val); val >>= 32; } - (*cell) += cells; + + (*cellp) += cells; } void __init device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, u64 start, u64 size) { - set_val(cell, address_cells, start); - set_val(cell, size_cells, size); + dt_set_cell(cell, address_cells, start); + dt_set_cell(cell, size_cells, size); +} + +void dt_set_range(__be32 **cellp, const struct dt_device_node *np, + u64 address, u64 size) +{ + dt_set_cell(cellp, dt_n_addr_cells(np), address); + dt_set_cell(cellp, dt_n_size_cells(np), size); } u32 __init device_tree_get_u32(const void *fdt, int node, const char *prop_name, @@ -568,6 +576,23 @@ const void *dt_get_property(const struct dt_device_node *np, return pp ? pp->value : NULL; } +int dt_property_read_string(const struct dt_device_node *np, + const char *propname, const char **out_string) +{ + const struct dt_property *pp = dt_find_property(np, propname, NULL); + + if ( !pp ) + return -EINVAL; + if ( !pp->value ) + return -ENODATA; + if ( strnlen(pp->value, pp->length) >= pp->length ) + return -EILSEQ; + + *out_string = pp->value; + + return 0; +} + bool_t dt_device_is_compatible(const struct dt_device_node *device, const char *compat) { @@ -640,6 +665,34 @@ struct dt_device_node *dt_find_node_by_alias(const char *alias) return NULL; } +bool_t dt_match_node(const struct dt_device_match *matches, + const struct dt_device_node *node) +{ + if ( !matches ) + return 0; + + while ( matches->path || matches->type || matches->compatible ) + { + bool_t match = 1; + + if ( matches->path ) + match &= dt_node_path_is_equal(node, matches->path); + + if ( matches->type ) + match &= dt_device_type_is_equal(node, matches->type); + + if ( matches->compatible ) + match &= dt_device_is_compatible(node, matches->compatible); + + if ( match ) + return match; + + matches++; + } + + return 0; +} + const struct dt_device_node *dt_get_parent(const struct dt_device_node *node) { if ( !node ) @@ -669,6 +722,23 @@ dt_find_compatible_node(struct dt_device_node *from, return np; } +struct dt_device_node * +dt_find_matching_node(struct dt_device_node *from, + const struct dt_device_match *matches) +{ + struct dt_device_node *np; + struct dt_device_node *dt; + + dt = from ? from->allnext : dt_host; + for_each_device_node(dt, np) + { + if ( dt_match_node(matches, np) ) + return np; + } + + return NULL; +} + int dt_n_addr_cells(const struct dt_device_node *np) { const __be32 *ip; @@ -1357,6 +1427,24 @@ int dt_device_get_irq(const struct dt_device_node *device, int index, return dt_irq_translate(&raw, out_irq); } +bool_t dt_device_is_available(const struct dt_device_node *device) +{ + const char *status; + u32 statlen; + + status = dt_get_property(device, "status", &statlen); + if ( status == NULL ) + return 1; + + if ( statlen > 0 ) + { + if ( !strcmp(status, "okay") || !strcmp(status, "ok") ) + return 1; + } + + return 0; +} + /** * unflatten_dt_node - Alloc and populate a device_node from the flat tree * @fdt: The parent device tree blob diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index e6a82cb..22a2973 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -48,6 +48,19 @@ struct dt_early_info { struct dt_module_info modules; }; +/* + * Struct used for matching a device + */ +struct dt_device_match { + const char *path; + const char *type; + const char *compatible; +}; + +#define DT_MATCH_PATH(p) { .path = p } +#define DT_MATCH_TYPE(typ) { .type = typ } +#define DT_MATCH_COMPATIBLE(compat) { .compatible = compat } + typedef u32 dt_phandle; /** @@ -223,6 +236,7 @@ extern const struct dt_device_node *dt_interrupt_controller; */ struct dt_device_node * __init dt_find_interrupt_controller(const char *compat); +#define dt_prop_cmp(s1, s2) strcmp((s1), (s2)) #define dt_node_cmp(s1, s2) strcasecmp((s1), (s2)) #define dt_compat_cmp(s1, s2) strcasecmp((s1), (s2)) @@ -246,6 +260,20 @@ static inline u64 dt_read_number(const __be32 *cell, int size) return r; } +/* Helper to convert a number of cells in bytes */ +static inline int dt_cells_to_size(int size) +{ + return (size * sizeof (u32)); +} + +static inline u64 dt_next_cell(int s, const __be32 **cellp) +{ + const __be32 *p = *cellp; + + *cellp = p + s; + return dt_read_number(p, s); +} + static inline const char *dt_node_full_name(const struct dt_device_node *np) { return (np && np->full_name) ? np->full_name : "<no-node>"; @@ -256,6 +284,18 @@ static inline const char *dt_node_name(const struct dt_device_node *np) return (np && np->name) ? np->name : "<no-node>"; } +static inline bool_t dt_node_name_is_equal(const struct dt_device_node *np, + const char *name) +{ + return !dt_node_cmp(np->name, name); +} + +static inline bool_t dt_node_path_is_equal(const struct dt_device_node *np, + const char *path) +{ + return !dt_node_cmp(np->full_name, path); +} + static inline bool_t dt_device_type_is_equal(const struct dt_device_node *device, const char *type) @@ -275,6 +315,12 @@ static inline domid_t dt_device_used_by(const struct dt_device_node *device) return device->used_by; } +static inline bool_t dt_property_name_is_equal(const struct dt_property *pp, + const char *name) +{ + return !dt_prop_cmp(pp->name, name); +} + /** * dt_find_compatible_node - Find a node based on type and one of the * tokens in its "compatible" property @@ -295,11 +341,29 @@ struct dt_device_node *dt_find_compatible_node(struct dt_device_node *from, /** * Find a property with a given name for a given node * and return the value. - */ + */ const void *dt_get_property(const struct dt_device_node *np, const char *name, u32 *lenp); /** + * dt_property_read_string - Find and read a string from a property + * @np: Device node from which the property value is to be read + * @propname: Name of the property to be searched + * @out_string: Pointer to null terminated return string, modified only + * if return value if 0. + * + * Search for a property in a device tree node and retrieve a null + * terminated string value (pointer to data, not a copy). Returns 0 on + * sucess, -EINVAL if the property does not exist, -ENODATA if property + * doest not have value, and -EILSEQ if the string is not + * null-terminated with the length of the property data. + * + * The out_string pointer is modifed only if a valid string can be decoded. + */ +int dt_property_read_string(const struct dt_device_node *np, + const char *propname, const char **out_string); + +/** * Checks if the given "compat" string matches one of the strings in * the device's "compatible" property */ @@ -433,4 +497,71 @@ int dt_n_size_cells(const struct dt_device_node *np); */ int dt_n_addr_cells(const struct dt_device_node *np); -#endif +/** + * dt_device_is_available - Check if a device is available for use + * + * @device: Node to check for availability + * + * Returns true if the status property is absent or set to "okay" or "ok", + * false otherwise. + */ +bool_t dt_device_is_available(const struct dt_device_node *device); + +/** + * dt_match_node - Tell if a device_node has a matching of dt_device_match + * @matches: array of dt_device_match structures to search in + * @node: the dt_device_node structure to match against + * + * Returns true if the device node match one of dt_device_match. + */ +bool_t dt_match_node(const struct dt_device_match *matches, + const struct dt_device_node *node); + +/** + * dt_find_matching_node - Find a node based on an dt_device_match match table + * @from: The node to start searching from or NULL, the node you pass + * will not be searched, only the next one will; typically, you pass + * what the returned call returned + * @matches: array of dt_device_match structures to search in + * + * Returns a node pointer. + */ +struct dt_device_node * +dt_find_matching_node(struct dt_device_node *from, + const struct dt_device_match *matches); + +/** + * dt_set_cell - Write a value into a serie of cells + * + * @cellp: Pointer to cells + * + * Write a value into a series of cells and update cellp to point to the + * cell just after. + */ +void dt_set_cell(__be32 **cellp, int size, u64 val); + +/** + * dt_set_range - Write range into a serie of cells + * + * @cellp: Pointer to cells + * @np: Node which contains the encoding for the address and + * the size + * @address: Start of range + * @size: Size of the range + * + * Write a range into a serie of cells and update cellp to point to the + * cell just after. + */ +void dt_set_range(__be32 **cellp, const struct dt_device_node *np, + u64 address, u64 size); + +#endif /* __XEN_DEVICE_TREE_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */
Signed-off-by: Julien Grall <julien.grall@linaro.org> --- xen/common/device_tree.c | 102 ++++++++++++++++++++++++++++--- xen/include/xen/device_tree.h | 135 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 228 insertions(+), 9 deletions(-)