dm: add cells_count parameter in *_count_phandle_with_args
Subsystems (9)
PATCH 1/3 dm: add cells_count parameter in *_count_phandle_with_args
The cell_count argument is required when cells_name is NULL.
This patch adds this parameter in live tree API
- of_count_phandle_with_args
- ofnode_count_phandle_with_args
- dev_count_phandle_with_args
This parameter solves issue when these API is used to count the number of element of a cell without cell name. This parameter allow to force the size cell.
For example:
count = dev_count_phandle_with_args(dev, "array", NULL, 3);
---
It is linked to previous serie [1] but it is not a blocking point today as no user use this API with cells_name = NULL
+ dev_count_phandle_with_args
+ ofnode_count_phandle_with_args
[1/3] was Previously sent in RFC [2] + missing impacts in:
drivers/net/designware.c drivers/power/domain/power-domain-uclass.c drivers/usb/host/ohci-da8xx.c drivers/usb/host/ohci-generic.c
I also add test in [3/3] for modified API.
But I think it is the good time to modify these functions as they are not hugely used.
[1] http://patchwork.ozlabs.org/project/uboot/list/?series=200899
"dm: add cells_count parameter in live DT APIs of_parse_phandle_with_args"
[2] http://patchwork.ozlabs.org/project/uboot/list/?series=200906&state=*
board/st/stm32mp1/stm32mp1.c | 2 +- drivers/clk/clk-uclass.c | 4 ++-- drivers/core/of_access.c | 7 ++++--- drivers/core/ofnode.c | 6 +++--- drivers/core/read.c | 5 +++-- drivers/net/designware.c | 3 ++- drivers/phy/phy-uclass.c | 2 +- drivers/power/domain/power-domain-uclass.c | 2 +- drivers/reset/reset-uclass.c | 2 +- drivers/usb/host/ehci-generic.c | 4 ++-- drivers/usb/host/ohci-da8xx.c | 3 ++- drivers/usb/host/ohci-generic.c | 6 ++++-- include/dm/of_access.h | 4 +++- include/dm/ofnode.h | 3 ++- include/dm/read.h | 8 +++++--- 15 files changed, 36 insertions(+), 25 deletions(-)
board/st/stm32mp1/stm32mp1.c +1 -1
@@ -314,7 +314,7 @@ static int board_check_usb_power(void)* for each of them */ adc_count =ofnode_count_phandle_with_args (node,"st,adc_usb_pd" , -"#io-channel-cells" ); +"#io-channel-cells" ,0 );if (adc_count <0 ) {if (adc_count == -ENOENT )return 0 ;
drivers/clk/clk-uclass.c +2 -2
@@ -160,7 +160,7 @@ int clk_get_bulk(struct udevice *dev, struct clk_bulk *bulk) bulk->count =0 ; - count =dev_count_phandle_with_args (dev,"clocks" ,"#clock-cells" ); + count =dev_count_phandle_with_args (dev,"clocks" ,"#clock-cells" ,0 );if (count <1 )return count;
@@ -195,7 +195,7 @@ static int clk_set_default_parents(struct udevice *dev, int stage)int ret; num_parents =dev_count_phandle_with_args (dev,"assigned-clock-parents" , -"#clock-cells" ); +"#clock-cells" ,0 );if (num_parents <0 ) {debug ("%s: could not read assigned-clock-parents for %p\n" , __func__, dev);
drivers/core/of_access.c +4 -3
@@ -756,10 +756,11 @@ int of_parse_phandle_with_args(const struct device_node *np, }int of_count_phandle_with_args (const struct device_node *np, -const char *list_name,const char *cells_name) +const char *list_name,const char *cells_name, +int cell_count) { -return __of_parse_phandle_with_args (np, list_name, cells_name,0 , --1 ,NULL ); +return __of_parse_phandle_with_args (np, list_name, cells_name, + cell_count,-1 ,NULL ); } static void of_alias_add(struct alias_prop *ap, struct device_node *np,
drivers/core/ofnode.c +3 -3
@@ -432,15 +432,15 @@ int ofnode_parse_phandle_with_args(ofnode node, const char *list_name, }int ofnode_count_phandle_with_args (ofnode node,const char *list_name, -const char *cells_name) +const char *cells_name,int cell_count) {if (ofnode_is_np (node))return of_count_phandle_with_args (ofnode_to_np (node), - list_name, cells_name); + list_name, cells_name, cell_count);else return fdtdec_parse_phandle_with_args (gd->fdt_blob,ofnode_to_offset (node), list_name, cells_name, -0 ,-1 ,NULL ); + cell_count,-1 ,NULL ); }ofnode ofnode_path (const char *path)
drivers/core/read.c +3 -2
@@ -214,10 +214,11 @@ int dev_read_phandle_with_args(const struct udevice *dev, const char *list_name, }int dev_count_phandle_with_args (const struct udevice *dev, -const char *list_name,const char *cells_name) +const char *list_name,const char *cells_name, +int cell_count) {return ofnode_count_phandle_with_args (dev_ofnode (dev), list_name, - cells_name); + cells_name, cell_count); }int dev_read_addr_cells (const struct udevice *dev)
drivers/net/designware.c +2 -1
@@ -688,7 +688,8 @@ int designware_eth_probe(struct udevice *dev)int i, clock_nb; priv->clock_count =0 ; - clock_nb =dev_count_phandle_with_args (dev,"clocks" ,"#clock-cells" ); + clock_nb =dev_count_phandle_with_args (dev,"clocks" ,"#clock-cells" , +0 );if (clock_nb >0 ) { priv->clocks =devm_kcalloc (dev, clock_nb,sizeof (struct clk ),GFP_KERNEL );
drivers/phy/phy-uclass.c +1 -1
@@ -179,7 +179,7 @@ int generic_phy_get_bulk(struct udevice *dev, struct phy_bulk *bulk)if (!dev_read_prop (dev,"phys" ,NULL ))return 0 ; - count =dev_count_phandle_with_args (dev,"phys" ,"#phy-cells" ); + count =dev_count_phandle_with_args (dev,"phys" ,"#phy-cells" ,0 );if (count <1 )return count;
drivers/power/domain/power-domain-uclass.c +1 -1
@@ -117,7 +117,7 @@ static int dev_power_domain_ctrl(struct udevice *dev, bool on)int i, count, ret =0 ; count =dev_count_phandle_with_args (dev,"power-domains" , -"#power-domain-cells" ); +"#power-domain-cells" ,0 );for (i =0 ; i < count; i++) { ret =power_domain_get_by_index (dev, &pd, i);if (ret)
drivers/reset/reset-uclass.c +1 -1
@@ -106,7 +106,7 @@ int reset_get_bulk(struct udevice *dev, struct reset_ctl_bulk *bulk) bulk->count =0 ; - count =dev_count_phandle_with_args (dev,"resets" ,"#reset-cells" ); + count =dev_count_phandle_with_args (dev,"resets" ,"#reset-cells" ,0 );if (count <1 )return count;
drivers/usb/host/ehci-generic.c +2 -2
@@ -86,7 +86,7 @@ static int ehci_usb_probe(struct udevice *dev) err =0 ; priv->clock_count =0 ; clock_nb =ofnode_count_phandle_with_args (dev_ofnode (dev),"clocks" , -"#clock-cells" ); +"#clock-cells" ,0 );if (clock_nb >0 ) { priv->clocks =devm_kcalloc (dev, clock_nb,sizeof (struct clk ),GFP_KERNEL );
@@ -116,7 +116,7 @@ static int ehci_usb_probe(struct udevice *dev) priv->reset_count =0 ; reset_nb =ofnode_count_phandle_with_args (dev_ofnode (dev),"resets" , -"#reset-cells" ); +"#reset-cells" ,0 );if (reset_nb >0 ) { priv->resets = devm_kcalloc(dev, reset_nb, sizeof(struct reset_ctl),
drivers/usb/host/ohci-da8xx.c +2 -1
@@ -95,7 +95,8 @@ static int ohci_da8xx_probe(struct udevice *dev) err =0 ; priv->clock_count =0 ; - clock_nb =dev_count_phandle_with_args (dev,"clocks" ,"#clock-cells" ); + clock_nb =dev_count_phandle_with_args (dev,"clocks" ,"#clock-cells" , +0 );if (clock_nb <0 )return clock_nb;
drivers/usb/host/ohci-generic.c +4 -2
@@ -85,7 +85,8 @@ static int ohci_usb_probe(struct udevice *dev) err =0 ; priv->clock_count =0 ; - clock_nb =dev_count_phandle_with_args (dev,"clocks" ,"#clock-cells" ); + clock_nb =dev_count_phandle_with_args (dev,"clocks" ,"#clock-cells" , +0 );if (clock_nb >0 ) { priv->clocks =devm_kcalloc (dev, clock_nb,sizeof (struct clk ),GFP_KERNEL );
@@ -111,7 +112,8 @@ static int ohci_usb_probe(struct udevice *dev) } priv->reset_count =0 ; - reset_nb =dev_count_phandle_with_args (dev,"resets" ,"#reset-cells" ); + reset_nb =dev_count_phandle_with_args (dev,"resets" ,"#reset-cells" , +0 );if (reset_nb >0 ) { priv->resets = devm_kcalloc(dev, reset_nb, sizeof(struct reset_ctl),
include/dm/of_access.h +3 -1
@@ -450,6 +450,7 @@ int of_parse_phandle_with_args(const struct device_node *np,* @np: pointer to a device tree node containing a list * @list_name: property name that contains a list * @cells_name: property name that specifies phandles' arguments count +* @cells_count: Cell count to use if @cells_name is NULL * @return number of phandle found, -ENOENT if * @list_name does not exist, -EINVAL if a phandle was not found, * @cells_name could not be found, the arguments were truncated or there
@@ -460,7 +461,8 @@ int of_parse_phandle_with_args(const struct device_node *np,* */ int of_count_phandle_with_args (const struct device_node *np, -const char *list_name,const char *cells_name); +const char *list_name,const char *cells_name, +int cells_count);/** * of_alias_scan() - Scan all properties of the 'aliases' node
include/dm/ofnode.h +2 -1
@@ -555,12 +555,13 @@ int ofnode_parse_phandle_with_args(ofnode node, const char *list_name,* @node: device tree node containing a list * @list_name: property name that contains a list * @cells_name: property name that specifies phandles' arguments count +* @cells_count: Cell count to use if @cells_name is NULL * @return number of phandle on success, -ENOENT if @list_name does not * exist, -EINVAL if a phandle was not found, @cells_name could not * be found. */ int ofnode_count_phandle_with_args (ofnode node,const char *list_name, -const char *cells_name); +const char *cells_name,int cell_count);/** * ofnode_path() - find a node by full path
include/dm/read.h +5 -3
@@ -429,12 +429,14 @@ int dev_read_phandle_with_args(const struct udevice *dev, const char *list_name,* @dev: device whose node containing a list * @list_name: property name that contains a list * @cells_name: property name that specifies phandles' arguments count +* @cells_count: Cell count to use if @cells_name is NULL * @Returns number of phandle found on success, on error returns appropriate * errno value. */ int dev_count_phandle_with_args (const struct udevice *dev, -const char *list_name,const char *cells_name); +const char *list_name,const char *cells_name, +int cell_count);/** * dev_read_addr_cells() - Get the number of address cells for a device's node
@@ -880,10 +882,10 @@ static inline int dev_read_phandle_with_args(const struct udevice *dev, }static inline int dev_count_phandle_with_args (const struct udevice *dev, -const char *list_name,const char *cells_name) +const char *list_name,const char *cells_name,int cell_count) {return ofnode_count_phandle_with_args (dev_ofnode (dev), list_name, - cells_name); + cells_name, cell_count); }static inline int dev_read_addr_cells (const struct udevice *dev)
Signature · 1 line
2.17.1
PATCH 2/3 fdtdec: correct test on return of fdt_node_offset_by_phandle
The result of fdt_node_offset_by_phandle is negative for error, so this patch corrects the check of this result in fdtdec_parse_phandle_with_args.
This patch allows to have the same behavior with or without OF_LIVE for the function dev_read_phandle_with_args with cell_name = NULL and with invalid phandle.
---
lib/fdtdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/fdtdec.c +1 -1
@@ -746,7 +746,7 @@ int fdtdec_parse_phandle_with_args(const void *blob, int src_node,if (cells_name || cur_index == index) { node =fdt_node_offset_by_phandle (blob, phandle); -if (!node) { +if (node <0 ) {debug ("%s: could not find phandle\n" ,fdt_get_name (blob, src_node,NULL ));
Signature · 1 line
2.17.1
PATCH 2/3 fdtdec: correct test on return of fdt_node_offset_by_phandle
Quoted 9 lines · Patrick Delaunay
The result of
fdt_node_offset_by_phandleis negative for error, so this patch corrects the check of this result infdtdec_parse_phandle_with_args.This patch allows to have the same behavior with or without
OF_LIVEfor the functiondev_read_phandle_with_argswithcell_name= NULL and with invalid phandle.
Quoted 5 lines
Signed-off-by Patrick Delaunay <[email protected]>---
lib/fdtdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH 2/3 fdtdec: correct test on return of fdt_node_offset_by_phandle
Quoted 9 lines · Patrick Delaunay
The result of
fdt_node_offset_by_phandleis negative for error, so this patch corrects the check of this result infdtdec_parse_phandle_with_args.This patch allows to have the same behavior with or without
OF_LIVEfor the functiondev_read_phandle_with_argswithcell_name= NULL and with invalid phandle.
Quoted 5 lines
Signed-off-by Patrick Delaunay <[email protected]>---
lib/fdtdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-dm/next, thanks!
PATCH 3/3 test: dm: add test for phandle access functions
In reply to Patrick DelaunayAdd unitary test for phandle access functions
- ofnode_count_phandle_with_args
- ofnode_parse_phandle_with_args
- dev_count_phandle_with_args
- dev_read_phandle_with_args
---
arch/sandbox/dts/test.dts | 1 + test/dm/ofnode.c | 75 +++++++++++++++++++++++++++++++++++++++ test/dm/test-fdt.c | 65 +++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+)
arch/sandbox/dts/test.dts +1 -0
@@ -128,6 +128,7 @@ str-value = "test string"; interrupts-extended = <&irq 3 0>; acpi,name = "GHIJ"; + phandle-value = <&gpio_c 10>, <0xFFFFFFFF 20>, <&gpio_a 30>; }; junk {
test/dm/ofnode.c +75 -0
81 lines not on this page · raw message
test/dm/test-fdt.c +65 -0
71 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 3/3 test: dm: add test for phandle access functions
Quoted 7 lines · Patrick Delaunay
Add unitary test for phandle access functions
-ofnode_count_phandle_with_args
-ofnode_parse_phandle_with_args
-dev_count_phandle_with_args
-dev_read_phandle_with_args
Quoted 7 lines
Signed-off-by Patrick Delaunay <[email protected]>---
arch/sandbox/dts/test.dts | 1 + test/dm/ofnode.c | 75 +++++++++++++++++++++++++++++++++++++++ test/dm/test-fdt.c | 65 +++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+)
PATCH 3/3 test: dm: add test for phandle access functions
Quoted 7 lines · Patrick Delaunay
Add unitary test for phandle access functions
-ofnode_count_phandle_with_args
-ofnode_parse_phandle_with_args
-dev_count_phandle_with_args
-dev_read_phandle_with_args
Quoted 7 lines
Signed-off-by Patrick Delaunay <[email protected]>---
arch/sandbox/dts/test.dts | 1 + test/dm/ofnode.c | 75 +++++++++++++++++++++++++++++++++++++++ test/dm/test-fdt.c | 65 +++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+)
Applied to u-boot-dm/next, thanks!
PATCH 1/3 dm: add cells_count parameter in *_count_phandle_with_args
In reply to Patrick DelaunayQuoted 38 lines · Patrick Delaunay
The
cell_countargument is required whencells_nameis NULL.This patch adds this parameter in live tree API
-of_count_phandle_with_args
-ofnode_count_phandle_with_args
-dev_count_phandle_with_argsThis parameter solves issue when these API is used to count the number of element of a cell without cell name. This parameter allow to force the size cell.
For example:
count =dev_count_phandle_with_args(dev, "array", NULL, 3);Signed-off-by Patrick Delaunay <[email protected]>---
It is linked to previous serie [1] but it is not a blocking point today as no user use this API withcells_name= NULL
+dev_count_phandle_with_args
+ofnode_count_phandle_with_args[1/3] was Previously sent in RFC [2] + missing impacts in:
drivers/net/designware.cdrivers/power/domain/power-domain-uclass.cdrivers/usb/host/ohci-da8xx.cdrivers/usb/host/ohci-generic.cI also add test in [3/3] for modified API.
But I think it is the good time to modify these functions as they are not hugely used.
[1] http://patchwork.ozlabs.org/project/uboot/list/?series=200899
"dm: addcells_countparameter in live DT APIsof_parse_phandle_with_args"
[2] http://patchwork.ozlabs.org/project/uboot/list/?series=200906&state=*
Quoted 16 lines
board/st/stm32mp1/stm32mp1.c | 2 +- drivers/clk/clk-uclass.c | 4 ++-- drivers/core/of_access.c | 7 ++++--- drivers/core/ofnode.c | 6 +++--- drivers/core/read.c | 5 +++-- drivers/net/designware.c | 3 ++- drivers/phy/phy-uclass.c | 2 +- drivers/power/domain/power-domain-uclass.c | 2 +- drivers/reset/reset-uclass.c | 2 +- drivers/usb/host/ehci-generic.c | 4 ++-- drivers/usb/host/ohci-da8xx.c | 3 ++- drivers/usb/host/ohci-generic.c | 6 ++++-- include/dm/of_access.h | 4 +++- include/dm/ofnode.h | 3 ++- include/dm/read.h | 8 +++++--- 15 files changed, 36 insertions(+), 25 deletions(-)