Merge "Merge remote-tracking branch 'origin/dev/swolfe_trustyporting_kernel-nvidia_20180728' into HEAD" into dev-kernel

22 files changed, 5960 insertions, 0 deletions

diff --git a/drivers/trusty/Kconfig b/drivers/trusty/Kconfig
new file mode 100644
index 000000000..cb32fbbb0
--- /dev/null
+++ b/drivers/trusty/Kconfig
@@ -0,0 +1,52 @@
+#
+# Trusty
+#
+
+menu "Trusty"
+
+config TRUSTY
+        tristate "Trusty"
+        default n
+
+config TRUSTY_FIQ
+        tristate
+        depends on TRUSTY
+
+config TRUSTY_FIQ_ARM
+        tristate
+        depends on TRUSTY
+        depends on ARM
+        select FIQ_GLUE
+        select TRUSTY_FIQ
+        default y
+
+config TRUSTY_FIQ_ARM64
+        tristate
+        depends on TRUSTY
+        depends on ARM64
+        select FIQ_GLUE
+        select TRUSTY_FIQ
+        default n
+
+config TRUSTY_LOG
+        tristate
+        depends on TRUSTY
+        default y
+
+config TRUSTY_VIRTIO
+        tristate "Trusty virtio support"
+        depends on TRUSTY
+        select VIRTIO
+        default y
+
+config TRUSTY_VIRTIO_IPC
+        tristate "Trusty Virtio IPC driver"
+        depends on TRUSTY_VIRTIO
+        default y
+        help
+          This module adds support for communications with Trusty Services
+
+          If you choose to build a module, it'll be called trusty-ipc.
+          Say N if unsure.
+
+endmenu
diff --git a/drivers/trusty/Makefile b/drivers/trusty/Makefile
new file mode 100644
index 000000000..0c838d28e
--- /dev/null
+++ b/drivers/trusty/Makefile
@@ -0,0 +1,16 @@
+#
+# Makefile for trusty components
+#
+subdir-ccflags-y += -Werror
+
+obj-$(CONFIG_TRUSTY)            += trusty.o
+obj-$(CONFIG_TRUSTY)            += trusty-irq.o
+obj-$(CONFIG_TRUSTY_FIQ)        += trusty-fiq.o
+obj-$(CONFIG_TRUSTY_FIQ_ARM)    += trusty-fiq-arm.o
+obj-$(CONFIG_TRUSTY_FIQ_ARM64)  += trusty-fiq-arm64.o trusty-fiq-arm64-glue.o
+obj-$(CONFIG_TRUSTY_LOG)        += trusty-log.o
+obj-$(CONFIG_TRUSTY)            += trusty-mem.o
+obj-$(CONFIG_TRUSTY_VIRTIO)     += trusty-virtio.o
+obj-$(CONFIG_TRUSTY_VIRTIO_IPC) += trusty-ipc.o
+obj-$(CONFIG_TRUSTY)            += trusty-ote.o
+obj-$(CONFIG_TRUSTY)            += trusty-otf-iface.o
diff --git a/drivers/trusty/trusty-fiq-arm.c b/drivers/trusty/trusty-fiq-arm.c
new file mode 100644
index 000000000..8c62a00bb
--- /dev/null
+++ b/drivers/trusty/trusty-fiq-arm.c
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2013 Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <asm/fiq_glue.h>
+#include <linux/platform_device.h>
+#include <linux/trusty/smcall.h>
+#include <linux/trusty/trusty.h>
+
+#include "trusty-fiq.h"
+
+#define _STRINGIFY(x) #x
+#define STRINGIFY(x) _STRINGIFY(x)
+
+static void __naked trusty_fiq_return(void)
+{
+        asm volatile(
+                ".arch_extension sec\n"
+                "mov    r12, r0\n"
+                "ldr    r0, =" STRINGIFY(SMC_FC_FIQ_EXIT) "\n"
+                "smc    #0");
+}
+
+int trusty_fiq_arch_probe(struct platform_device *pdev)
+{
+        return fiq_glue_set_return_handler(trusty_fiq_return);
+}
+
+void trusty_fiq_arch_remove(struct platform_device *pdev)
+{
+        fiq_glue_clear_return_handler(trusty_fiq_return);
+}
diff --git a/drivers/trusty/trusty-fiq-arm64-glue.S b/drivers/trusty/trusty-fiq-arm64-glue.S
new file mode 100644
index 000000000..6994b3a94
--- /dev/null
+++ b/drivers/trusty/trusty-fiq-arm64-glue.S
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2013 Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <asm/asm-offsets.h>
+#include <asm/ptrace.h>
+#include <linux/linkage.h>
+#include <linux/trusty/smcall.h>
+
+.macro  push    reg1,reg2,remregs:vararg
+        .ifnb \remregs
+        push \remregs
+        .endif
+        stp     \reg1, \reg2, [sp, #-16]!
+.endm
+
+.macro  pop     reg1,reg2,remregs:vararg
+        ldp     \reg1, \reg2, [sp], #16
+        .ifnb \remregs
+        pop \remregs
+        .endif
+.endm
+
+ENTRY(trusty_fiq_glue_arm64)
+        sub     sp, sp, #S_FRAME_SIZE - S_LR
+        push    x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, \
+                x14, x15, x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, \
+                x26, x27, x28, x29
+        ldr     x0, =SMC_FC64_GET_FIQ_REGS
+        smc     #0
+        stp     x0, x1, [sp, #S_PC] /* original pc, cpsr */
+        tst     x1, PSR_MODE_MASK
+        csel    x2, x2, x3, eq          /* sp el0, sp el1 */
+        stp     x30, x2, [sp, #S_LR]    /* lr, original sp */
+        mov     x0, sp
+        mov     x1, x3
+        bl      trusty_fiq_handler
+        pop     x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, \
+                x14, x15, x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, \
+                x26, x27, x28, x29
+        ldr     x30, [sp], #S_FRAME_SIZE - S_LR /* load LR and restore SP */
+        ldr     x0, =SMC_FC_FIQ_EXIT
+        smc     #0
+        b       .       /* should not get here */
diff --git a/drivers/trusty/trusty-fiq-arm64.c b/drivers/trusty/trusty-fiq-arm64.c
new file mode 100644
index 000000000..8b9a40887
--- /dev/null
+++ b/drivers/trusty/trusty-fiq-arm64.c
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2013 Google, Inc.
+ *