From 62ead87fb3b4355f81671db8b015527c2b20a8bd Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 13 Sep 2016 22:07:04 +0100
Subject: [PATCH] usermem: move the 32bit get/put here as it makes more sense

Also add support for the direct and BANK modes
---
 Kernel/usermem.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/Kernel/usermem.c b/Kernel/usermem.c
index baadab03..9cfa7ae5 100644
--- a/Kernel/usermem.c
+++ b/Kernel/usermem.c
@@ -104,6 +104,42 @@ int uzero(void *user, usize_t count)
 	return _uzero(user,count);
 }
 
+#ifdef CONFIG_32BIT
+
+uint32_t ugetl(void *uaddr, int *err)
+{
+	if (!valaddr(uaddr, 4)) {
+		if (err)
+			*err = -1;
+		return -1;
+	}
+#ifdef MISALIGNED
+	if (MISALIGNED(user, 4)) }
+		ssig(udata.u_proc, SIGBUS);
+		*err = -1;
+		return -1;
+	}
+#endif
+	if (err)
+		*err = 0;
+	return _ugetl(uaddr);
+}
+
+int uputl(uint32_t val, void *uaddr)
+{
+	if (!valaddr(uaddr, 4))
+		return -1;
+#ifdef MISALIGNED
+	if (MISALIGNED(user, 2)) }
+		ssig(udata.u_proc, SIGBUS);
+		return -1;
+	}
+#endif
+	return _uputl(val, uaddr);
+}
+
+#endif
+
 /*
  *	Optional C language implementation for porting to new processors
  *	or where asm isn't needed
@@ -194,7 +230,28 @@ int _uzero(uint8_t *user, usize_t count)
 	return 0;
 }
 
+#ifdef CONFIG_32BIT
+
+uint32_t _ugetl(void *uaddr)
+{
+	uint32_t v;
+	BANK_PROCESS;
+	v = *(uint32_t *)uaddr;
+	BANK_KERNEL;
+	return v;
+}
+
+int _uputl(uint32_t val, void *uaddr)
+{
+	BANK_PROCESS;
+	*(uint32_t *)uaddr = val;
+	BANK_KERNEL;
+	return 0;
+}
+
+#endif
 #endif
+
 #ifdef CONFIG_USERMEM_DIRECT
 
 /* Systems where all memory is always mapped for live processes and kernel */
@@ -229,4 +286,19 @@ int _uzero(uint8_t *user, usize_t count)
 	memset(user, 0, count);
 	return 0;
 }
+
+#ifdef CONFIG_32BIT
+
+uint32_t _ugetl(void *uaddr)
+{
+	return *(uint32_t *)uaddr;
+}
+
+int _uputl(uint32_t val, void *uaddr)
+{
+	*(uint32_t *)uaddr = val;
+	return 0;
+}
+
+#endif
 #endif
-- 
2.34.1