[PATCH v2 1/3] tools: kwboot: Allow to specify custom baudrate only in supported operations

[PATCH v2 1/3] tools: kwboot: Allow to specify custom baudrate only in supported operations

[Pali Rohár]

Custom baudrate different than 115200 may be specified only when kwboot is
not going to send boot/debug message pattern or when it is going to send
boot message pattern with image file (in which case baudrate change happens
after sending kwbimage header). BootROM detects boot/debug message pattern
only at baudrate 115200.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 tools/kwboot.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 69d1be0f4823..986f27c2012a 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -2133,6 +2133,12 @@ main(int argc, char **argv)
 	if (optind != argc)
 		goto usage;
 
+	/* boot and debug message use baudrate 115200 */
+	if (((bootmsg && !imgpath) || debugmsg) && baudrate != 115200) {
+		fprintf(stderr, "Baudrate other than 115200 cannot be used for this operation.\n");
+		goto usage;
+	}
+
 	tty = kwboot_open_tty(ttypath, imgpath ? 115200 : baudrate);
 	if (tty < 0) {
 		perror(ttypath);
-- 
2.20.1

[PATCH v2 2/3] tools: kwboot: Check if baudrate value is supported before sending image

[Pali Rohár]

Call kwboot_open_tty() which baudrate value which was specified at the
command line by option -B. This function returns error if baudrate is not
supported by selected tty device.

Initial baudrate for image transfer is always 115200, so call
kwboot_tty_change_baudrate() with value 115200 immediately after
kwboot_open_tty() if baudrate specified by option -B is different than
115200.

This makes kwboot fail immediately, informing that baudrate is unsupported,
instead of failing only after the first part of image is already sent.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 tools/kwboot.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 986f27c2012a..3b45e19a30aa 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -2139,12 +2139,24 @@ main(int argc, char **argv)
 		goto usage;
 	}
 
-	tty = kwboot_open_tty(ttypath, imgpath ? 115200 : baudrate);
+	tty = kwboot_open_tty(ttypath, baudrate);
 	if (tty < 0) {
 		perror(ttypath);
 		goto out;
 	}
 
+	/*
+	 * initial baudrate for image transfer is always 115200,
+	 * the change to different baudrate is done only after the header is sent
+	 */
+	if (imgpath && baudrate != 115200) {
+		rc = kwboot_tty_change_baudrate(tty, 115200);
+		if (rc) {
+			perror(ttypath);
+			goto out;
+		}
+	}
+
 	if (baudrate == 115200)
 		/* do not change baudrate during Xmodem to the same value */
 		baudrate = 0;
-- 
2.20.1

Re: [PATCH v2 2/3] tools: kwboot: Check if baudrate value is supported before sending image

[Stefan Roese]

On 3/7/22 19:03, Pali Rohár wrote:
> Call kwboot_open_tty() which baudrate value which was specified at the
> command line by option -B. This function returns error if baudrate is not
> supported by selected tty device.
> 
> Initial baudrate for image transfer is always 115200, so call
> kwboot_tty_change_baudrate() with value 115200 immediately after
> kwboot_open_tty() if baudrate specified by option -B is different than
> 115200.
> 
> This makes kwboot fail immediately, informing that baudrate is unsupported,
> instead of failing only after the first part of image is already sent.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan


> ---
>   tools/kwboot.c | 14 +++++++++++++-
>   1 file changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 986f27c2012a..3b45e19a30aa 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -2139,12 +2139,24 @@ main(int argc, char **argv)
>   		goto usage;
>   	}
>   
> -	tty = kwboot_open_tty(ttypath, imgpath ? 115200 : baudrate);
> +	tty = kwboot_open_tty(ttypath, baudrate);
>   	if (tty < 0) {
>   		perror(ttypath);
>   		goto out;
>   	}
>   
> +	/*
> +	 * initial baudrate for image transfer is always 115200,
> +	 * the change to different baudrate is done only after the header is sent
> +	 */
> +	if (imgpath && baudrate != 115200) {
> +		rc = kwboot_tty_change_baudrate(tty, 115200);
> +		if (rc) {
> +			perror(ttypath);
> +			goto out;
> +		}
> +	}
> +
>   	if (baudrate == 115200)
>   		/* do not change baudrate during Xmodem to the same value */
>   		baudrate = 0;

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

[PATCH v2 3/3] tools: kwboot: Allow to mix positional arguments with option -b

[Pali Rohár]

Commit 9e6d71d2b55f ("tools: kwboot: Allow to use -b without image path as
the last getopt() option") broke usage of kwboot with following arguments:

  kwboot -t -B 115200 /dev/ttyUSB0 -b u-boot-spl.kwb

Fix parsing of option -b with optional argument again.

Fixes: 9e6d71d2b55f ("tools: kwboot: Allow to use -b without image path as the last getopt() option")
Signed-off-by: Pali Rohár <pali@kernel.org>
Reported-by: Tony Dinh <mibodhi@gmail.com>
---
Tony and Marcel, could you test this change if all your kwboot use cases
still work correctly?
---
 tools/kwboot.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 3b45e19a30aa..9f2dd2de4ef5 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -2073,7 +2073,8 @@ main(int argc, char **argv)
 			bootmsg = 1;
 			if (prev_optind == optind)
 				goto usage;
-			if (optind < argc - 1 && argv[optind] && argv[optind][0] != '-')
+			/* Option -b could have optional argument which specify image path */
+			if (optind < argc && argv[optind] && argv[optind][0] != '-')
 				imgpath = argv[optind++];
 			break;
 
@@ -2128,10 +2129,19 @@ main(int argc, char **argv)
 	if (!bootmsg && !term && !debugmsg && !imgpath)
 		goto usage;
 
-	ttypath = argv[optind++];
-
-	if (optind != argc)
+	/*
+	 * If there is no remaining argument but optional imgpath was parsed
+	 * then it means that optional imgpath was eaten by getopt parser.
+	 * Reassing imgpath to required ttypath argument.
+	 */
+	if (optind == argc && imgpath) {
+		ttypath = imgpath;
+		imgpath = NULL;
+	} else if (optind + 1 == argc) {
+		ttypath = argv[optind];
+	} else {
 		goto usage;
+	}
 
 	/* boot and debug message use baudrate 115200 */
 	if (((bootmsg && !imgpath) || debugmsg) && baudrate != 115200) {
-- 
2.20.1

Re: [PATCH v2 3/3] tools: kwboot: Allow to mix positional arguments with option -b

[Tony Dinh]

Hi Pali,

I've tested this patch series and it's all working fine!

Thanks,
Tony

Tested-by: Tony Dinh <mibodhi at gmail.com>


On Mon, Mar 7, 2022 at 10:04 AM Pali Rohár <pali@kernel.org> wrote:
>
> Commit 9e6d71d2b55f ("tools: kwboot: Allow to use -b without image path as
> the last getopt() option") broke usage of kwboot with following arguments:
>
>   kwboot -t -B 115200 /dev/ttyUSB0 -b u-boot-spl.kwb
>
> Fix parsing of option -b with optional argument again.
>
> Fixes: 9e6d71d2b55f ("tools: kwboot: Allow to use -b without image path as the last getopt() option")
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Reported-by: Tony Dinh <mibodhi@gmail.com>
> ---
> Tony and Marcel, could you test this change if all your kwboot use cases
> still work correctly?
> ---
>  tools/kwboot.c | 18 ++++++++++++++----
>  1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 3b45e19a30aa..9f2dd2de4ef5 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -2073,7 +2073,8 @@ main(int argc, char **argv)
>                         bootmsg = 1;
>                         if (prev_optind == optind)
>                                 goto usage;
> -                       if (optind < argc - 1 && argv[optind] && argv[optind][0] != '-')
> +                       /* Option -b could have optional argument which specify image path */
> +                       if (optind < argc && argv[optind] && argv[optind][0] != '-')
>                                 imgpath = argv[optind++];
>                         break;
>
> @@ -2128,10 +2129,19 @@ main(int argc, char **argv)
>         if (!bootmsg && !term && !debugmsg && !imgpath)
>                 goto usage;
>
> -       ttypath = argv[optind++];
> -
> -       if (optind != argc)
> +       /*
> +        * If there is no remaining argument but optional imgpath was parsed
> +        * then it means that optional imgpath was eaten by getopt parser.
> +        * Reassing imgpath to required ttypath argument.
> +        */
> +       if (optind == argc && imgpath) {
> +               ttypath = imgpath;
> +               imgpath = NULL;
> +       } else if (optind + 1 == argc) {
> +               ttypath = argv[optind];
> +       } else {
>                 goto usage;
> +       }
>
>         /* boot and debug message use baudrate 115200 */
>         if (((bootmsg && !imgpath) || debugmsg) && baudrate != 115200) {
> --
> 2.20.1
>

Re: [PATCH v2 3/3] tools: kwboot: Allow to mix positional arguments with option -b

[Pali Rohár]

On Monday 07 March 2022 21:23:29 Tony Dinh wrote:
> Hi Pali,
> 
> I've tested this patch series and it's all working fine!

Perfect!

Stefan, I think that this change should go into 2022.04 as it is fixing
regression introduced during 2022.04 development.

Could you do more checks/testing of kwboot if everything is also working
fine for you?

> Thanks,
> Tony
> 
> Tested-by: Tony Dinh <mibodhi at gmail.com>
> 
> 
> On Mon, Mar 7, 2022 at 10:04 AM Pali Rohár <pali@kernel.org> wrote:
> >
> > Commit 9e6d71d2b55f ("tools: kwboot: Allow to use -b without image path as
> > the last getopt() option") broke usage of kwboot with following arguments:
> >
> >   kwboot -t -B 115200 /dev/ttyUSB0 -b u-boot-spl.kwb
> >
> > Fix parsing of option -b with optional argument again.
> >
> > Fixes: 9e6d71d2b55f ("tools: kwboot: Allow to use -b without image path as the last getopt() option")
> > Signed-off-by: Pali Rohár <pali@kernel.org>
> > Reported-by: Tony Dinh <mibodhi@gmail.com>
> > ---
> > Tony and Marcel, could you test this change if all your kwboot use cases
> > still work correctly?
> > ---
> >  tools/kwboot.c | 18 ++++++++++++++----
> >  1 file changed, 14 insertions(+), 4 deletions(-)
> >
> > diff --git a/tools/kwboot.c b/tools/kwboot.c
> > index 3b45e19a30aa..9f2dd2de4ef5 100644
> > --- a/tools/kwboot.c
> > +++ b/tools/kwboot.c
> > @@ -2073,7 +2073,8 @@ main(int argc, char **argv)
> >                         bootmsg = 1;
> >                         if (prev_optind == optind)
> >                                 goto usage;
> > -                       if (optind < argc - 1 && argv[optind] && argv[optind][0] != '-')
> > +                       /* Option -b could have optional argument which specify image path */
> > +                       if (optind < argc && argv[optind] && argv[optind][0] != '-')
> >                                 imgpath = argv[optind++];
> >                         break;
> >
> > @@ -2128,10 +2129,19 @@ main(int argc, char **argv)
> >         if (!bootmsg && !term && !debugmsg && !imgpath)
> >                 goto usage;
> >
> > -       ttypath = argv[optind++];
> > -
> > -       if (optind != argc)
> > +       /*
> > +        * If there is no remaining argument but optional imgpath was parsed
> > +        * then it means that optional imgpath was eaten by getopt parser.
> > +        * Reassing imgpath to required ttypath argument.
> > +        */
> > +       if (optind == argc && imgpath) {
> > +               ttypath = imgpath;
> > +               imgpath = NULL;
> > +       } else if (optind + 1 == argc) {
> > +               ttypath = argv[optind];
> > +       } else {
> >                 goto usage;
> > +       }
> >
> >         /* boot and debug message use baudrate 115200 */
> >         if (((bootmsg && !imgpath) || debugmsg) && baudrate != 115200) {
> > --
> > 2.20.1
> >

Re: [PATCH v2 3/3] tools: kwboot: Allow to mix positional arguments with option -b

[Stefan Roese]

On 3/8/22 20:22, Pali Rohár wrote:
> On Monday 07 March 2022 21:23:29 Tony Dinh wrote:
>> Hi Pali,
>>
>> I've tested this patch series and it's all working fine!
> 
> Perfect!
> 
> Stefan, I think that this change should go into 2022.04 as it is fixing
> regression introduced during 2022.04 development.

I agree.

> Could you do more checks/testing of kwboot if everything is also working
> fine for you?

I'll try to do this later this week, yes.

Thanks,
Stefan

>> Thanks,
>> Tony
>>
>> Tested-by: Tony Dinh <mibodhi at gmail.com>
>>
>>
>> On Mon, Mar 7, 2022 at 10:04 AM Pali Rohár <pali@kernel.org> wrote:
>>>
>>> Commit 9e6d71d2b55f ("tools: kwboot: Allow to use -b without image path as
>>> the last getopt() option") broke usage of kwboot with following arguments:
>>>
>>>    kwboot -t -B 115200 /dev/ttyUSB0 -b u-boot-spl.kwb
>>>
>>> Fix parsing of option -b with optional argument again.
>>>
>>> Fixes: 9e6d71d2b55f ("tools: kwboot: Allow to use -b without image path as the last getopt() option")
>>> Signed-off-by: Pali Rohár <pali@kernel.org>
>>> Reported-by: Tony Dinh <mibodhi@gmail.com>
>>> ---
>>> Tony and Marcel, could you test this change if all your kwboot use cases
>>> still work correctly?
>>> ---
>>>   tools/kwboot.c | 18 ++++++++++++++----
>>>   1 file changed, 14 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/tools/kwboot.c b/tools/kwboot.c
>>> index 3b45e19a30aa..9f2dd2de4ef5 100644
>>> --- a/tools/kwboot.c
>>> +++ b/tools/kwboot.c
>>> @@ -2073,7 +2073,8 @@ main(int argc, char **argv)
>>>                          bootmsg = 1;
>>>                          if (prev_optind == optind)
>>>                                  goto usage;
>>> -                       if (optind < argc - 1 && argv[optind] && argv[optind][0] != '-')
>>> +                       /* Option -b could have optional argument which specify image path */
>>> +                       if (optind < argc && argv[optind] && argv[optind][0] != '-')
>>>                                  imgpath = argv[optind++];
>>>                          break;
>>>
>>> @@ -2128,10 +2129,19 @@ main(int argc, char **argv)
>>>          if (!bootmsg && !term && !debugmsg && !imgpath)
>>>                  goto usage;
>>>
>>> -       ttypath = argv[optind++];
>>> -
>>> -       if (optind != argc)
>>> +       /*
>>> +        * If there is no remaining argument but optional imgpath was parsed
>>> +        * then it means that optional imgpath was eaten by getopt parser.
>>> +        * Reassing imgpath to required ttypath argument.
>>> +        */
>>> +       if (optind == argc && imgpath) {
>>> +               ttypath = imgpath;
>>> +               imgpath = NULL;
>>> +       } else if (optind + 1 == argc) {
>>> +               ttypath = argv[optind];
>>> +       } else {
>>>                  goto usage;
>>> +       }
>>>
>>>          /* boot and debug message use baudrate 115200 */
>>>          if (((bootmsg && !imgpath) || debugmsg) && baudrate != 115200) {
>>> --
>>> 2.20.1
>>>

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH v2 3/3] tools: kwboot: Allow to mix positional arguments with option -b

[Stefan Roese]

On 3/7/22 19:03, Pali Rohár wrote:
> Commit 9e6d71d2b55f ("tools: kwboot: Allow to use -b without image path as
> the last getopt() option") broke usage of kwboot with following arguments:
> 
>    kwboot -t -B 115200 /dev/ttyUSB0 -b u-boot-spl.kwb
> 
> Fix parsing of option -b with optional argument again.
> 
> Fixes: 9e6d71d2b55f ("tools: kwboot: Allow to use -b without image path as the last getopt() option")
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Reported-by: Tony Dinh <mibodhi@gmail.com>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
> Tony and Marcel, could you test this change if all your kwboot use cases
> still work correctly?
> ---
>   tools/kwboot.c | 18 ++++++++++++++----
>   1 file changed, 14 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 3b45e19a30aa..9f2dd2de4ef5 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -2073,7 +2073,8 @@ main(int argc, char **argv)
>   			bootmsg = 1;
>   			if (prev_optind == optind)
>   				goto usage;
> -			if (optind < argc - 1 && argv[optind] && argv[optind][0] != '-')
> +			/* Option -b could have optional argument which specify image path */
> +			if (optind < argc && argv[optind] && argv[optind][0] != '-')
>   				imgpath = argv[optind++];
>   			break;
>   
> @@ -2128,10 +2129,19 @@ main(int argc, char **argv)
>   	if (!bootmsg && !term && !debugmsg && !imgpath)
>   		goto usage;
>   
> -	ttypath = argv[optind++];
> -
> -	if (optind != argc)
> +	/*
> +	 * If there is no remaining argument but optional imgpath was parsed
> +	 * then it means that optional imgpath was eaten by getopt parser.
> +	 * Reassing imgpath to required ttypath argument.
> +	 */
> +	if (optind == argc && imgpath) {
> +		ttypath = imgpath;
> +		imgpath = NULL;
> +	} else if (optind + 1 == argc) {
> +		ttypath = argv[optind];
> +	} else {
>   		goto usage;
> +	}
>   
>   	/* boot and debug message use baudrate 115200 */
>   	if (((bootmsg && !imgpath) || debugmsg) && baudrate != 115200) {

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH v2 3/3] tools: kwboot: Allow to mix positional arguments with option -b

[Stefan Roese]

On 3/7/22 19:03, Pali Rohár wrote:
> Commit 9e6d71d2b55f ("tools: kwboot: Allow to use -b without image path as
> the last getopt() option") broke usage of kwboot with following arguments:
> 
>    kwboot -t -B 115200 /dev/ttyUSB0 -b u-boot-spl.kwb
> 
> Fix parsing of option -b with optional argument again.
> 
> Fixes: 9e6d71d2b55f ("tools: kwboot: Allow to use -b without image path as the last getopt() option")
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Reported-by: Tony Dinh <mibodhi@gmail.com>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
> Tony and Marcel, could you test this change if all your kwboot use cases
> still work correctly?
> ---
>   tools/kwboot.c | 18 ++++++++++++++----
>   1 file changed, 14 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 3b45e19a30aa..9f2dd2de4ef5 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -2073,7 +2073,8 @@ main(int argc, char **argv)
>   			bootmsg = 1;
>   			if (prev_optind == optind)
>   				goto usage;
> -			if (optind < argc - 1 && argv[optind] && argv[optind][0] != '-')
> +			/* Option -b could have optional argument which specify image path */
> +			if (optind < argc && argv[optind] && argv[optind][0] != '-')
>   				imgpath = argv[optind++];
>   			break;
>   
> @@ -2128,10 +2129,19 @@ main(int argc, char **argv)
>   	if (!bootmsg && !term && !debugmsg && !imgpath)
>   		goto usage;
>   
> -	ttypath = argv[optind++];
> -
> -	if (optind != argc)
> +	/*
> +	 * If there is no remaining argument but optional imgpath was parsed
> +	 * then it means that optional imgpath was eaten by getopt parser.
> +	 * Reassing imgpath to required ttypath argument.
> +	 */
> +	if (optind == argc && imgpath) {
> +		ttypath = imgpath;
> +		imgpath = NULL;
> +	} else if (optind + 1 == argc) {
> +		ttypath = argv[optind];
> +	} else {
>   		goto usage;
> +	}
>   
>   	/* boot and debug message use baudrate 115200 */
>   	if (((bootmsg && !imgpath) || debugmsg) && baudrate != 115200) {

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH v2 1/3] tools: kwboot: Allow to specify custom baudrate only in supported operations

[Stefan Roese]

On 3/7/22 19:03, Pali Rohár wrote:
> Custom baudrate different than 115200 may be specified only when kwboot is
> not going to send boot/debug message pattern or when it is going to send
> boot message pattern with image file (in which case baudrate change happens
> after sending kwbimage header). BootROM detects boot/debug message pattern
> only at baudrate 115200.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 6 ++++++
>   1 file changed, 6 insertions(+)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 69d1be0f4823..986f27c2012a 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -2133,6 +2133,12 @@ main(int argc, char **argv)
>   	if (optind != argc)
>   		goto usage;
>   
> +	/* boot and debug message use baudrate 115200 */
> +	if (((bootmsg && !imgpath) || debugmsg) && baudrate != 115200) {
> +		fprintf(stderr, "Baudrate other than 115200 cannot be used for this operation.\n");
> +		goto usage;
> +	}
> +
>   	tty = kwboot_open_tty(ttypath, imgpath ? 115200 : baudrate);
>   	if (tty < 0) {
>   		perror(ttypath);

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH v2 1/3] tools: kwboot: Allow to specify custom baudrate only in supported operations

[Stefan Roese]

On 3/7/22 19:03, Pali Rohár wrote:
> Custom baudrate different than 115200 may be specified only when kwboot is
> not going to send boot/debug message pattern or when it is going to send
> boot message pattern with image file (in which case baudrate change happens
> after sending kwbimage header). BootROM detects boot/debug message pattern
> only at baudrate 115200.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
>   tools/kwboot.c | 6 ++++++
>   1 file changed, 6 insertions(+)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 69d1be0f4823..986f27c2012a 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -2133,6 +2133,12 @@ main(int argc, char **argv)
>   	if (optind != argc)
>   		goto usage;
>   
> +	/* boot and debug message use baudrate 115200 */
> +	if (((bootmsg && !imgpath) || debugmsg) && baudrate != 115200) {
> +		fprintf(stderr, "Baudrate other than 115200 cannot be used for this operation.\n");
> +		goto usage;
> +	}
> +
>   	tty = kwboot_open_tty(ttypath, imgpath ? 115200 : baudrate);
>   	if (tty < 0) {
>   		perror(ttypath);

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

[PATCH] arm: kirkwood: Sheevaplug : Use Marvell uclass mvgbe and PHY driver for Ethernet

[Tony Dinh]

The Globalscale Technologies Sheevaplug board has the network chip
Marvell 88E1116R. Use uclass mvgbe and the compatible driver M88E1310
driver to bring up Ethernet.

- Currently, CONFIG_RESET_PHY_R symbol is used in
arch/arm/mach-kirkwood/include/mach/config.h for all Kirkwood
boards with mv8831116 PHY, with each board defines the function
reset_phy(). Undefine it for this board.
- Add board_eth_init() to use uclass mvgbe to bring up the network.
And remove ad-hoc code.
- Enable CONFIG_PHY_MARVELL to properly configure the network.
- Miscellaneous changes: Move constants to .c file and remove header file
board/Marvell/sheevaplug/sheevaplug.h, use BIT macro, and add/cleanup
comments.

Signed-off-by: Tony Dinh <mibodhi@gmail.com>
---

 board/Marvell/sheevaplug/sheevaplug.c | 83 +++++----------------------
 board/Marvell/sheevaplug/sheevaplug.h | 24 --------
 configs/sheevaplug_defconfig          |  1 +
 include/configs/sheevaplug.h          | 17 +++---
 4 files changed, 22 insertions(+), 103 deletions(-)
 delete mode 100644 board/Marvell/sheevaplug/sheevaplug.h

diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
index 5952d158b2..26ee39ef77 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2021  Tony Dinh <mibodhi@gmail.com>
+ * Copyright (C) 2021-2022  Tony Dinh <mibodhi@gmail.com>
  * (C) Copyright 2009
  * Marvell Semiconductor <www.marvell.com>
  * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
@@ -8,17 +8,21 @@
 
 #include <common.h>
 #include <init.h>
-#include <miiphy.h>
-#include <net.h>
+#include <netdev.h>
 #include <asm/global_data.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/mpp.h>
-#include "sheevaplug.h"
+#include <linux/bitops.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#define SHEEVAPLUG_OE_LOW		(~(0))
+#define SHEEVAPLUG_OE_HIGH		(~(0))
+#define SHEEVAPLUG_OE_VAL_LOW		BIT(29)       /* USB_PWEN low */
+#define SHEEVAPLUG_OE_VAL_HIGH		BIT(17)       /* LED pin high */
+
 int board_early_init_f(void)
 {
 	/*
@@ -88,6 +92,11 @@ int board_early_init_f(void)
 	return 0;
 }
 
+int board_eth_init(struct bd_info *bis)
+{
+	return cpu_eth_init(bis);
+}
+
 int board_init(void)
 {
 	/*
@@ -95,72 +104,8 @@ int board_init(void)
 	 */
 	gd->bd->bi_arch_number = MACH_TYPE_SHEEVAPLUG;
 
-	/* adress of boot parameters */
+	/* address of boot parameters */
 	gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;
 
 	return 0;
 }
-
-static int fdt_get_phy_addr(const char *path)
-{
-	const void *fdt = gd->fdt_blob;
-	const u32 *reg;
-	const u32 *val;
-	int node, phandle, addr;
-
-	/* Find the node by its full path */
-	node = fdt_path_offset(fdt, path);
-	if (node >= 0) {
-		/* Look up phy-handle */
-		val = fdt_getprop(fdt, node, "phy-handle", NULL);
-		if (val) {
-			phandle = fdt32_to_cpu(*val);
-			if (!phandle)
-				return -1;
-			/* Follow it to its node */
-			node = fdt_node_offset_by_phandle(fdt, phandle);
-			if (node) {
-				/* Look up reg */
-				reg = fdt_getprop(fdt, node, "reg", NULL);
-				if (reg) {
-					addr = fdt32_to_cpu(*reg);
-					return addr;
-				}
-			}
-		}
-	}
-	return -1;
-}
-
-#ifdef CONFIG_RESET_PHY_R
-/* Configure and enable MV88E1116 PHY */
-void reset_phy(void)
-{
-	u16 reg;
-	int phyaddr;
-	char *name = "ethernet-controller@72000";
-	char *eth0_path = "/ocp@f1000000/ethernet-controller@72000/ethernet0-port@0";
-
-	if (miiphy_set_current_dev(name))
-		return;
-
-	phyaddr = fdt_get_phy_addr(eth0_path);
-	if (phyaddr < 0)
-		return;
-
-	/*
-	 * Enable RGMII delay on Tx and Rx for CPU port
-	 * Ref: sec 4.7.2 of chip datasheet
-	 */
-	miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 2);
-	miiphy_read(name, phyaddr, MV88E1116_MAC_CTRL_REG, &reg);
-	reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL);
-	miiphy_write(name, phyaddr, MV88E1116_MAC_CTRL_REG, reg);
-	miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 0);
-
-	/* reset the phy */
-	miiphy_reset(name, phyaddr);
-
-	printf("88E1116 Initialized on %s\n", name);
-}
-#endif /* CONFIG_RESET_PHY_R */
diff --git a/board/Marvell/sheevaplug/sheevaplug.h b/board/Marvell/sheevaplug/sheevaplug.h
deleted file mode 100644
index e026c1b53b..0000000000
--- a/board/Marvell/sheevaplug/sheevaplug.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2009
- * Marvell Semiconductor <www.marvell.com>
- * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- */
-
-#ifndef __SHEEVAPLUG_H
-#define __SHEEVAPLUG_H
-
-#define SHEEVAPLUG_OE_LOW		(~(0))
-#define SHEEVAPLUG_OE_HIGH		(~(0))
-#define SHEEVAPLUG_OE_VAL_LOW		(1 << 29)	/* USB_PWEN low */
-#define SHEEVAPLUG_OE_VAL_HIGH		(1 << 17)	/* LED pin high */
-
-/* PHY related */
-#define MV88E1116_LED_FCTRL_REG		10
-#define MV88E1116_CPRSP_CR3_REG		21
-#define MV88E1116_MAC_CTRL_REG		21
-#define MV88E1116_PGADR_REG		22
-#define MV88E1116_RGMII_TXTM_CTRL	(1 << 4)
-#define MV88E1116_RGMII_RXTM_CTRL	(1 << 5)
-
-#endif /* __SHEEVAPLUG_H */
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 0c5031b2d2..41bf1065b0 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -50,6 +50,7 @@ CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_MVEBU_MMC=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
+CONFIG_PHY_MARVELL=y
 CONFIG_DM_ETH=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 4499a63aed..276c134a20 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
+ * (C) Copyright 2022 Tony Dinh <mibodhi@gmail.com>
  * (C) Copyright 2009-2014
  * Gerald Kerma <dreagle@doukki.net>
  * Marvell Semiconductor <www.marvell.com>
@@ -11,13 +12,6 @@
 
 #include "mv-common.h"
 
-/*
- *  Environment variables configurations
- */
-/*
- * max 4k env size is enough, but in case of nand
- * it has to be rounded to sector size
- */
 /*
  * Environment is right behind U-Boot in flash. Make sure U-Boot
  * doesn't grow into the environment area.
@@ -29,7 +23,7 @@
  */
 
 #define CONFIG_EXTRA_ENV_SETTINGS	"x_bootargs=console"	\
-	"=ttyS0,115200 mtdparts="CONFIG_MTDPARTS_DEFAULT	\
+	"=ttyS0,115200 mtdparts=" CONFIG_MTDPARTS_DEFAULT	\
 	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x400000\0" \
 	"x_bootcmd_usb=usb start\0" \
 	"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
@@ -37,13 +31,16 @@
 /*
  * Ethernet Driver configuration
  */
-#ifdef CONFIG_CMD_NET
 #define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	0
-#endif /* CONFIG_CMD_NET */
+#ifdef CONFIG_RESET_PHY_R
+#undef CONFIG_RESET_PHY_R	/* remove legacy reset_phy() */
+#endif
 
 /*
  * SATA driver configuration
+ *
+ * The original Sheevaplug board does not have eSATA, so allow SATA to be disabled.
  */
 #ifdef CONFIG_SATA
 #define CONFIG_LBA48
-- 
2.30.2

Re: [PATCH v2 2/3] tools: kwboot: Check if baudrate value is supported before sending image

[Stefan Roese]

On 3/7/22 19:03, Pali Rohár wrote:
> The Globalscale Technologies Sheevaplug board has the network chip
> Marvell 88E1116R. Use uclass mvgbe and the compatible driver M88E1310
> driver to bring up Ethernet.
> 
> - Currently, CONFIG_RESET_PHY_R symbol is used in
> arch/arm/mach-kirkwood/include/mach/config.h for all Kirkwood
> boards with mv8831116 PHY, with each board defines the function
> reset_phy(). Undefine it for this board.
> - Add board_eth_init() to use uclass mvgbe to bring up the network.
> And remove ad-hoc code.
> - Enable CONFIG_PHY_MARVELL to properly configure the network.
> - Miscellaneous changes: Move constants to .c file and remove header file
> board/Marvell/sheevaplug/sheevaplug.h, use BIT macro, and add/cleanup
> comments.
> 
> Signed-off-by: Tony Dinh <mibodhi@gmail.com>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
> 
>   board/Marvell/sheevaplug/sheevaplug.c | 83 +++++----------------------
>   board/Marvell/sheevaplug/sheevaplug.h | 24 --------
>   configs/sheevaplug_defconfig          |  1 +
>   include/configs/sheevaplug.h          | 17 +++---
>   4 files changed, 22 insertions(+), 103 deletions(-)
>   delete mode 100644 board/Marvell/sheevaplug/sheevaplug.h
> 
> diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheev

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de