| Message ID | 20180517154701.GA20281@e107155-lin (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thu, May 17, 2018 at 6:47 PM, Sudeep Holla <sudeep.holla@arm.com> wrote: > Is below patch does what you were looking for ? Somewhat. See below for some minors. > of_property_read_u64 searches for a property in a device node and read > a 64-bit value from it. Instead of using of_get_property to get the > property and then read 64-bit value using of_read_number, we can make > use of of_property_read_u64. Suggested-by? > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> > - cache_size = of_get_property(np, propname, NULL); > - if (cache_size) > - this_leaf->size = of_read_number(cache_size, 1); > + if (!of_property_read_u64(np, propname, &cache_size)) > + this_leaf->size = cache_size; I suppose it's something like this ret = of_property_...(..., &this_leaf->VAR); if (ret) warning / set default / etc > propname = cache_type_info[ct_idx].line_size_props[i]; > - line_size = of_get_property(np, propname, NULL); > - if (line_size) > + line_size = of_property_read_u64(np, propname, &line_size); > + if (line_size) { ret = ... if (ret) { > + this_leaf->coherency_line_size = line_size; > break; > + } > + if (!of_property_read_u64(np, propname, &nr_sets)) > + this_leaf->number_of_sets = nr_sets; As in first case.
On 18/05/18 22:50, Andy Shevchenko wrote: > On Thu, May 17, 2018 at 6:47 PM, Sudeep Holla <sudeep.holla@arm.com> wrote: > >> Is below patch does what you were looking for ? > > Somewhat. > See below for some minors. > Thanks >> of_property_read_u64 searches for a property in a device node and read >> a 64-bit value from it. Instead of using of_get_property to get the >> property and then read 64-bit value using of_read_number, we can make >> use of of_property_read_u64. > > Suggested-by? > Yes indeed, added it locally after I sent out this patch. Will send out a proper patch soon. >> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> > > >> - cache_size = of_get_property(np, propname, NULL); >> - if (cache_size) >> - this_leaf->size = of_read_number(cache_size, 1); >> + if (!of_property_read_u64(np, propname, &cache_size)) >> + this_leaf->size = cache_size; > > I suppose it's something like this > > ret = of_property_...(..., &this_leaf->VAR); > if (ret) > warning / set default / etc OK, I do prefer this but once I was told not to use structure elements directly like that, but should be harmless in this particular case, will do so.
On 21/05/18 10:27, Sudeep Holla wrote: > > > On 18/05/18 22:50, Andy Shevchenko wrote: >> On Thu, May 17, 2018 at 6:47 PM, Sudeep Holla <sudeep.holla@arm.com> wrote: >> >>> Is below patch does what you were looking for ? >> >> Somewhat. >> See below for some minors. >> > > Thanks > >>> of_property_read_u64 searches for a property in a device node and read >>> a 64-bit value from it. Instead of using of_get_property to get the >>> property and then read 64-bit value using of_read_number, we can make >>> use of of_property_read_u64. >> >> Suggested-by? >> > > Yes indeed, added it locally after I sent out this patch. Will send out > a proper patch soon. > >>> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> >> >> >>> - cache_size = of_get_property(np, propname, NULL); >>> - if (cache_size) >>> - this_leaf->size = of_read_number(cache_size, 1); >>> + if (!of_property_read_u64(np, propname, &cache_size)) >>> + this_leaf->size = cache_size; >> >> I suppose it's something like this >> >> ret = of_property_...(..., &this_leaf->VAR); >> if (ret) >> warning / set default / etc > > OK, I do prefer this but once I was told not to use structure elements > directly like that, but should be harmless in this particular case, will > do so. > I spoke too early, I need to retain local u64 variable otherwise we get incompatible pointer type(expected 'u64 *' but argument is of type ‘unsigned int *’) error with Werror=incompatible-pointer-types.
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c index 2880e2ab01f5..56715014f07b 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -74,22 +74,21 @@ static inline int get_cacheinfo_idx(enum cache_type type) static void cache_size(struct cacheinfo *this_leaf, struct device_node *np) { const char *propname; - const __be32 *cache_size; + u64 cache_size; int ct_idx; ct_idx = get_cacheinfo_idx(this_leaf->type); propname = cache_type_info[ct_idx].size_prop; - cache_size = of_get_property(np, propname, NULL); - if (cache_size) - this_leaf->size = of_read_number(cache_size, 1); + if (!of_property_read_u64(np, propname, &cache_size)) + this_leaf->size = cache_size; } /* not cache_line_size() because that's a macro in include/linux/cache.h */ static void cache_get_line_size(struct cacheinfo *this_leaf, struct device_node *np) { - const __be32 *line_size; + u64 line_size; int i, lim, ct_idx; ct_idx = get_cacheinfo_idx(this_leaf->type); @@ -99,27 +98,26 @@ static void cache_get_line_size(struct cacheinfo *this_leaf, const char *propname; propname = cache_type_info[ct_idx].line_size_props[i]; - line_size = of_get_property(np, propname, NULL); - if (line_size) + line_size = of_property_read_u64(np, propname, &line_size); + if (line_size) { + this_leaf->coherency_line_size = line_size; break; + } } - if (line_size) - this_leaf->coherency_line_size = of_read_number(line_size, 1); } static void cache_nr_sets(struct cacheinfo *this_leaf, struct device_node *np) { const char *propname; - const __be32 *nr_sets; + u64 nr_sets; int ct_idx; ct_idx = get_cacheinfo_idx(this_leaf->type); propname = cache_type_info[ct_idx].nr_sets_prop; - nr_sets = of_get_property(np, propname, NULL); - if (nr_sets) - this_leaf->number_of_sets = of_read_number(nr_sets, 1); + if (!of_property_read_u64(np, propname, &nr_sets)) + this_leaf->number_of_sets = nr_sets; } static void cache_associativity(struct cacheinfo *this_leaf)