diff mbox

[U-Boot] commit 620776d causes TFTP error: 'Unsupported option(s) requested' (8)

Message ID 20150825121935.GA17346@amd
State Accepted
Delegated to: Joe Hershberger
Headers show

Commit Message

Pavel Machek Aug. 25, 2015, 12:19 p.m. UTC
On Tue 2015-08-25 14:13:17, Hannes Schmelzer wrote:
> Hi,
> 
> i've same problem.
> 
> Running tftp-hpa on Linux Mint 17.
> 
> cat /etc/default/tftpd-hpa
> # /etc/default/tftpd-hpa
> RUN_DAEMON="yes"
> TFTP_USERNAME="tftp"
> TFTP_DIRECTORY="/tftpboot/tseries"
> TFTP_ADDRESS="0.0.0.0:69"
> TFTP_OPTIONS="-l -s"

Yes. Please try patch I mailed half an hour ago... it should fix
that. (Actually here it is again, without changelog).

Sorry for the trouble,
								Pavel


Date: Tue, 25 Aug 2015 13:44:25 +0200
From: Pavel Machek <pavel@denx.de>
To: Bin Meng <bmeng.cn@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>, Tom Rini
<trini@konsulko.com>, U-Boot Mailing
List <u-boot@lists.denx.de>
Subject: [PATCH] Change default tftp timeout to be	rfc-compliant

Comments

Hannes Schmelzer Aug. 25, 2015, 12:23 p.m. UTC | #1
Hi Pavel,

this works for me.

many thanks.
I will looking for some patch coming soon.

best regards,
Hannes


On 25.08.2015 14:19, Pavel Machek wrote:
> On Tue 2015-08-25 14:13:17, Hannes Schmelzer wrote:
>> Hi,
>>
>> i've same problem.
>>
>> Running tftp-hpa on Linux Mint 17.
>>
>> cat /etc/default/tftpd-hpa
>> # /etc/default/tftpd-hpa
>> RUN_DAEMON="yes"
>> TFTP_USERNAME="tftp"
>> TFTP_DIRECTORY="/tftpboot/tseries"
>> TFTP_ADDRESS="0.0.0.0:69"
>> TFTP_OPTIONS="-l -s"
> Yes. Please try patch I mailed half an hour ago... it should fix
> that. (Actually here it is again, without changelog).
>
> Sorry for the trouble,
> 								Pavel
>
>
> Date: Tue, 25 Aug 2015 13:44:25 +0200
> From: Pavel Machek <pavel@denx.de>
> To: Bin Meng <bmeng.cn@gmail.com>
> Cc: Joe Hershberger <joe.hershberger@ni.com>, Tom Rini
> <trini@konsulko.com>, U-Boot Mailing
> List <u-boot@lists.denx.de>
> Subject: [PATCH] Change default tftp timeout to be	rfc-compliant
> 	
>
> diff --git a/net/tftp.c b/net/tftp.c
> index 18ce84c..e919638 100644
> --- a/net/tftp.c
> +++ b/net/tftp.c
> @@ -18,8 +18,9 @@
>   
>   /* Well known TFTP port # */
>   #define WELL_KNOWN_PORT	69
> -/* Millisecs to timeout for lost pkt */
> -#define TIMEOUT		100UL
> +/* Millisecs to timeout for lost pkt. Anything below 1000msec is against RFC, and
> +   some servers will refuse it. */
> +#define TIMEOUT		1000UL
>   #ifndef	CONFIG_NET_RETRY_COUNT
>   /* # of timeouts before giving up */
>   # define TIMEOUT_COUNT	1000
>
Alexey Brodkin Sept. 10, 2015, 10:26 p.m. UTC | #2
Hi Pavel,

On Tue, 2015-08-25 at 14:19 +0200, Pavel Machek wrote:
> On Tue 2015-08-25 14:13:17, Hannes Schmelzer wrote:
> > Hi,
> > 
> > i've same problem.
> > 
> > Running tftp-hpa on Linux Mint 17.
> > 
> > cat /etc/default/tftpd-hpa
> > # /etc/default/tftpd-hpa
> > RUN_DAEMON="yes"
> > TFTP_USERNAME="tftp"
> > TFTP_DIRECTORY="/tftpboot/tseries"
> > TFTP_ADDRESS="0.0.0.0:69"
> > TFTP_OPTIONS="-l -s"
> 
> Yes. Please try patch I mailed half an hour ago... it should fix
> that. (Actually here it is again, without changelog).
> 
> Sorry for the trouble,
> 								Pavel

I'm wondering if there's a chance to fix that obvious regression
anytime soon?

We're approaching v2015.10 release and with today's master
all my boards fail on tftp load with mentioned:
-------------------->8-------------------
# tftp
Speed: 100, full duplex
Using ethernet@f000a000 device
TFTP from server 10.225.15.67; our IP address is 10.225.15.11
Filename 'uImage'.
Load address: 0x82000000
Loading: T T 
TFTP error: 'Unsupported option(s) requested' (8)
-------------------->8-------------------

If there's no proper fix for now then we do need to revert
http://git.denx.de/?p=u-boot.git;a=commit;h=620776d734e4b126c407f636bda825a594a17723

-Alexey
Joe Hershberger Sept. 10, 2015, 10:46 p.m. UTC | #3
Hi Alexey,

On Thu, Sep 10, 2015 at 5:26 PM, Alexey Brodkin
<Alexey.Brodkin@synopsys.com> wrote:
> Hi Pavel,
>
> On Tue, 2015-08-25 at 14:19 +0200, Pavel Machek wrote:
>> On Tue 2015-08-25 14:13:17, Hannes Schmelzer wrote:
>> > Hi,
>> >
>> > i've same problem.
>> >
>> > Running tftp-hpa on Linux Mint 17.
>> >
>> > cat /etc/default/tftpd-hpa
>> > # /etc/default/tftpd-hpa
>> > RUN_DAEMON="yes"
>> > TFTP_USERNAME="tftp"
>> > TFTP_DIRECTORY="/tftpboot/tseries"
>> > TFTP_ADDRESS="0.0.0.0:69"
>> > TFTP_OPTIONS="-l -s"
>>
>> Yes. Please try patch I mailed half an hour ago... it should fix
>> that. (Actually here it is again, without changelog).
>>
>> Sorry for the trouble,
>>                                                               Pavel
>
> I'm wondering if there's a chance to fix that obvious regression
> anytime soon?

This is already in u-boot-x86/master here:
http://git.denx.de/?p=u-boot/u-boot-x86.git;a=commit;h=527ba17bfd058bd87d5ed4c65aa6f31bebb25dfe

> We're approaching v2015.10 release and with today's master
> all my boards fail on tftp load with mentioned:

Sounds like Simon is soon sending a pull request...
http://u-boot.10912.n7.nabble.com/Any-more-patches-for-x86-td227547.html

Cheers,
-Joe
Simon Glass Sept. 10, 2015, 10:51 p.m. UTC | #4
Hi,

On 10 September 2015 at 15:26, Alexey Brodkin
<Alexey.Brodkin@synopsys.com> wrote:
> Hi Pavel,
>
> On Tue, 2015-08-25 at 14:19 +0200, Pavel Machek wrote:
>> On Tue 2015-08-25 14:13:17, Hannes Schmelzer wrote:
>> > Hi,
>> >
>> > i've same problem.
>> >
>> > Running tftp-hpa on Linux Mint 17.
>> >
>> > cat /etc/default/tftpd-hpa
>> > # /etc/default/tftpd-hpa
>> > RUN_DAEMON="yes"
>> > TFTP_USERNAME="tftp"
>> > TFTP_DIRECTORY="/tftpboot/tseries"
>> > TFTP_ADDRESS="0.0.0.0:69"
>> > TFTP_OPTIONS="-l -s"
>>
>> Yes. Please try patch I mailed half an hour ago... it should fix
>> that. (Actually here it is again, without changelog).
>>
>> Sorry for the trouble,
>>                                                               Pavel
>
> I'm wondering if there's a chance to fix that obvious regression
> anytime soon?
>
> We're approaching v2015.10 release and with today's master
> all my boards fail on tftp load with mentioned:
> -------------------->8-------------------
> # tftp
> Speed: 100, full duplex
> Using ethernet@f000a000 device
> TFTP from server 10.225.15.67; our IP address is 10.225.15.11
> Filename 'uImage'.
> Load address: 0x82000000
> Loading: T T
> TFTP error: 'Unsupported option(s) requested' (8)
> -------------------->8-------------------
>
> If there's no proper fix for now then we do need to revert
> http://git.denx.de/?p=u-boot.git;a=commit;h=620776d734e4b126c407f636bda825a594a17723

Please test on u-boot-x86/master - I just sent a pull request.

Regards,
Simon
diff mbox

Patch

diff --git a/net/tftp.c b/net/tftp.c
index 18ce84c..e919638 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -18,8 +18,9 @@ 
 
 /* Well known TFTP port # */
 #define WELL_KNOWN_PORT	69
-/* Millisecs to timeout for lost pkt */
-#define TIMEOUT		100UL
+/* Millisecs to timeout for lost pkt. Anything below 1000msec is against RFC, and
+   some servers will refuse it. */
+#define TIMEOUT		1000UL
 #ifndef	CONFIG_NET_RETRY_COUNT
 /* # of timeouts before giving up */
 # define TIMEOUT_COUNT	1000