diff mbox

[U-Boot,v2] apalis_t30: colibri_imx7: colibri_t30: fix ethernet functionality

Message ID 1473893640-13533-1-git-send-email-marcel.ziswiler@toradex.com
State Accepted
Commit f7c81e287954fd9048d4419006e8314b7b7c46d0
Delegated to: Marek Vasut
Headers show

Commit Message

Marcel Ziswiler Sept. 14, 2016, 10:54 p.m. UTC
Since commit aa7a648747d8c704a9a81c9e493d386930724e9d
("net: Stop including NFS overhead in defragment max") the following
has been reproducibly observed while trying to transfer data over TFTP:

Load address: 0x80408000
Loading: EHCI timed out on TD - token=0x8008d80
T EHCI timed out on TD - token=0x88008d80
Rx: failed to receive: -5

This patch fixes this by lowering our TFTP block size to be within the
standard maximal de-fragmentation aka IP packet size again.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

---

Changes in v2:
- lowering our TFTP block size rather than increasing the maximal
  de-fragmentation aka IP packet size as suggested by Joe
- add Apalis T30 and Colibri iMX7 as well as suggested by Joe
- base on top of u-boot-usb/master as suggested by Marek

 include/configs/apalis_t30.h   | 2 +-
 include/configs/colibri_imx7.h | 4 ++--
 include/configs/colibri_t30.h  | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

Comments

Joe Hershberger Sept. 15, 2016, 5 p.m. UTC | #1
On Wed, Sep 14, 2016 at 5:54 PM, Marcel Ziswiler
<marcel.ziswiler@toradex.com> wrote:
> Since commit aa7a648747d8c704a9a81c9e493d386930724e9d
> ("net: Stop including NFS overhead in defragment max") the following
> has been reproducibly observed while trying to transfer data over TFTP:
>
> Load address: 0x80408000
> Loading: EHCI timed out on TD - token=0x8008d80
> T EHCI timed out on TD - token=0x88008d80
> Rx: failed to receive: -5
>
> This patch fixes this by lowering our TFTP block size to be within the
> standard maximal de-fragmentation aka IP packet size again.
>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Marek Vasut Sept. 15, 2016, 10:09 p.m. UTC | #2
On 09/15/2016 12:54 AM, Marcel Ziswiler wrote:
> Since commit aa7a648747d8c704a9a81c9e493d386930724e9d
> ("net: Stop including NFS overhead in defragment max") the following
> has been reproducibly observed while trying to transfer data over TFTP:
> 
> Load address: 0x80408000
> Loading: EHCI timed out on TD - token=0x8008d80
> T EHCI timed out on TD - token=0x88008d80
> Rx: failed to receive: -5
> 
> This patch fixes this by lowering our TFTP block size to be within the
> standard maximal de-fragmentation aka IP packet size again.
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Applied to u-boot-usb/master, although this probably should've gone via
u-boot-imx or so.

Thanks!
diff mbox

Patch

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 8c76605..3fc1779 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -52,7 +52,7 @@ 
 
 /* General networking support */
 #define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE		16384
+#define CONFIG_TFTP_BLOCKSIZE		16352
 #define CONFIG_TFTP_TSIZE
 
 /* Miscellaneous commands */
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 2ec392e..999963f 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -44,9 +44,9 @@ 
 
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_MICREL
-#define CONFIG_TFTP_TSIZE
 #define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE		16384
+#define CONFIG_TFTP_BLOCKSIZE		16352
+#define CONFIG_TFTP_TSIZE
 
 /* ENET1 */
 #define IMX_FEC_BASE			ENET_IPS_BASE_ADDR
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 3431cde..e2a2549 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -48,8 +48,7 @@ 
 
 /* General networking support */
 #define CONFIG_IP_DEFRAG
-#define CONFIG_NET_MAXDEFRAG		(16384 + 4096 + 24)
-#define CONFIG_TFTP_BLOCKSIZE		16384
+#define CONFIG_TFTP_BLOCKSIZE		16352
 #define CONFIG_TFTP_TSIZE
 
 /* Miscellaneous commands */