linux: update to 4.9.86

mk/linux-ver.mk

@@ -28,10 +28,10 @@ KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		6ebcc57ba31d714af872347184d1de32f4ab0b7096ef4e062d1ca6b3234d9333
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_9),y)
-KERNEL_FILE_VER:=	4.9.77
+KERNEL_FILE_VER:=	4.9.86
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		7c29bc3fb96f1e23d98f664e786dddd53a1599f56431b9b7fdfba402a4b3705c
+KERNEL_HASH:=		a7cf6eb5efcf182f1760fdfc06118eecce5d8c9d82d6945e68fc15db990c6e85
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_4),y)
 KERNEL_FILE_VER:=	4.4.112

target/linux/Config.in.kernelversion

@@ -56,7 +56,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_14
 	depends on !ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_4_9
-	bool "4.9.77"
+	bool "4.9.86"
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_CSKY
 	depends on !ADK_TARGET_ARCH_METAG

target/linux/patches/4.9.77/mips64r6-multi3.patch

@@ -1,107 +0,0 @@
-MIPS: Implement __multi3 for GCC7 MIPS64r6 builds 
-
-Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>             
-Signed-off-by: James Hogan <jhogan@kernel.org>
-
-diff -Nur linux-4.9.71.orig/arch/mips/lib/libgcc.h linux-4.9.71/arch/mips/lib/libgcc.h
---- linux-4.9.71.orig/arch/mips/lib/libgcc.h	2017-12-20 10:07:34.000000000 +0100
-+++ linux-4.9.71/arch/mips/lib/libgcc.h	2017-12-25 16:08:31.476051643 +0100
-@@ -9,10 +9,18 @@
- struct DWstruct {
- 	int high, low;
- };
-+
-+struct TWstruct {
-+	long long high, low;
-+};
- #elif defined(__LITTLE_ENDIAN)
- struct DWstruct {
- 	int low, high;
- };
-+
-+struct TWstruct {
-+	long long low, high;
-+};
- #else
- #error I feel sick.
- #endif
-@@ -22,4 +30,13 @@
- 	long long ll;
- } DWunion;
- 
-+#if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPSR6)
-+typedef int ti_type __attribute__((mode(TI)));
-+
-+typedef union {
-+	struct TWstruct s;
-+	ti_type ti;
-+} TWunion;
-+#endif
-+
- #endif /* __ASM_LIBGCC_H */
-diff -Nur linux-4.9.71.orig/arch/mips/lib/Makefile linux-4.9.71/arch/mips/lib/Makefile
---- linux-4.9.71.orig/arch/mips/lib/Makefile	2017-12-20 10:07:34.000000000 +0100
-+++ linux-4.9.71/arch/mips/lib/Makefile	2017-12-25 16:08:31.476051643 +0100
-@@ -15,4 +15,5 @@
- obj-$(CONFIG_CPU_TX39XX)	+= r3k_dump_tlb.o
- 
- # libgcc-style stuff needed in the kernel
--obj-y += ashldi3.o ashrdi3.o bswapsi.o bswapdi.o cmpdi2.o lshrdi3.o ucmpdi2.o
-+obj-y += ashldi3.o ashrdi3.o bswapsi.o bswapdi.o cmpdi2.o lshrdi3.o multi3.o \
-+	 ucmpdi2.o
-diff -Nur linux-4.9.71.orig/arch/mips/lib/multi3.c linux-4.9.71/arch/mips/lib/multi3.c
---- linux-4.9.71.orig/arch/mips/lib/multi3.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.71/arch/mips/lib/multi3.c	2017-12-25 16:08:31.476051643 +0100
-@@ -0,0 +1,52 @@
-+// SPDX-License-Identifier: GPL-2.0
-+#include <linux/export.h>
-+
-+#include "libgcc.h"
-+
-+/*
-+ * GCC 7 suboptimally generates __multi3 calls for mips64r6, so for that
-+ * specific case only we'll implement it here.
-+ *
-+ * See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82981
-+ */
-+#if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPSR6) && (__GNUC__ == 7)
-+
-+/* multiply 64-bit values, low 64-bits returned */
-+static inline long long notrace dmulu(long long a, long long b)
-+{
-+	long long res;
-+	asm ("dmulu %0,%1,%2" : "=r" (res) : "r" (a), "r" (b));
-+	return res;
-+}
-+
-+/* multiply 64-bit unsigned values, high 64-bits of 128-bit result returned */
-+static inline long long notrace dmuhu(long long a, long long b)
-+{
-+	long long res;
-+	asm ("dmuhu %0,%1,%2" : "=r" (res) : "r" (a), "r" (b));
-+	return res;
-+}
-+
-+/* multiply 128-bit values, low 128-bits returned */
-+ti_type notrace __multi3(ti_type a, ti_type b)
-+{
-+	TWunion res, aa, bb;
-+
-+	aa.ti = a;
-+	bb.ti = b;
-+
-+	/*
-+	 * a * b =           (a.lo * b.lo)
-+	 *         + 2^64  * (a.hi * b.lo + a.lo * b.hi)
-+	 *        [+ 2^128 * (a.hi * b.hi)]
-+	 */
-+	res.s.low = dmulu(aa.s.low, bb.s.low);
-+	res.s.high = dmuhu(aa.s.low, bb.s.low);
-+	res.s.high += dmulu(aa.s.high, bb.s.low);
-+	res.s.high += dmulu(aa.s.low, bb.s.high);
-+
-+	return res.ti;
-+}
-+EXPORT_SYMBOL(__multi3);
-+
-+#endif /* 64BIT && CPU_MIPSR6 && GCC7 */