Merge branch 'staging/neutrino-msm-fajita-4.9' of https://github.com/…

…0ctobot/neutrino-staging into neutrino-msm-fajita-4.9

* staging/neutrino-msm-fajita-4.9: (8 commits)
  Revert "block: maple-iosched: Disable 'compare-distinct-pointer-types' warnings"
  block: maple-iosched: block: Convert fifo_time from ulong to u64
  block: maple-iosched: Update MAPLE_IOSCHED_PATCHLEVEL
  net: wireguard: Remove tools to import source automatically
  net: Import WireGuard version 0.0.20190702
  wireguard: add deprecated arm64 assembly files to gitignore
  wireguard: Fix compilation after totalram_pages atomic conversion
  neutrino: Enable CONFIG_DEFAULT_MAPLE

Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com>

Conflicts:
	arch/arm64/configs/neutrino_defconfig

arch/arm64/configs/neutrino_defconfig

@@ -341,11 +341,11 @@ CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_IOSCHED_BFQ=y
 # CONFIG_BFQ_GROUP_IOSCHED is not set
 # CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_BFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_MAPLE is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFAULT_MAPLE=y
+CONFIG_DEFAULT_IOSCHED="maple"
 CONFIG_ASN1=y
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y

block/Makefile

@@ -25,7 +25,3 @@ obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
 obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o
 obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o
 obj-$(CONFIG_BLK_MQ_PCI)	+= blk-mq-pci.o
-
-ifeq ($(CONFIG_IOSCHED_MAPLE),y)
-CFLAGS_maple-iosched.o += -Wno-compare-distinct-pointer-types
-endif

block/maple-iosched.c

@@ -5,6 +5,7 @@
  * Copyright (C) 2016 Joe Maples <joe@frap129.org>
  *           (C) 2012 Brandon Berhent <bbedward@gmail.com
  *           (C) 2012 Miguel Boton <mboton@gmail.com>
+ *           (C) 2019 Adam W. Willis <return_of_octobot@gmail.com>
  *
  * Maple uses a first come first serve style algorithm with seperated read/write
  * handling to allow for read biases. By prioritizing reads, simple tasks should
@@ -19,7 +20,7 @@
 #include <linux/slab.h>
 #include <linux/msm_drm_notify.h>
 
-#define MAPLE_IOSCHED_PATCHLEVEL	(8)
+#define MAPLE_IOSCHED_PATCHLEVEL	(DRM-9)
 
 enum { ASYNC, SYNC };
 
@@ -66,7 +67,8 @@ maple_merged_requests(struct request_queue *q, struct request *rq,
 	 * and move into next position (next will be deleted) in fifo.
 	 */
 	if (!list_empty(&rq->queuelist) && !list_empty(&next->queuelist)) {
-		if (time_before(next->fifo_time, rq->fifo_time)) {
+		if (time_before((unsigned long)next->fifo_time,
+				(unsigned long)rq->fifo_time)) {
 			list_move(&rq->queuelist, &next->queuelist);
 			rq->fifo_time = next->fifo_time;
 		}
@@ -112,7 +114,7 @@ maple_expired_request(struct maple_data *mdata, int sync, int data_dir)
 	rq = rq_entry_fifo(list->next);
 
 	/* Request has expired */
-	if (time_after_eq(jiffies, rq->fifo_time))
+	if (time_after_eq(jiffies, (unsigned long)rq->fifo_time))
 		return rq;
 
 	return NULL;
@@ -135,7 +137,8 @@ maple_choose_expired_request(struct maple_data *mdata)
 	 * Read requests have priority over write.
 	 */
 	if (rq_async_read && rq_sync_read) {
-		if (time_after(rq_sync_read->fifo_time, rq_async_read->fifo_time))
+		if (time_after((unsigned long)rq_sync_read->fifo_time,
+			       (unsigned long)rq_async_read->fifo_time))
 			return rq_async_read;
 	} else if (rq_async_read) {
 		return rq_async_read;
@@ -144,7 +147,8 @@ maple_choose_expired_request(struct maple_data *mdata)
 	}
 
 	if (rq_async_write && rq_sync_write) {
-		if (time_after(rq_sync_write->fifo_time, rq_async_write->fifo_time))
+		if (time_after((unsigned long)rq_sync_write->fifo_time,
+			       (unsigned long)rq_async_write->fifo_time))
 			return rq_async_write;
 	} else if (rq_async_write) {
 		return rq_async_write;

net/Makefile

@@ -14,7 +14,7 @@ obj-$(CONFIG_NET)		+= $(tmp-y)
 obj-$(CONFIG_LLC)		+= llc/
 obj-$(CONFIG_NET)		+= ethernet/ 802/ sched/ netlink/
 obj-$(CONFIG_NETFILTER)		+= netfilter/
-obj-$(CONFIG_WIREGUARD) += wireguard/
+obj-$(CONFIG_WIREGUARD)		+= wireguard/
 obj-$(CONFIG_INET)		+= ipv4/
 obj-$(CONFIG_XFRM)		+= xfrm/
 obj-$(CONFIG_UNIX)		+= unix/

net/wireguard/.gitignore

@@ -0,0 +1,2 @@
+crypto/zinc/chacha20/chacha20-arm64.S
+crypto/zinc/poly1305/poly1305-arm64.S

net/wireguard/Kconfig

@@ -0,0 +1,32 @@
+config WIREGUARD
+	tristate "IP: WireGuard secure network tunnel"
+	depends on NET && INET
+	depends on IPV6 || !IPV6
+	select NET_UDP_TUNNEL
+	select DST_CACHE
+	select CRYPTO_BLKCIPHER
+	select VFP
+	select VFPv3 if CPU_V7
+	select NEON if CPU_V7
+	select KERNEL_MODE_NEON if CPU_V7
+	default m
+	help
+	  WireGuard is a secure, fast, and easy to use replacement for IPsec
+	  that uses modern cryptography and clever networking tricks. It's
+	  designed to be fairly general purpose and abstract enough to fit most
+	  use cases, while at the same time remaining extremely simple to
+	  configure. See www.wireguard.com for more info.
+
+	  It's safe to say Y or M here, as the driver is very lightweight and
+	  is only in use when an administrator chooses to add an interface.
+
+config WIREGUARD_DEBUG
+	bool "Debugging checks and verbose messages"
+	depends on WIREGUARD
+	help
+	  This will write log messages for handshake and other events
+	  that occur for a WireGuard interface. It will also perform some
+	  extra validation checks and unit tests at various points. This is
+	  only useful for debugging.
+
+	  Say N here unless you know what you're doing.

net/wireguard/Makefile

@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+
+ccflags-y := -O3 -fvisibility=hidden
+ccflags-$(CONFIG_WIREGUARD_DEBUG) += -DDEBUG -g
+ccflags-y += -D'pr_fmt(fmt)=KBUILD_MODNAME ": " fmt'
+
+wireguard-y := main.o noise.o device.o peer.o timers.o queueing.o send.o receive.o socket.o peerlookup.o allowedips.o ratelimiter.o cookie.o netlink.o
+
+include $(src)/crypto/Makefile.include
+include $(src)/compat/Makefile.include
+
+obj-$(if $(KBUILD_EXTMOD),m,$(CONFIG_WIREGUARD)) := wireguard.o