From: Yury Norov <ynorov@caviumnetworks.com>
To: <catalin.marinas@arm.com>, <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Cc: <pinskia@gmail.com>, <ddaney.cavm@gmail.com>,
<jan.dakinevich@gmail.com>, <Prasun.Kapoor@caviumnetworks.com>,
<christoph.muellner@theobroma-systems.com>,
<philipp.tomsich@theobroma-systems.com>, <broonie@kernel.org>,
<andrey.konovalov@linaro.org>, <Nathan_Lynch@mentor.com>,
<agraf@suse.de>, <bamvor.zhangjian@huawei.com>,
<klimov.linux@gmail.com>, Yury Norov <ynorov@caviumnetworks.com>
Subject: [PATCH v6 12/17] ilp32: common 32-bit wrappers
Date: Tue, 3 Nov 2015 02:30:41 +0300 [thread overview]
Message-ID: <1446507046-24604-13-git-send-email-ynorov@caviumnetworks.com> (raw)
In-Reply-To: <1446507046-24604-1-git-send-email-ynorov@caviumnetworks.com>
From: Jan Dakinevich <jan.dakinevich@gmail.com>
Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
Signed-off-by: Jan Dakinevich <jan.dakinevich@gmail.com>
Reviewed-by: David Daney <david.daney@cavium.com>
---
arch/arm64/kernel/Makefile | 1 +
arch/arm64/kernel/entry32-common.S | 37 +++++++++++++++++++++++++++++++++++++
arch/arm64/kernel/entry32.S | 29 -----------------------------
3 files changed, 38 insertions(+), 29 deletions(-)
create mode 100644 arch/arm64/kernel/entry32-common.S
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index 1470332..35a59af 100644
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -24,6 +24,7 @@ arm64-obj-$(CONFIG_AARCH32_EL0) += sys32.o kuser32.o signal32.o \
sys_compat.o entry32.o \
../../arm/kernel/opcodes.o
arm64-obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o entry-ftrace.o
+arm64-obj-$(CONFIG_COMPAT) += entry32-common.o
arm64-obj-$(CONFIG_MODULES) += arm64ksyms.o module.o
arm64-obj-$(CONFIG_PERF_EVENTS) += perf_regs.o perf_callchain.o
arm64-obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o
diff --git a/arch/arm64/kernel/entry32-common.S b/arch/arm64/kernel/entry32-common.S
new file mode 100644
index 0000000..2ad5912
--- /dev/null
+++ b/arch/arm64/kernel/entry32-common.S
@@ -0,0 +1,37 @@
+#include <linux/linkage.h>
+#include <linux/const.h>
+
+#include <asm/assembler.h>
+#include <asm/asm-offsets.h>
+#include <asm/errno.h>
+#include <asm/page.h>
+
+ENTRY(compat_sys_statfs64_wrapper)
+ mov w3, #84
+ cmp w1, #88
+ csel w1, w3, w1, eq
+ b compat_sys_statfs64
+ENDPROC(compat_sys_statfs64_wrapper)
+
+ENTRY(compat_sys_fstatfs64_wrapper)
+ mov w3, #84
+ cmp w1, #88
+ csel w1, w3, w1, eq
+ b compat_sys_fstatfs64
+ENDPROC(compat_sys_fstatfs64_wrapper)
+
+/*
+ * Note: off_4k (w5) is always in units of 4K. If we can't do the
+ * requested offset because it is not page-aligned, we return -EINVAL.
+ */
+ENTRY(compat_sys_mmap2_wrapper)
+#if PAGE_SHIFT > 12
+ tst w5, #~PAGE_MASK >> 12
+ b.ne 1f
+ lsr w5, w5, #PAGE_SHIFT - 12
+#endif
+ b sys_mmap_pgoff
+1: mov x0, #-EINVAL
+ ret
+ENDPROC(compat_sys_mmap2_wrapper)
+
diff --git a/arch/arm64/kernel/entry32.S b/arch/arm64/kernel/entry32.S
index f332d5d..8026129 100644
--- a/arch/arm64/kernel/entry32.S
+++ b/arch/arm64/kernel/entry32.S
@@ -40,35 +40,6 @@ ENTRY(compat_sys_rt_sigreturn_wrapper)
b compat_sys_rt_sigreturn
ENDPROC(compat_sys_rt_sigreturn_wrapper)
-ENTRY(compat_sys_statfs64_wrapper)
- mov w3, #84
- cmp w1, #88
- csel w1, w3, w1, eq
- b compat_sys_statfs64
-ENDPROC(compat_sys_statfs64_wrapper)
-
-ENTRY(compat_sys_fstatfs64_wrapper)
- mov w3, #84
- cmp w1, #88
- csel w1, w3, w1, eq
- b compat_sys_fstatfs64
-ENDPROC(compat_sys_fstatfs64_wrapper)
-
-/*
- * Note: off_4k (w5) is always in units of 4K. If we can't do the
- * requested offset because it is not page-aligned, we return -EINVAL.
- */
-ENTRY(compat_sys_mmap2_wrapper)
-#if PAGE_SHIFT > 12
- tst w5, #~PAGE_MASK >> 12
- b.ne 1f
- lsr w5, w5, #PAGE_SHIFT - 12
-#endif
- b sys_mmap_pgoff
-1: mov x0, #-EINVAL
- ret
-ENDPROC(compat_sys_mmap2_wrapper)
-
/*
* Wrappers for AArch32 syscalls that either take 64-bit parameters
* in registers or that take 32-bit parameters which require sign
--
2.1.4
next prev parent reply other threads:[~2015-11-02 23:33 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-02 23:30 [RFC PATCH v6 00/17] ILP32 for ARM64 Yury Norov
2015-11-02 23:30 ` [PATCH v6 01/17] arm64:ilp32: add documentation on the ILP32 ABI " Yury Norov
2015-11-05 14:33 ` Arnd Bergmann
2015-11-02 23:30 ` [PATCH v6 02/17] arm64: ensure the kernel is compiled for LP64 Yury Norov
2015-11-02 23:30 ` [PATCH v6 03/17] arm64: rename COMPAT to AARCH32_EL0 in Kconfig Yury Norov
2015-11-02 23:30 ` [PATCH v6 04/17] arm64: change some CONFIG_COMPAT over to use CONFIG_AARCH32_EL0 instead Yury Norov
2015-11-02 23:30 ` [PATCH v6 05/17] arm64:ilp32: share signal structures between ILP32 and LP64 ABIs Yury Norov
2015-11-02 23:30 ` [PATCH v6 06/17] arm64: introduce is_a32_task and is_a32_thread (for AArch32 compat) Yury Norov
2015-11-02 23:30 ` [PATCH v6 07/17] arm64:ilp32: add is_ilp32_compat_{task,thread} and TIF_32BIT_AARCH64 Yury Norov
2015-11-02 23:30 ` [PATCH v6 08/17] arm64:ilp32: share HWCAP between LP64 and ILP32 Yury Norov
2015-11-02 23:30 ` [PATCH v6 09/17] arm64:ilp32 use the native LP64 'start_thread' for ILP32 threads Yury Norov
2015-11-02 23:30 ` [PATCH v6 10/17] arm64:ilp32: support core dump generation for ILP32 Yury Norov
2015-11-02 23:30 ` [PATCH v6 11/17] ptrace: Allow compat to use the native siginfo Yury Norov
2015-11-05 13:53 ` Arnd Bergmann
2015-11-02 23:30 ` Yury Norov [this message]
2015-11-02 23:30 ` [PATCH v6 13/17] arm64:ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it Yury Norov
2015-11-05 13:50 ` Arnd Bergmann
2015-11-11 17:54 ` Andreas Schwab
2015-11-11 20:40 ` Arnd Bergmann
2015-11-11 23:07 ` Andreas Schwab
2015-11-11 23:23 ` Arnd Bergmann
2015-11-12 8:58 ` Andreas Schwab
2015-11-12 9:22 ` Arnd Bergmann
2015-11-12 9:44 ` Andreas Schwab
2015-11-12 13:24 ` Arnd Bergmann
2015-11-12 13:47 ` Andreas Schwab
2015-11-13 15:34 ` Arnd Bergmann
2015-11-13 15:38 ` Andrew Pinski
2015-11-13 16:10 ` Arnd Bergmann
2015-11-15 15:18 ` Arnd Bergmann
2015-11-15 16:42 ` Chris Metcalf
2015-11-16 10:16 ` Joseph Myers
2015-11-16 11:00 ` Arnd Bergmann
2015-11-16 11:12 ` Joseph Myers
2015-11-16 11:40 ` Arnd Bergmann
2015-11-16 12:03 ` Joseph Myers
2015-11-16 12:12 ` Arnd Bergmann
2015-11-16 12:34 ` Joseph Myers
2015-11-16 13:15 ` Arnd Bergmann
2015-11-16 13:34 ` Andreas Schwab
2015-11-16 13:54 ` Arnd Bergmann
2015-11-02 23:30 ` [PATCH v6 14/17] aarch64: ilp32: use generic stat64 structure Yury Norov
2015-11-05 14:03 ` Arnd Bergmann
2015-11-02 23:30 ` [PATCH v6 15/17] arm64:ilp32: use the native siginfo instead of the compat siginfo Yury Norov
2015-11-02 23:30 ` [PATCH v6 16/17] arm64:ilp32: change COMPAT_ELF_PLATFORM to report a a subplatform for ILP32 Yury Norov
2015-11-02 23:30 ` [PATCH v6 17/17] arm64:ilp32: add ARM64_ILP32 to Kconfig Yury Norov
2015-11-05 11:36 ` [RFC PATCH v6 00/17] ILP32 for ARM64 Andreas Schwab
2015-11-05 13:39 ` Andrew Pinski
2015-11-05 22:18 ` Yury Norov
2015-11-09 10:01 ` Andreas Schwab
2015-11-11 7:16 ` Zhangjian (Bamvor)
2015-11-11 8:44 ` Andreas Schwab
2015-11-09 13:23 ` Andreas Schwab
2015-11-09 14:21 ` Arnd Bergmann
2015-11-09 14:33 ` Andreas Schwab
2015-11-09 14:36 ` Arnd Bergmann
2015-11-09 14:52 ` pinskia
2015-11-09 15:50 ` Yury Norov
2015-11-09 16:04 ` Yury Norov
2015-12-01 22:55 ` Iosif Harutyunov
2015-12-03 17:05 ` Yury Norov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446507046-24604-13-git-send-email-ynorov@caviumnetworks.com \
--to=ynorov@caviumnetworks.com \
--cc=Nathan_Lynch@mentor.com \
--cc=Prasun.Kapoor@caviumnetworks.com \
--cc=agraf@suse.de \
--cc=andrey.konovalov@linaro.org \
--cc=arnd@arndb.de \
--cc=bamvor.zhangjian@huawei.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=christoph.muellner@theobroma-systems.com \
--cc=ddaney.cavm@gmail.com \
--cc=jan.dakinevich@gmail.com \
--cc=klimov.linux@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=philipp.tomsich@theobroma-systems.com \
--cc=pinskia@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®