linux-ti33x-psp 3.2: update to 3.2.5

Runtime tested on a beaglebone A3

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

1 files changed, 94 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0022-NFS-Retry-mounting-NFSROOT.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0022-NFS-Retry-mounting-NFSROOT.patch
new file mode 100644
index 00000000..8c4acc62
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0022-NFS-Retry-mounting-NFSROOT.patch
@@ -0,0 +1,94 @@
+From 1ef216baa398a27c95a9de67f36805cbeea81fe6 Mon Sep 17 00:00:00 2001
+From: Chuck Lever <chuck.lever@oracle.com>
+Date: Mon, 5 Dec 2011 15:40:30 -0500
+Subject: [PATCH 022/130] NFS: Retry mounting NFSROOT
+
+commit 43717c7daebf10b43f12e68512484b3095bb1ba5 upstream.
+
+Lukas Razik <linux@razik.name> reports that on his SPARC system,
+booting with an NFS root file system stopped working after commit
+56463e50 "NFS: Use super.c for NFSROOT mount option parsing."
+
+We found that the network switch to which Lukas' client was attached
+was delaying access to the LAN after the client's NIC driver reported
+that its link was up.  The delay was longer than the timeouts used in
+the NFS client during mounting.
+
+NFSROOT worked for Lukas before commit 56463e50 because in those
+kernels, the client's first operation was an rpcbind request to
+determine which port the NFS server was listening on.  When that
+request failed after a long timeout, the client simply selected the
+default NFS port (2049).  By that time the switch was allowing access
+to the LAN, and the mount succeeded.
+
+Neither of these client behaviors is desirable, so reverting 56463e50
+is really not a choice.  Instead, introduce a mechanism that retries
+the NFSROOT mount request several times.  This is the same tactic that
+normal user space NFS mounts employ to overcome server and network
+delays.
+
+Signed-off-by: Lukas Razik <linux@razik.name>
+[ cel: match kernel coding style, add proper patch description ]
+[ cel: add exponential back-off ]
+Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
+Tested-by: Lukas Razik <linux@razik.name>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ init/do_mounts.c |   35 +++++++++++++++++++++++++++++++----
+ 1 files changed, 31 insertions(+), 4 deletions(-)
+
+diff --git a/init/do_mounts.c b/init/do_mounts.c
+index 0f6e1d9..db6e5ee 100644
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -398,15 +398,42 @@ out:
+ }
+  
+ #ifdef CONFIG_ROOT_NFS
++
++#define NFSROOT_TIMEOUT_MIN    5
++#define NFSROOT_TIMEOUT_MAX    30
++#define NFSROOT_RETRY_MAX      5
++
+ static int __init mount_nfs_root(void)
+ {
+        char *root_dev, *root_data;
++       unsigned int timeout;
++       int try, err;
+ 
+-       if (nfs_root_data(&root_dev, &root_data) != 0)
+-               return 0;
+-       if (do_mount_root(root_dev, "nfs", root_mountflags, root_data) != 0)
++       err = nfs_root_data(&root_dev, &root_data);
++       if (err != 0)
+                return 0;
+-       return 1;
++
++       /*
++        * The server or network may not be ready, so try several
++        * times.  Stop after a few tries in case the client wants
++        * to fall back to other boot methods.
++        */
++       timeout = NFSROOT_TIMEOUT_MIN;
++       for (try = 1; ; try++) {
++               err = do_mount_root(root_dev, "nfs",
++                                       root_mountflags, root_data);
++               if (err == 0)
++                       return 1;
++               if (try > NFSROOT_RETRY_MAX)
++                       break;
++
++               /* Wait, in case the server refused us immediately */
++               ssleep(timeout);
++               timeout <<= 1;
++               if (timeout > NFSROOT_TIMEOUT_MAX)
++                       timeout = NFSROOT_TIMEOUT_MAX;
++       }
++       return 0;
+ }
+ #endif
+ 
+-- 
+1.7.7.4
+