cmd: pinmux: update result of do_status
PATCH 1/2 cmd: pinmux: update result of do_status
Update the result of do_status and alway returns a CMD_RET_ value (-ENOSYS was a possible result of show_pinmux).
This patch also adds pincontrol name in error messages (dev->name) and treats correctly the status sub command when pin-controller device is not selected.
---
cmd/pinmux.c | 44 +++++++++++++++++++----------------- test/py/tests/test_pinmux.py | 4 ++-- 2 files changed, 25 insertions(+), 23 deletions(-)
cmd/pinmux.c +23 -21
@@ -41,7 +41,7 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc,return CMD_RET_SUCCESS ; } -static int show_pinmux (struct udevice *dev) +static void show_pinmux (struct udevice *dev) {char pin_name[PINNAME_SIZE ];char pin_mux[PINMUX_SIZE ];
@@ -51,54 +51,56 @@ static int show_pinmux(struct udevice *dev) pins_count =pinctrl_get_pins_count (dev); -if (pins_count == -ENOSYS ) { -printf ("Ops get_pins_count not supported\n" ); -return pins_count; +if (pins_count <0 ) { +printf ("Ops get_pins_count not supported by %s\n" , dev->name); +return ; }for (i =0 ; i < pins_count; i++) { ret =pinctrl_get_pin_name (dev, i, pin_name,PINNAME_SIZE ); -if (ret == -ENOSYS ) { -printf ("Ops get_pin_name not supported\n" ); -return ret; +if (ret) { +printf ("Ops get_pin_name error (%d) by %s\n" , + ret, dev->name); +return ; } ret =pinctrl_get_pin_muxing (dev, i, pin_mux,PINMUX_SIZE );if (ret) { -printf ("Ops get_pin_muxing error (%d)\n" , ret); -return ret; +printf ("Ops get_pin_muxing error (%d) by %s in %s\n" , + ret, pin_name, dev->name); +return ; }printf ("%-*s: %-*s\n" ,PINNAME_SIZE , pin_name,PINMUX_SIZE , pin_mux); } - -return 0 ; }static int do_status (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {struct udevice *dev; -int ret =CMD_RET_USAGE ; -if (currdev && (argc <2 ||strcmp (argv[1 ],"-a" ))) -return show_pinmux (currdev); +if (argc <2 ) { +if (!currdev) { +printf ("pin-controller device not selected\n" ); +return CMD_RET_FAILURE ; + } +show_pinmux (currdev); +return CMD_RET_SUCCESS ; + } -if (argc <2 ||strcmp (argv[1 ],"-a" )) -return ret; +if (strcmp (argv[1 ],"-a" )) +return CMD_RET_USAGE ; uclass_foreach_dev_probe(UCLASS_PINCTRL, dev) {/* insert a separator between each pin-controller display */ printf ("--------------------------\n" );printf ("%s:\n" , dev->name); - ret =show_pinmux (dev); -if (ret <0 ) -printf ("Can't display pin muxing for %s\n" , - dev->name); +show_pinmux (dev); } -return ret; +return CMD_RET_SUCCESS ; } static int do_list(struct cmd_tbl *cmdtp, int flag, int argc,
test/py/tests/test_pinmux.py +2 -2
@@ -13,9 +13,9 @@ def test_pinmux_usage_1(u_boot_console): @pytest.mark.buildconfigspec('cmd_pinmux') def test_pinmux_usage_2(u_boot_console): """Test that 'pinmux status' executed without previous "pinmux dev" - command displays pinmux usage.""" + command displays error message.""" output = u_boot_console.run_command('pinmux status') - assert 'Usage:' in output + assert 'pin-controller device not selected' in output @pytest.mark.buildconfigspec('cmd_pinmux') @pytest.mark.boardspec('sandbox')
Signature · 1 line
2.17.1
PATCH 2/2 cmd: pinmux: support pin name in status command
Allow pin name parameter for pimux staus command,
as gpio command to get status of one pin.
The possible usage of the command is:
Quoted 6 lines
pinmux dev pinctrl
pinmux statuspinmux status -a
pinmux status <pin-name>
---
cmd/pinmux.c | 41 +++++++++++++++++++++++++----------- test/py/tests/test_pinmux.py | 29 +++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 12 deletions(-)
cmd/pinmux.c +29 -12
@@ -41,19 +41,20 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc,return CMD_RET_SUCCESS ; } -static void show_pinmux (struct udevice *dev) +static bool show_pinmux (struct udevice *dev,char *name) {char pin_name[PINNAME_SIZE ];char pin_mux[PINMUX_SIZE ];int pins_count;int i;int ret; +bool found = false; pins_count =pinctrl_get_pins_count (dev);if (pins_count <0 ) {printf ("Ops get_pins_count not supported by %s\n" , dev->name); -return ; +return found; }for (i =0 ; i < pins_count; i++) {
@@ -61,43 +62,59 @@ static void show_pinmux(struct udevice *dev)if (ret) {printf ("Ops get_pin_name error (%d) by %s\n" , ret, dev->name); -return ; +return found; } - +if (name &&strcmp (name, pin_name)) +continue ; + found = true; ret =pinctrl_get_pin_muxing (dev, i, pin_mux,PINMUX_SIZE );if (ret) {printf ("Ops get_pin_muxing error (%d) by %s in %s\n" , ret, pin_name, dev->name); -return ; +return found; }printf ("%-*s: %-*s\n" ,PINNAME_SIZE , pin_name,PINMUX_SIZE , pin_mux); } + +return found; }static int do_status (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {struct udevice *dev; +char *name; +bool found = false;if (argc <2 ) {if (!currdev) {printf ("pin-controller device not selected\n" );return CMD_RET_FAILURE ; } -show_pinmux (currdev); +show_pinmux (currdev,NULL );return CMD_RET_SUCCESS ; }if (strcmp (argv[1 ],"-a" )) -return CMD_RET_USAGE ; + name = argv[1 ]; +else + name =NULL ; uclass_foreach_dev_probe(UCLASS_PINCTRL, dev) { -/* insert a separator between each pin-controller display */ -printf ("--------------------------\n" ); -printf ("%s:\n" , dev->name); -show_pinmux (dev); +if (!name) { +/* insert a separator between each pin-controller display */ +printf ("--------------------------\n" ); +printf ("%s:\n" , dev->name); + } +if (show_pinmux (dev, name)) + found = true; + } + +if (name && !found) { +printf ("%s not found\n" , name); +return CMD_RET_FAILURE ; }return CMD_RET_SUCCESS ;
@@ -148,5 +165,5 @@ U_BOOT_CMD(pinmux, CONFIG_SYS_MAXARGS, 1, do_pinmux,"show pin-controller muxing" ,"list - list UCLASS_PINCTRL devices\n" "pinmux dev [pincontroller-name] - select pin-controller device\n" -"pinmux status [-a] - print pin-controller muxing [for all]\n" +"pinmux status [-a | pin-name] - print pin-controller muxing [for all | for pin-name]\n" )
test/py/tests/test_pinmux.py +29 -0
@@ -82,3 +82,32 @@ def test_pinmux_status(u_boot_console): assert ('P6 : GPIO1 drive-open-drain.' in output) assert ('P7 : GPIO2 bias-pull-down input-enable.' in output) assert ('P8 : GPIO3 bias-disable.' in output) + + at pytest.mark.buildconfigspec('cmd_pinmux') + at pytest.mark.boardspec('sandbox') +def test_pinmux_status_pinname(u_boot_console): + """Test that 'pinmux status <pinname>' displays selected pin.""" + + output = u_boot_console.run_command('pinmux status a5') + assert ('a5 : gpio output .' in output) + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a6' in output) + assert (not 'P0' in output) + assert (not 'P8' in output) + + output = u_boot_console.run_command('pinmux status P7') + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a5' in output) + assert (not 'P0' in output) + assert (not 'P6' in output) + assert ('P7 : GPIO2 bias-pull-down input-enable.' in output) + assert (not 'P8' in output) + + output = u_boot_console.run_command('pinmux status P9') + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a5' in output) + assert (not 'P8' in output) + assert ('P9 not found' in output)
Signature · 1 line
2.17.1
PATCH 2/2 cmd: pinmux: support pin name in status command
Hi Patrick
-----Original Message-----
From: Uboot-stm32 <[email protected]> On Behalf Of Patrick DELAUNAY
Sent: mercredi 28 octobre 2020 11:07
To: u-boot at lists.denx.de
Cc: U-Boot STM32 <[email protected]>; Simon Glass <[email protected]>; Patrick DELAUNAY <[email protected]>; Sean Anderson <[email protected]>
Subject: [Uboot-stm32] [PATCH 2/2] cmd: pinmux: support pin name in status command
Allow pin name parameter for pimux staus command, as gpio command to get status of one pin.
The possible usage of the command is:
Quoted 6 lines
pinmux dev pinctrl
pinmux statuspinmux status -a
pinmux status <pin-name>
---
cmd/pinmux.c | 41 +++++++++++++++++++++++++----------- test/py/tests/test_pinmux.py | 29 +++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 12 deletions(-)
cmd/pinmux.c +29 -12
@@ -41,19 +41,20 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc,return CMD_RET_SUCCESS ; } -static void show_pinmux (struct udevice *dev) +static bool show_pinmux (struct udevice *dev,char *name) {char pin_name[PINNAME_SIZE ];char pin_mux[PINMUX_SIZE ];int pins_count;int i;int ret; +bool found = false; pins_count =pinctrl_get_pins_count (dev);if (pins_count <0 ) {printf ("Ops get_pins_count not supported by %s\n" , dev->name); -return ; +return found; }for (i =0 ; i < pins_count; i++) {
@@ -61,43 +62,59 @@ static void show_pinmux(struct udevice *dev)if (ret) {printf ("Ops get_pin_name error (%d) by %s\n" , ret, dev->name); -return ; +return found; } - +if (name &&strcmp (name, pin_name)) +continue ; + found = true; ret =pinctrl_get_pin_muxing (dev, i, pin_mux,PINMUX_SIZE );if (ret) {printf ("Ops get_pin_muxing error (%d) by %s in %s\n" , ret, pin_name, dev->name); -return ; +return found; }printf ("%-*s: %-*s\n" ,PINNAME_SIZE , pin_name,PINMUX_SIZE , pin_mux); } + +return found; }static int do_status (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {struct udevice *dev; +char *name; +bool found = false;if (argc <2 ) {if (!currdev) {printf ("pin-controller device not selected\n" );return CMD_RET_FAILURE ; } -show_pinmux (currdev); +show_pinmux (currdev,NULL );return CMD_RET_SUCCESS ; }if (strcmp (argv[1 ],"-a" )) -return CMD_RET_USAGE ; + name = argv[1 ]; +else + name =NULL ; uclass_foreach_dev_probe(UCLASS_PINCTRL, dev) { -/* insert a separator between each pin-controller display */ -printf ("--------------------------\n" ); -printf ("%s:\n" , dev->name); -show_pinmux (dev); +if (!name) { +/* insert a separator between each pin-controller display */ +printf ("--------------------------\n" ); +printf ("%s:\n" , dev->name); + } +if (show_pinmux (dev, name)) + found = true; + } + +if (name && !found) { +printf ("%s not found\n" , name); +return CMD_RET_FAILURE ; }return CMD_RET_SUCCESS ;
@@ -148,5 +165,5 @@ U_BOOT_CMD(pinmux, CONFIG_SYS_MAXARGS, 1, do_pinmux,"show pin-controller muxing" ,"list - list UCLASS_PINCTRL devices\n" "pinmux dev [pincontroller-name] - select pin-controller device\n" -"pinmux status [-a] - print pin-controller muxing [for all]\n" +"pinmux status [-a | pin-name] - print pin-controller muxing [for all | for pin-name]\n" )
test/py/tests/test_pinmux.py +29 -0
@@ -82,3 +82,32 @@ def test_pinmux_status(u_boot_console): assert ('P6 : GPIO1 drive-open-drain.' in output) assert ('P7 : GPIO2 bias-pull-down input-enable.' in output) assert ('P8 : GPIO3 bias-disable.' in output) + + at pytest.mark.buildconfigspec('cmd_pinmux') + at pytest.mark.boardspec('sandbox') +def test_pinmux_status_pinname(u_boot_console): + """Test that 'pinmux status <pinname>' displays selected pin.""" + + output = u_boot_console.run_command('pinmux status a5') + assert ('a5 : gpio output .' in output) + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a6' in output) + assert (not 'P0' in output) + assert (not 'P8' in output) + + output = u_boot_console.run_command('pinmux status P7') + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a5' in output) + assert (not 'P0' in output) + assert (not 'P6' in output) + assert ('P7 : GPIO2 bias-pull-down input-enable.' in output) + assert (not 'P8' in output) + + output = u_boot_console.run_command('pinmux status P9') + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a5' in output) + assert (not 'P8' in output) + assert ('P9 not found' in output)
Thanks
Patrice
--
2.17.1
_______________________________________________
Uboot-stm32 mailing list
Uboot-stm32 at st-md-mailman.stormreply.com
https://st-md-mailman.stormreply.com/mailman/listinfo/uboot-stm32
PATCH 2/2 cmd: pinmux: support pin name in status command
In reply to Patrick DelaunayHi Patrick,
Quoted 25 lines · Patrick Delaunay
Allow pin name parameter for pimux staus command,
as gpio command to get status of one pin.The possible usage of the command is:
Quoted 6 lines
pinmux dev pinctrl
pinmux statuspinmux status -a
pinmux status <pin-name>
Signed-off-by Patrick Delaunay <[email protected]>---
cmd/pinmux.c | 41 +++++++++++++++++++++++++----------- test/py/tests/test_pinmux.py | 29 +++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 12 deletions(-)cmd/pinmux.c +0
-0
cmd/pinmux.c static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, · line 44
Quoted 5 lines
cmd/pinmux.c +1
-1@@ -41,19 +41,20 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc,return CMD_RET_SUCCESS ; } -static void show_pinmux (struct udevice *dev) +static bool show_pinmux (struct udevice *dev,char *name)
How about returning -ENOENT if there is no pin.
Quoted 4 lines
cmd/pinmux.c +0
-0{char pin_name[PINNAME_SIZE ];char pin_mux[PINMUX_SIZE ];int pins_count;
cmd/pinmux.c static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, · line 57
Quoted 10 lines
cmd/pinmux.c +2
-1int i;int ret; +bool found = false; pins_count =pinctrl_get_pins_count (dev);if (pins_count <0 ) {printf ("Ops get_pins_count not supported by %s\n" , dev->name); -return ; +return found;
Here found will be false, so I think you are conflating different errors. Better to return pins_count in this case.
Quoted 106 lines
cmd/pinmux.c +26
-10}for (i =0 ; i < pins_count; i++) {@@ -61,43 +62,59 @@ static void show_pinmux(struct udevice *dev)if (ret) {printf ("Ops get_pin_name error (%d) by %s\n" , ret, dev->name); -return ; +return found; } - +if (name &&strcmp (name, pin_name)) +continue ; + found = true; ret =pinctrl_get_pin_muxing (dev, i, pin_mux,PINMUX_SIZE );if (ret) {printf ("Ops get_pin_muxing error (%d) by %s in %s\n" , ret, pin_name, dev->name); -return ; +return found; }printf ("%-*s: %-*s\n" ,PINNAME_SIZE , pin_name,PINMUX_SIZE , pin_mux); } + +return found; }static int do_status (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {struct udevice *dev; +char *name; +bool found = false;if (argc <2 ) {if (!currdev) {printf ("pin-controller device not selected\n" );return CMD_RET_FAILURE ; } -show_pinmux (currdev); +show_pinmux (currdev,NULL );return CMD_RET_SUCCESS ; }if (strcmp (argv[1 ],"-a" )) -return CMD_RET_USAGE ; + name = argv[1 ]; +else + name =NULL ; uclass_foreach_dev_probe(UCLASS_PINCTRL, dev) { -/* insert a separator between each pin-controller display */ -printf ("--------------------------\n" ); -printf ("%s:\n" , dev->name); -show_pinmux (dev); +if (!name) { +/* insert a separator between each pin-controller display */ +printf ("--------------------------\n" ); +printf ("%s:\n" , dev->name); + } +if (show_pinmux (dev, name)) + found = true; + } + +if (name && !found) { +printf ("%s not found\n" , name); +return CMD_RET_FAILURE ; }return CMD_RET_SUCCESS ;@@ -148,5 +165,5 @@ U_BOOT_CMD(pinmux, CONFIG_SYS_MAXARGS, 1, do_pinmux,"show pin-controller muxing" ,"list - list UCLASS_PINCTRL devices\n" "pinmux dev [pincontroller-name] - select pin-controller device\n" -"pinmux status [-a] - print pin-controller muxing [for all]\n" +"pinmux status [-a | pin-name] - print pin-controller muxing [for all | for pin-name]\n" )test/py/tests/test_pinmux.py +19
-0@@ -82,3 +82,32 @@ def test_pinmux_status(u_boot_console): assert ('P6 : GPIO1 drive-open-drain.' in output) assert ('P7 : GPIO2 bias-pull-down input-enable.' in output) assert ('P8 : GPIO3 bias-disable.' in output) + + at pytest.mark.buildconfigspec('cmd_pinmux') + at pytest.mark.boardspec('sandbox') +def test_pinmux_status_pinname(u_boot_console): + """Test that 'pinmux status <pinname>' displays selected pin.""" + + output = u_boot_console.run_command('pinmux status a5') + assert ('a5 : gpio output .' in output) + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a6' in output) + assert (not 'P0' in output) + assert (not 'P8' in output) + + output = u_boot_console.run_command('pinmux status P7') + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a5' in output) + assert (not 'P0' in output)
test/py/tests/test_pinmux.py def test_pinmux_status(u_boot_console): · line 113
Quoted 10 lines
test/py/tests/test_pinmux.py +10
-0+ assert (not 'P6' in output) + assert ('P7 : GPIO2 bias-pull-down input-enable.' in output) + assert (not 'P8' in output) + + output = u_boot_console.run_command('pinmux status P9') + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a5' in output) + assert (not 'P8' in output) + assert ('P9 not found' in output)
Can we write this test in C? We can use run_command()...see acpi.c
Quoted 3 lines
--
2.17.1
Regards,
Simon
PATCH 2/2 cmd: pinmux: support pin name in status command
Hi,
Quoted 27 lines · Simon Glass
Hi Patrick,
Quoted 24 lines · Patrick Delaunay
Allow pin name parameter for pimux staus command,
as gpio command to get status of one pin.The possible usage of the command is:
Quoted 4 lines
pinmux dev pinctrl
pinmux status
pinmux status -a
pinmux status <pin-name>Signed-off-by Patrick Delaunay <[email protected]>---
cmd/pinmux.c | 41 +++++++++++++++++++++++++----------- test/py/tests/test_pinmux.py | 29 +++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 12 deletions(-)cmd/pinmux.c +0
-0@@ -41,19 +41,20 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc,return CMD_RET_SUCCESS ; }
Quoted 3 lines
cmd/pinmux.c static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, · line 44
Quoted 2 lines
cmd/pinmux.c +1
-1-static void show_pinmux (struct udevice *dev) +static bool show_pinmux (struct udevice *dev,char *name)How about returning
-ENOENTif there is no pin.
OK
Quoted 8 lines
Quoted 8 lines
cmd/pinmux.c +1
-0{char pin_name[PINNAME_SIZE ];char pin_mux[PINMUX_SIZE ];int pins_count;int i;int ret; +bool found = false;
Quoted 8 lines
cmd/pinmux.c static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, · line 57
Quoted 6 lines
cmd/pinmux.c +1
-1pins_count =pinctrl_get_pins_count (dev);if (pins_count <0 ) {printf ("Ops get_pins_count not supported by %s\n" , dev->name); -return ; +return found;Here found will be false, so I think you are conflating different errors. Better to return
pins_countin this case.
OK
Quoted 109 lines
Quoted 109 lines
cmd/pinmux.c +26
-10}for (i =0 ; i < pins_count; i++) {@@ -61,43 +62,59 @@ static void show_pinmux(struct udevice *dev)if (ret) {printf ("Ops get_pin_name error (%d) by %s\n" , ret, dev->name); -return ; +return found; } - +if (name &&strcmp (name, pin_name)) +continue ; + found = true; ret =pinctrl_get_pin_muxing (dev, i, pin_mux,PINMUX_SIZE );if (ret) {printf ("Ops get_pin_muxing error (%d) by %s in %s\n" , ret, pin_name, dev->name); -return ; +return found; }printf ("%-*s: %-*s\n" ,PINNAME_SIZE , pin_name,PINMUX_SIZE , pin_mux); } + +return found; }static int do_status (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {struct udevice *dev; +char *name; +bool found = false;if (argc <2 ) {if (!currdev) {printf ("pin-controller device not selected\n" );return CMD_RET_FAILURE ; } -show_pinmux (currdev); +show_pinmux (currdev,NULL );return CMD_RET_SUCCESS ; }if (strcmp (argv[1 ],"-a" )) -return CMD_RET_USAGE ; + name = argv[1 ]; +else + name =NULL ; uclass_foreach_dev_probe(UCLASS_PINCTRL, dev) { -/* insert a separator between each pin-controller display */ -printf ("--------------------------\n" ); -printf ("%s:\n" , dev->name); -show_pinmux (dev); +if (!name) { +/* insert a separator between each pin-controller display */ +printf ("--------------------------\n" ); +printf ("%s:\n" , dev->name); + } +if (show_pinmux (dev, name)) + found = true; + } + +if (name && !found) { +printf ("%s not found\n" , name); +return CMD_RET_FAILURE ; }return CMD_RET_SUCCESS ;@@ -148,5 +165,5 @@ U_BOOT_CMD(pinmux, CONFIG_SYS_MAXARGS, 1, do_pinmux,"show pin-controller muxing" ,"list - list UCLASS_PINCTRL devices\n" "pinmux dev [pincontroller-name] - select pin-controller device\n" -"pinmux status [-a] - print pin-controller muxing [for all]\n" +"pinmux status [-a | pin-name] - print pin-controller muxing [for all | for pin-name]\n" )test/py/tests/test_pinmux.py +22
-0@@ -82,3 +82,32 @@ def test_pinmux_status(u_boot_console): assert ('P6 : GPIO1 drive-open-drain.' in output) assert ('P7 : GPIO2 bias-pull-down input-enable.' in output) assert ('P8 : GPIO3 bias-disable.' in output) + + at pytest.mark.buildconfigspec('cmd_pinmux') + at pytest.mark.boardspec('sandbox') +def test_pinmux_status_pinname(u_boot_console): + """Test that 'pinmux status <pinname>' displays selected pin.""" + + output = u_boot_console.run_command('pinmux status a5') + assert ('a5 : gpio output .' in output) + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a6' in output) + assert (not 'P0' in output) + assert (not 'P8' in output) + + output = u_boot_console.run_command('pinmux status P7') + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a5' in output) + assert (not 'P0' in output) + assert (not 'P6' in output) + assert ('P7 : GPIO2 bias-pull-down input-enable.' in output) + assert (not 'P8' in output)
Quoted 8 lines
test/py/tests/test_pinmux.py def test_pinmux_status(u_boot_console): · line 113
Quoted 7 lines
test/py/tests/test_pinmux.py +7
-0+ + output = u_boot_console.run_command('pinmux status P9') + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a5' in output) + assert (not 'P8' in output) + assert ('P9 not found' in output)Can we write this test in C? We can use run_command()...see
acpi.c
Any reason to prefer C test to python...
I just complete the existing pinmux tests.
For performance ?
other pinmux tests in already python should be migrate also ?
Quoted 9 lines
Quoted 3 lines
--
2.17.1Regards,
Simon
_______________________________________________
Uboot-stm32 mailing list
Uboot-stm32 at st-md-mailman.stormreply.com
https://st-md-mailman.stormreply.com/mailman/listinfo/uboot-stm32
Reagards
Patrick
PATCH 2/2 cmd: pinmux: support pin name in status command
Hi Patrick,
Quoted 175 lines · Patrick DELAUNAY
Hi,
Quoted 27 lines · Simon Glass
Hi Patrick,
Quoted 24 lines · Patrick Delaunay
Allow pin name parameter for pimux staus command,
as gpio command to get status of one pin.The possible usage of the command is:
Quoted 4 lines
pinmux dev pinctrl
pinmux status
pinmux status -a
pinmux status <pin-name>Signed-off-by Patrick Delaunay <[email protected]>---
cmd/pinmux.c | 41 +++++++++++++++++++++++++----------- test/py/tests/test_pinmux.py | 29 +++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 12 deletions(-)cmd/pinmux.c +0
-0@@ -41,19 +41,20 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc,return CMD_RET_SUCCESS ; }Quoted 3 lines
cmd/pinmux.c static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, · line 44
Quoted 2 lines
cmd/pinmux.c +1
-1-static void show_pinmux (struct udevice *dev) +static bool show_pinmux (struct udevice *dev,char *name)How about returning
-ENOENTif there is no pin.OK
Quoted 8 lines
Quoted 8 lines
cmd/pinmux.c +1
-0{char pin_name[PINNAME_SIZE ];char pin_mux[PINMUX_SIZE ];int pins_count;int i;int ret; +bool found = false;Quoted 8 lines
cmd/pinmux.c static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, · line 57
Quoted 6 lines
cmd/pinmux.c +1
-1pins_count =pinctrl_get_pins_count (dev);if (pins_count <0 ) {printf ("Ops get_pins_count not supported by %s\n" , dev->name); -return ; +return found;Here found will be false, so I think you are conflating different errors. Better to return
pins_countin this case.OK
Quoted 109 lines
Quoted 109 lines
cmd/pinmux.c +26
-10}for (i =0 ; i < pins_count; i++) {@@ -61,43 +62,59 @@ static void show_pinmux(struct udevice *dev)if (ret) {printf ("Ops get_pin_name error (%d) by %s\n" , ret, dev->name); -return ; +return found; } - +if (name &&strcmp (name, pin_name)) +continue ; + found = true; ret =pinctrl_get_pin_muxing (dev, i, pin_mux,PINMUX_SIZE );if (ret) {printf ("Ops get_pin_muxing error (%d) by %s in %s\n" , ret, pin_name, dev->name); -return ; +return found; }printf ("%-*s: %-*s\n" ,PINNAME_SIZE , pin_name,PINMUX_SIZE , pin_mux); } + +return found; }static int do_status (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {struct udevice *dev; +char *name; +bool found = false;if (argc <2 ) {if (!currdev) {printf ("pin-controller device not selected\n" );return CMD_RET_FAILURE ; } -show_pinmux (currdev); +show_pinmux (currdev,NULL );return CMD_RET_SUCCESS ; }if (strcmp (argv[1 ],"-a" )) -return CMD_RET_USAGE ; + name = argv[1 ]; +else + name =NULL ; uclass_foreach_dev_probe(UCLASS_PINCTRL, dev) { -/* insert a separator between each pin-controller display */ -printf ("--------------------------\n" ); -printf ("%s:\n" , dev->name); -show_pinmux (dev); +if (!name) { +/* insert a separator between each pin-controller display */ +printf ("--------------------------\n" ); +printf ("%s:\n" , dev->name); + } +if (show_pinmux (dev, name)) + found = true; + } + +if (name && !found) { +printf ("%s not found\n" , name); +return CMD_RET_FAILURE ; }return CMD_RET_SUCCESS ;@@ -148,5 +165,5 @@ U_BOOT_CMD(pinmux, CONFIG_SYS_MAXARGS, 1, do_pinmux,"show pin-controller muxing" ,"list - list UCLASS_PINCTRL devices\n" "pinmux dev [pincontroller-name] - select pin-controller device\n" -"pinmux status [-a] - print pin-controller muxing [for all]\n" +"pinmux status [-a | pin-name] - print pin-controller muxing [for all | for pin-name]\n" )test/py/tests/test_pinmux.py +22
-0@@ -82,3 +82,32 @@ def test_pinmux_status(u_boot_console): assert ('P6 : GPIO1 drive-open-drain.' in output) assert ('P7 : GPIO2 bias-pull-down input-enable.' in output) assert ('P8 : GPIO3 bias-disable.' in output) + + at pytest.mark.buildconfigspec('cmd_pinmux') + at pytest.mark.boardspec('sandbox') +def test_pinmux_status_pinname(u_boot_console): + """Test that 'pinmux status <pinname>' displays selected pin.""" + + output = u_boot_console.run_command('pinmux status a5') + assert ('a5 : gpio output .' in output) + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a6' in output) + assert (not 'P0' in output) + assert (not 'P8' in output) + + output = u_boot_console.run_command('pinmux status P7') + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a5' in output) + assert (not 'P0' in output) + assert (not 'P6' in output) + assert ('P7 : GPIO2 bias-pull-down input-enable.' in output) + assert (not 'P8' in output)Quoted 8 lines
test/py/tests/test_pinmux.py def test_pinmux_status(u_boot_console): · line 113
Quoted 7 lines
test/py/tests/test_pinmux.py +7
-0+ + output = u_boot_console.run_command('pinmux status P9') + assert (not 'pinctrl-gpio:' in output) + assert (not 'pinctrl:' in output) + assert (not 'a5' in output) + assert (not 'P8' in output) + assert ('P9 not found' in output)Can we write this test in C? We can use run_command()...see
acpi.c
Quoted 5 lines
Any reason to prefer C test to python...
I just complete the existing pinmux tests.
For performance ?
I wrote this up here:
https://u-boot.readthedocs.io/en/latest/develop/tests_writing.html
Quoted 2 lines
other pinmux tests in already python should be migrate also ?
They may as well be, to the extent that they only run on sandbox.
Regards,
SImon
PATCH 2/2 cmd: pinmux: support pin name in status command
Hi Simon,
Quoted 4 lines · Simon Glass
Hi Patrick,
On Thu, 6 May 2021 at 02:38, Patrick DELAUNAY
<[email protected]> wrote:
...
Quoted 7 lines
Any reason to prefer C test to python...
I just complete the existing pinmux tests.
For performance ?
I wrote this up here:
Quoted 7 lines
https://u-boot.readthedocs.io/en/latest/develop/tests_writing.html
Quoted 1 line
other pinmux tests in already python should be migrate also ?
They may as well be, to the extent that they only run on sandbox.
Regards,
SImon
I discover this page, it is clear now.
And I will chaneg the test to C.
Patrick
PATCH 1/2 cmd: pinmux: update result of do_status
In reply to Patrick DelaunayHi Patrick
-----Original Message-----
From: Uboot-stm32 <[email protected]> On Behalf Of Patrick DELAUNAY
Sent: mercredi 28 octobre 2020 11:07
To: u-boot at lists.denx.de
Cc: U-Boot STM32 <[email protected]>; Simon Glass <[email protected]>; Patrick DELAUNAY <[email protected]>; Sean Anderson <[email protected]>
Subject: [Uboot-stm32] [PATCH 1/2] cmd: pinmux: update result of do_status
Update the result of do_status and alway returns a CMD_RET_ value (-ENOSYS was a possible result of show_pinmux).
This patch also adds pincontrol name in error messages (dev->name) and treats correctly the status sub command when pin-controller device is not selected.
---
cmd/pinmux.c | 44 +++++++++++++++++++----------------- test/py/tests/test_pinmux.py | 4 ++-- 2 files changed, 25 insertions(+), 23 deletions(-)
cmd/pinmux.c +23 -21
@@ -41,7 +41,7 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc,return CMD_RET_SUCCESS ; } -static int show_pinmux (struct udevice *dev) +static void show_pinmux (struct udevice *dev) {char pin_name[PINNAME_SIZE ];char pin_mux[PINMUX_SIZE ];
@@ -51,54 +51,56 @@ static int show_pinmux(struct udevice *dev) pins_count =pinctrl_get_pins_count (dev); -if (pins_count == -ENOSYS ) { -printf ("Ops get_pins_count not supported\n" ); -return pins_count; +if (pins_count <0 ) { +printf ("Ops get_pins_count not supported by %s\n" , dev->name); +return ; }for (i =0 ; i < pins_count; i++) { ret =pinctrl_get_pin_name (dev, i, pin_name,PINNAME_SIZE ); -if (ret == -ENOSYS ) { -printf ("Ops get_pin_name not supported\n" ); -return ret; +if (ret) { +printf ("Ops get_pin_name error (%d) by %s\n" , + ret, dev->name); +return ; } ret =pinctrl_get_pin_muxing (dev, i, pin_mux,PINMUX_SIZE );if (ret) { -printf ("Ops get_pin_muxing error (%d)\n" , ret); -return ret; +printf ("Ops get_pin_muxing error (%d) by %s in %s\n" , + ret, pin_name, dev->name); +return ; }printf ("%-*s: %-*s\n" ,PINNAME_SIZE , pin_name,PINMUX_SIZE , pin_mux); } - -return 0 ; }static int do_status (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {struct udevice *dev; -int ret =CMD_RET_USAGE ; -if (currdev && (argc <2 ||strcmp (argv[1 ],"-a" ))) -return show_pinmux (currdev); +if (argc <2 ) { +if (!currdev) { +printf ("pin-controller device not selected\n" ); +return CMD_RET_FAILURE ; + } +show_pinmux (currdev); +return CMD_RET_SUCCESS ; + } -if (argc <2 ||strcmp (argv[1 ],"-a" )) -return ret; +if (strcmp (argv[1 ],"-a" )) +return CMD_RET_USAGE ; uclass_foreach_dev_probe(UCLASS_PINCTRL, dev) {/* insert a separator between each pin-controller display */ printf ("--------------------------\n" );printf ("%s:\n" , dev->name); - ret =show_pinmux (dev); -if (ret <0 ) -printf ("Can't display pin muxing for %s\n" , - dev->name); +show_pinmux (dev); } -return ret; +return CMD_RET_SUCCESS ; } static int do_list(struct cmd_tbl *cmdtp, int flag, int argc, diff --git a/test/py/tests/test_pinmux.py b/test/py/tests/test_pinmux.py index 0cbbae000c..b3ae2ab024 100644
test/py/tests/test_pinmux.py +2 -2
@@ -13,9 +13,9 @@ def test_pinmux_usage_1(u_boot_console): @pytest.mark.buildconfigspec('cmd_pinmux') def test_pinmux_usage_2(u_boot_console): """Test that 'pinmux status' executed without previous "pinmux dev" - command displays pinmux usage.""" + command displays error message.""" output = u_boot_console.run_command('pinmux status') - assert 'Usage:' in output + assert 'pin-controller device not selected' in output @pytest.mark.buildconfigspec('cmd_pinmux') @pytest.mark.boardspec('sandbox')
Thanks
Patrice
--
2.17.1
_______________________________________________
Uboot-stm32 mailing list
Uboot-stm32 at st-md-mailman.stormreply.com
https://st-md-mailman.stormreply.com/mailman/listinfo/uboot-stm32
PATCH 1/2 cmd: pinmux: update result of do_status
Hi Patrick,
Quoted 25 lines · Patrice CHOTARD
Hi Patrick
-----Original Message-----
From: Uboot-stm32 <[email protected]> On Behalf Of Patrick DELAUNAY
Sent: mercredi 28 octobre 2020 11:07
To: u-boot at lists.denx.de
Cc: U-Boot STM32 <[email protected]>; Simon Glass <[email protected]>; Patrick DELAUNAY <[email protected]>; Sean Anderson <[email protected]>
Subject: [Uboot-stm32] [PATCH 1/2] cmd: pinmux: update result ofdo_statusUpdate the result of
do_statusand alway returns aCMD_RET_value (-ENOSYSwas a possible result ofshow_pinmux).This patch also adds pincontrol name in error messages (
dev->name) and treats correctly the status sub command when pin-controller device is not selected.Signed-off-by Patrick Delaunay <[email protected]>---
cmd/pinmux.c | 44 +++++++++++++++++++----------------- test/py/tests/test_pinmux.py | 4 ++-- 2 files changed, 25 insertions(+), 23 deletions(-)
cmd/pinmux.c static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, · line 44
Quoted 4 lines
cmd/pinmux.c +0
-1@@ -41,7 +41,7 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc,return CMD_RET_SUCCESS ; } -static int show_pinmux (struct udevice *dev)
I think it is better to return the error code and let the caller ignore it, If we later want to report the error code, we can.
cmd/pinmux.c static int show_pinmux(struct udevice *dev) · line 54
Quoted 12 lines
cmd/pinmux.c +2
-3+static void show_pinmux (struct udevice *dev) {char pin_name[PINNAME_SIZE ];char pin_mux[PINMUX_SIZE ];@@ -51,54 +51,56 @@ static int show_pinmux(struct udevice *dev) pins_count =pinctrl_get_pins_count (dev); -if (pins_count == -ENOSYS ) { -printf ("Ops get_pins_count not supported\n" ); -return pins_count; +if (pins_count <0 ) {
Why change this to < 0 ?
I believe that -ENOSYS is the only valid error. We should update the get_pins_count() API function to indicate that.
Quoted 84 lines
cmd/pinmux.c +21
-17+printf ("Ops get_pins_count not supported by %s\n" , dev->name); +return ; }for (i =0 ; i < pins_count; i++) { ret =pinctrl_get_pin_name (dev, i, pin_name,PINNAME_SIZE ); -if (ret == -ENOSYS ) { -printf ("Ops get_pin_name not supported\n" ); -return ret; +if (ret) { +printf ("Ops get_pin_name error (%d) by %s\n" , + ret, dev->name); +return ; } ret =pinctrl_get_pin_muxing (dev, i, pin_mux,PINMUX_SIZE );if (ret) { -printf ("Ops get_pin_muxing error (%d)\n" , ret); -return ret; +printf ("Ops get_pin_muxing error (%d) by %s in %s\n" , + ret, pin_name, dev->name); +return ; }printf ("%-*s: %-*s\n" ,PINNAME_SIZE , pin_name,PINMUX_SIZE , pin_mux); } - -return 0 ; }static int do_status (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {struct udevice *dev; -int ret =CMD_RET_USAGE ; -if (currdev && (argc <2 ||strcmp (argv[1 ],"-a" ))) -return show_pinmux (currdev); +if (argc <2 ) { +if (!currdev) { +printf ("pin-controller device not selected\n" ); +return CMD_RET_FAILURE ; + } +show_pinmux (currdev); +return CMD_RET_SUCCESS ; + } -if (argc <2 ||strcmp (argv[1 ],"-a" )) -return ret; +if (strcmp (argv[1 ],"-a" )) +return CMD_RET_USAGE ; uclass_foreach_dev_probe(UCLASS_PINCTRL, dev) {/* insert a separator between each pin-controller display */ printf ("--------------------------\n" );printf ("%s:\n" , dev->name); - ret =show_pinmux (dev); -if (ret <0 ) -printf ("Can't display pin muxing for %s\n" , - dev->name); +show_pinmux (dev); } -return ret; +return CMD_RET_SUCCESS ; } static int do_list(struct cmd_tbl *cmdtp, int flag, int argc, diff --git a/test/py/tests/test_pinmux.py b/test/py/tests/test_pinmux.py index 0cbbae000c..b3ae2ab024 100644test/py/tests/test_pinmux.py +2
-2@@ -13,9 +13,9 @@ def test_pinmux_usage_1(u_boot_console): @pytest.mark.buildconfigspec('cmd_pinmux') def test_pinmux_usage_2(u_boot_console): """Test that 'pinmux status' executed without previous "pinmux dev" - command displays pinmux usage.""" + command displays error message.""" output = u_boot_console.run_command('pinmux status') - assert 'Usage:' in output + assert 'pin-controller device not selected' in output @pytest.mark.buildconfigspec('cmd_pinmux') @pytest.mark.boardspec('sandbox')
Quoted 4 lines
Reviewed-by Patrice Chotard <[email protected]>Thanks
Patrice
Regards,
Simon
PATCH 1/2 cmd: pinmux: update result of do_status
Hi Simon,
Quoted 30 lines · Simon Glass
Hi Patrick,
Quoted 27 lines · Patrice CHOTARD
Hi Patrick
-----Original Message-----
From: Uboot-stm32 <[email protected]> On Behalf Of Patrick DELAUNAY
Sent: mercredi 28 octobre 2020 11:07
To: u-boot at lists.denx.de
Cc: U-Boot STM32 <[email protected]>; Simon Glass <[email protected]>; Patrick DELAUNAY <[email protected]>; Sean Anderson <[email protected]>
Subject: [Uboot-stm32] [PATCH 1/2] cmd: pinmux: update result ofdo_statusUpdate the result of
do_statusand alway returns aCMD_RET_value (-ENOSYSwas a possible result ofshow_pinmux).This patch also adds pincontrol name in error messages (
dev->name) and treats correctly the status sub command when pin-controller device is not selected.Signed-off-by Patrick Delaunay <[email protected]>---
cmd/pinmux.c | 44 +++++++++++++++++++----------------- test/py/tests/test_pinmux.py | 4 ++-- 2 files changed, 25 insertions(+), 23 deletions(-)cmd/pinmux.c +0
-0@@ -41,7 +41,7 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc,return CMD_RET_SUCCESS ; }
Quoted 3 lines
cmd/pinmux.c static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, · line 44
Quoted 1 line
cmd/pinmux.c +0
-1-static int show_pinmux (struct udevice *dev)I think it is better to return the error code and let the caller ignore it, If we later want to report the error code, we can.
ok even if this static is only a help of do_status I will continue to return the result.
Quoted 8 lines
Quoted 8 lines
cmd/pinmux.c +1
-0+static void show_pinmux (struct udevice *dev) {char pin_name[PINNAME_SIZE ];char pin_mux[PINMUX_SIZE ];@@ -51,54 +51,56 @@ static int show_pinmux(struct udevice *dev) pins_count =pinctrl_get_pins_count (dev);
Quoted 8 lines
cmd/pinmux.c static int show_pinmux(struct udevice *dev) · line 54
Quoted 4 lines
cmd/pinmux.c +1
-3-if (pins_count == -ENOSYS ) { -printf ("Ops get_pins_count not supported\n" ); -return pins_count; +if (pins_count <0 ) {Why change this to < 0 ?
I believe that
-ENOSYSis the only valid error. We should update theget_pins_count()API function to indicate that.
I think that any value < 0 was allowed ...
/**
* pinctrl_get_pins_count() - Display pin-controller pins number
* @dev:Pinctrl device to use
*
* This allows to know the number of pins owned by a given pin-controller *
* Return: Number of pins if OK, or negative error code on failure */intpinctrl_get_pins_count(structudevice*dev);
withintpinctrl_get_pins_count(structudevice*dev)
{ struct pinctrl_ops *ops = pinctrl_get_ops(dev); if (!ops->get_pins_count) return -ENOSYS; returnops->get_pins_count(dev);
}
But after check you are right: the ops don't allow negative value for error /**
* @get_pins_count:Get the number of selectable pins
*
* @dev:Pinctrl device to use
*
* This function is necessary to parse the "pins" property in DTS. *
* @Return:
* number of selectable named pins available in this driver
*/
int(*get_pins_count)(structudevice*dev);
I will update the API doc and this check.
Quoted 24 lines
Quoted 24 lines
cmd/pinmux.c +2
-0+printf ("Ops get_pins_count not supported by %s\n" , dev->name); +return ; } static int do_list(struct cmd_tbl *cmdtp, int flag, int argc, diff --git a/test/py/tests/test_pinmux.py b/test/py/tests/test_pinmux.py index 0cbbae000c..b3ae2ab024 100644test/py/tests/test_pinmux.py +2
-2@@ -13,9 +13,9 @@ def test_pinmux_usage_1(u_boot_console): @pytest.mark.buildconfigspec('cmd_pinmux') def test_pinmux_usage_2(u_boot_console): """Test that 'pinmux status' executed without previous "pinmux dev" - command displays pinmux usage.""" + command displays error message.""" output = u_boot_console.run_command('pinmux status') - assert 'Usage:' in output + assert 'pin-controller device not selected' in output @pytest.mark.buildconfigspec('cmd_pinmux') @pytest.mark.boardspec('sandbox')Reviewed-by Patrice Chotard <[email protected]>
Quoted 8 lines
Quoted 2 lines
Thanks
PatriceRegards,
Simon
_______________________________________________
Uboot-stm32 mailing list
Uboot-stm32 at st-md-mailman.stormreply.com
https://st-md-mailman.stormreply.com/mailman/listinfo/uboot-stm32
Regards
Patrick