@@ -6,13 +6,12 @@ MACHINEOVERRIDES =. "tc:"
# Das U-boot
UBOOT_MACHINE ?= "total_compute_defconfig"
-PREFERRED_VERSION_u-boot ?= "2022.04"
UBOOT_RD_LOADADDRESS = "0x88000000"
UBOOT_RD_ENTRYPOINT = "0x88000000"
UBOOT_LOADADDRESS = "0x80080000"
UBOOT_ENTRYPOINT = "0x80080000"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-arm64-ack"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
# OP-TEE
PREFERRED_VERSION_optee-os ?= "3.18%"
deleted file mode 100644
@@ -1,33 +0,0 @@
-From f7c24393604e45012447b16aaa95eb5e7224ba07 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Tue, 12 Apr 2022 12:43:49 +0100
-Subject: [PATCH] arm: total_compute: update secure dram size
-
-Update secure DRAM size as it is increased by 64MB for additional
-secure partitions.
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: Id8ce99c7a5330d3c28d473009c4db04141e6fa4d
-Upstream-Status: Pending [Not submitted to upstream yet]
----
- include/configs/total_compute.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h
-index 0324b1e1b217..62bdb4f6a3ae 100644
---- a/include/configs/total_compute.h
-+++ b/include/configs/total_compute.h
-@@ -23,8 +23,8 @@
-
- /* Physical Memory Map */
- #define PHYS_SDRAM_1 0x80000000
--/* Top 48MB reserved for secure world use */
--#define DRAM_SEC_SIZE 0x03000000
-+/* Top 112MB reserved for secure world use */
-+#define DRAM_SEC_SIZE 0x07000000
- #define PHYS_SDRAM_1_SIZE 0x80000000 - DRAM_SEC_SIZE
- #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-
-2.30.2
-
deleted file mode 100644
@@ -1,2611 +0,0 @@
-From 42fd69fb5ec0c441b3d31ec544ed03bedab28d45 Mon Sep 17 00:00:00 2001
-From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
-Date: Tue, 16 Nov 2021 12:34:52 +0000
-Subject: [PATCH 2/7] arm_ffa: introducing Arm FF-A low-level driver
-
-This driver implements Arm Firmware Framework for Armv8-A on u-boot
-
-The Firmware Framework for Arm A-profile processors (FF-A)
-describes interfaces (ABIs) that standardize communication
-between the Secure World and Normal World leveraging TrustZone
-technology.
-
-This driver is based on FF-A specification v1.0 and uses SMC32
-calling convention.
-
-FF-A specification:
-
-https://developer.arm.com/documentation/den0077/a/?lang=en
-
-The driver provides helper FF-A interfaces for user layers.
-These helper functions allow clients to pass data and select the
-FF-A function to use for the communication with secure world.
-
-Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
-Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
-Upstream-Status: Submitted [https://patchwork.ozlabs.org/project/uboot/patch/20220801172053.20163-4-abdellatif.elkhlifi@arm.com/]
----
- MAINTAINERS | 8 +
- arch/arm/cpu/armv8/smccc-call.S | 27 +
- arch/arm/lib/asm-offsets.c | 6 +
- common/board_r.c | 6 +
- drivers/Kconfig | 2 +
- drivers/Makefile | 1 +
- drivers/arm-ffa/Kconfig | 26 +
- drivers/arm-ffa/Makefile | 3 +
- drivers/arm-ffa/arm-ffa-uclass.c | 67 ++
- drivers/arm-ffa/arm_ffa_prv.h | 199 ++++
- drivers/arm-ffa/core.c | 1484 ++++++++++++++++++++++++++++++
- include/arm_ffa.h | 191 ++++
- include/arm_ffa_helper.h | 45 +
- include/dm/uclass-id.h | 1 +
- include/linux/arm-smccc.h | 28 +-
- lib/Kconfig | 1 +
- lib/Makefile | 1 +
- lib/arm-ffa/Kconfig | 6 +
- lib/arm-ffa/Makefile | 8 +
- lib/arm-ffa/arm_ffa_helper.c | 188 ++++
- lib/efi_loader/efi_boottime.c | 17 +
- 21 files changed, 2314 insertions(+), 1 deletion(-)
- create mode 100644 drivers/arm-ffa/Kconfig
- create mode 100644 drivers/arm-ffa/Makefile
- create mode 100644 drivers/arm-ffa/arm-ffa-uclass.c
- create mode 100644 drivers/arm-ffa/arm_ffa_prv.h
- create mode 100644 drivers/arm-ffa/core.c
- create mode 100644 include/arm_ffa.h
- create mode 100644 include/arm_ffa_helper.h
- create mode 100644 lib/arm-ffa/Kconfig
- create mode 100644 lib/arm-ffa/Makefile
- create mode 100644 lib/arm-ffa/arm_ffa_helper.c
-
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 96582fc677..14307e6da6 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -232,6 +232,14 @@ F: board/CZ.NIC/
- F: configs/turris_*_defconfig
- F: include/configs/turris_*.h
-
-+ARM FF-A
-+M: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
-+S: Maintained
-+F: drivers/arm-ffa/
-+F: include/arm_ffa.h
-+F: include/arm_ffa_helper.h
-+F: lib/arm-ffa/
-+
- ARM FREESCALE IMX
- M: Stefano Babic <sbabic@denx.de>
- M: Fabio Estevam <festevam@gmail.com>
-diff --git a/arch/arm/cpu/armv8/smccc-call.S b/arch/arm/cpu/armv8/smccc-call.S
-index dc92b28777..ffc39c9fef 100644
---- a/arch/arm/cpu/armv8/smccc-call.S
-+++ b/arch/arm/cpu/armv8/smccc-call.S
-@@ -1,6 +1,8 @@
- /* SPDX-License-Identifier: GPL-2.0 */
- /*
- * Copyright (c) 2015, Linaro Limited
-+ * (C) Copyright 2021 ARM Limited
-+ * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
- */
- #include <linux/linkage.h>
- #include <linux/arm-smccc.h>
-@@ -45,3 +47,28 @@ ENDPROC(__arm_smccc_smc)
- ENTRY(__arm_smccc_hvc)
- SMCCC hvc
- ENDPROC(__arm_smccc_hvc)
-+
-+#if (IS_ENABLED(CONFIG_ARM_FFA_TRANSPORT))
-+
-+ .macro FFASMCCC instr
-+ .cfi_startproc
-+ \instr #0
-+ ldr x9, [sp]
-+ stp x0, x1, [x9, #ARM_SMCCC_RES_X0_OFFS]
-+ stp x2, x3, [x9, #ARM_SMCCC_RES_X2_OFFS]
-+ stp x4, x5, [x9, #ARM_SMCCC_RES_X4_OFFS]
-+ stp x6, x7, [x9, #ARM_SMCCC_RES_X6_OFFS]
-+ ret
-+ .cfi_endproc
-+ .endm
-+
-+/*
-+ * void arm_ffa_smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2,
-+ * unsigned long a3, unsigned long a4, unsigned long a5,
-+ * unsigned long a6, unsigned long a7, struct arm_smccc_res *res)
-+ */
-+ENTRY(__arm_ffa_smccc_smc)
-+ FFASMCCC smc
-+ENDPROC(__arm_ffa_smccc_smc)
-+
-+#endif
-diff --git a/arch/arm/lib/asm-offsets.c b/arch/arm/lib/asm-offsets.c
-index 22fd541f9a..45eca83a47 100644
---- a/arch/arm/lib/asm-offsets.c
-+++ b/arch/arm/lib/asm-offsets.c
-@@ -9,6 +9,8 @@
- * generate asm statements containing #defines,
- * compile this file to assembler, and then extract the
- * #defines from the assembly-language output.
-+ *
-+ * (C) Copyright 2021 ARM Limited
- */
-
- #include <common.h>
-@@ -115,6 +117,10 @@ int main(void)
- #ifdef CONFIG_ARM_SMCCC
- DEFINE(ARM_SMCCC_RES_X0_OFFS, offsetof(struct arm_smccc_res, a0));
- DEFINE(ARM_SMCCC_RES_X2_OFFS, offsetof(struct arm_smccc_res, a2));
-+#if (IS_ENABLED(CONFIG_ARM_FFA_TRANSPORT))
-+ DEFINE(ARM_SMCCC_RES_X4_OFFS, offsetof(struct arm_smccc_res, a4));
-+ DEFINE(ARM_SMCCC_RES_X6_OFFS, offsetof(struct arm_smccc_res, a6));
-+#endif
- DEFINE(ARM_SMCCC_QUIRK_ID_OFFS, offsetof(struct arm_smccc_quirk, id));
- DEFINE(ARM_SMCCC_QUIRK_STATE_OFFS, offsetof(struct arm_smccc_quirk, state));
- #endif
-diff --git a/common/board_r.c b/common/board_r.c
-index c24d9b4e22..af20f38b10 100644
---- a/common/board_r.c
-+++ b/common/board_r.c
-@@ -61,6 +61,9 @@
- #include <wdt.h>
- #include <asm-generic/gpio.h>
- #include <efi_loader.h>
-+#ifdef CONFIG_ARM_FFA_TRANSPORT
-+#include <arm_ffa_helper.h>
-+#endif
-
- DECLARE_GLOBAL_DATA_PTR;
-
-@@ -770,6 +773,9 @@ static init_fnc_t init_sequence_r[] = {
- INIT_FUNC_WATCHDOG_RESET
- initr_net,
- #endif
-+#ifdef CONFIG_ARM_FFA_TRANSPORT
-+ ffa_helper_init_device,
-+#endif
- #ifdef CONFIG_POST
- initr_post,
- #endif
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index b26ca8cf70..e83c23789d 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -6,6 +6,8 @@ source "drivers/core/Kconfig"
-
- source "drivers/adc/Kconfig"
-
-+source "drivers/arm-ffa/Kconfig"
-+
- source "drivers/ata/Kconfig"
-
- source "drivers/axi/Kconfig"
-diff --git a/drivers/Makefile b/drivers/Makefile
-index 4e7cf28440..6671d2a604 100644
---- a/drivers/Makefile
-+++ b/drivers/Makefile
-@@ -107,6 +107,7 @@ obj-y += iommu/
- obj-y += smem/
- obj-y += thermal/
- obj-$(CONFIG_TEE) += tee/
-+obj-$(CONFIG_ARM_FFA_TRANSPORT) += arm-ffa/
- obj-y += axi/
- obj-y += ufs/
- obj-$(CONFIG_W1) += w1/
-diff --git a/drivers/arm-ffa/Kconfig b/drivers/arm-ffa/Kconfig
-new file mode 100644
-index 0000000000..d71444c1fa
---- /dev/null
-+++ b/drivers/arm-ffa/Kconfig
-@@ -0,0 +1,26 @@
-+# SPDX-License-Identifier: GPL-2.0
-+
-+config ARM_FFA_TRANSPORT
-+ bool "Enable Arm Firmware Framework for Armv8-A driver"
-+ depends on DM && ARM64
-+ select ARM_SMCCC
-+ select LIB_UUID
-+ select ARM_FFA_TRANSPORT_HELPERS
-+ select CMD_ARMFFA
-+ help
-+ The Firmware Framework for Arm A-profile processors (FF-A)
-+ describes interfaces (ABIs) that standardize communication
-+ between the Secure World and Normal World leveraging TrustZone
-+ technology.
-+
-+ This driver is based on FF-A specification v1.0 and uses SMC32
-+ calling convention.
-+
-+ FF-A specification:
-+
-+ https://developer.arm.com/documentation/den0077/a/?lang=en
-+
-+ In u-boot FF-A design, the Secure World is considered as one
-+ entity to communicate with. FF-A communication is handled by
-+ one device and one instance. This device takes care of
-+ all the interactions between Normal world and Secure World.
-diff --git a/drivers/arm-ffa/Makefile b/drivers/arm-ffa/Makefile
-new file mode 100644
-index 0000000000..9fb5bea522
---- /dev/null
-+++ b/drivers/arm-ffa/Makefile
-@@ -0,0 +1,3 @@
-+# SPDX-License-Identifier: GPL-2.0+
-+
-+obj-y += arm-ffa-uclass.o core.o
-diff --git a/drivers/arm-ffa/arm-ffa-uclass.c b/drivers/arm-ffa/arm-ffa-uclass.c
-new file mode 100644
-index 0000000000..43f6066281
---- /dev/null
-+++ b/drivers/arm-ffa/arm-ffa-uclass.c
-@@ -0,0 +1,67 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * (C) Copyright 2021 ARM Limited
-+ * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
-+ */
-+
-+#include <common.h>
-+#include <dm.h>
-+#include <arm_ffa.h>
-+#include <errno.h>
-+#include <log.h>
-+#include <asm/global_data.h>
-+
-+DECLARE_GLOBAL_DATA_PTR;
-+
-+UCLASS_DRIVER(ffa) = {
-+ .name = "ffa",
-+ .id = UCLASS_FFA,
-+};
-+
-+/**
-+ * ffa_get_invoke_func - performs a call to the FF-A driver dispatcher
-+ * @func_id: The FF-A function to be used
-+ * @func_data: Pointer to the FF-A function arguments
-+ * container structure. This also includes
-+ * pointers to the returned data needed by
-+ * clients.
-+ *
-+ * This runtime function passes the FF-A function ID and its arguments to
-+ * the FF-A driver dispatcher.
-+ * This function is called by the FF-A helper functions.
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+int __ffa_runtime ffa_get_invoke_func(u32 func_id, struct ffa_interface_data *func_data)
-+{
-+ if (!ffa_device_get_ops()->invoke_func)
-+ return -EINVAL;
-+
-+ return ffa_device_get_ops()->invoke_func(func_id, func_data);
-+}
-+
-+/**
-+ * ffa_init_device - probes the arm_ffa device
-+ *
-+ * This boot time function makes sure the arm_ffa device is probed
-+ * and ready for use.
-+ * This function is called automatically at initcalls
-+ * level (after u-boot relocation).
-+ *
-+ * Arm FF-A transport is implemented through a single u-boot
-+ * device (arm_ffa). So, there is only one device belonging to UCLASS_FFA.
-+ * All FF-A clients should use the arm_ffa device to use the FF-A
-+ * transport.
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+int ffa_init_device(void)
-+{
-+ ffa_dbg("[%s]", __func__);
-+
-+ return ffa_get_device();
-+}
-diff --git a/drivers/arm-ffa/arm_ffa_prv.h b/drivers/arm-ffa/arm_ffa_prv.h
-new file mode 100644
-index 0000000000..38ea4ba83e
---- /dev/null
-+++ b/drivers/arm-ffa/arm_ffa_prv.h
-@@ -0,0 +1,199 @@
-+/* SPDX-License-Identifier: GPL-2.0+ */
-+/*
-+ * (C) Copyright 2021 ARM Limited
-+ * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
-+ */
-+
-+#ifndef __ARM_FFA_PRV_H
-+#define __ARM_FFA_PRV_H
-+
-+#include <arm_ffa.h>
-+#include <linux/bitfield.h>
-+#include <linux/bitops.h>
-+
-+/*
-+ * This header is private. It is exclusively used by the FF-A driver
-+ */
-+
-+/* FF-A driver version definitions */
-+
-+#define MAJOR_VERSION_MASK GENMASK(30, 16)
-+#define MINOR_VERSION_MASK GENMASK(15, 0)
-+#define GET_FFA_MAJOR_VERSION(x) \
-+ ((u16)(FIELD_GET(MAJOR_VERSION_MASK, (x))))
-+#define GET_FFA_MINOR_VERSION(x) \
-+ ((u16)(FIELD_GET(MINOR_VERSION_MASK, (x))))
-+#define PACK_VERSION_INFO(major, minor) \
-+ (FIELD_PREP(MAJOR_VERSION_MASK, (major)) | \
-+ FIELD_PREP(MINOR_VERSION_MASK, (minor)))
-+
-+#define FFA_MAJOR_VERSION (1)
-+#define FFA_MINOR_VERSION (0)
-+#define FFA_VERSION_1_0 \
-+ PACK_VERSION_INFO(FFA_MAJOR_VERSION, FFA_MINOR_VERSION)
-+
-+/* Endpoint ID mask (u-boot endpoint ID) */
-+
-+#define GET_SELF_ENDPOINT_ID_MASK GENMASK(15, 0)
-+#define GET_SELF_ENDPOINT_ID(x) \
-+ ((u16)(FIELD_GET(GET_SELF_ENDPOINT_ID_MASK, (x))))
-+
-+#define PREP_SELF_ENDPOINT_ID_MASK GENMASK(31, 16)
-+#define PREP_SELF_ENDPOINT_ID(x) \
-+ ((u16)(FIELD_PREP(PREP_SELF_ENDPOINT_ID_MASK, (x))))
-+
-+/* Partition endpoint ID mask (partition with which u-boot communicates with) */
-+
-+#define PREP_PART_ENDPOINT_ID_MASK GENMASK(15, 0)
-+#define PREP_PART_ENDPOINT_ID(x) \
-+ ((u16)(FIELD_PREP(PREP_PART_ENDPOINT_ID_MASK, (x))))
-+
-+/* The FF-A SMC function prototype definition */
-+
-+typedef void (*invoke_ffa_fn_t)(unsigned long a0, unsigned long a1,
-+ unsigned long a2, unsigned long a3, unsigned long a4,
-+ unsigned long a5, unsigned long a6, unsigned long a7,
-+ struct arm_smccc_res *res);
-+
-+/**
-+ * enum ffa_conduit - Arm FF-A conduits supported by the Arm FF-A driver
-+ * Currently only SMC32 is supported.
-+ */
-+enum ffa_conduit {
-+ FFA_CONDUIT_SMC = 0,
-+};
-+
-+/**
-+ * FFA_DECLARE_ARGS - FF-A functions local variables
-+ * @a0-a7: local variables used to set registers x0-x7
-+ * @res: the structure hosting the FF-A function return data
-+ *
-+ * A helper macro for declaring local variables for the FF-A functions arguments.
-+ * The x0-x7 registers are used to exchange data with the secure world.
-+ * But, only the bottom 32-bit of thes registers contains the data.
-+ */
-+#define FFA_DECLARE_ARGS \
-+ unsigned long a0 = 0; \
-+ unsigned long a1 = 0; \
-+ unsigned long a2 = 0; \
-+ unsigned long a3 = 0; \
-+ unsigned long a4 = 0; \
-+ unsigned long a5 = 0; \
-+ unsigned long a6 = 0; \
-+ unsigned long a7 = 0; \
-+ struct arm_smccc_res res = {0}
-+
-+/* FF-A error codes */
-+#define FFA_ERR_STAT_NOT_SUPPORTED (-1)
-+#define FFA_ERR_STAT_INVALID_PARAMETERS (-2)
-+#define FFA_ERR_STAT_NO_MEMORY (-3)
-+#define FFA_ERR_STAT_BUSY (-4)
-+#define FFA_ERR_STAT_INTERRUPTED (-5)
-+#define FFA_ERR_STAT_DENIED (-6)
-+#define FFA_ERR_STAT_RETRY (-7)
-+#define FFA_ERR_STAT_ABORTED (-8)
-+
-+/**
-+ * struct ffa_features_desc - FF-A functions features
-+ * @func_id: FF-A function
-+ * @field1: features read from register w2
-+ * @field2: features read from register w3
-+ *
-+ * Data structure describing the features of the FF-A functions queried by
-+ * FFA_FEATURES
-+ */
-+struct ffa_features_desc {
-+ u32 func_id;
-+ u32 field1;
-+ u32 field2;
-+};
-+
-+/**
-+ * enum ffa_rxtx_buf_sizes - minimum sizes supported
-+ * for the RX/TX buffers
-+ */
-+enum ffa_rxtx_buf_sizes {
-+ RXTX_4K,
-+ RXTX_64K,
-+ RXTX_16K
-+};
-+
-+/*
-+ * Number of the FF-A interfaces features descriptors
-+ * currently only FFA_RXTX_MAP descriptor is supported
-+ */
-+#define FFA_FEATURE_DESC_CNT (1)
-+
-+/**
-+ * struct ffa_pdata - platform data for the arm_ffa device
-+ * @conduit: The FF-A conduit used
-+ *
-+ * Platform data structure read from the device tree
-+ */
-+struct ffa_pdata {
-+ enum ffa_conduit conduit;
-+};
-+
-+/**
-+ * struct ffa_rxtxpair - structure hosting the RX/TX buffers physical addresses
-+ * @rxbuf: physical address of the RX buffer
-+ * @txbuf: physical address of the TX buffer
-+ *
-+ * Data structure hosting the physical addresses of the mapped RX/TX buffers
-+ * These physical address are used by the FF-A functions that use the RX/TX buffers
-+ */
-+struct ffa_rxtxpair {
-+ u64 rxbuf; /* physical address */
-+ u64 txbuf; /* physical address */
-+};
-+
-+/**
-+ * struct ffa_partition_desc - the secure partition descriptor
-+ * @info: partition information
-+ * @UUID: UUID
-+ *
-+ * Each partition has its descriptor containing the partitions information and the UUID
-+ */
-+struct ffa_partition_desc {
-+ struct ffa_partition_info info;
-+ union ffa_partition_uuid UUID;
-+};
-+
-+/**
-+ * struct ffa_partitions - descriptors for all secure partitions
-+ * @count: The number of partitions descriptors
-+ * @descs The partitions descriptors table
-+ *
-+ * This data structure contains the partitions descriptors table
-+ */
-+struct ffa_partitions {
-+ u32 count;
-+ struct ffa_partition_desc *descs; /* virtual address */
-+};
-+
-+/**
-+ * struct ffa_prvdata - the driver private data structure
-+ *
-+ * @dev: The arm_ffa device under u-boot driver model
-+ * @fwk_version: FF-A framework version
-+ * @id: u-boot endpoint ID
-+ * @partitions: The partitions descriptors structure
-+ * @pair: The RX/TX buffers pair
-+ * @conduit: The selected conduit
-+ * @invoke_ffa_fn: The function executing the FF-A function
-+ * @features: Table of the FF-A functions having features
-+ *
-+ * The driver data structure hosting all resident data.
-+ */
-+struct ffa_prvdata {
-+ struct udevice *dev;
-+ u32 fwk_version;
-+ u16 id;
-+ struct ffa_partitions partitions;
-+ struct ffa_rxtxpair pair;
-+ enum ffa_conduit conduit;
-+ invoke_ffa_fn_t invoke_ffa_fn;
-+ struct ffa_features_desc features[FFA_FEATURE_DESC_CNT];
-+};
-+
-+#endif
-diff --git a/drivers/arm-ffa/core.c b/drivers/arm-ffa/core.c
-new file mode 100644
-index 0000000000..98e2d2fa17
---- /dev/null
-+++ b/drivers/arm-ffa/core.c
-@@ -0,0 +1,1484 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * (C) Copyright 2021 ARM Limited
-+ * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
-+ */
-+
-+#include "arm_ffa_prv.h"
-+#include <asm/global_data.h>
-+#include <asm/io.h>
-+#include <common.h>
-+#include <dm.h>
-+#include <fdtdec.h>
-+#include <linux/errno.h>
-+#include <linux/sizes.h>
-+#include <log.h>
-+#include <malloc.h>
-+#include <mapmem.h>
-+#include <string.h>
-+
-+DECLARE_GLOBAL_DATA_PTR;
-+
-+/**
-+ * The device private data structure containing all the resident
-+ * data read from secure world
-+ */
-+struct ffa_prvdata __ffa_runtime_data ffa_priv_data = {0};
-+
-+/*
-+ * Driver functions
-+ */
-+
-+/**
-+ * ffa_get_device - probes the arm_ffa device
-+ *
-+ * This boot time function makes sure the arm_ffa device is probed
-+ * and ready for use. This is done using uclass_get_device.
-+ * The arm_ffa driver belongs to UCLASS_FFA.
-+ * This function should be called before using the driver.
-+ *
-+ * Arm FF-A transport is implemented through a single u-boot
-+ * device (arm_ffa). So, there is only one device belonging to UCLASS_FFA.
-+ * All FF-A clients should use the arm_ffa device to use the FF-A
-+ * transport.
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+int ffa_get_device(void)
-+{
-+ int ret;
-+ int devnum = 0;
-+
-+ ffa_dbg("[%s]", __func__);
-+
-+ if (ffa_priv_data.dev)
-+ return FFA_ERR_STAT_SUCCESS;
-+
-+ /*
-+ * searching and probing the device
-+ */
-+ ret = uclass_get_device(UCLASS_FFA, devnum, &ffa_priv_data.dev);
-+ if (ret) {
-+ ffa_err("can not find the device");
-+ ffa_priv_data.dev = NULL;
-+ return -ENODEV;
-+ }
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+}
-+
-+/**
-+ * ffa_get_version - FFA_VERSION handler function
-+ *
-+ * This is the boot time function that implements FFA_VERSION FF-A function
-+ * to get from the secure world the FF-A framework version
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int ffa_get_version(void)
-+{
-+ u16 major, minor;
-+
-+ FFA_DECLARE_ARGS;
-+
-+ ffa_dbg("[%s]", __func__);
-+
-+ if (!ffa_priv_data.invoke_ffa_fn)
-+ panic("[FFA] no private data found\n");
-+
-+ a0 = FFA_VERSION;
-+ a1 = FFA_VERSION_1_0;
-+ ffa_priv_data.invoke_ffa_fn(a0, a1, a2, a3, a4, a5, a6, a7, &res);
-+
-+ if (res.a0 == FFA_ERR_STAT_NOT_SUPPORTED) {
-+ ffa_err("A Firmware Framework implementation does not exist");
-+ return -EOPNOTSUPP;
-+ }
-+
-+ major = GET_FFA_MAJOR_VERSION(res.a0);
-+ minor = GET_FFA_MINOR_VERSION(res.a0);
-+
-+ ffa_info("FF-A driver %d.%d\nFF-A framework %d.%d",
-+ FFA_MAJOR_VERSION, FFA_MINOR_VERSION, major, minor);
-+
-+ if ((major == FFA_MAJOR_VERSION && minor >= FFA_MINOR_VERSION)) {
-+ ffa_info("Versions are compatible ");
-+
-+ ffa_priv_data.fwk_version = res.a0;
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+ }
-+
-+ ffa_info("Versions are incompatible ");
-+ return -EPROTONOSUPPORT;
-+}
-+
-+/**
-+ * ffa_get_endpoint_id - FFA_ID_GET handler function
-+ *
-+ * This is the boot time function that implements FFA_ID_GET FF-A function
-+ * to get from the secure world u-boot endpoint ID
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int ffa_get_endpoint_id(void)
-+{
-+ FFA_DECLARE_ARGS;
-+
-+ ffa_dbg("[%s]", __func__);
-+
-+ if (!ffa_priv_data.invoke_ffa_fn)
-+ panic("[FFA] no private data found\n");
-+
-+ a0 = FFA_ID_GET;
-+
-+ ffa_priv_data.invoke_ffa_fn(a0, a1, a2, a3, a4, a5, a6, a7, &res);
-+
-+ switch (res.a0) {
-+ case FFA_ERROR:
-+ {
-+ if (((int)res.a2) == FFA_ERR_STAT_NOT_SUPPORTED) {
-+ ffa_err("This function is not implemented at this FF-A instance");
-+ return -EOPNOTSUPP;
-+ }
-+
-+ ffa_err("Undefined error code (%d)", ((int)res.a2));
-+ return -EINVAL;
-+ }
-+ case FFA_SUCCESS:
-+ {
-+ ffa_priv_data.id = GET_SELF_ENDPOINT_ID(res.a2);
-+ ffa_info("endpoint ID is %u", ffa_priv_data.id);
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+ }
-+ default:
-+ {
-+ ffa_err("Undefined response function (0x%lx)", res.a0);
-+ return -EINVAL;
-+ }
-+ }
-+}
-+
-+/**
-+ * ffa_get_features_desc - returns the features descriptor of the specified
-+ * FF-A function
-+ * @func_id: the FF-A function which the features are to be retrieved
-+ *
-+ * This is a boot time function that searches the features descriptor of the
-+ * specified FF-A function
-+ *
-+ * Return:
-+ *
-+ * When found, the address of the features descriptor is returned. Otherwise, NULL.
-+ */
-+static struct ffa_features_desc *ffa_get_features_desc(u32 func_id)
-+{
-+ u32 desc_idx;
-+
-+ /*
-+ * search for the descriptor of the selected FF-A interface
-+ */
-+ for (desc_idx = 0; desc_idx < FFA_FEATURE_DESC_CNT ; desc_idx++)
-+ if (ffa_priv_data.features[desc_idx].func_id == func_id)
-+ return &ffa_priv_data.features[desc_idx];
-+
-+ return NULL;
-+}
-+
-+/**
-+ * ffa_get_rxtx_map_features - FFA_FEATURES handler function with FFA_RXTX_MAP
-+ * argument
-+ *
-+ * This is the boot time function that implements FFA_FEATURES FF-A function
-+ * to retrieve the FFA_RXTX_MAP features
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int ffa_get_rxtx_map_features(void)
-+{
-+ FFA_DECLARE_ARGS;
-+
-+ ffa_dbg("[%s]", __func__);
-+
-+ if (!ffa_priv_data.invoke_ffa_fn)
-+ panic("[FFA] no private data found\n");
-+
-+ a0 = FFA_FEATURES;
-+ a1 = FFA_RXTX_MAP;
-+
-+ ffa_priv_data.invoke_ffa_fn(a0, a1, a2, a3, a4, a5, a6, a7, &res);
-+
-+ switch (res.a0) {
-+ case FFA_ERROR:
-+ {
-+ if (((int)res.a2) == FFA_ERR_STAT_NOT_SUPPORTED) {
-+ ffa_err("FFA_RXTX_MAP is not implemented at this FF-A instance");
-+ return -EOPNOTSUPP;
-+ }
-+
-+ ffa_err("Undefined error code (%d)", ((int)res.a2));
-+ return -EINVAL;
-+ }
-+ case FFA_SUCCESS:
-+ {
-+ u32 desc_idx;
-+
-+ /*
-+ * search for an empty descriptor
-+ */
-+ for (desc_idx = 0; desc_idx < FFA_FEATURE_DESC_CNT ; desc_idx++)
-+ if (!ffa_priv_data.features[desc_idx].func_id) {
-+ /*
-+ * populate the descriptor with
-+ * the interface features data
-+ */
-+ ffa_priv_data.features[desc_idx].func_id =
-+ FFA_RXTX_MAP;
-+ ffa_priv_data.features[desc_idx].field1 =
-+ res.a2;
-+
-+ ffa_info("FFA_RXTX_MAP features data 0x%lx",
-+ res.a2);
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+ }
-+
-+ ffa_err("Cannot save FFA_RXTX_MAP features data. Descriptors table full");
-+ return -ENOBUFS;
-+ }
-+ default:
-+ {
-+ ffa_err("Undefined response function (0x%lx)",
-+ res.a0);
-+ return -EINVAL;
-+ }
-+ }
-+}
-+
-+/**
-+ * ffa_get_rxtx_buffers_pages_cnt - reads from the features data descriptors
-+ * the minimum number of pages in each of the RX/TX
-+ * buffers
-+ * @buf_4k_pages: Pointer to the minimum number of pages
-+ *
-+ * This is the boot time function that returns the minimum number of pages
-+ * in each of the RX/TX buffers
-+ *
-+ * Return:
-+ *
-+ * buf_4k_pages points to the returned number of pages
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int ffa_get_rxtx_buffers_pages_cnt(size_t *buf_4k_pages)
-+{
-+ struct ffa_features_desc *desc = NULL;
-+
-+ ffa_dbg("[%s]", __func__);
-+
-+ if (!buf_4k_pages)
-+ return -EINVAL;
-+
-+ desc = ffa_get_features_desc(FFA_RXTX_MAP);
-+ if (!desc)
-+ return -EINVAL;
-+
-+ ffa_dbg("FFA_RXTX_MAP descriptor found");
-+
-+ switch (desc->field1) {
-+ case RXTX_4K:
-+ *buf_4k_pages = 1;
-+ break;
-+ case RXTX_16K:
-+ *buf_4k_pages = 4;
-+ break;
-+ case RXTX_64K:
-+ *buf_4k_pages = 16;
-+ break;
-+ default:
-+ ffa_err("RX/TX buffer size not supported");
-+ return -EINVAL;
-+ }
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+}
-+
-+/**
-+ * ffa_free_rxtx_buffers - frees the RX/TX buffers
-+ * @buf_4k_pages: the minimum number of pages in each of the RX/TX
-+ * buffers
-+ *
-+ * This is the boot time function used to free the RX/TX buffers
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int ffa_free_rxtx_buffers(size_t buf_4k_pages)
-+{
-+ efi_status_t free_rxbuf_ret, free_txbuf_ret;
-+
-+ ffa_info("Freeing RX/TX buffers");
-+
-+ free_rxbuf_ret = efi_free_pages(ffa_priv_data.pair.rxbuf, buf_4k_pages);
-+ free_txbuf_ret = efi_free_pages(ffa_priv_data.pair.txbuf, buf_4k_pages);
-+
-+ if (free_rxbuf_ret != EFI_SUCCESS || free_txbuf_ret != EFI_SUCCESS) {
-+ ffa_err("Failed to free RX/TX buffers (rx: %lu , tx: %lu)",
-+ free_rxbuf_ret,
-+ free_txbuf_ret);
-+ return -EINVAL;
-+ }
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+}
-+
-+/**
-+ * ffa_alloc_rxtx_buffers - allocates the RX/TX buffers
-+ * @buf_4k_pages: the minimum number of pages in each of the RX/TX
-+ * buffers
-+ *
-+ * This is the boot time function used by ffa_map_rxtx_buffers to allocate
-+ * the RX/TX buffers before mapping them
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int ffa_alloc_rxtx_buffers(size_t buf_4k_pages)
-+{
-+ ffa_dbg("[%s]", __func__);
-+
-+#if CONFIG_IS_ENABLED(EFI_LOADER)
-+
-+ efi_status_t efi_ret;
-+ void *virt_txbuf;
-+ void *virt_rxbuf;
-+
-+ ffa_info("Using %lu 4KB page(s) for RX/TX buffers size",
-+ buf_4k_pages);
-+
-+ efi_ret = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES,
-+ EFI_BOOT_SERVICES_DATA,
-+ buf_4k_pages,
-+ &ffa_priv_data.pair.rxbuf);
-+
-+ if (efi_ret != EFI_SUCCESS) {
-+ ffa_priv_data.pair.rxbuf = 0;
-+ ffa_err("Failure to allocate RX buffer (EFI error: 0x%lx)",
-+ efi_ret);
-+
-+ return -ENOBUFS;
-+ }
-+
-+ ffa_info("RX buffer at phys 0x%llx",
-+ ffa_priv_data.pair.rxbuf);
-+
-+ /*
-+ * convert the RX buffer physical address to virtual address
-+ */
-+ virt_rxbuf = (void *)map_sysmem((phys_addr_t)ffa_priv_data.pair.rxbuf, 0);
-+
-+ /*
-+ * make sure the buffer is clean before use
-+ */
-+ memset(virt_rxbuf, 0, buf_4k_pages * SZ_4K);
-+
-+ unmap_sysmem(virt_rxbuf);
-+
-+ efi_ret = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES,
-+ EFI_RUNTIME_SERVICES_DATA,
-+ buf_4k_pages,
-+ &ffa_priv_data.pair.txbuf);
-+
-+ if (efi_ret != EFI_SUCCESS) {
-+ ffa_dbg("FFA_RXTX_MAP: freeing RX buffer");
-+ efi_free_pages(ffa_priv_data.pair.rxbuf, buf_4k_pages);
-+ ffa_priv_data.pair.rxbuf = 0;
-+ ffa_priv_data.pair.txbuf = 0;
-+ ffa_err("Failure to allocate the TX buffer (EFI error: 0x%lx)"
-+ , efi_ret);
-+
-+ return -ENOBUFS;
-+ }
-+
-+ ffa_info("TX buffer at phys 0x%llx",
-+ ffa_priv_data.pair.txbuf);
-+
-+ /*
-+ * convert the TX buffer physical address to virtual address
-+ */
-+ virt_txbuf = (void *)map_sysmem((phys_addr_t)ffa_priv_data.pair.txbuf, 0);
-+
-+ /*
-+ * make sure the buffer is clean before use
-+ */
-+ memset(virt_txbuf, 0, buf_4k_pages * SZ_4K);
-+
-+ unmap_sysmem(virt_txbuf);
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+
-+#else
-+ return -ENOBUFS;
-+#endif
-+}
-+
-+/**
-+ * ffa_map_rxtx_buffers - FFA_RXTX_MAP handler function
-+ * @buf_4k_pages: the minimum number of pages in each of the RX/TX
-+ * buffers
-+ *
-+ * This is the boot time function that implements FFA_RXTX_MAP FF-A function
-+ * to map the RX/TX buffers
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int ffa_map_rxtx_buffers(size_t buf_4k_pages)
-+{
-+ int ret;
-+
-+ FFA_DECLARE_ARGS;
-+
-+ ffa_dbg("[%s]", __func__);
-+
-+ if (!ffa_priv_data.invoke_ffa_fn)
-+ panic("[FFA] no private data found\n");
-+
-+ ret = ffa_alloc_rxtx_buffers(buf_4k_pages);
-+ if (ret != FFA_ERR_STAT_SUCCESS)
-+ return ret;
-+
-+ a0 = FFA_RXTX_MAP;
-+ a1 = ffa_priv_data.pair.txbuf;
-+ a2 = ffa_priv_data.pair.rxbuf;
-+ a3 = buf_4k_pages;
-+
-+ ffa_priv_data.invoke_ffa_fn(a0, a1, a2, a3, a4, a5, a6, a7, &res);
-+
-+ switch (res.a0) {
-+ case FFA_ERROR:
-+ {
-+ switch (((int)res.a2)) {
-+ case FFA_ERR_STAT_INVALID_PARAMETERS:
-+ ffa_err("One or more fields in input parameters is incorrectly encoded");
-+ ret = -EPERM;
-+ break;
-+ case FFA_ERR_STAT_NO_MEMORY:
-+ ffa_err("Not enough memory");
-+ ret = -ENOMEM;
-+ break;
-+ case FFA_ERR_STAT_DENIED:
-+ ffa_err("Buffer pair already registered");
-+ ret = -EACCES;
-+ break;
-+ case FFA_ERR_STAT_NOT_SUPPORTED:
-+ ffa_err("This function is not implemented at this FF-A instance");
-+ ret = -EOPNOTSUPP;
-+ break;
-+ default:
-+ ffa_err("Undefined error (%d)",
-+ ((int)res.a2));
-+ ret = -EINVAL;
-+ }
-+ break;
-+ }
-+ case FFA_SUCCESS:
-+ ffa_info("RX/TX buffers mapped");
-+ return FFA_ERR_STAT_SUCCESS;
-+ default:
-+ ffa_err("Undefined response function (0x%lx)",
-+ res.a0);
-+ ret = -EINVAL;
-+ }
-+
-+ ffa_free_rxtx_buffers(buf_4k_pages);
-+
-+ return ret;
-+}
-+
-+/**
-+ * ffa_unmap_rxtx_buffers - FFA_RXTX_UNMAP handler function
-+ *
-+ * This is the boot time function that implements FFA_RXTX_UNMAP FF-A function
-+ * to unmap the RX/TX buffers
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int ffa_unmap_rxtx_buffers(void)
-+{
-+ FFA_DECLARE_ARGS;
-+
-+ ffa_dbg("[%s]", __func__);
-+
-+ if (!ffa_priv_data.invoke_ffa_fn)
-+ panic("[FFA] no private data found\n");
-+
-+ a0 = FFA_RXTX_UNMAP;
-+ a1 = PREP_SELF_ENDPOINT_ID(ffa_priv_data.id);
-+
-+ ffa_priv_data.invoke_ffa_fn(a0, a1, a2, a3, a4, a5, a6, a7, &res);
-+
-+ switch (res.a0) {
-+ case FFA_ERROR:
-+ {
-+ if (((int)res.a2) == FFA_ERR_STAT_NOT_SUPPORTED)
-+ panic("[FFA] FFA_RXTX_UNMAP is not implemented at this FF-A instance\n");
-+ else if (((int)res.a2) == FFA_ERR_STAT_INVALID_PARAMETERS)
-+ panic("[FFA] There is no buffer pair registered on behalf of the caller\n");
-+ else
-+ panic("[FFA] Undefined error (%d)\n", ((int)res.a2));
-+ }
-+ case FFA_SUCCESS:
-+ {
-+ size_t buf_4k_pages = 0;
-+ int ret;
-+
-+ ret = ffa_get_rxtx_buffers_pages_cnt(&buf_4k_pages);
-+ if (ret != FFA_ERR_STAT_SUCCESS)
-+ panic("[FFA] RX/TX buffers unmapped but failure in getting pages count\n");
-+
-+ ret = ffa_free_rxtx_buffers(buf_4k_pages);
-+ if (ret != FFA_ERR_STAT_SUCCESS)
-+ panic("[FFA] RX/TX buffers unmapped but failure in freeing the memory\n");
-+
-+ ffa_info("RX/TX buffers unmapped and memory freed");
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+ }
-+ default:
-+ panic("[FFA] Undefined response function (0x%lx)", res.a0);
-+ }
-+}
-+
-+/**
-+ * ffa_release_rx_buffer - FFA_RX_RELEASE handler function
-+ *
-+ * This is the boot time function that invokes FFA_RX_RELEASE FF-A function
-+ * to release the ownership of the RX buffer
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int ffa_release_rx_buffer(void)
-+{
-+ FFA_DECLARE_ARGS;
-+
-+ ffa_dbg("[%s]", __func__);
-+
-+ if (!ffa_priv_data.invoke_ffa_fn)
-+ panic("[FFA] no private data found\n");
-+
-+ a0 = FFA_RX_RELEASE;
-+
-+ ffa_priv_data.invoke_ffa_fn(a0, a1, a2, a3, a4, a5, a6, a7, &res);
-+
-+ switch (res.a0) {
-+ case FFA_ERROR:
-+ {
-+ if (((int)res.a2) == FFA_ERR_STAT_NOT_SUPPORTED)
-+ panic("[FFA] FFA_RX_RELEASE is not implemented at this FF-A instance\n");
-+ else if (((int)res.a2) == FFA_ERR_STAT_DENIED)
-+ panic("[FFA] Caller did not have ownership of the RX buffer\n");
-+ else
-+ panic("[FFA] Undefined error (%d)\n", ((int)res.a2));
-+ }
-+ case FFA_SUCCESS:
-+ ffa_info("RX buffer released");
-+ return FFA_ERR_STAT_SUCCESS;
-+
-+ default:
-+ panic("[FFA] Undefined response function (0x%lx)\n", res.a0);
-+ }
-+}
-+
-+/**
-+ * ffa_uuid_are_identical - checks whether two given UUIDs are identical
-+ * @uuid1: first UUID
-+ * @uuid2: second UUID
-+ *
-+ * This is a boot time function used by ffa_read_partitions_info to search
-+ * for a UUID in the partitions descriptors table
-+ *
-+ * Return:
-+ *
-+ * 1 when UUIDs match. Otherwise, 0
-+ */
-+int ffa_uuid_are_identical(const union ffa_partition_uuid *uuid1,
-+ const union ffa_partition_uuid *uuid2)
-+{
-+ if (!uuid1 || !uuid2)
-+ return 0;
-+
-+ return (!memcmp(uuid1, uuid2, sizeof(union ffa_partition_uuid)));
-+}
-+
-+/**
-+ * ffa_read_partitions_info - reads the data queried by FFA_PARTITION_INFO_GET
-+ * and saves it in the private structure
-+ * @count: The number of partitions queried
-+ * @part_uuid: Pointer to the partition(s) UUID
-+ *
-+ * This is the boot time function that reads the partitions information
-+ * returned by the FFA_PARTITION_INFO_GET and saves it in the private
-+ * data structure.
-+ *
-+ * Return:
-+ *
-+ * The private data structure is updated with the partition(s) information
-+ * FFA_ERR_STAT_SUCCESS is returned on success. Otherwise, failure
-+ */
-+static int ffa_read_partitions_info(u32 count, union ffa_partition_uuid *part_uuid)
-+{
-+ ffa_dbg("[%s]", __func__);
-+
-+ if (!count) {
-+ ffa_err("No partition detected");
-+ return -ENODATA;
-+ }
-+
-+ ffa_info("Reading partitions data from the RX buffer");
-+
-+#if CONFIG_IS_ENABLED(EFI_LOADER)
-+
-+ if (!part_uuid) {
-+ /*
-+ * querying information of all partitions
-+ */
-+ u64 data_pages;
-+ u64 data_bytes;
-+ efi_status_t efi_ret;
-+ size_t buf_4k_pages = 0;
-+ u32 desc_idx;
-+ struct ffa_partition_info *parts_info;
-+ int ret;
-+
-+ data_bytes = count * sizeof(struct ffa_partition_desc);
-+ data_pages = efi_size_in_pages(data_bytes);
-+
-+ /*
-+ * get the RX buffer size in pages
-+ */
-+ ret = ffa_get_rxtx_buffers_pages_cnt(&buf_4k_pages);
-+ if (ret != FFA_ERR_STAT_SUCCESS) {
-+ ffa_err("Can not get the RX buffer size (error %d)", ret);
-+ return ret;
-+ }
-+
-+ if (data_pages > buf_4k_pages) {
-+ ffa_err("Partitions data size exceeds the RX buffer size:");
-+ ffa_err(" Sizes in pages: data %llu , RX buffer %lu ",
-+ data_pages,
-+ buf_4k_pages);
-+
-+ return -ENOMEM;
-+ }
-+
-+ efi_ret = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES,
-+ EFI_RUNTIME_SERVICES_DATA,
-+ data_pages,
-+ (u64 *)&ffa_priv_data.partitions.descs);
-+
-+ if (efi_ret != EFI_SUCCESS) {
-+ ffa_priv_data.partitions.descs = NULL;
-+
-+ ffa_err("Cannot allocate partitions data buffer (EFI error 0x%lx)",
-+ efi_ret);
-+
-+ return -ENOBUFS;
-+ }
-+
-+ /*
-+ * convert the descs buffer physical address
-+ * to virtual address
-+ * This virtual address should not be unmapped
-+ * descs is expected to be a virtual address
-+ */
-+ ffa_priv_data.partitions.descs =
-+ (struct ffa_partition_desc *)
-+ map_sysmem((phys_addr_t)
-+ ffa_priv_data.partitions.descs, 0);
-+
-+ /*
-+ * make sure the buffer is clean before use
-+ */
-+ memset(ffa_priv_data.partitions.descs, 0,
-+ data_pages * SZ_4K);
-+
-+ ffa_info("Copying %lld page(s) of partitions data from RX buffer",
-+ data_pages);
-+
-+ /*
-+ * convert the RX buffer physical address to
-+ * virtual address
-+ */
-+ parts_info = (struct ffa_partition_info *)
-+ map_sysmem((phys_addr_t)
-+ ffa_priv_data.pair.rxbuf, 0);
-+
-+ for (desc_idx = 0 ; desc_idx < count ; desc_idx++) {
-+ ffa_priv_data.partitions.descs[desc_idx].info =
-+ parts_info[desc_idx];
-+
-+ ffa_info("Partition ID %x : info cached",
-+ ffa_priv_data.partitions.descs[desc_idx].info.id);
-+ }
-+ unmap_sysmem(parts_info);
-+
-+ ffa_priv_data.partitions.count = count;
-+
-+ ffa_info("%d partition(s) found and cached", count);
-+
-+ } else {
-+ u32 rx_desc_idx, cached_desc_idx;
-+ struct ffa_partition_info *parts_info;
-+ u8 desc_found;
-+
-+ /*
-+ * convert the RX buffer physical address to virtual address
-+ */
-+ parts_info = (struct ffa_partition_info *)
-+ map_sysmem((phys_addr_t)ffa_priv_data.pair.rxbuf, 0);
-+
-+ /*
-+ * search for the SP IDs read from the RX buffer
-+ * in the already cached SPs.
-+ * Update the UUID when ID found.
-+ */
-+ for (rx_desc_idx = 0; rx_desc_idx < count ; rx_desc_idx++) {
-+ desc_found = 0;
-+
-+ /*
-+ * search the current ID in the cached partitions
-+ */
-+ for (cached_desc_idx = 0;
-+ cached_desc_idx < ffa_priv_data.partitions.count;
-+ cached_desc_idx++) {
-+ /*
-+ * save the UUID
-+ */
-+ if (ffa_priv_data.partitions.descs[cached_desc_idx].info.id ==
-+ parts_info[rx_desc_idx].id) {
-+ ffa_priv_data.partitions.descs[cached_desc_idx].UUID =
-+ *part_uuid;
-+
-+ desc_found = 1;
-+ break;
-+ }
-+ }
-+
-+ if (!desc_found) {
-+ unmap_sysmem(parts_info);
-+ return -ENODATA;
-+ }
-+ }
-+ unmap_sysmem(parts_info);
-+ }
-+#else
-+#warning "arm_ffa: reading FFA_PARTITION_INFO_GET data not implemented"
-+#endif
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+}
-+
-+/**
-+ * ffa_query_partitions_info - invokes FFA_PARTITION_INFO_GET
-+ * and saves partitions data
-+ * @part_uuid: Pointer to the partition(s) UUID
-+ * @pcount: Pointer to the number of partitions variable filled when querying
-+ *
-+ * This is the boot time function that executes the FFA_PARTITION_INFO_GET
-+ * to query the partitions data. Then, it calls ffa_read_partitions_info
-+ * to save the data in the private data structure.
-+ *
-+ * After reading the data the RX buffer is released using ffa_release_rx_buffer
-+ *
-+ * Return:
-+ *
-+ * When part_uuid is NULL, all partitions data are retrieved from secure world
-+ * When part_uuid is non NULL, data for partitions matching the given UUID are
-+ * retrieved and the number of partitions is returned
-+ * FFA_ERR_STAT_SUCCESS is returned on success. Otherwise, failure
-+ */
-+static int ffa_query_partitions_info(union ffa_partition_uuid *part_uuid,
-+ u32 *pcount)
-+{
-+ unsigned long a0 = 0;
-+ union ffa_partition_uuid query_uuid = {0};
-+ unsigned long a5 = 0;
-+ unsigned long a6 = 0;
-+ unsigned long a7 = 0;
-+ struct arm_smccc_res res = {0};
-+
-+ ffa_dbg("[%s]", __func__);
-+
-+ if (!ffa_priv_data.invoke_ffa_fn)
-+ panic("[FFA] no private data found\n");
-+
-+ a0 = FFA_PARTITION_INFO_GET;
-+
-+ /*
-+ * If a UUID is specified. Information for one or more
-+ * partitions in the system is queried. Otherwise, information
-+ * for all installed partitions is queried
-+ */
-+
-+ if (part_uuid) {
-+ if (!pcount)
-+ return -EINVAL;
-+
-+ query_uuid = *part_uuid;
-+ }
-+
-+ ffa_priv_data.invoke_ffa_fn(a0, query_uuid.words.a1, query_uuid.words.a2,
-+ query_uuid.words.a3, query_uuid.words.a4,
-+ a5, a6, a7, &res);
-+
-+ switch (res.a0) {
-+ case FFA_ERROR:
-+ {
-+ switch (((int)res.a2)) {
-+ case FFA_ERR_STAT_INVALID_PARAMETERS:
-+ ffa_err("Unrecognized UUID");
-+ return -EPERM;
-+ case FFA_ERR_STAT_NO_MEMORY:
-+ ffa_err("Results cannot fit in RX buffer of the caller");
-+ return -ENOMEM;
-+ case FFA_ERR_STAT_DENIED:
-+ ffa_err("Callee is not in a state to handle this request");
-+ return -EACCES;
-+ case FFA_ERR_STAT_NOT_SUPPORTED:
-+ ffa_err("This function is not implemented at this FF-A instance");
-+ return -EOPNOTSUPP;
-+ case FFA_ERR_STAT_BUSY:
-+ ffa_err("RX buffer of the caller is not free");
-+ return -EBUSY;
-+ default:
-+ ffa_err("Undefined error (%d)", ((int)res.a2));
-+ return -EINVAL;
-+ }
-+ }
-+ case FFA_SUCCESS:
-+ {
-+ int ret;
-+
-+ /*
-+ * res.a2 contains the count of partition information descriptors
-+ * populated in the RX buffer
-+ */
-+ if (res.a2) {
-+ ret = ffa_read_partitions_info(res.a2, part_uuid);
-+ if (ret)
-+ ffa_err("Failed to read partition(s) data , error (%d)", ret);
-+ }
-+
-+ /*
-+ * return the SP count
-+ */
-+ if (part_uuid) {
-+ if (!ret)
-+ *pcount = res.a2;
-+ else
-+ *pcount = 0;
-+ }
-+ /*
-+ * After calling FFA_PARTITION_INFO_GET the buffer ownership
-+ * is assigned to the consumer (u-boot). So, we need to give
-+ * the ownership back to the secure world
-+ */
-+ ret = ffa_release_rx_buffer();
-+
-+ if (!part_uuid && !res.a2) {
-+ ffa_err("[FFA] no partition installed in the system");
-+ return -ENODEV;
-+ }
-+
-+ return ret;
-+ }
-+ default:
-+ ffa_err("Undefined response function (0x%lx)", res.a0);
-+ return -EINVAL;
-+ }
-+}
-+
-+/**
-+ * ffa_get_partitions_info - FFA_PARTITION_INFO_GET handler function
-+ * @func_data: Pointer to the FF-A function arguments container structure.
-+ * The passed arguments:
-+ * Mode 1: When getting from the driver the number of
-+ * secure partitions:
-+ * @data0_size: UUID size
-+ * @data0: pointer to the UUID (little endian)
-+ * @data1_size: size of the number of partitions
-+ * variable
-+ * @data1: pointer to the number of partitions
-+ * variable. The variable will be set
-+ * by the driver
-+ * Mode 2: When requesting the driver to return the
-+ * partitions information:
-+ * @data0_size: UUID size
-+ * @data0: pointer to the UUID (little endian)
-+ * @data1_size: size of the SPs information buffer
-+ * @data1: pointer to SPs information buffer
-+ * (allocated by the client).
-+ * The buffer will be filled by the driver
-+ *
-+ * This is the boot time function that queries the secure partition data from
-+ * the private data structure. If not found, it invokes FFA_PARTITION_INFO_GET
-+ * FF-A function to query the partition information from secure world.
-+ *
-+ * A client of the FF-A driver should know the UUID of the service it wants to
-+ * access. It should use the UUID to request the FF-A driver to provide the
-+ * partition(s) information of the service. The FF-A driver uses
-+ * PARTITION_INFO_GET to obtain this information. This is implemented through
-+ * ffa_get_partitions_info function.
-+ * A new FFA_PARTITION_INFO_GET call is issued (first one performed through
-+ * ffa_cache_partitions_info) allowing to retrieve the partition(s) information.
-+ * They are not saved (already done). We only update the UUID in the cached area.
-+ * This assumes that partitions data does not change in the secure world.
-+ * Otherwise u-boot will have an outdated partition data. The benefit of caching
-+ * the information in the FF-A driver is to accommodate discovery after
-+ * ExitBootServices().
-+ *
-+ * When invoked through a client request, ffa_get_partitions_info should be
-+ * called twice. First call is to get from the driver the number of secure
-+ * partitions (SPs) associated to a particular UUID.
-+ * Then, the caller (client) allocates the buffer to host the SPs data and
-+ * issues a 2nd call. Then, the driver fills the SPs data in the pre-allocated
-+ * buffer.
-+ *
-+ * To achieve the mechanism described above, ffa_get_partitions_info uses the
-+ * following functions:
-+ * ffa_read_partitions_info
-+ * ffa_query_partitions_info
-+ *
-+ * Return:
-+ *
-+ * @data1: When pointing to the number of partitions variable, the number is
-+ * set by the driver.
-+ * When pointing to the partitions information buffer, the buffer will be
-+ * filled by the driver.
-+ *
-+ * On success FFA_ERR_STAT_SUCCESS is returned. Otherwise, failure
-+ */
-+static int ffa_get_partitions_info(struct ffa_interface_data *func_data)
-+{
-+ /*
-+ * fill_data:
-+ * 0: return the SP count
-+ * 1: fill SP data and return it to the caller
-+ * -1: undefined mode
-+ */
-+ int fill_data = -1;
-+ u32 desc_idx, client_desc_idx;
-+ union ffa_partition_uuid *part_uuid;
-+ u32 client_desc_max_cnt;
-+ u32 parts_found = 0;
-+
-+ ffa_dbg("[%s]", __func__);
-+
-+ if (!func_data) {
-+ ffa_err("No function data provided");
-+ return -EINVAL;
-+ }
-+
-+ if (!ffa_priv_data.partitions.count || !ffa_priv_data.partitions.descs)
-+ panic("[FFA] No partition installed\n");
-+
-+ if (func_data->data0_size == sizeof(union ffa_partition_uuid) &&
-+ func_data->data0 &&
-+ func_data->data1_size == sizeof(u32) &&
-+ func_data->data1) {
-+ /*
-+ * data0 (in): pointer to UUID
-+ * data1 (in): pointer to SP count
-+ * Out: SP count returned in the count variable pointed by data1
-+ */
-+
-+ fill_data = 0;
-+
-+ ffa_info("Preparing for checking partitions count");
-+
-+ } else if ((func_data->data0_size == sizeof(union ffa_partition_uuid)) &&
-+ func_data->data0 &&
-+ (func_data->data1_size >= sizeof(struct ffa_partition_info)) &&
-+ !(func_data->data1_size % sizeof(struct ffa_partition_info)) &&
-+ func_data->data1) {
-+ /*
-+ * data0 (in): pointer to UUID
-+ * data1 (in): pointer to SPs descriptors buffer
-+ * (created by the client)
-+ * Out: SPs descriptors returned in the buffer
-+ * pointed by data1
-+ */
-+
-+ fill_data = 1;
-+
-+ client_desc_idx = 0;
-+
-+ /*
-+ * number of empty descriptors preallocated by the caller
-+ */
-+ client_desc_max_cnt =
-+ func_data->data1_size / sizeof(struct ffa_partition_info);
-+
-+ ffa_info("Preparing for filling partitions info");
-+
-+ } else {
-+ ffa_err("Invalid function arguments provided");
-+ return -EINVAL;
-+ }
-+
-+ part_uuid = (union ffa_partition_uuid *)func_data->data0;
-+
-+ ffa_info("Searching partitions using the provided UUID");
-+
-+#ifdef DEBUG
-+ {
-+ u32 dbg_uuid_cnt;
-+
-+ ffa_dbg("UUID: [LSB]");
-+
-+ for (dbg_uuid_cnt = 0 ; dbg_uuid_cnt < UUID_SIZE ; dbg_uuid_cnt++)
-+ ffa_dbg(" %02x", part_uuid->bytes[dbg_uuid_cnt]);
-+ }
-+#endif
-+
-+ /*
-+ * search in the cached partitions
-+ */
-+ for (desc_idx = 0;
-+ desc_idx < ffa_priv_data.partitions.count;
-+ desc_idx++) {
-+ if (ffa_uuid_are_identical(&ffa_priv_data.partitions.descs[desc_idx].UUID,
-+ part_uuid)) {
-+ ffa_info("Partition ID %x matches the provided UUID",
-+ ffa_priv_data.partitions.descs[desc_idx].info.id);
-+
-+ parts_found++;
-+
-+ if (fill_data) {
-+ /*
-+ * trying to fill the partition info in data1
-+ */
-+
-+ if (client_desc_idx < client_desc_max_cnt) {
-+ ((struct ffa_partition_info *)
-+ func_data->data1)[client_desc_idx++] =
-+ ffa_priv_data.partitions.descs[desc_idx].info;
-+ continue;
-+ }
-+
-+ ffa_err("Failed to fill the current descriptor client buffer full");
-+ return -ENOBUFS;
-+ }
-+ }
-+ }
-+
-+ if (!parts_found) {
-+ int ret;
-+
-+ ffa_info("No partition found. Querying framework ...");
-+
-+ ret = ffa_query_partitions_info(part_uuid, &parts_found);
-+
-+ if (ret == FFA_ERR_STAT_SUCCESS) {
-+ if (!fill_data) {
-+ *((u32 *)func_data->data1) = parts_found;
-+
-+ ffa_info("Number of partition(s) found matching the UUID: %d",
-+ parts_found);
-+ } else {
-+ /*
-+ * we want to read SPs info
-+ */
-+
-+ /*
-+ * If SPs data filled, retry searching SP info again
-+ */
-+ if (parts_found)
-+ ret = ffa_get_partitions_info(func_data);
-+ else
-+ ret = -ENODATA;
-+ }
-+ }
-+
-+ return ret;
-+ }
-+
-+ /* partition(s) found */
-+ if (!fill_data)
-+ *((u32 *)func_data->data1) = parts_found;
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+}
-+
-+/**
-+ * ffa_cache_partitions_info - Queries and saves all secure partitions data
-+ *
-+ * This is a boot time function that invokes FFA_PARTITION_INFO_GET FF-A
-+ * function to query from secure world all partitions information.
-+ *
-+ * The FFA_PARTITION_INFO_GET call is issued with nil UUID as an argument.
-+ * All installed partitions information are returned. We cache them in the
-+ * resident private data structure and we keep the UUID field empty
-+ * (in FF-A 1.0 UUID is not provided by the partition descriptor)
-+ *
-+ * This function is called at the device probing level.
-+ * ffa_cache_partitions_info uses ffa_query_partitions_info to get the data
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int ffa_cache_partitions_info(void)
-+{
-+ ffa_dbg("[%s]", __func__);
-+ return ffa_query_partitions_info(NULL, NULL);
-+}
-+
-+/**
-+ * ffa_msg_send_direct_req - FFA_MSG_SEND_DIRECT_{REQ,RESP} handler function
-+ * @func_data: Pointer to the FF-A function arguments container structure.
-+ * The passed arguments:
-+ * @data0_size: partition ID size
-+ * @data0: pointer to the partition ID
-+ * @data1_size: exchanged data size
-+ * @data1: pointer to the data buffer preallocated by
-+ * the client (in/out)
-+ *
-+ * This is the runtime function that implements FFA_MSG_SEND_DIRECT_{REQ,RESP}
-+ * FF-A functions.
-+ *
-+ * FFA_MSG_SEND_DIRECT_REQ is used to send the data to the secure partition.
-+ * The response from the secure partition is handled by reading the
-+ * FFA_MSG_SEND_DIRECT_RESP arguments.
-+ *
-+ * The maximum size of the data that can be exchanged is 20 bytes which is
-+ * sizeof(struct ffa_send_direct_data) as defined by the FF-A specification 1.0
-+ * in the section relevant to FFA_MSG_SEND_DIRECT_{REQ,RESP}
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int __ffa_runtime ffa_msg_send_direct_req(struct ffa_interface_data
-+ *func_data)
-+{
-+ u16 dst_part_id;
-+ unsigned long a0 = 0;
-+ unsigned long a1 = 0;
-+ unsigned long a2 = 0;
-+ struct ffa_send_direct_data *msg;
-+ struct arm_smccc_res res = {0};
-+
-+ ffa_dbg("[%s]", __func__);
-+
-+ if (!ffa_priv_data.invoke_ffa_fn)
-+ panic("[FFA] no private data found\n");
-+
-+ if (!func_data)
-+ return -EINVAL;
-+
-+ if (!ffa_priv_data.partitions.count || !ffa_priv_data.partitions.descs)
-+ panic("[FFA] no partition installed\n");
-+
-+ if (func_data->data0_size != sizeof(u16) ||
-+ !func_data->data0 ||
-+ func_data->data1_size != FFA_MSG_SEND_DIRECT_MAX_SIZE ||
-+ !func_data->data1) {
-+ ffa_err("Undefined interface parameters");
-+ return -EINVAL;
-+ }
-+
-+ dst_part_id = *((u16 *)func_data->data0);
-+ msg = func_data->data1;
-+
-+ ffa_dbg("Sending data to partition ID 0x%x", dst_part_id);
-+
-+ a0 = FFA_MSG_SEND_DIRECT_REQ;
-+
-+ a1 = PREP_SELF_ENDPOINT_ID(ffa_priv_data.id) |
-+ PREP_PART_ENDPOINT_ID(dst_part_id);
-+
-+ ffa_priv_data.invoke_ffa_fn(a0, a1, a2,
-+ msg->a3,
-+ msg->a4,
-+ msg->a5,
-+ msg->a6,
-+ msg->a7,
-+ &res);
-+
-+ while (res.a0 == FFA_INTERRUPT)
-+ ffa_priv_data.invoke_ffa_fn(FFA_RUN, res.a1,
-+ 0, 0, 0, 0, 0, 0,
-+ &res);
-+
-+ switch (res.a0) {
-+ case FFA_ERROR:
-+ {
-+ switch (((int)res.a2)) {
-+ case FFA_ERR_STAT_INVALID_PARAMETERS:
-+ ffa_err("Invalid endpoint ID or non-zero reserved register");
-+ return -EPERM;
-+ case FFA_ERR_STAT_ABORTED:
-+ panic("[FFA] Message target ran into unexpected error and has aborted\n");
-+ case FFA_ERR_STAT_DENIED:
-+ panic("[FFA] Callee is not in a state to handle this request\n");
-+ case FFA_ERR_STAT_NOT_SUPPORTED:
-+ panic("[FFA] This function is not implemented at this FF-A instance\n");
-+ case FFA_ERR_STAT_BUSY:
-+ panic("[FFA] Message target is busy\n");
-+ default:
-+ panic("[FFA] Undefined error (%d)\n", ((int)res.a2));
-+ }
-+ }
-+ case FFA_SUCCESS:
-+
-+ ffa_dbg("Message sent with no response");
-+ return FFA_ERR_STAT_SUCCESS;
-+
-+ case FFA_MSG_SEND_DIRECT_RESP:
-+
-+ ffa_dbg("Message sent with response");
-+
-+ /*
-+ * extract the 32-bit wide return data
-+ */
-+ msg->a3 = (u32)res.a3;
-+ msg->a4 = (u32)res.a4;
-+ msg->a5 = (u32)res.a5;
-+ msg->a6 = (u32)res.a6;
-+ msg->a7 = (u32)res.a7;
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+
-+ default:
-+ panic("[FFA] Undefined response function (0x%lx)\n", res.a0);
-+ }
-+}
-+
-+/**
-+ * invoke_ffa_drv_api - The driver dispatcher function
-+ * @func_id: The FF-A function to be used
-+ * @func_data: Pointer to the FF-A function arguments container
-+ * structure. This also includes pointers to the
-+ * returned data needed by clients.
-+ * The dispatcher is a runtime function that selects the FF-A function handler
-+ * based on the input FF-A function ID.
-+ * The input arguments are passed to the handler function.
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+int __ffa_runtime invoke_ffa_drv_api(u32 func_id,
-+ struct ffa_interface_data *func_data)
-+{
-+ if (!ffa_priv_data.dev)
-+ panic("[FFA] no device found\n");
-+
-+ switch (func_id) {
-+ case FFA_PARTITION_INFO_GET:
-+ return ffa_get_partitions_info(func_data);
-+ case FFA_RXTX_UNMAP:
-+ return ffa_unmap_rxtx_buffers();
-+ case FFA_MSG_SEND_DIRECT_REQ:
-+ return ffa_msg_send_direct_req(func_data);
-+ default:
-+
-+ ffa_err("Undefined FF-A interface (%d)", func_id);
-+
-+ return -EINVAL;
-+ }
-+}
-+
-+/**
-+ * ffa_init_private_data - Initialization of the private data
-+ * @dev: the arm_ffa device
-+ *
-+ * This boot time function reads data from the platform data structure
-+ * and populates the private data structure
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int ffa_init_private_data(struct udevice *dev)
-+{
-+ struct ffa_pdata *pdata = dev_get_plat(dev);
-+
-+ ffa_priv_data.conduit = pdata->conduit;
-+
-+ if (ffa_priv_data.conduit == FFA_CONDUIT_SMC) {
-+ ffa_priv_data.invoke_ffa_fn = arm_ffa_smccc_smc;
-+ } else {
-+ ffa_err("Undefined FF-A conduit (%d)", ffa_priv_data.conduit);
-+ return -EINVAL;
-+ }
-+
-+ ffa_info("Conduit is %s",
-+ ((ffa_priv_data.conduit == FFA_CONDUIT_SMC) ?
-+ "SMC" : "NOT SUPPORTED"));
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+}
-+
-+/**
-+ * ffa_probe - The driver probe function
-+ * @dev: the arm_ffa device
-+ *
-+ * Probing is done at boot time and triggered by the uclass device discovery.
-+ * At probe level the following actions are done:
-+ * - initialization of the driver private data structure
-+ * - querying from secure world the FF-A framework version
-+ * - querying from secure world the u-boot endpoint ID
-+ * - querying from secure world the supported features of the specified FF-A calls
-+ * - mapping the RX/TX buffers
-+ * - querying from secure world all the partitions information
-+ *
-+ * All data queried from secure world is saved in the resident private data structure.
-+ *
-+ * The probe will fail if either FF-A framework is not detected or the
-+ * FF-A requests are not behaving correctly. This ensures that the
-+ * driver is not installed and its operations are not exported to the clients.
-+ * However, once the driver is successfully probed and an FF-A anomaly is
-+ * detected when clients invoke the driver operations, the driver cause
-+ * u-boot to panic because the client would not know what to do in such conditions.
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int ffa_probe(struct udevice *dev)
-+{
-+ int ret;
-+ size_t buf_4k_pages = 0;
-+
-+ ffa_dbg("[%s]: initializing the FF-A driver", __func__);
-+
-+ ret = ffa_init_private_data(dev);
-+
-+ if (ret != FFA_ERR_STAT_SUCCESS)
-+ return ret;
-+
-+ ret = ffa_get_version();
-+
-+ if (ret != FFA_ERR_STAT_SUCCESS)
-+ return ret;
-+
-+ ret = ffa_get_endpoint_id();
-+
-+ if (ret != FFA_ERR_STAT_SUCCESS)
-+ return ret;
-+
-+ ret = ffa_get_rxtx_map_features();
-+
-+ if (ret != FFA_ERR_STAT_SUCCESS)
-+ return ret;
-+
-+ ret = ffa_get_rxtx_buffers_pages_cnt(&buf_4k_pages);
-+
-+ if (ret != FFA_ERR_STAT_SUCCESS)
-+ return ret;
-+
-+ ret = ffa_map_rxtx_buffers(buf_4k_pages);
-+
-+ if (ret != FFA_ERR_STAT_SUCCESS)
-+ return ret;
-+
-+ ret = ffa_cache_partitions_info();
-+
-+ if (ret != FFA_ERR_STAT_SUCCESS) {
-+ ffa_free_rxtx_buffers(buf_4k_pages);
-+ return ret;
-+ }
-+
-+ ffa_dbg("[%s]: initialization done", __func__);
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+}
-+
-+/**
-+ * ffa_of_to_plat - Reads the device tree node
-+ * @dev: the arm_ffa device
-+ *
-+ * This boot time function reads data from the device tree node and populates
-+ * the platform data structure
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+static int ffa_of_to_plat(struct udevice *dev)
-+{
-+ struct ffa_pdata *pdata = dev_get_plat(dev);
-+ const char *conduit;
-+
-+ ffa_dbg("[%s]", __func__);
-+
-+ conduit = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "method", NULL);
-+
-+ if (strcmp("smc", conduit)) {
-+ ffa_err("Unsupported conduit");
-+ return -EINVAL;
-+ }
-+
-+ pdata->conduit = FFA_CONDUIT_SMC;
-+
-+ return FFA_ERR_STAT_SUCCESS;
-+}
-+
-+/**
-+ * ffa_drv_ops - The driver operations runtime structure
-+ * @invoke_func: The driver dispatcher
-+ */
-+struct ffa_ops __ffa_runtime_data ffa_drv_ops = {
-+ .invoke_func = invoke_ffa_drv_api
-+};
-+
-+/**
-+ * ffa_device_get_ops - driver operations getter
-+ *
-+ * Return:
-+ * This runtime function returns a pointer to the driver operations structure
-+ */
-+const struct ffa_ops * __ffa_runtime ffa_device_get_ops(void)
-+{
-+ return &ffa_drv_ops;
-+}
-+
-+/**
-+ * Defining the device tree compatible string
-+ */
-+
-+static const struct udevice_id ffa_match_id[] = {
-+ {"arm,ffa", 0},
-+ {},
-+};
-+
-+/**
-+ * Declaring the arm_ffa driver under UCLASS_FFA
-+ */
-+
-+U_BOOT_DRIVER(arm_ffa) = {
-+ .name = "arm_ffa",
-+ .of_match = ffa_match_id,
-+ .id = UCLASS_FFA,
-+ .of_to_plat = ffa_of_to_plat,
-+ .probe = ffa_probe,
-+ .plat_auto = sizeof(struct ffa_pdata),
-+};
-diff --git a/include/arm_ffa.h b/include/arm_ffa.h
-new file mode 100644
-index 0000000000..313f46f747
---- /dev/null
-+++ b/include/arm_ffa.h
-@@ -0,0 +1,191 @@
-+/* SPDX-License-Identifier: GPL-2.0+ */
-+/*
-+ * (C) Copyright 2021 ARM Limited
-+ * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
-+ */
-+
-+#ifndef __ARM_FFA_H
-+#define __ARM_FFA_H
-+
-+#include <linux/arm-smccc.h>
-+#include <linux/printk.h>
-+
-+/*
-+ * This header is public. It can be used by clients to access
-+ * data structures and definitions they need
-+ */
-+
-+/*
-+ * Macros for displaying logs
-+ */
-+
-+#define ffa_dbg(fmt, ...) pr_debug("[FFA] " fmt "\n", ##__VA_ARGS__)
-+#define ffa_info(fmt, ...) pr_info("[FFA] " fmt "\n", ##__VA_ARGS__)
-+#define ffa_err(fmt, ...) pr_err("[FFA] " fmt "\n", ##__VA_ARGS__)
-+
-+/*
-+ * The driver operations success error code
-+ */
-+#define FFA_ERR_STAT_SUCCESS (0)
-+
-+#if CONFIG_IS_ENABLED(EFI_LOADER)
-+
-+#include <efi_loader.h>
-+
-+/*
-+ * __ffa_runtime_data and __ffa_runtime - controls whether data/code are
-+ * available after calling the EFI ExitBootServices service.
-+ * Data/code tagged with these keywords are resident (available at boot time and
-+ * at runtime)
-+ */
-+
-+#define __ffa_runtime_data __efi_runtime_data
-+#define __ffa_runtime __efi_runtime
-+
-+#else
-+
-+#define __ffa_runtime_data
-+#define __ffa_runtime
-+
-+#endif
-+
-+/*
-+ * Definitions of the Arm FF-A interfaces supported by the Arm FF-A driver
-+ */
-+
-+#define FFA_SMC(calling_convention, func_num) \
-+ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, (calling_convention), \
-+ ARM_SMCCC_OWNER_STANDARD, (func_num))
-+
-+#define FFA_SMC_32(func_num) FFA_SMC(ARM_SMCCC_SMC_32, (func_num))
-+
-+#define FFA_VERSION FFA_SMC_32(0x63)
-+#define FFA_ID_GET FFA_SMC_32(0x69)
-+#define FFA_FEATURES FFA_SMC_32(0x64)
-+#define FFA_PARTITION_INFO_GET FFA_SMC_32(0x68)
-+#define FFA_RXTX_MAP FFA_SMC_32(0x66)
-+#define FFA_RXTX_UNMAP FFA_SMC_32(0x67)
-+#define FFA_RX_RELEASE FFA_SMC_32(0x65)
-+#define FFA_MSG_SEND_DIRECT_REQ FFA_SMC_32(0x6F)
-+#define FFA_MSG_SEND_DIRECT_RESP FFA_SMC_32(0x70)
-+#define FFA_RUN FFA_SMC_32(0x6D)
-+#define FFA_ERROR FFA_SMC_32(0x60)
-+#define FFA_SUCCESS FFA_SMC_32(0x61)
-+#define FFA_INTERRUPT FFA_SMC_32(0x62)
-+
-+/*
-+ * struct ffa_partition_info - Partition information descriptor
-+ * @id: Partition ID
-+ * @exec_ctxt: Execution context count
-+ * @properties: Partition properties
-+ *
-+ * Data structure containing information about partitions instantiated in the system
-+ * This structure is filled with the data queried by FFA_PARTITION_INFO_GET
-+ */
-+struct __packed ffa_partition_info {
-+ u16 id;
-+ u16 exec_ctxt;
-+/* partition supports receipt of direct requests */
-+#define FFA_PARTITION_DIRECT_RECV BIT(0)
-+/* partition can send direct requests. */
-+#define FFA_PARTITION_DIRECT_SEND BIT(1)
-+/* partition can send and receive indirect messages. */
-+#define FFA_PARTITION_INDIRECT_MSG BIT(2)
-+ u32 properties;
-+};
-+
-+/*
-+ * struct ffa_send_direct_data - Data structure hosting the data
-+ * used by FFA_MSG_SEND_DIRECT_{REQ,RESP}
-+ * @a3-a7: Data read/written from/to w3-w7 registers
-+ *
-+ * Data structure containing the data to be sent by FFA_MSG_SEND_DIRECT_REQ
-+ * or read from FFA_MSG_SEND_DIRECT_RESP
-+ */
-+struct __packed ffa_send_direct_data {
-+ u32 a3; /* w3 */
-+ u32 a4; /* w4 */
-+ u32 a5; /* w5 */
-+ u32 a6; /* w6 */
-+ u32 a7; /* w7 */
-+};
-+
-+#define FFA_MSG_SEND_DIRECT_MAX_SIZE (sizeof(struct ffa_send_direct_data))
-+
-+/* UUID data size */
-+#define UUID_SIZE (16)
-+
-+/*
-+ * union ffa_partition_uuid - Data union hosting the UUID
-+ * transmitted by FFA_PARTITION_INFO_GET
-+ * @words: data structure giving 32-bit words access to the UUID data
-+ * @bytes: data structure giving byte access to the UUID data
-+ *
-+ * The structure holds little-endian UUID data.
-+ */
-+union ffa_partition_uuid {
-+ struct __packed words {
-+ u32 a1; /* w1 */
-+ u32 a2; /* w2 */
-+ u32 a3; /* w3 */
-+ u32 a4; /* w4 */
-+ } words;
-+ u8 bytes[UUID_SIZE];
-+};
-+
-+/**
-+ * struct ffa_interface_data - generic FF-A interface data structure used to exchange
-+ * data between user layers and the driver
-+ * @data0_size: size of the first argument
-+ * @data0: pointer to the first argument
-+ * @data1_size>: size of the second argument
-+ * @data1: pointer to the second argument
-+ *
-+ * Using this structure user layers can pass various types of data with different sizes.
-+ * The driver internal functions can detect the nature of this data, verfy compliance
-+ * then execute the request when appropriate.
-+ */
-+struct ffa_interface_data {
-+ u32 data0_size; /* size of the first argument */
-+ void *data0; /* pointer to the first argument */
-+ u32 data1_size; /* size of the second argument */
-+ void *data1; /* pointer to the second argument */
-+};
-+
-+/**
-+ * struct ffa_ops - The driver operations structure
-+ * @invoke_func: function pointer to the invoke function
-+ *
-+ * The data structure providing all the operations supported by the driver.
-+ * This structure is resident.
-+ */
-+struct ffa_ops {
-+ /* the driver dispatcher */
-+ int (*invoke_func)(u32 func_id, struct ffa_interface_data *func_data);
-+};
-+
-+/**
-+ * The device driver and the Uclass driver public functions
-+ */
-+
-+/**
-+ * ffa_get_invoke_func - performs a call to the FF-A driver dispatcher
-+ */
-+int __ffa_runtime ffa_get_invoke_func(u32 func_id,
-+ struct ffa_interface_data *func_data);
-+
-+/**
-+ * ffa_device_get_ops - driver operations getter
-+ */
-+const struct ffa_ops * __ffa_runtime ffa_device_get_ops(void);
-+
-+/**
-+ * ffa_get_device - probes the arm_ffa device
-+ */
-+int ffa_get_device(void);
-+
-+/**
-+ * ffa_init_device - probes the arm_ffa device
-+ */
-+int ffa_init_device(void);
-+#endif
-diff --git a/include/arm_ffa_helper.h b/include/arm_ffa_helper.h
-new file mode 100644
-index 0000000000..0e143e5451
---- /dev/null
-+++ b/include/arm_ffa_helper.h
-@@ -0,0 +1,45 @@
-+/* SPDX-License-Identifier: GPL-2.0+ */
-+/*
-+ * (C) Copyright 2021 ARM Limited
-+ * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
-+ */
-+
-+#ifndef __ARM_FFA_HELPER_H
-+#define __ARM_FFA_HELPER_H
-+
-+#include <arm_ffa.h>
-+
-+/*
-+ * This header is public. Including this header provides all data structures
-+ * and definitions needed by clients to use the FF-A transport driver
-+ *
-+ * It also provides helper functions allowing to pass data and invoke FF-A functions
-+ */
-+
-+/**
-+ * ffa_helper_get_partitions_info - Wrapper function for FFA_PARTITION_INFO_GET
-+ */
-+int ffa_helper_get_partitions_info(struct ffa_interface_data *func_data);
-+
-+/**
-+ * ffa_helper_unmap_rxtx_buffers - Wrapper function for FFA_RXTX_UNMAP
-+ */
-+int ffa_helper_unmap_rxtx_buffers(void);
-+
-+/**
-+ * ffa_helper_msg_send_direct_req - Wrapper function for
-+ * FFA_MSG_SEND_DIRECT_{REQ,RESP}
-+ */
-+int __ffa_runtime ffa_helper_msg_send_direct_req(struct ffa_interface_data
-+ *func_data);
-+
-+/**
-+ * ffa_helper_init_device - Wrapper function for probing the arm_ffa device
-+ */
-+int ffa_helper_init_device(void);
-+
-+/**
-+ * ffa_uuid_str_to_bin - Converts a big endian UUID string to a little endian buffer
-+ */
-+int ffa_uuid_str_to_bin(const char *uuid_str, unsigned char *uuid_bin);
-+#endif
-diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h
-index 0e26e1d138..a1181b8f48 100644
---- a/include/dm/uclass-id.h
-+++ b/include/dm/uclass-id.h
-@@ -52,6 +52,7 @@ enum uclass_id {
- UCLASS_EFI_MEDIA, /* Devices provided by UEFI firmware */
- UCLASS_ETH, /* Ethernet device */
- UCLASS_ETH_PHY, /* Ethernet PHY device */
-+ UCLASS_FFA, /* Arm Firmware Framework for Armv8-A */
- UCLASS_FIRMWARE, /* Firmware */
- UCLASS_FS_FIRMWARE_LOADER, /* Generic loader */
- UCLASS_GPIO, /* Bank of general-purpose I/O pins */
-diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
-index 7f2be23394..54980a130f 100644
---- a/include/linux/arm-smccc.h
-+++ b/include/linux/arm-smccc.h
-@@ -1,6 +1,8 @@
- /* SPDX-License-Identifier: GPL-2.0 */
- /*
- * Copyright (c) 2015, Linaro Limited
-+ * (C) Copyright 2021 ARM Limited
-+ * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
- */
- #ifndef __LINUX_ARM_SMCCC_H
- #define __LINUX_ARM_SMCCC_H
-@@ -57,13 +59,17 @@
- #include <linux/types.h>
- /**
- * struct arm_smccc_res - Result from SMC/HVC call
-- * @a0-a3 result values from registers 0 to 3
-+ * @a0-a7 result values from registers 0 to 7
- */
- struct arm_smccc_res {
- unsigned long a0;
- unsigned long a1;
- unsigned long a2;
- unsigned long a3;
-+ unsigned long a4;
-+ unsigned long a5;
-+ unsigned long a6;
-+ unsigned long a7;
- };
-
- /**
-@@ -113,6 +119,26 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
- unsigned long a5, unsigned long a6, unsigned long a7,
- struct arm_smccc_res *res, struct arm_smccc_quirk *quirk);
-
-+#if (IS_ENABLED(CONFIG_ARM_FFA_TRANSPORT))
-+/**
-+ * __arm_ffa_smccc_smc() - make SMC calls used for FF-A transport
-+ * @a0-a7: arguments passed in 64-bit registers x0 to x7
-+ * @res: result values from 64-bit registers x0 to x7
-+ *
-+ * This function is used to make SMC calls following SMC32 Calling Convention.
-+ * The content of the supplied parameters is copied to registers x0 to x7 prior
-+ * to the SMC instruction. The SMC call return data is 32-bit data read from
-+ * registers x0 tp x7.
-+ */
-+asmlinkage void __arm_ffa_smccc_smc(unsigned long a0, unsigned long a1,
-+ unsigned long a2, unsigned long a3, unsigned long a4,
-+ unsigned long a5, unsigned long a6, unsigned long a7,
-+ struct arm_smccc_res *res);
-+
-+#define arm_ffa_smccc_smc __arm_ffa_smccc_smc
-+
-+#endif
-+
- #define arm_smccc_smc(...) __arm_smccc_smc(__VA_ARGS__, NULL)
-
- #define arm_smccc_smc_quirk(...) __arm_smccc_smc(__VA_ARGS__)
-diff --git a/lib/Kconfig b/lib/Kconfig
-index 3c6fa99b1a..473821b882 100644
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -810,6 +810,7 @@ config SMBIOS_PARSER
- source lib/efi/Kconfig
- source lib/efi_loader/Kconfig
- source lib/optee/Kconfig
-+source lib/arm-ffa/Kconfig
-
- config TEST_FDTDEC
- bool "enable fdtdec test"
-diff --git a/lib/Makefile b/lib/Makefile
-index 11b03d1cbe..8e6fad6130 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -9,6 +9,7 @@ obj-$(CONFIG_EFI) += efi/
- obj-$(CONFIG_EFI_LOADER) += efi_driver/
- obj-$(CONFIG_EFI_LOADER) += efi_loader/
- obj-$(CONFIG_CMD_BOOTEFI_SELFTEST) += efi_selftest/
-+obj-$(CONFIG_ARM_FFA_TRANSPORT_HELPERS) += arm-ffa/
- obj-$(CONFIG_LZMA) += lzma/
- obj-$(CONFIG_BZIP2) += bzip2/
- obj-$(CONFIG_TIZEN) += tizen/
-diff --git a/lib/arm-ffa/Kconfig b/lib/arm-ffa/Kconfig
-new file mode 100644
-index 0000000000..79acbc5a8f
---- /dev/null
-+++ b/lib/arm-ffa/Kconfig
-@@ -0,0 +1,6 @@
-+config ARM_FFA_TRANSPORT_HELPERS
-+ bool "Enable interface helpers for Arm Firmware Framework for Armv8-A"
-+ depends on ARM_FFA_TRANSPORT
-+ help
-+ User layers call FF-A interfaces using helper functions which
-+ pass the data and the FF-A function ID to the low level driver
-diff --git a/lib/arm-ffa/Makefile b/lib/arm-ffa/Makefile
-new file mode 100644
-index 0000000000..c30c0f3981
---- /dev/null
-+++ b/lib/arm-ffa/Makefile
-@@ -0,0 +1,8 @@
-+# SPDX-License-Identifier: GPL-2.0+
-+#
-+# (C) Copyright 2021 Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
-+#
-+
-+# This file only gets included when CONFIG_ARM_FFA_TRANSPORT_HELPERS is set
-+
-+obj-y += arm_ffa_helper.o
-diff --git a/lib/arm-ffa/arm_ffa_helper.c b/lib/arm-ffa/arm_ffa_helper.c
-new file mode 100644
-index 0000000000..623899d380
---- /dev/null
-+++ b/lib/arm-ffa/arm_ffa_helper.c
-@@ -0,0 +1,188 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * (C) Copyright 2021 ARM Limited
-+ * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
-+ */
-+
-+#include <common.h>
-+#include <arm_ffa_helper.h>
-+#include <uuid.h>
-+
-+/**
-+ * ffa_helper_get_partitions_info - Wrapper function for FFA_PARTITION_INFO_GET
-+ *
-+ * @func_data: Pointer to the FF-A function arguments container
-+ * structure.
-+ * The passed arguments:
-+ * Mode 1: When getting from the driver the number of
-+ * secure partitions:
-+ * @data0_size: UUID size
-+ * @data0: pointer to the UUID (little endian)
-+ * @data1_size: size of the number of partitions
-+ * variable
-+ * @data1: pointer to the number of partitions
-+ * variable. The variable will be set
-+ * by the driver
-+ * Mode 2: When requesting the driver to return the
-+ * partitions information:
-+ * @data0_size: UUID size
-+ * @data0: pointer to the UUID (little endian)
-+ * @data1_size: size of the SPs information buffer
-+ * @data1: pointer to SPs information buffer
-+ * (allocated by the client).
-+ * The buffer will be filled by the driver
-+ *
-+ * This is the boot time function used by clients who wants to get from secure
-+ * world the partition(s) information.
-+ *
-+ * A client of the FF-A driver should know the UUID of the service it wants to
-+ * access. It should use the UUID to request the FF-A driver to provide the
-+ * partition(s) information of the service. The client should use
-+ * ffa_helper_get_partitions_info to pass the UUID information to the driver
-+ * which uses PARTITION_INFO_GET to obtain the partition(s) information.
-+ *
-+ * ffa_helper_get_partitions_info should be called twice. First call is to get
-+ * from the driver the number of secure partitions (SPs) associated to a
-+ * particular UUID. Then, the caller (client) allocates the buffer to host the
-+ * SPs data and issues a 2nd call. Then, the driver fills the SPs data in the
-+ * pre-allocated buffer.
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+int ffa_helper_get_partitions_info(struct ffa_interface_data *func_data)
-+{
-+ return ffa_get_invoke_func(FFA_PARTITION_INFO_GET, func_data);
-+}
-+
-+/**
-+ * ffa_helper_unmap_rxtx_buffers - Wrapper function for FFA_RXTX_UNMAP
-+ *
-+ * This is the boot time function that allows clients to unmap the RX/TX
-+ * buffers
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+int ffa_helper_unmap_rxtx_buffers(void)
-+{
-+ return ffa_get_invoke_func(FFA_RXTX_UNMAP, NULL);
-+}
-+
-+/**
-+ * ffa_helper_msg_send_direct_req - Wrapper function for
-+ * FFA_MSG_SEND_DIRECT_{REQ,RESP}
-+ * @func_data: Pointer to the FF-A function arguments container structure.
-+ * The passed arguments:
-+ * @data0_size: partition ID size
-+ * @data0: pointer to the partition ID
-+ * @data1_size: exchanged data size
-+ * @data1: pointer to the data buffer preallocated by the client (in/out)
-+ *
-+ * This is the runtime function that allows clients to send data to the secure
-+ * world partitions. The arm_ffa driver uses FFA_MSG_SEND_DIRECT_REQ to send the
-+ * data to the secure partition. The response from the secure partition is
-+ * handled internally by the driver using FFA_MSG_SEND_DIRECT_RESP and returned
-+ * to ffa_helper_msg_send_direct_req through @func_data
-+ *
-+ * The maximum size of the data that can be exchanged is 20 bytes which is
-+ * sizeof(struct ffa_send_direct_data) as defined by the FF-A specification 1.0
-+ * in the section relevant to FFA_MSG_SEND_DIRECT_{REQ,RESP}
-+ *
-+ * The client should pre-allocate a buffer pointed by @data1 which the size
-+ * is sizeof(struct ffa_send_direct_data)
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+int __ffa_runtime ffa_helper_msg_send_direct_req(struct ffa_interface_data
-+ *func_data)
-+{
-+ return ffa_get_invoke_func(FFA_MSG_SEND_DIRECT_REQ, func_data);
-+}
-+
-+/**
-+ * ffa_helper_init_device - Wrapper function for probing the arm_ffa device
-+ *
-+ * This boot time function should be called to probe the arm_ffa device so
-+ * it becomes ready for use.
-+ * To achieve that, this function is called automatically at initcalls
-+ * level (after u-boot relocation).
-+ *
-+ * Return:
-+ *
-+ * FFA_ERR_STAT_SUCCESS on success. Otherwise, failure
-+ */
-+int ffa_helper_init_device(void)
-+{
-+ return ffa_init_device();
-+}
-+
-+/**
-+ * ffa_uuid_str_to_bin - Converts a big endian UUID string to a little endian buffer
-+ * @uuid_str: UUID string in big endian format (36 bytes wide + '/0')
-+ * @uuid_bin: preallocated 16 bytes UUID buffer in little endian format
-+ *
-+ * UUID binary format used by the FF-A framework (16 bytes):
-+ *
-+ * [LSB] 4B-2B-2B-2B-6B (little endian data fields)
-+ *
-+ * UUID string is 36 length of characters (36 bytes):
-+ *
-+ * xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-+ * be be be be be
-+ *
-+ * where x is a hexadecimal character. Fields are separated by '-'s.
-+ * When converting to a binary UUID, these endianness rules apply:
-+ * be: means the field in the string is considered a big endian hex number
-+ * and should be converted to little endian binary format
-+ *
-+ * Return:
-+ *
-+ * uuid_bin filled with little endian UUID data
-+ * On success 0 is returned. Otherwise, failure code.
-+ */
-+int ffa_uuid_str_to_bin(const char *uuid_str, unsigned char *uuid_bin)
-+{
-+ u16 tmp16 = 0;
-+ u32 tmp32 = 0;
-+ u64 tmp64 = 0;
-+
-+ if (!uuid_str_valid(uuid_str) || !uuid_bin)
-+ return -EINVAL;
-+
-+ /*
-+ * reverse bytes from big to little endian
-+ */
-+ tmp32 = simple_strtoul(uuid_str, NULL, 16);
-+ memcpy(uuid_bin, &tmp32, 4);
-+
-+ /*
-+ * reverse bytes from big to little endian
-+ */
-+ tmp16 = simple_strtoul(uuid_str + 9, NULL, 16);
-+ memcpy(uuid_bin + 4, &tmp16, 2);
-+
-+ /*
-+ * reverse bytes from big to little endian
-+ */
-+ tmp16 = simple_strtoul(uuid_str + 14, NULL, 16);
-+ memcpy(uuid_bin + 6, &tmp16, 2);
-+
-+ /*
-+ * reverse bytes from big to little endian
-+ */
-+ tmp16 = simple_strtoul(uuid_str + 19, NULL, 16);
-+ memcpy(uuid_bin + 8, &tmp16, 2);
-+
-+ /*
-+ * reverse bytes from big to little endian
-+ */
-+ tmp64 = simple_strtoull(uuid_str + 24, NULL, 16);
-+ memcpy(uuid_bin + 10, (char *)&tmp64, 6);
-+
-+ return 0;
-+}
-diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
-index 5bcb8253ed..cffa2c69d6 100644
---- a/lib/efi_loader/efi_boottime.c
-+++ b/lib/efi_loader/efi_boottime.c
-@@ -23,6 +23,10 @@
- #include <asm/setjmp.h>
- #include <linux/libfdt_env.h>
-
-+#if defined(CONFIG_ARM_FFA_TRANSPORT)
-+#include <arm_ffa_helper.h>
-+#endif
-+
- DECLARE_GLOBAL_DATA_PTR;
-
- /* Task priority level */
-@@ -2114,6 +2118,10 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle,
- struct efi_event *evt, *next_event;
- efi_status_t ret = EFI_SUCCESS;
-
-+#if defined(CONFIG_ARM_FFA_TRANSPORT)
-+ int ffa_ret;
-+#endif
-+
- EFI_ENTRY("%p, %zx", image_handle, map_key);
-
- /* Check that the caller has read the current memory map */
-@@ -2174,6 +2182,15 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle,
- dm_remove_devices_flags(DM_REMOVE_ACTIVE_ALL);
- }
-
-+#if defined(CONFIG_ARM_FFA_TRANSPORT)
-+ /* unmap FF-A RX/TX buffers */
-+ ffa_ret = ffa_helper_unmap_rxtx_buffers();
-+ if (ffa_ret)
-+ debug("[efi_boottime][ERROR]: can not unmap FF-A RX/TX buffers\n");
-+ else
-+ debug("[efi_boottime][INFO]: FF-A RX/TX buffers unmapped\n");
-+#endif
-+
- /* Patch out unsupported runtime function */
- efi_runtime_detach();
-
-2.34.1
-
deleted file mode 100644
@@ -1,30 +0,0 @@
-From 8dd3e03bd83939746b6a849dce37435ea7581032 Mon Sep 17 00:00:00 2001
-From: Davidson K <davidson.kumaresan@arm.com>
-Date: Thu, 14 Jul 2022 19:35:41 +0530
-Subject: [PATCH 3/7] arm: total_compute: enable psci
-
-psci is used for system reset
-
-Signed-off-by: Davidson K <davidson.kumaresan@arm.com>
-Change-Id: Iff4f769dc5e64b6000e892d77a011102b090acfd
-Upstream-Status: Submitted [https://patchwork.ozlabs.org/project/uboot/patch/20220809102652.23776-1-davidson.kumaresan@arm.com/]
----
- arch/arm/dts/total_compute.dts | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm/dts/total_compute.dts b/arch/arm/dts/total_compute.dts
-index 4399269a44..96edacda0b 100644
---- a/arch/arm/dts/total_compute.dts
-+++ b/arch/arm/dts/total_compute.dts
-@@ -45,4 +45,8 @@
- clock-frequency = <24000000>;
- clock-output-names = "bp:clock24mhz";
- };
-+ psci {
-+ compatible = "arm,psci-1.0", "arm,psci-0.2";
-+ method = "smc";
-+ };
- };
-2.34.1
-
deleted file mode 100644
@@ -1,37 +0,0 @@
-From 6eee50e5376356b1faeb30507b411120a8b5c7d1 Mon Sep 17 00:00:00 2001
-From: Davidson K <davidson.kumaresan@arm.com>
-Date: Mon, 6 Jun 2022 15:13:15 +0530
-Subject: [PATCH 4/7] arm_ffa: rxtx_map should use 64 bit calls
-
-rxtx_map deals with the 64 bit addresses and hence the 64 bit calls
-should be used
-
-Signed-off-by: Davidson K <davidson.kumaresan@arm.com>
-Change-Id: Iec1251266e61139767588d683d60bada1ed10abe
-Upstream-Status: Pending [Not submitted to upstream yet]
----
- include/arm_ffa.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/include/arm_ffa.h b/include/arm_ffa.h
-index 313f46f747..9627107079 100644
---- a/include/arm_ffa.h
-+++ b/include/arm_ffa.h
-@@ -58,12 +58,13 @@
- ARM_SMCCC_OWNER_STANDARD, (func_num))
-
- #define FFA_SMC_32(func_num) FFA_SMC(ARM_SMCCC_SMC_32, (func_num))
-+#define FFA_SMC_64(func_num) FFA_SMC(ARM_SMCCC_SMC_64, (func_num))
-
- #define FFA_VERSION FFA_SMC_32(0x63)
- #define FFA_ID_GET FFA_SMC_32(0x69)
- #define FFA_FEATURES FFA_SMC_32(0x64)
- #define FFA_PARTITION_INFO_GET FFA_SMC_32(0x68)
--#define FFA_RXTX_MAP FFA_SMC_32(0x66)
-+#define FFA_RXTX_MAP FFA_SMC_64(0x66)
- #define FFA_RXTX_UNMAP FFA_SMC_32(0x67)
- #define FFA_RX_RELEASE FFA_SMC_32(0x65)
- #define FFA_MSG_SEND_DIRECT_REQ FFA_SMC_32(0x6F)
-2.34.1
-
deleted file mode 100644
@@ -1,993 +0,0 @@
-From 6d26058401bce6012173b5341cdf4de72772a1c2 Mon Sep 17 00:00:00 2001
-From: Davidson K <davidson.kumaresan@arm.com>
-Date: Mon, 6 Jun 2022 13:19:07 +0530
-Subject: [PATCH 5/7] efi_firmware: add new fmp driver that supports arm fwu
- specification
-
-This fmp driver communicates to the firmware update secure partition
-executing in the secure world which is an implementation of the arm
-psa specification for the firmware update. The communication to the
-firmware update secure partition is based on stmm and arm ff-a framework.
-
-It implements only the get_image_info and set_image api.
-
-Signed-off-by: Davidson K <davidson.kumaresan@arm.com>
-Change-Id: I94c2cad210c32a60a8a0594cacf530b68ab6a09d
-Upstream-Status: Pending [Not submitted to upstream yet]
----
- include/efi_firmware_arm_psa.h | 218 +++++++++++
- include/efi_loader.h | 1 +
- lib/efi_loader/Kconfig | 9 +
- lib/efi_loader/Makefile | 1 +
- lib/efi_loader/efi_capsule.c | 8 +
- lib/efi_loader/efi_firmware.c | 134 +++++++
- lib/efi_loader/efi_firmware_arm_psa.c | 520 ++++++++++++++++++++++++++
- 7 files changed, 891 insertions(+)
- create mode 100644 include/efi_firmware_arm_psa.h
- create mode 100644 lib/efi_loader/efi_firmware_arm_psa.c
-
-diff --git a/include/efi_firmware_arm_psa.h b/include/efi_firmware_arm_psa.h
-new file mode 100644
-index 0000000000..82f932066c
---- /dev/null
-+++ b/include/efi_firmware_arm_psa.h
-@@ -0,0 +1,218 @@
-+/* SPDX-License-Identifier: GPL-2.0+ */
-+/*
-+ * Copyright (C) 2022 Arm Limited
-+ */
-+
-+#ifndef _EFI_FIRMWARE_ARM_PSA_H
-+#define _EFI_FIRMWARE_ARM_PSA_H
-+
-+#include <efi_loader.h>
-+#include <mm_communication.h>
-+#include <stdint.h>
-+
-+#define PSA_FWU_DIRECTORY_UUID \
-+ EFI_GUID(0xdeee58d9, 0x5147, 0x4ad3, \
-+ 0xa2, 0x90, 0x77, 0x66, 0x6e, 0x23, 0x41, 0xa5)
-+
-+#define PSA_FWU_SP_UUID \
-+ EFI_GUID(0x6823a838, 0x1b06, 0x470e, \
-+ 0x97, 0x74, 0x0c, 0xce, 0x8b, 0xfb, 0x53, 0xfd)
-+
-+#define FFA_FWU_SP_UUID \
-+ {0x68, 0x23, 0xa8, 0x38, 0x1b, 0x06, 0x47, \
-+ 0x0e, 0x97, 0x74, 0x0c, 0xce, 0x8b, 0xfb, 0x53, 0xfd}
-+
-+#define FWU_DISCOVER 0
-+#define FWU_BEGIN_STAGING 1
-+#define FWU_END_STAGING 2
-+#define FWU_CANCEL_STAGING 3
-+#define FWU_OPEN 4
-+#define FWU_WRITE_STREAM 5
-+#define FWU_READ_STREAM 6
-+#define FWU_COMMIT 7
-+#define FWU_ACCEPT_IMAGE 9
-+#define FWU_SELECT_PREVIOUS 10
-+
-+#define FWU_SUCCESS 0
-+#define FWU_UNKNOWN ((int32_t)-1)
-+#define FWU_BUSY ((int32_t)-2)
-+#define FWU_OUT_OF_BOUNDS ((int32_t)-3)
-+#define FWU_AUTH_FAIL ((int32_t)-4)
-+#define FWU_NO_PERMISSION ((int32_t)-5)
-+#define FWU_DENIED ((int32_t)-6)
-+#define FWU_RESUME ((int32_t)-7)
-+
-+#define MAX_IMAGES 5
-+
-+typedef int32_t fwu_status_t;
-+
-+struct fwu_image_info_entry {
-+ efi_guid_t image_guid;
-+ uint32_t client_permissions;
-+ uint32_t img_max_size;
-+ uint32_t lowest_acceptable_version;
-+ uint32_t img_version;
-+ uint32_t accepted;
-+ uint32_t reserved;
-+}__packed;
-+
-+struct fwu_image_directory {
-+ uint32_t directory_version;
-+ uint32_t num_images;
-+ uint32_t active_index;
-+ uint32_t boot_index;
-+ struct fwu_image_info_entry entries[MAX_IMAGES];
-+}__packed;
-+
-+int __efi_runtime arm_psa_get_image_info(
-+ efi_uintn_t *image_info_size,
-+ struct efi_firmware_image_descriptor *image_info,
-+ u32 *descriptor_version,
-+ u8 *descriptor_count,
-+ efi_uintn_t *descriptor_size,
-+ u32 *package_version,
-+ u16 **package_version_name
-+);
-+
-+int __efi_runtime arm_psa_update(
-+ const void *image,
-+ u8 image_index,
-+ efi_uintn_t image_size
-+);
-+
-+struct mm_fwu_discover_arg {
-+ uint32_t func_id;
-+}__packed;
-+
-+struct mm_fwu_discover_ret {
-+ uint32_t status;
-+ uint8_t version_major;
-+ uint8_t version_minor;
-+ uint16_t num_func;
-+ uint8_t function_presence[];
-+}__packed;
-+
-+struct mm_fwu_begin_staging_arg {
-+ uint32_t func_id;
-+}__packed;
-+
-+struct mm_fwu_begin_staging_ret {
-+ uint32_t status;
-+}__packed;
-+
-+struct mm_fwu_end_staging_arg {
-+ uint32_t func_id;
-+}__packed;
-+
-+struct mm_fwu_end_staging_ret {
-+ uint32_t status;
-+}__packed;
-+
-+struct mm_fwu_cancel_staging_arg {
-+ uint32_t func_id;
-+}__packed;
-+
-+struct mm_fwu_cancel_staging_ret {
-+ uint32_t status;
-+}__packed;
-+
-+struct mm_fwu_open_arg {
-+ uint32_t func_id;
-+ efi_guid_t image_guid;
-+}__packed;
-+
-+struct mm_fwu_open_ret {
-+ uint32_t status;
-+ uint32_t handle;
-+}__packed;
-+
-+struct mm_fwu_write_stream_arg {
-+ uint32_t func_id;
-+ uint32_t handle;
-+ uint32_t data_len;
-+ uint8_t payload[];
-+}__packed;
-+
-+struct mm_fwu_write_stream_ret {
-+ uint32_t status;
-+};
-+
-+struct mm_fwu_read_stream_arg {
-+ uint32_t func_id;
-+ uint32_t handle;
-+}__packed;
-+
-+struct mm_fwu_read_stream_ret {
-+ uint32_t status;
-+ uint32_t read_bytes;
-+ uint32_t total_bytes;
-+ uint8_t payload[];
-+}__packed;
-+
-+struct mm_fwu_commit_arg {
-+ uint32_t func_id;
-+ uint32_t handle;
-+ uint32_t acceptance_req;
-+ uint32_t max_atomic_len;
-+}__packed;
-+
-+struct mm_fwu_commit_ret {
-+ uint32_t status;
-+ uint32_t progress;
-+ uint32_t total_work;
-+}__packed;
-+
-+struct mm_fwu_accept_arg {
-+ uint32_t func_id;
-+ uint32_t reserved;
-+ efi_guid_t image_type_uuid;
-+}__packed;
-+
-+struct mm_fwu_accept_ret {
-+ uint32_t status;
-+};
-+
-+struct mm_fwu_select_previous_arg {
-+ uint32_t func_id;
-+}__packed;
-+
-+struct mm_fwu_select_previous_ret {
-+ uint32_t status;
-+}__packed;
-+
-+inline static void *get_fwu_hdr(struct efi_mm_communicate_header *mm_hdr)
-+{
-+ const efi_guid_t fwu_sp_guid = PSA_FWU_SP_UUID;
-+ guidcpy(&mm_hdr->header_guid, &fwu_sp_guid);
-+ return mm_hdr->data;
-+}
-+
-+#define GET_HDR(name) \
-+static inline struct mm_fwu_##name * \
-+get_fwu_##name (struct efi_mm_communicate_header *mm_hdr) \
-+{ \
-+ return (struct mm_fwu_##name *)get_fwu_hdr(mm_hdr); \
-+} \
-+
-+GET_HDR(discover_arg)
-+GET_HDR(discover_ret)
-+GET_HDR(begin_staging_arg)
-+GET_HDR(begin_staging_ret)
-+GET_HDR(end_staging_arg)
-+GET_HDR(end_staging_ret)
-+GET_HDR(cancel_staging_arg)
-+GET_HDR(cancel_staging_ret)
-+GET_HDR(open_arg)
-+GET_HDR(open_ret)
-+GET_HDR(write_stream_arg)
-+GET_HDR(write_stream_ret)
-+GET_HDR(read_stream_arg)
-+GET_HDR(read_stream_ret)
-+GET_HDR(commit_arg)
-+GET_HDR(commit_ret)
-+GET_HDR(accept_arg)
-+GET_HDR(accept_ret)
-+GET_HDR(select_previous_arg)
-+GET_HDR(select_previous_ret)
-+
-+#endif /* _EFI_FIRMWARE_ARM_PSA_H */
-diff --git a/include/efi_loader.h b/include/efi_loader.h
-index af36639ec6..7327c87497 100644
---- a/include/efi_loader.h
-+++ b/include/efi_loader.h
-@@ -961,6 +961,7 @@ u16 *efi_create_indexed_name(u16 *buffer, size_t buffer_size, const char *name,
-
- extern const struct efi_firmware_management_protocol efi_fmp_fit;
- extern const struct efi_firmware_management_protocol efi_fmp_raw;
-+extern const struct efi_firmware_management_protocol efi_fmp_arm_psa;
-
- /* Capsule update */
- efi_status_t EFIAPI efi_update_capsule(
-diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
-index e5e35fe51f..f99d436f16 100644
---- a/lib/efi_loader/Kconfig
-+++ b/lib/efi_loader/Kconfig
-@@ -168,6 +168,15 @@ config EFI_CAPSULE_FIRMWARE_MANAGEMENT
- Select this option if you want to enable capsule-based
- firmware update using Firmware Management Protocol.
-
-+config EFI_CAPSULE_FIRMWARE_ARM_PSA
-+ bool "FMP driver for ARM PSA FWU specification"
-+ depends on EFI_CAPSULE_FIRMWARE_MANAGEMENT
-+ select EFI_CAPSULE_FIRMWARE
-+ help
-+ Select this option if you want to enable firmware management protocol
-+ driver that supports the ARM PSA firmware update specification as
-+ mentioned in https://developer.arm.com/documentation/den0118/a/
-+
- config EFI_CAPSULE_FIRMWARE_FIT
- bool "FMP driver for FIT images"
- depends on FIT
-diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
-index 034d26cf01..f986ac6417 100644
---- a/lib/efi_loader/Makefile
-+++ b/lib/efi_loader/Makefile
-@@ -38,6 +38,7 @@ obj-y += efi_boottime.o
- obj-y += efi_helper.o
- obj-$(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) += efi_capsule.o
- obj-$(CONFIG_EFI_CAPSULE_FIRMWARE) += efi_firmware.o
-+obj-$(CONFIG_EFI_CAPSULE_FIRMWARE_ARM_PSA) += efi_firmware_arm_psa.o
- obj-y += efi_console.o
- obj-y += efi_device_path.o
- obj-$(CONFIG_EFI_DEVICE_PATH_TO_TEXT) += efi_device_path_to_text.o
-diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c
-index f00440163d..3154fc51d3 100644
---- a/lib/efi_loader/efi_capsule.c
-+++ b/lib/efi_loader/efi_capsule.c
-@@ -1041,6 +1041,14 @@ efi_status_t __weak efi_load_capsule_drivers(void)
- &efi_fmp_raw, NULL));
- }
-
-+ if (IS_ENABLED(CONFIG_EFI_CAPSULE_FIRMWARE_ARM_PSA)) {
-+ handle = NULL;
-+ ret = EFI_CALL(efi_install_multiple_protocol_interfaces(
-+ &handle,
-+ &efi_guid_firmware_management_protocol,
-+ &efi_fmp_arm_psa, NULL));
-+ }
-+
- return ret;
- }
-
-diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c
-index a5ff32f121..3356559af8 100644
---- a/lib/efi_loader/efi_firmware.c
-+++ b/lib/efi_loader/efi_firmware.c
-@@ -9,6 +9,7 @@
- #include <common.h>
- #include <charset.h>
- #include <dfu.h>
-+#include <efi_firmware_arm_psa.h>
- #include <efi_loader.h>
- #include <image.h>
- #include <signatures.h>
-@@ -478,3 +479,136 @@ const struct efi_firmware_management_protocol efi_fmp_raw = {
- .set_package_info = efi_firmware_set_package_info_unsupported,
- };
- #endif /* CONFIG_EFI_CAPSULE_FIRMWARE_RAW */
-+
-+#ifdef CONFIG_EFI_CAPSULE_FIRMWARE_ARM_PSA
-+/*
-+ * This FIRMWARE_MANAGEMENT_PROTOCOL driver provides a firmware update
-+ * method that supports the arm psa firmware update specification.
-+ */
-+
-+/**
-+ * efi_firmware_arm_psa_get_image_info - return information about the
-+ * current firmware image
-+ * @this: Protocol instance
-+ * @image_info_size: Size of @image_info
-+ * @image_info: Image information
-+ * @descriptor_version: Pointer to version number
-+ * @descriptor_count: Pointer to number of descriptors
-+ * @descriptor_size: Pointer to descriptor size
-+ * package_version: Package version
-+ * package_version_name: Package version's name
-+ *
-+ * Return information bout the current firmware image in @image_info.
-+ * @image_info will consist of a number of descriptors.
-+ *
-+ * Return status code
-+ */
-+
-+static
-+efi_status_t EFIAPI efi_firmware_arm_psa_get_image_info(
-+ struct efi_firmware_management_protocol *this,
-+ efi_uintn_t *image_info_size,
-+ struct efi_firmware_image_descriptor *image_info,
-+ u32 *descriptor_version,
-+ u8 *descriptor_count,
-+ efi_uintn_t *descriptor_size,
-+ u32 *package_version,
-+ u16 **package_version_name)
-+{
-+ int ret;
-+
-+ EFI_ENTRY("%p %p %p %p %p %p %p %p\n", this,
-+ image_info_size, image_info,
-+ descriptor_version, descriptor_count, descriptor_size,
-+ package_version, package_version_name);
-+
-+ if (!image_info_size)
-+ return EFI_EXIT(EFI_INVALID_PARAMETER);
-+
-+ if (*image_info_size &&
-+ (!image_info || !descriptor_version || !descriptor_count ||
-+ !descriptor_size || !package_version || !package_version_name))
-+ return EFI_EXIT(EFI_INVALID_PARAMETER);
-+
-+ ret = arm_psa_get_image_info(image_info_size, image_info,
-+ descriptor_version, descriptor_count,
-+ descriptor_size,
-+ package_version, package_version_name);
-+
-+ if (ret) {
-+ if (ret == -ENOMEM)
-+ return EFI_EXIT(EFI_BUFFER_TOO_SMALL);
-+ else
-+ return EFI_EXIT(EFI_DEVICE_ERROR);
-+ }
-+
-+ return EFI_EXIT(EFI_SUCCESS);
-+}
-+
-+/**
-+ * efi_firmware_arm_psa_set_image - update the firmware image
-+ * @this: Protocol instance
-+ * @image_index: Image index number
-+ * @image: New image
-+ * @image_size: Size of new image
-+ * @vendor_code: Vendor-specific update policy
-+ * @progress: Function to report the progress of update
-+ * @abort_reason: Pointer to string of abort reason
-+ *
-+ * Update the firmware to new image, following the arm psa firmware
-+ * update specification.
-+ * @vendor_code, @progress and @abort_reason are not supported.
-+ *
-+ * Return: status code
-+ */
-+static
-+efi_status_t EFIAPI efi_firmware_arm_psa_set_image(
-+ struct efi_firmware_management_protocol *this,
-+ u8 image_index,
-+ const void *image,
-+ efi_uintn_t image_size,
-+ const void *vendor_code,
-+ efi_status_t (*progress)(efi_uintn_t completion),
-+ u16 **abort_reason)
-+{
-+ u32 fmp_hdr_signature;
-+ const struct fmp_payload_header *header;
-+
-+ EFI_ENTRY("%p %d %p %zd %p %p %p\n", this, image_index, image,
-+ image_size, vendor_code, progress, abort_reason);
-+
-+ if (!image)
-+ return EFI_EXIT(EFI_INVALID_PARAMETER);
-+
-+ /* TODO: capsule authentication */
-+
-+ fmp_hdr_signature = FMP_PAYLOAD_HDR_SIGNATURE;
-+ header = (void *)image;
-+
-+ if (!memcmp(&header->signature, &fmp_hdr_signature,
-+ sizeof(fmp_hdr_signature))) {
-+ /*
-+ * When building the capsule with the scripts in
-+ * edk2, a FMP header is inserted above the capsule
-+ * payload. Compensate for this header to get the
-+ * actual payload that is to be updated.
-+ */
-+ image = (unsigned char *)image + header->header_size;
-+ image_size -= header->header_size;
-+ }
-+
-+ if (arm_psa_update(image, image_index, image_size))
-+ return EFI_EXIT(EFI_DEVICE_ERROR);
-+
-+ return EFI_EXIT(EFI_SUCCESS);
-+}
-+
-+const struct efi_firmware_management_protocol efi_fmp_arm_psa = {
-+ .get_image_info = efi_firmware_arm_psa_get_image_info,
-+ .get_image = efi_firmware_get_image_unsupported,
-+ .set_image = efi_firmware_arm_psa_set_image,
-+ .check_image = efi_firmware_check_image_unsupported,
-+ .get_package_info = efi_firmware_get_package_info_unsupported,
-+ .set_package_info = efi_firmware_set_package_info_unsupported,
-+};
-+#endif /* CONFIG_EFI_CAPSULE_FIRMWARE_ARM_PSA */
-diff --git a/lib/efi_loader/efi_firmware_arm_psa.c b/lib/efi_loader/efi_firmware_arm_psa.c
-new file mode 100644
-index 0000000000..ab575f0124
---- /dev/null
-+++ b/lib/efi_loader/efi_firmware_arm_psa.c
-@@ -0,0 +1,520 @@
-+/* SPDX-License-Identifier: GPL-2.0+ */
-+/*
-+ * Copyright (C) 2022 Arm Limited
-+ */
-+
-+#include <arm_ffa_helper.h>
-+#include <configs/total_compute.h>
-+#include <efi_firmware_arm_psa.h>
-+#include <efi_loader.h>
-+#include <malloc.h>
-+#include <mapmem.h>
-+#include <mm_communication.h>
-+
-+/* MM return codes */
-+#define MM_SUCCESS 0
-+
-+#define ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64 0xC4000061
-+#define ARM_SVC_ID_SP_EVENT_COMPLETE ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64
-+
-+__efi_runtime_data static u16 mm_sp_id;
-+__efi_runtime_data static int fwu_initialized = 0;
-+__efi_runtime_data struct fwu_image_directory cached_image_directory;
-+__efi_runtime_data struct efi_mm_communicate_header *mm_hdr;
-+__efi_runtime_data void *mm_comm_buf;
-+
-+/**
-+ * ffa_discover_mm_sp_id() - Query the MM partition ID
-+ *
-+ * Use the FF-A driver to get the MM partition ID.
-+ * If multiple partitions are found, use the first one
-+ *
-+ * Return:
-+ *
-+ * 0 on success
-+ */
-+static int __efi_runtime ffa_discover_mm_sp_id(void)
-+{
-+ struct ffa_interface_data func_data = {0};
-+ u32 count = 0;
-+ int ret;
-+ struct ffa_partition_info *parts_info;
-+ static union ffa_partition_uuid fwu_sp_uuid = {.bytes = FFA_FWU_SP_UUID};
-+
-+ /*
-+ * get from the driver the count of the SPs matching the UUID
-+ */
-+ func_data.data0_size = sizeof(fwu_sp_uuid);
-+ func_data.data0 = &fwu_sp_uuid;
-+ func_data.data1_size = sizeof(count);
-+ func_data.data1 = &count;
-+
-+ ret = ffa_helper_get_partitions_info(&func_data);
-+ if (ret != FFA_ERR_STAT_SUCCESS) {
-+ log_err("EFI: Failure in querying partitions count (error code: %d)\n", ret);
-+ return ret;
-+ }
-+
-+ if (!count) {
-+ log_info("EFI: No MM partition found\n");
-+ return ret;
-+ }
-+
-+ /*
-+ * pre-allocate a buffer to be filled by the driver
-+ * with ffa_partition_info structs
-+ */
-+ parts_info = calloc(count, sizeof(struct ffa_partition_info));
-+ if (!parts_info)
-+ return -EINVAL;
-+
-+ log_info("EFI: Pre-allocating %d partition(s) info structures\n", count);
-+
-+ func_data.data1_size = count * sizeof(struct ffa_partition_info);
-+ func_data.data1 = parts_info;
-+
-+ /*
-+ * ask the driver to fill the
-+ * buffer with the SPs info
-+ */
-+ ret = ffa_helper_get_partitions_info(&func_data);
-+ if (ret != FFA_ERR_STAT_SUCCESS) {
-+ log_err("EFI: Failure in querying partition(s) info (error code: %d)\n", ret);
-+ free(parts_info);
-+ return ret;
-+ }
-+
-+ /*
-+ * MM SPs found , use the first one
-+ */
-+
-+ mm_sp_id = parts_info[0].id;
-+
-+ log_info("EFI: MM partition ID 0x%x\n", mm_sp_id);
-+
-+ free(parts_info);
-+
-+ return 0;
-+}
-+
-+/**
-+ * ffa_notify_mm_sp() - Announce there is data in the shared buffer
-+ *
-+ * Notifies the MM partition in the trusted world that
-+ * data is available in the shared buffer.
-+ * This is a blocking call during which trusted world has exclusive access
-+ * to the MM shared buffer.
-+ *
-+ * Return:
-+ *
-+ * 0 on success
-+ */
-+static int __efi_runtime ffa_notify_mm_sp(void)
-+{
-+ struct ffa_interface_data func_data = {0};
-+ struct ffa_send_direct_data msg = {0};
-+ int ret;
-+ u32 sp_event_complete;
-+ int sp_event_ret;
-+
-+ func_data.data0_size = sizeof(mm_sp_id);
-+ func_data.data0 = &mm_sp_id;
-+
-+ msg.a3 = FFA_SHARED_MM_BUFFER_ADDR;
-+ msg.a4 = FFA_SHARED_MM_BUFFER_SIZE;
-+ func_data.data1_size = sizeof(msg);
-+ func_data.data1 = &msg;
-+
-+ ret = ffa_helper_msg_send_direct_req(&func_data);
-+ if (ret != FFA_ERR_STAT_SUCCESS) {
-+ log_err("EFI: Failure to notify the MM SP , FF-A error (%d)\n", ret);
-+ return ret;
-+ }
-+
-+ sp_event_complete = msg.a3;
-+ sp_event_ret = (int)msg.a4;
-+
-+ if (sp_event_complete == ARM_SVC_ID_SP_EVENT_COMPLETE && sp_event_ret == MM_SUCCESS)
-+ return 0;
-+
-+ log_err("EFI: Failure to notify the MM SP (0x%x , %d)\n",
-+ sp_event_complete,
-+ sp_event_ret);
-+
-+ return -EACCES;
-+}
-+
-+static fwu_status_t __efi_runtime fwu_discover(void)
-+{
-+ int ret;
-+ struct mm_fwu_discover_arg *discover_arg = get_fwu_discover_arg(mm_hdr);
-+ struct mm_fwu_discover_ret *discover_ret = get_fwu_discover_ret(mm_hdr);
-+
-+ discover_arg->func_id = FWU_DISCOVER;
-+
-+ mm_hdr->message_len = sizeof(struct mm_fwu_discover_arg);
-+
-+ ret = ffa_notify_mm_sp();
-+ if (ret)
-+ return ret;
-+
-+ if (discover_ret->version_major != 1) {
-+ log_err("FWU: Unsupported Update Agent version\n");
-+ return -EINVAL;
-+ }
-+ /* TODO: check other parameters as well */
-+
-+ return discover_ret->status;
-+}
-+
-+static fwu_status_t __efi_runtime fwu_begin_staging(void)
-+{
-+ int ret;
-+ struct mm_fwu_begin_staging_arg *begin_staging_arg = get_fwu_begin_staging_arg(mm_hdr);
-+ struct mm_fwu_begin_staging_ret *begin_staging_ret = get_fwu_begin_staging_ret(mm_hdr);
-+
-+ begin_staging_arg->func_id = FWU_BEGIN_STAGING;
-+
-+ mm_hdr->message_len = sizeof(struct mm_fwu_begin_staging_arg);
-+
-+ ret = ffa_notify_mm_sp();
-+ if (ret)
-+ return ret;
-+
-+ return begin_staging_ret->status;
-+}
-+
-+static fwu_status_t __efi_runtime fwu_end_staging(void)
-+{
-+ int ret;
-+ struct mm_fwu_end_staging_arg *end_staging_arg = get_fwu_end_staging_arg(mm_hdr);
-+ struct mm_fwu_end_staging_ret *end_staging_ret = get_fwu_end_staging_ret(mm_hdr);
-+
-+ end_staging_arg->func_id = FWU_END_STAGING;
-+
-+ mm_hdr->message_len = sizeof(struct mm_fwu_end_staging_arg);
-+
-+ ret = ffa_notify_mm_sp();
-+ if (ret)
-+ return ret;
-+
-+ return end_staging_ret->status;
-+}
-+
-+static fwu_status_t __efi_runtime fwu_cancel_staging(void)
-+{
-+ int ret;
-+ struct mm_fwu_cancel_staging_arg *cancel_staging_arg = get_fwu_cancel_staging_arg(mm_hdr);
-+ struct mm_fwu_cancel_staging_ret *cancel_staging_ret = get_fwu_cancel_staging_ret(mm_hdr);
-+
-+ cancel_staging_arg->func_id = FWU_CANCEL_STAGING;
-+
-+ mm_hdr->message_len = sizeof(struct mm_fwu_cancel_staging_arg);
-+
-+ ret = ffa_notify_mm_sp();
-+ if (ret)
-+ return ret;
-+
-+ return cancel_staging_ret->status;
-+}
-+
-+static fwu_status_t __efi_runtime fwu_open(const efi_guid_t *img_uuid, uint32_t *handle)
-+{
-+ int ret;
-+ struct mm_fwu_open_arg *open_hdr = get_fwu_open_arg(mm_hdr);
-+ struct mm_fwu_open_ret *open_ret = get_fwu_open_ret(mm_hdr);
-+
-+ open_hdr->func_id = FWU_OPEN;
-+ guidcpy(&open_hdr->image_guid, img_uuid);
-+
-+ mm_hdr->message_len = sizeof(struct mm_fwu_open_arg);
-+
-+ ret = ffa_notify_mm_sp();
-+ if (ret)
-+ return ret;
-+
-+ *handle = open_ret->handle;
-+
-+ return open_ret->status;
-+}
-+
-+static fwu_status_t __efi_runtime fwu_read_stream(uint32_t handle, uint8_t *buffer, uint32_t buffer_size)
-+{
-+ int ret;
-+ struct mm_fwu_read_stream_arg *read_stream_hdr = get_fwu_read_stream_arg(mm_hdr);
-+ struct mm_fwu_read_stream_ret *read_stream_ret = get_fwu_read_stream_ret(mm_hdr);
-+ uint32_t payload_size = FFA_SHARED_MM_BUFFER_SIZE - sizeof(struct mm_fwu_read_stream_ret)
-+ - sizeof(struct efi_mm_communicate_header);
-+ uint32_t read_offset = 0, read_size, total_size;
-+
-+ do {
-+ read_stream_hdr->func_id = FWU_READ_STREAM;
-+ read_stream_hdr->handle = handle;
-+
-+ mm_hdr->message_len = sizeof(struct mm_fwu_read_stream_arg);
-+
-+ ret = ffa_notify_mm_sp();
-+ if (ret)
-+ return ret;
-+
-+ if (read_stream_ret->status)
-+ return read_stream_ret->status;
-+
-+ read_size = read_stream_ret->read_bytes;
-+ total_size = read_stream_ret->total_bytes;
-+
-+ log_info("FWU: read bytes / total bytes : %d/%d\n", read_size, total_size);
-+
-+ if ((read_size <= payload_size) && (read_offset + read_size <= buffer_size))
-+ memcpy(buffer + read_offset, read_stream_ret->payload, read_size);
-+ else
-+ return -EINVAL;
-+
-+ read_offset += read_size;
-+
-+ if (read_offset > total_size)
-+ return -EINVAL;
-+ } while (total_size != read_offset);
-+
-+ return read_stream_ret->status;
-+}
-+
-+static fwu_status_t __efi_runtime fwu_write_stream(uint32_t handle, const uint8_t *buffer, uint32_t remaining_size)
-+{
-+ int ret;
-+ struct mm_fwu_write_stream_arg *write_stream_arg = get_fwu_write_stream_arg(mm_hdr);
-+ struct mm_fwu_write_stream_ret *write_stream_ret = get_fwu_write_stream_ret(mm_hdr);
-+ uint32_t write_size;
-+ uint32_t payload_size = FFA_SHARED_MM_BUFFER_SIZE - sizeof(struct mm_fwu_write_stream_arg)
-+ - sizeof(struct efi_mm_communicate_header);
-+
-+ while (remaining_size) {
-+ write_size = (remaining_size < payload_size) ? remaining_size : payload_size;
-+ write_stream_arg->func_id = FWU_WRITE_STREAM;
-+ write_stream_arg->handle = handle;
-+ write_stream_arg->data_len = write_size;
-+ memcpy(write_stream_arg->payload, buffer, write_size);
-+
-+ mm_hdr->message_len = sizeof(struct mm_fwu_write_stream_arg) + write_size;
-+
-+ ret = ffa_notify_mm_sp();
-+ if (ret)
-+ return ret;
-+
-+ if(write_stream_ret->status)
-+ return write_stream_ret->status;
-+
-+ remaining_size -= write_size;
-+ buffer += write_size;
-+
-+ log_info("FWU: write size = %d, remaining size = %d\n",
-+ write_size, remaining_size);
-+ }
-+
-+ return write_stream_ret->status;
-+}
-+
-+static fwu_status_t __efi_runtime fwu_commit(uint32_t handle, bool client_accept)
-+{
-+ int ret;
-+ struct mm_fwu_commit_arg *commit_arg = get_fwu_commit_arg(mm_hdr);
-+ struct mm_fwu_commit_ret *commit_ret = get_fwu_commit_ret(mm_hdr);
-+
-+ do {
-+ commit_arg->func_id = FWU_COMMIT;
-+ commit_arg->handle = handle;
-+ commit_arg->acceptance_req = client_accept;
-+ commit_arg->max_atomic_len = 0;
-+
-+ mm_hdr->message_len = sizeof(struct mm_fwu_commit_arg);
-+
-+ ret = ffa_notify_mm_sp();
-+ if (ret)
-+ return ret;
-+
-+ log_info("FWU: commit progress %d/%d (work/total_work)\n",
-+ commit_ret->progress, commit_ret->total_work);
-+
-+ } while(commit_ret->status==FWU_RESUME);
-+
-+ return commit_ret->status;
-+}
-+
-+int __efi_runtime arm_psa_update(
-+ const void *image,
-+ u8 image_index,
-+ efi_uintn_t image_size
-+)
-+{
-+ int ret = 0;
-+ uint32_t handle;
-+
-+ if(image_index >= cached_image_directory.num_images)
-+ return -EINVAL;
-+
-+ ret = fwu_begin_staging();
-+ if (ret) {
-+ log_err("FWU: begin staging failed, ret = %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = fwu_open(&cached_image_directory.entries[image_index].image_guid, &handle);
-+ if (ret) {
-+ log_err("FWU: firmware image open failed, ret = %d\n", ret);
-+ goto cancel_staging;
-+ }
-+
-+ ret = fwu_write_stream(handle, (uint8_t *)image, image_size);
-+ if (ret) {
-+ log_err("FWU: write stream failed, ret = %d\n", ret);
-+ goto cancel_staging;
-+ }
-+
-+ /* TODO: implement client driven image acceptance */
-+ ret = fwu_commit(handle, 0);
-+ if (ret) {
-+ log_err("FWU: commit failed, ret = %d\n", ret);
-+ goto cancel_staging;
-+ }
-+
-+ ret = fwu_end_staging();
-+ if (ret) {
-+ log_err("FWU: end staging failed, ret = %d\n", ret);
-+ goto cancel_staging;
-+ }
-+
-+ log_info("successfully updated the image at index %d\n", image_index);
-+ return ret;
-+
-+cancel_staging:
-+ if (fwu_cancel_staging())
-+ log_err("FWU: cancel staging failed, ret = %d\n", ret);
-+
-+ return ret;
-+}
-+
-+static int __efi_runtime read_image_directory(void)
-+{
-+ int ret;
-+ uint32_t handle;
-+
-+ const efi_guid_t fwu_directory_uuid = PSA_FWU_DIRECTORY_UUID;
-+
-+ ret = fwu_open(&fwu_directory_uuid, &handle);
-+ if (ret) {
-+ log_err("FWU: open image directory failed, ret = %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = fwu_read_stream(handle, (uint8_t *)&cached_image_directory, sizeof(cached_image_directory));
-+ if (ret) {
-+ log_err("FWU: read stream failed, ret = %d\n", ret);
-+ return ret;
-+ }
-+
-+ if(cached_image_directory.num_images > MAX_IMAGES) {
-+ log_err("FWU: image limit exceeded.\n");
-+ log_err("FWU: number of images present: %d, max number of images supported: %d\n",
-+ cached_image_directory.num_images, MAX_IMAGES);
-+ return -EINVAL;
-+ }
-+
-+ return ret;
-+}
-+
-+static int update_agent_init(void)
-+{
-+ int ret;
-+
-+ ret = ffa_discover_mm_sp_id();
-+ if (ret) {
-+ log_err("FWU: discover update agent failed, ret = %d\n", ret);
-+ return ret;
-+ }
-+
-+ mm_comm_buf = (void *)map_sysmem((phys_addr_t)FFA_SHARED_MM_BUFFER_ADDR, 0);
-+ mm_hdr = (struct efi_mm_communicate_header *)mm_comm_buf;
-+
-+ ret = fwu_discover();
-+ if (ret) {
-+ log_err("FWU: discover failed, ret = %d\n", ret);
-+ goto out;
-+ }
-+
-+ ret = read_image_directory();
-+ if (ret) {
-+ log_err("FWU: reading image directory failed, ret = %d\n", ret);
-+ goto out;
-+ }
-+
-+ fwu_initialized = 1;
-+ return ret;
-+out:
-+ unmap_sysmem(mm_comm_buf);
-+ return ret;
-+}
-+
-+int __efi_runtime arm_psa_get_image_info(
-+ efi_uintn_t *image_info_size,
-+ struct efi_firmware_image_descriptor *image_info,
-+ u32 *descriptor_version,
-+ u8 *descriptor_count,
-+ efi_uintn_t *descriptor_size,
-+ u32 *package_version,
-+ u16 **package_version_name)
-+{
-+ int ret = 0;
-+ int required_image_info_size;
-+
-+ if (!fwu_initialized) {
-+ ret = update_agent_init();
-+ if (ret) {
-+ log_err("update agent init failed, ret = %d\n", ret);
-+ return ret;
-+ }
-+ }
-+
-+ required_image_info_size = cached_image_directory.num_images *
-+ sizeof(struct efi_firmware_image_descriptor);
-+
-+ if (*image_info_size < required_image_info_size) {
-+ *image_info_size = required_image_info_size;
-+ return -ENOMEM;
-+ }
-+
-+ *descriptor_version = EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION;
-+ *descriptor_count = cached_image_directory.num_images;
-+ *descriptor_size = required_image_info_size;
-+ *package_version = 0xffffffff; /* not supported */
-+ *package_version_name = NULL; /* not supported */
-+
-+ for (int i = 0; i < cached_image_directory.num_images; i++) {
-+ image_info[i].image_index = i+1;
-+ guidcpy(&image_info[i].image_type_id, &cached_image_directory.entries[i].image_guid);
-+ image_info[i].image_id = i;
-+ image_info[i].image_id_name = NULL; /* not supported */
-+ image_info[i].version = cached_image_directory.entries[i].img_version;
-+ image_info[i].version_name = NULL; /* not supported */
-+ image_info[i].size = cached_image_directory.entries[i].img_max_size;
-+
-+ image_info[i].attributes_supported =
-+ IMAGE_ATTRIBUTE_IMAGE_UPDATABLE |
-+ IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED;
-+ image_info[i].attributes_setting =
-+ IMAGE_ATTRIBUTE_IMAGE_UPDATABLE;
-+
-+ /* Check if the capsule authentication is enabled */
-+ if (IS_ENABLED(CONFIG_EFI_CAPSULE_AUTHENTICATE))
-+ image_info[i].attributes_setting |=
-+ IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED;
-+
-+ image_info[i].lowest_supported_image_version =
-+ cached_image_directory.entries[i].lowest_acceptable_version;
-+ image_info[i].last_attempt_version = 0;
-+ image_info[i].last_attempt_status = LAST_ATTEMPT_STATUS_SUCCESS;
-+ image_info[i].hardware_instance = 1;
-+ image_info[i].dependencies = NULL; /* not supported */
-+ }
-+
-+ return ret;
-+}
-2.34.1
-
deleted file mode 100644
@@ -1,70 +0,0 @@
-From 2ab887402b9e22842d07e5f2fe1ac54518555af5 Mon Sep 17 00:00:00 2001
-From: Davidson K <davidson.kumaresan@arm.com>
-Date: Mon, 6 Jun 2022 13:24:42 +0530
-Subject: [PATCH 6/7] arm: total_compute: enable capsule update
-
-It includes:
-* Enabling runtime capsule update
-* Enabling efidebug command line tool
-* Enabling the FMP driver that supports ARM PSA firmware update specification
-* Predefining the carved out memory to be used for MM communication
-* Enabling FF-A transport driver and adding an entry in dts
-
-Signed-off-by: Davidson K <davidson.kumaresan@arm.com>
-Change-Id: I6d6c70c6fc386d6c40def800a7417c1ce4b8acf5
-Upstream-Status: Pending [Not submitted to upstream yet]
----
- arch/arm/dts/total_compute.dts | 7 +++++++
- configs/total_compute_defconfig | 5 +++++
- include/configs/total_compute.h | 4 ++++
- 3 files changed, 16 insertions(+)
-
-diff --git a/arch/arm/dts/total_compute.dts b/arch/arm/dts/total_compute.dts
-index 96edacda0b..9b2cbfb452 100644
---- a/arch/arm/dts/total_compute.dts
-+++ b/arch/arm/dts/total_compute.dts
-@@ -45,8 +45,15 @@
- clock-frequency = <24000000>;
- clock-output-names = "bp:clock24mhz";
- };
-+
- psci {
- compatible = "arm,psci-1.0", "arm,psci-0.2";
- method = "smc";
- };
-+
-+ arm_ffa {
-+ compatible = "arm,ffa";
-+ method = "smc";
-+ status = "okay";
-+ };
- };
-diff --git a/configs/total_compute_defconfig b/configs/total_compute_defconfig
-index 6a375543cd..531ce41cd3 100644
---- a/configs/total_compute_defconfig
-+++ b/configs/total_compute_defconfig
-@@ -52,3 +52,8 @@ CONFIG_SYS_FLASH_PROTECTION=y
- CONFIG_SYS_FLASH_CFI=y
- CONFIG_LIBAVB=y
- CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_ARM_FFA_TRANSPORT=y
-+CONFIG_CMD_EFIDEBUG=y
-+CONFIG_EFI_CAPSULE_FIRMWARE_ARM_PSA=y
-+CONFIG_EFI_CAPSULE_ON_DISK=y
-+CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
-diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h
-index 62bdb4f6a3..4b00f47ec6 100644
---- a/include/configs/total_compute.h
-+++ b/include/configs/total_compute.h
-@@ -59,4 +59,8 @@
- #define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */
- #define FLASH_MAX_SECTOR_SIZE 0x00040000
-
-+/* Shared buffer used for communication between u-boot and the FWU SP */
-+#define FFA_SHARED_MM_BUFFER_SIZE 4 * 1024 * 1024 /* 4 MB */
-+#define FFA_SHARED_MM_BUFFER_ADDR (0xFCA00000)
-+
- #endif /* __TOTAL_COMPUTE_H */
-2.34.1
-
deleted file mode 100644
@@ -1,51 +0,0 @@
-From 47be0456ea1760837d2de857e57842e595e9ea5e Mon Sep 17 00:00:00 2001
-From: Davidson K <davidson.kumaresan@arm.com>
-Date: Mon, 27 Jun 2022 14:11:27 +0530
-Subject: [PATCH 7/7] arm_ffa: unmap rxtx buffer before exiting u-boot
-
-The linux kernel ffa driver will be used after the kernel boots. It
-will try to map its own rxtx buffer. But there can be only one rxtx
-buffer mapped from the non secure world. Since the rxtx buffer of
-the u-boot is no longer used and we have to map the rxtx buffer of
-the linux kernel, the rxtx buffer of the u-boot should be unmapped.
-
-This will not be needed after the efi runtime services are enabled
-
-Signed-off-by: Davidson K <davidson.kumaresan@arm.com>
-Change-Id: I9deb6283d81f791185aa0a32d205b394d6d91f76
-Upstream-Status: Pending [Not submitted to upstream yet]
----
- drivers/arm-ffa/core.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/drivers/arm-ffa/core.c b/drivers/arm-ffa/core.c
-index 98e2d2fa17..0c619439cb 100644
---- a/drivers/arm-ffa/core.c
-+++ b/drivers/arm-ffa/core.c
-@@ -1470,6 +1470,16 @@ static const struct udevice_id ffa_match_id[] = {
- {},
- };
-
-+/**
-+ * Unmap the rxtx buffer before exiting u-boot
-+ * This avoids conflicts with the linux kernel ffa driver
-+ */
-+
-+static int ffa_remove(struct udevice *dev)
-+{
-+ return ffa_unmap_rxtx_buffers();
-+}
-+
- /**
- * Declaring the arm_ffa driver under UCLASS_FFA
- */
-@@ -1481,4 +1491,6 @@ U_BOOT_DRIVER(arm_ffa) = {
- .of_to_plat = ffa_of_to_plat,
- .probe = ffa_probe,
- .plat_auto = sizeof(struct ffa_pdata),
-+ .remove = ffa_remove,
-+ .flags = DM_FLAG_OS_PREPARE,
- };
-2.34.1
-
@@ -1,3 +1,3 @@
CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="console=ttyAMA0 debug user_debug=31 earlycon=pl011,0x7ff80000 loglevel=9 androidboot.hardware=total_compute androidboot.boot_devices=1c050000.mmci androidboot.selinux=permissive allow_mismatched_32bit_el0"
+CONFIG_BOOTARGS="console=ttyAMA0 debug earlycon=pl011,0x7ff80000"
CONFIG_BOOTDELAY=0
@@ -97,11 +97,4 @@ SRC_URI:append:juno = " file://0001-configs-vexpress-modify-to-boot-compressed-i
#
SRC_URI:append:tc = " \
file://bootargs.cfg \
- file://0001-arm-total_compute-update-secure-dram-size.patch \
- file://0002-arm_ffa-introducing-Arm-FF-A-low-level-driver.patch \
- file://0003-arm-total_compute-enable-psci.patch \
- file://0004-arm_ffa-rxtx_map-should-use-64-bit-calls.patch \
- file://0005-efi_firmware-add-new-fmp-driver-that-supports-arm-fw.patch \
- file://0006-arm-total_compute-enable-capsule-update.patch \
- file://0007-arm_ffa-unmap-rxtx-buffer-before-exiting-u-boot.patch \
"
deleted file mode 100644
@@ -1,26 +0,0 @@
-HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
-DESCRIPTION = "U-Boot, a boot loader for Embedded boards based on PowerPC, \
-ARM, MIPS and several other processors, which can be installed in a boot \
-ROM and used to initialize and test the hardware or to download and run \
-application code."
-SECTION = "bootloaders"
-DEPENDS += "flex-native bison-native"
-
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
-PE = "1"
-
-# We use the revision in order to avoid having to fetch it from the
-# repo during parse
-SRCREV = "e4b6ebd3de982ae7185dbf689a030e73fd06e0d2"
-
-SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
- "
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-do_configure[cleandirs] = "${B}"
-
-require recipes-bsp/u-boot/u-boot.inc
-
-DEPENDS += "bc-native dtc-native gnutls-native"
deleted file mode 100644
@@ -1 +0,0 @@
-kconf non-hardware tc/autofdo.cfg
deleted file mode 100644
@@ -1,13 +0,0 @@
-kconf hardware tc/base.cfg
-kconf non-hardware tc/dhcp.cfg
-kconf non-hardware tc/devtmpfs.cfg
-kconf non-hardware tc/gralloc.cfg
-kconf non-hardware tc/mali.cfg
-kconf non-hardware tc/ffa.cfg
-kconf non-hardware tc/optee.cfg
-kconf non-hardware tc/virtio.cfg
-kconf non-hardware tc/autofdo.cfg
-kconf non-hardware tc/ci700.cfg
-kconf non-hardware tc/trusty.cfg
-kconf non-hardware tc/disable_mpam.cfg
-kconf non-hardware tc/disable_btf.cfg
deleted file mode 100644
@@ -1,3 +0,0 @@
-CONFIG_CORESIGHT=y
-CONFIG_CORESIGHT_SOURCE_ETM4X=y
-CONFIG_CORESIGHT_TRBE=y
deleted file mode 100644
@@ -1,12 +0,0 @@
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARM_MHU=y
-CONFIG_ARM_MHU_V2=y
-CONFIG_ARM_SMMU_V3=y
-CONFIG_ARM64_VA_BITS_48=y
-CONFIG_COMMON_CLK_SCMI=y
-CONFIG_DRM_HDLCD=y
-CONFIG_DRM_KOMEDA=y
-CONFIG_DRM_VIRT_ENCODER=y
-CONFIG_MMC_ARMMMCI=y
-CONFIG_SERIO_AMBAKMI=y
-CONFIG_SMC91X=y
deleted file mode 100644
@@ -1 +0,0 @@
-CONFIG_ARM_CMN=y
deleted file mode 100644
@@ -1,3 +0,0 @@
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_VT=y
deleted file mode 100644
@@ -1,2 +0,0 @@
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
deleted file mode 100644
@@ -1 +0,0 @@
-CONFIG_DEBUG_INFO_BTF=n
deleted file mode 100644
@@ -1 +0,0 @@
-CONFIG_ARM64_MPAM=n
deleted file mode 100644
@@ -1 +0,0 @@
-CONFIG_ARM_FFA_TRANSPORT=y
deleted file mode 100644
@@ -1,2 +0,0 @@
-CONFIG_DMABUF_HEAPS_SYSTEM=y
-CONFIG_DMABUF_HEAPS_CMA=y
deleted file mode 100644
@@ -1 +0,0 @@
-CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
deleted file mode 100644
@@ -1,2 +0,0 @@
-CONFIG_TEE=y
-CONFIG_OPTEE=y
deleted file mode 100644
@@ -1 +0,0 @@
-CONFIG_TRUSTY=y
deleted file mode 100644
@@ -1,2 +0,0 @@
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_MMIO=y
@@ -17,7 +17,6 @@ SRC_URI:append:fvp-base = " ${SRC_URI_KMETA}"
SRC_URI:append:fvp-baser-aemv8r64 = " ${SRC_URI_KMETA}"
SRC_URI:append:juno = " ${SRC_URI_KMETA}"
SRC_URI:append:n1sdp = " ${SRC_URI_KMETA}"
-SRC_URI:append:tc = " ${SRC_URI_KMETA}"
SRCREV:arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5"
#
@@ -128,54 +127,5 @@ KCONFIG_MODE:sgi575 = "--alldefconfig"
# Total Compute (TC0/TC1) KMACHINE
#
COMPATIBLE_MACHINE:tc = "(tc0|tc1)"
+KBUILD_DEFCONFIG:tc = "defconfig"
KCONFIG_MODE:tc = "--alldefconfig"
-FILESEXTRAPATHS:prepend:tc := "${ARMBSPFILESPATHS}:${THISDIR}/linux-arm64-ack-5.15/tc:"
-SRC_URI:append:tc = " \
- file://gki_defconfig \
- file://0001-drm-Add-component-aware-simple-encoder.patch \
- file://0001-drm-komeda-Fix-handling-of-atomic-commits-in-the-ato.patch \
- file://0002-drm-arm-komeda-add-RENDER-capability-to-the-device-n.patch \
- file://0003-firmware-arm_ffa-Fix-uuid-argument-passed-to-ffa_par.patch \
- file://0004-firmware-arm_ffa-Add-ffa_dev_get_drvdata.patch \
- file://0005-firmware-arm_ffa-extern-ffa_bus_type.patch \
- file://0006-firmware-arm_ffa-Fix-FFA_MEM_SHARE-and-FFA_MEM_FRAG_.patch \
- file://0007-Revert-optee-use-driver-internal-tee_context-for-som.patch \
- file://0008-tee-add-sec_world_id-to-struct-tee_shm.patch \
- file://0009-optee-simplify-optee_release.patch \
- file://0010-optee-refactor-driver-with-internal-callbacks.patch \
- file://0011-optee-isolate-smc-abi.patch \
- file://0012-optee-add-FF-A-support.patch \
- file://0013-optee-smc_abi.c-add-missing-include-linux-mm.h.patch \
- file://0014-optee-Fix-spelling-mistake-reclain-reclaim.patch \
- file://0015-optee-fix-kfree-NULL-pointer.patch \
- file://0016-perf-arm-cmn-Account-for-NUMA-affinity.patch \
- file://0017-perf-arm-cmn-Drop-compile-test-restriction.patch \
- file://0018-perf-arm-cmn-Refactor-node-ID-handling.patch \
- file://0019-perf-arm-cmn-Streamline-node-iteration.patch \
- file://0020-perf-arm-cmn-Refactor-DTM-handling.patch \
- file://0021-perf-arm-cmn-Optimise-DTM-counter-reads.patch \
- file://0022-perf-arm-cmn-Optimise-DTC-counter-accesses.patch \
- file://0023-perf-arm-cmn-Move-group-validation-data-off-stack.patch \
- file://0024-perf-arm-cmn-Demarcate-CMN-600-specifics.patch \
- file://0025-perf-arm-cmn-Support-new-IP-features.patch \
- file://0026-perf-arm-cmn-Add-CI-700-Support.patch \
- file://0027-ANDROID-trusty-Backport-of-trusty-driver.patch \
- file://0028-ANDROID-trusty-Remove-FFA-specific-initilization.patch \
- file://0029-ANDROID-trusty-Rename-transfer-memory-function-to-le.patch \
- file://0030-ANDROID-trusty-Separate-out-SMC-based-transport.patch \
- file://0031-ANDROID-trusty-Modify-device-compatible-string.patch \
- file://0032-ANDROID-trusty-Add-transport-descriptor.patch \
- file://0033-ANDROID-trusty-Add-trusty-ffa-driver.patch \
- file://0034-ANDROID-trusty-ffa-Add-support-for-FFA-memory-operat.patch \
- file://0035-ANDROID-trusty-ffa-Enable-FFA-transport-for-both-mem.patch \
- file://0036-ANDROID-trusty-Make-trusty-transports-configurable.patch \
- file://0037-ANDROID-trusty-log-include-panic_notifier.h.patch \
- file://0038-ANDROID-trusty-ipc-fix-VIRTIO_ID_TRUSTY_IPC-ID.patch \
- file://0039-gki_config-add-tc-disable_mpam.patch \
- file://0040-ANDROID-KVM-arm64-disable-FFA-driver-at-EL2.patch \
- file://init_disassemble_info-signature-changes-causes-compile-failures.patch \
- file://0041-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch \
- file://0042-mm-page_alloc-fix-building-error-on-Werror-array-com.patch \
- "
-KERNEL_FEATURES:append:tc = " bsp/arm-platforms/tc.scc"
-KERNEL_FEATURES:append:tc1 = " bsp/arm-platforms/tc-autofdo.scc"
deleted file mode 100644
@@ -1,367 +0,0 @@
-From 5c07d2e7bf1634743249178bf2ca2a06779e6e7a Mon Sep 17 00:00:00 2001
-From: Tushar Khandelwal <tushar.khandelwal@arm.com>
-Date: Tue, 16 Jun 2020 12:39:06 +0000
-Subject: [PATCH 01/40] drm: Add component-aware simple encoder
-
-This is a simple DRM encoder that gets its connector timings information
-from a OF subnode in the device tree and exposes that as a "discovered"
-panel. It can be used together with component-based DRM drivers in an
-emulated environment where no real encoder or connector hardware exists
-and the display output is configured outside the kernel.
-
-Signed-off-by: Tushar Khandelwal <tushar.khandelwal@arm.com>
-
-Upstream-Status: Backport [https://git.linaro.org/landing-teams/working/arm/kernel-release.git/commit/?h=latest-armlt&id=15283f7be4b1e586702551e85b4caf06531ac2fc]
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: Ic68cbba7da7d36ee23359ff53bf30eb44cb78661
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/gpu/drm/Kconfig | 11 +
- drivers/gpu/drm/Makefile | 2 +
- drivers/gpu/drm/drm_virtual_encoder.c | 299 ++++++++++++++++++++++++++
- 3 files changed, 312 insertions(+)
- create mode 100644 drivers/gpu/drm/drm_virtual_encoder.c
-
-diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index cea777ae7fb9..2468ec7155ef 100644
---- a/drivers/gpu/drm/Kconfig
-+++ b/drivers/gpu/drm/Kconfig
-@@ -291,6 +291,17 @@ config DRM_VKMS
-
- If M is selected the module will be called vkms.
-
-+config DRM_VIRT_ENCODER
-+ tristate "Virtual OF-based encoder"
-+ depends on DRM && OF
-+ select VIDEOMODE_HELPERS
-+ help
-+ Choose this option to get a virtual encoder and its associated
-+ connector that will use the device tree to read the display
-+ timings information. If M is selected the module will be called
-+ drm_vencoder.
-+
-+
- source "drivers/gpu/drm/exynos/Kconfig"
-
- source "drivers/gpu/drm/rockchip/Kconfig"
-diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
-index ad1112154898..361999b7d063 100644
---- a/drivers/gpu/drm/Makefile
-+++ b/drivers/gpu/drm/Makefile
-@@ -59,6 +59,8 @@ drm_kms_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
-
- obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
- obj-$(CONFIG_DRM_DEBUG_SELFTEST) += selftests/
-+drm_vencoder-y := drm_virtual_encoder.o
-+obj-$(CONFIG_DRM_VIRT_ENCODER) += drm_vencoder.o
-
- obj-$(CONFIG_DRM) += drm.o
- obj-$(CONFIG_DRM_MIPI_DBI) += drm_mipi_dbi.o
-diff --git a/drivers/gpu/drm/drm_virtual_encoder.c b/drivers/gpu/drm/drm_virtual_encoder.c
-new file mode 100644
-index 000000000000..39a902ecfe32
---- /dev/null
-+++ b/drivers/gpu/drm/drm_virtual_encoder.c
-@@ -0,0 +1,299 @@
-+/*
-+ * Copyright (C) 2016 ARM Limited
-+ * Author: Liviu Dudau <Liviu.Dudau@arm.com>
-+ *
-+ * Dummy encoder and connector that use the OF to "discover" the attached
-+ * display timings. Can be used in situations where the encoder and connector's
-+ * functionality are emulated and no setup steps are needed, or to describe
-+ * attached panels for which no driver exists but can be used without
-+ * additional hardware setup.
-+ *
-+ * The encoder also uses the component framework so that it can be a quick
-+ * replacement for existing drivers when testing in an emulated environment.
-+ *
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ *
-+ */
-+
-+#include <drm/drm_crtc.h>
-+#include <drm/drm_atomic_helper.h>
-+#include <drm/drm_crtc_helper.h>
-+#include <drm/drm_probe_helper.h>
-+#include <drm/drm_print.h>
-+#include <linux/platform_device.h>
-+#include <drm/drm_of.h>
-+#include <linux/component.h>
-+#include <video/display_timing.h>
-+#include <video/of_display_timing.h>
-+#include <video/videomode.h>
-+
-+struct drm_virt_priv {
-+ struct drm_connector connector;
-+ struct drm_encoder encoder;
-+ struct display_timings *timings;
-+};
-+
-+#define connector_to_drm_virt_priv(x) \
-+ container_of(x, struct drm_virt_priv, connector)
-+
-+#define encoder_to_drm_virt_priv(x) \
-+ container_of(x, struct drm_virt_priv, encoder)
-+
-+static void drm_virtcon_destroy(struct drm_connector *connector)
-+{
-+ struct drm_virt_priv *conn = connector_to_drm_virt_priv(connector);
-+
-+ drm_connector_cleanup(connector);
-+ display_timings_release(conn->timings);
-+}
-+
-+static enum drm_connector_status
-+drm_virtcon_detect(struct drm_connector *connector, bool force)
-+{
-+ return connector_status_connected;
-+}
-+
-+static const struct drm_connector_funcs drm_virtcon_funcs = {
-+ .reset = drm_atomic_helper_connector_reset,
-+ .detect = drm_virtcon_detect,
-+ .fill_modes = drm_helper_probe_single_connector_modes,
-+ .destroy = drm_virtcon_destroy,
-+ .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
-+ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-+};
-+
-+static int drm_virtcon_get_modes(struct drm_connector *connector)
-+{
-+ struct drm_virt_priv *conn = connector_to_drm_virt_priv(connector);
-+ struct display_timings *timings = conn->timings;
-+ int i;
-+
-+ for (i = 0; i < timings->num_timings; i++) {
-+ struct drm_display_mode *mode = drm_mode_create(connector->dev);
-+ struct videomode vm;
-+
-+ if (videomode_from_timings(timings, &vm, i))
-+ break;
-+
-+ drm_display_mode_from_videomode(&vm, mode);
-+ mode->type = DRM_MODE_TYPE_DRIVER;
-+ if (timings->native_mode == i)
-+ mode->type = DRM_MODE_TYPE_PREFERRED;
-+
-+ drm_mode_set_name(mode);
-+ drm_mode_probed_add(connector, mode);
-+ }
-+
-+ return i;
-+}
-+
-+static int drm_virtcon_mode_valid(struct drm_connector *connector,
-+ struct drm_display_mode *mode)
-+{
-+ return MODE_OK;
-+}
-+
-+struct drm_encoder *drm_virtcon_best_encoder(struct drm_connector *connector)
-+{
-+ struct drm_virt_priv *priv = connector_to_drm_virt_priv(connector);
-+
-+ return &priv->encoder;
-+}
-+
-+struct drm_encoder *
-+drm_virtcon_atomic_best_encoder(struct drm_connector *connector,
-+ struct drm_atomic_state *state)
-+{
-+ struct drm_virt_priv *priv = connector_to_drm_virt_priv(connector);
-+
-+ return &priv->encoder;
-+}
-+
-+static const struct drm_connector_helper_funcs drm_virtcon_helper_funcs = {
-+ .get_modes = drm_virtcon_get_modes,
-+ .mode_valid = drm_virtcon_mode_valid,
-+ .best_encoder = drm_virtcon_best_encoder,
-+ .atomic_best_encoder = drm_virtcon_atomic_best_encoder,
-+};
-+
-+static void drm_vencoder_destroy(struct drm_encoder *encoder)
-+{
-+ drm_encoder_cleanup(encoder);
-+}
-+
-+static const struct drm_encoder_funcs drm_vencoder_funcs = {
-+ .destroy = drm_vencoder_destroy,
-+};
-+
-+static void drm_vencoder_dpms(struct drm_encoder *encoder, int mode)
-+{
-+ /* nothing needed */
-+}
-+
-+static bool drm_vencoder_mode_fixup(struct drm_encoder *encoder,
-+ const struct drm_display_mode *mode,
-+ struct drm_display_mode *adjusted_mode)
-+{
-+ /* nothing needed */
-+ return true;
-+}
-+
-+static void drm_vencoder_prepare(struct drm_encoder *encoder)
-+{
-+ drm_vencoder_dpms(encoder, DRM_MODE_DPMS_OFF);
-+}
-+
-+static void drm_vencoder_commit(struct drm_encoder *encoder)
-+{
-+ drm_vencoder_dpms(encoder, DRM_MODE_DPMS_ON);
-+}
-+
-+static void drm_vencoder_mode_set(struct drm_encoder *encoder,
-+ struct drm_display_mode *mode,
-+ struct drm_display_mode *adjusted_mode)
-+{
-+ /* nothing needed */
-+}
-+
-+static const struct drm_encoder_helper_funcs drm_vencoder_helper_funcs = {
-+ .dpms = drm_vencoder_dpms,
-+ .mode_fixup = drm_vencoder_mode_fixup,
-+ .prepare = drm_vencoder_prepare,
-+ .commit = drm_vencoder_commit,
-+ .mode_set = drm_vencoder_mode_set,
-+};
-+
-+static int drm_vencoder_bind(struct device *dev, struct device *master,
-+ void *data)
-+{
-+ struct drm_encoder *encoder;
-+ struct drm_virt_priv *con;
-+ struct drm_connector *connector;
-+ struct drm_device *drm = data;
-+ u32 crtcs = 0;
-+ int ret;
-+
-+ con = devm_kzalloc(dev, sizeof(*con), GFP_KERNEL);
-+ if (!con)
-+ return -ENOMEM;
-+
-+ dev_set_drvdata(dev, con);
-+ connector = &con->connector;
-+ encoder = &con->encoder;
-+
-+ if (dev->of_node) {
-+ struct drm_bridge *bridge;
-+ crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);
-+ bridge = of_drm_find_bridge(dev->of_node);
-+ if (bridge) {
-+ ret = drm_bridge_attach(encoder, bridge, NULL, 0);
-+ if (ret) {
-+ DRM_ERROR("Failed to initialize bridge\n");
-+ return ret;
-+ }
-+ }
-+ con->timings = of_get_display_timings(dev->of_node);
-+ if (!con->timings) {
-+ dev_err(dev, "failed to get display panel timings\n");
-+ return ENXIO;
-+ }
-+ }
-+
-+ /* If no CRTCs were found, fall back to the old encoder's behaviour */
-+ if (crtcs == 0) {
-+ dev_warn(dev, "Falling back to first CRTC\n");
-+ crtcs = 1 << 0;
-+ }
-+
-+ encoder->possible_crtcs = crtcs ? crtcs : 1;
-+ encoder->possible_clones = 0;
-+
-+ ret = drm_encoder_init(drm, encoder, &drm_vencoder_funcs,
-+ DRM_MODE_ENCODER_VIRTUAL, NULL);
-+ if (ret)
-+ goto encoder_init_err;
-+
-+ drm_encoder_helper_add(encoder, &drm_vencoder_helper_funcs);
-+
-+ /* bogus values, pretend we're a 24" screen for DPI calculations */
-+ connector->display_info.width_mm = 519;
-+ connector->display_info.height_mm = 324;
-+ connector->interlace_allowed = false;
-+ connector->doublescan_allowed = false;
-+ connector->polled = 0;
-+
-+ ret = drm_connector_init(drm, connector, &drm_virtcon_funcs,
-+ DRM_MODE_CONNECTOR_VIRTUAL);
-+ if (ret)
-+ goto connector_init_err;
-+
-+ drm_connector_helper_add(connector, &drm_virtcon_helper_funcs);
-+
-+ drm_connector_register(connector);
-+
-+ ret = drm_connector_attach_encoder(connector, encoder);
-+ if (ret)
-+ goto attach_err;
-+
-+ return ret;
-+
-+attach_err:
-+ drm_connector_unregister(connector);
-+ drm_connector_cleanup(connector);
-+connector_init_err:
-+ drm_encoder_cleanup(encoder);
-+encoder_init_err:
-+ display_timings_release(con->timings);
-+
-+ return ret;
-+};
-+
-+static void drm_vencoder_unbind(struct device *dev, struct device *master,
-+ void *data)
-+{
-+ struct drm_virt_priv *con = dev_get_drvdata(dev);
-+
-+ drm_connector_unregister(&con->connector);
-+ drm_connector_cleanup(&con->connector);
-+ drm_encoder_cleanup(&con->encoder);
-+ display_timings_release(con->timings);
-+}
-+
-+static const struct component_ops drm_vencoder_ops = {
-+ .bind = drm_vencoder_bind,
-+ .unbind = drm_vencoder_unbind,
-+};
-+
-+static int drm_vencoder_probe(struct platform_device *pdev)
-+{
-+ return component_add(&pdev->dev, &drm_vencoder_ops);
-+}
-+
-+static int drm_vencoder_remove(struct platform_device *pdev)
-+{
-+ component_del(&pdev->dev, &drm_vencoder_ops);
-+ return 0;
-+}
-+
-+static const struct of_device_id drm_vencoder_of_match[] = {
-+ { .compatible = "drm,virtual-encoder", },
-+ {},
-+};
-+MODULE_DEVICE_TABLE(of, drm_vencoder_of_match);
-+
-+static struct platform_driver drm_vencoder_driver = {
-+ .probe = drm_vencoder_probe,
-+ .remove = drm_vencoder_remove,
-+ .driver = {
-+ .name = "drm_vencoder",
-+ .of_match_table = drm_vencoder_of_match,
-+ },
-+};
-+
-+module_platform_driver(drm_vencoder_driver);
-+
-+MODULE_AUTHOR("Liviu Dudau");
-+MODULE_DESCRIPTION("Virtual DRM Encoder");
-+MODULE_LICENSE("GPL v2");
-2.34.1
-
deleted file mode 100644
@@ -1,115 +0,0 @@
-From 3bfadb22e58bdf7691f80f403dd85794f2b86ad6 Mon Sep 17 00:00:00 2001
-From: Liviu Dudau <liviu.dudau@arm.com>
-Date: Fri, 8 Jul 2022 16:39:21 +0100
-Subject: [PATCH] drm/komeda: Fix handling of atomic commits in the
- atomic_commit_tail hook
-
-Komeda driver relies on the generic DRM atomic helper functions to handle
-commits. It only implements an atomic_commit_tail hook for the
-mode_config_helper_funcs and even that one is pretty close to the generic
-implementation with the exception of additional dma_fence signalling.
-
-What the generic helper framework doesn't do is waiting for the actual
-hardware to signal that the commit parameters have been written into the
-appropriate registers. As we signal CRTC events only on the irq handlers,
-we need to flush the configuration and wait for the hardware to respond.
-
-Add the Komeda specific implementation for atomic_commit_hw_done() that
-flushes and waits for flip done before calling drm_atomic_helper_commit_hw_done().
-
-The fix was prompted by a patch from Carsten Haitzler where he was trying to
-solve the same issue but in a different way that I think can lead to wrong
-event signaling to userspace.
-
-Upstream-Status: Backport [https://patchwork.freedesktop.org/patch/msgid/20220722122139.288486-1-liviu.dudau@arm.com]
-Reported-by: Carsten Haitzler <carsten.haitzler@arm.com>
-Tested-by: Carsten Haitzler <carsten.haitzler@arm.com>
-Reviewed-by: Carsten Haitzler <carsten.haitzler@arm.com>
-Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20220722122139.288486-1-liviu.dudau@arm.com
-Signed-off-by: Ben Horgan <ben.horgan@arm.com>
-Change-Id: I0bd92150120eb929692c1d38c4d1077d38401cdd
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- .../gpu/drm/arm/display/komeda/komeda_crtc.c | 4 ++--
- .../gpu/drm/arm/display/komeda/komeda_kms.c | 21 ++++++++++++++++++-
- .../gpu/drm/arm/display/komeda/komeda_kms.h | 2 ++
- 3 files changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
-index 59172acb9738..292f533d8cf0 100644
---- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
-+++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
-@@ -235,7 +235,7 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcrtc,
- crtc->state->event = NULL;
- drm_crtc_send_vblank_event(crtc, event);
- } else {
-- DRM_WARN("CRTC[%d]: FLIP happen but no pending commit.\n",
-+ DRM_WARN("CRTC[%d]: FLIP happened but no pending commit.\n",
- drm_crtc_index(&kcrtc->base));
- }
- spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
-@@ -286,7 +286,7 @@ komeda_crtc_atomic_enable(struct drm_crtc *crtc,
- komeda_crtc_do_flush(crtc, old);
- }
-
--static void
-+void
- komeda_crtc_flush_and_wait_for_flip_done(struct komeda_crtc *kcrtc,
- struct completion *input_flip_done)
- {
-diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
-index 8b2be8a9a27d..c434fb43d82c 100644
---- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
-+++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
-@@ -69,6 +69,25 @@ static const struct drm_driver komeda_kms_driver = {
- .minor = 1,
- };
-
-+static void komeda_kms_atomic_commit_hw_done(struct drm_atomic_state *state)
-+{
-+ struct drm_device *dev = state->dev;
-+ struct komeda_kms_dev *kms = to_kdev(dev);
-+ int i;
-+
-+ for (i = 0; i < kms->n_crtcs; i++) {
-+ struct komeda_crtc *kcrtc = &kms->crtcs[i];
-+
-+ if (kcrtc->base.state->active) {
-+ struct completion *flip_done = NULL;
-+ if (kcrtc->base.state->event)
-+ flip_done = kcrtc->base.state->event->base.completion;
-+ komeda_crtc_flush_and_wait_for_flip_done(kcrtc, flip_done);
-+ }
-+ }
-+ drm_atomic_helper_commit_hw_done(state);
-+}
-+
- static void komeda_kms_commit_tail(struct drm_atomic_state *old_state)
- {
- struct drm_device *dev = old_state->dev;
-@@ -81,7 +100,7 @@ static void komeda_kms_commit_tail(struct drm_atomic_state *old_state)
-
- drm_atomic_helper_commit_modeset_enables(dev, old_state);
-
-- drm_atomic_helper_commit_hw_done(old_state);
-+ komeda_kms_atomic_commit_hw_done(old_state);
-
- drm_atomic_helper_wait_for_flip_done(dev, old_state);
-
-diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
-index 456f3c435719..bf6e8fba5061 100644
---- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
-+++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
-@@ -182,6 +182,8 @@ void komeda_kms_cleanup_private_objs(struct komeda_kms_dev *kms);
-
- void komeda_crtc_handle_event(struct komeda_crtc *kcrtc,
- struct komeda_events *evts);
-+void komeda_crtc_flush_and_wait_for_flip_done(struct komeda_crtc *kcrtc,
-+ struct completion *input_flip_done);
-
- struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev);
- void komeda_kms_detach(struct komeda_kms_dev *kms);
-2.25.1
-
deleted file mode 100644
@@ -1,33 +0,0 @@
-From 97bdf703e47606d15cd04f1aa5490bcaed842ae3 Mon Sep 17 00:00:00 2001
-From: Tushar Khandelwal <tushar.khandelwal@arm.com>
-Date: Wed, 17 Jun 2020 10:49:26 +0000
-Subject: [PATCH 02/40] drm: arm: komeda: add RENDER capability to the device
- node
-
-this is required to make this driver work with android framework
-
-Signed-off-by: Tushar Khandelwal <tushar.khandelwal@arm.com>
-
-Upstream-Status: Inappropriate [Product specific configuration]
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
-index 93b7f09b96ca..8b2be8a9a27d 100644
---- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
-+++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
-@@ -58,7 +58,7 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data)
- }
-
- static const struct drm_driver komeda_kms_driver = {
-- .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
-+ .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_RENDER,
- .lastclose = drm_fb_helper_lastclose,
- DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(komeda_gem_cma_dumb_create),
- .fops = &komeda_cma_fops,
-2.34.1
-
deleted file mode 100644
@@ -1,30 +0,0 @@
-From 6b9cf2d89db4fc10b930b8d8f8fce3a0d00fecf8 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Thu, 13 Jan 2022 20:14:25 +0000
-Subject: [PATCH 03/40] firmware: arm_ffa: Fix uuid argument passed to
- ffa_partition_probe
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: Ib2749ec3e02da5bb6d835f7dbf2d608c41fad1f2
-Upstream-Status: Backport [f3c45c045e25ed52461829d2ce07954f72b6ad15]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/firmware/arm_ffa/driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c
-index fc6d3b9bd472..d3d53fbd3d29 100644
---- a/drivers/firmware/arm_ffa/driver.c
-+++ b/drivers/firmware/arm_ffa/driver.c
-@@ -501,7 +501,7 @@ static int ffa_partition_info_get(const char *uuid_str,
- return -ENODEV;
- }
-
-- count = ffa_partition_probe(&uuid_null, &pbuf);
-+ count = ffa_partition_probe(&uuid, &pbuf);
- if (count <= 0)
- return -ENOENT;
-
-2.34.1
-
deleted file mode 100644
@@ -1,34 +0,0 @@
-From 9fe23341c66deefb1f953d7ca642f928d8a50c6e Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Thu, 13 Jan 2022 22:22:28 +0000
-Subject: [PATCH 04/40] firmware: arm_ffa: Add ffa_dev_get_drvdata
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: Icd09d686cab9922563b1deda5276307ea5d94923
-Upstream-Status: Backport [498af8d1678ae2351218337b47bbf3cb0fc16821]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- include/linux/arm_ffa.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h
-index f0cb5b72b87b..06dc83d38779 100644
---- a/include/linux/arm_ffa.h
-+++ b/include/linux/arm_ffa.h
-@@ -129,7 +129,12 @@ struct ffa_driver {
-
- static inline void ffa_dev_set_drvdata(struct ffa_device *fdev, void *data)
- {
-- fdev->dev.driver_data = data;
-+ dev_set_drvdata(&fdev->dev, data);
-+}
-+
-+static inline void *ffa_dev_get_drvdata(struct ffa_device *fdev)
-+{
-+ return dev_get_drvdata(&fdev->dev);
- }
-
- #if IS_REACHABLE(CONFIG_ARM_FFA_TRANSPORT)
-2.34.1
-
deleted file mode 100644
@@ -1,31 +0,0 @@
-From 53e29fa837f36f3a699f7ada50dd08e43028a9c7 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Thu, 13 Jan 2022 22:23:52 +0000
-Subject: [PATCH 05/40] firmware: arm_ffa: extern ffa_bus_type
-
-extern ffa_bus_type so that SP driver can use it in bus_find_device call.
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: Ib7a6a563aa35627a545f82c796816a5f72c80d70
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- include/linux/arm_ffa.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h
-index 06dc83d38779..d5c0a0c37fbe 100644
---- a/include/linux/arm_ffa.h
-+++ b/include/linux/arm_ffa.h
-@@ -179,6 +179,8 @@ const struct ffa_dev_ops *ffa_dev_ops_get(struct ffa_device *dev)
- #define ffa_unregister(driver) \
- ffa_driver_unregister(driver)
-
-+extern struct bus_type ffa_bus_type;
-+
- /**
- * module_ffa_driver() - Helper macro for registering a psa_ffa driver
- * @__ffa_driver: ffa_driver structure
-2.34.1
-
deleted file mode 100644
@@ -1,55 +0,0 @@
-From 47cd54d908380de17d84a852625ef3a1ff92f496 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Fri, 14 Jan 2022 12:23:04 +0000
-Subject: [PATCH 06/40] firmware: arm_ffa: Fix FFA_MEM_SHARE and
- FFA_MEM_FRAG_TX
-
-FFA memory share on success might return FFA_MEM_FRAG_RX. In that case
-set handle from w1/w2 from FFA return value.
-
-FFA_MEM_FRAG_TX call will return FFA_SUCCESS for the last fragment, so
-check for this return code.
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: I7ef44742d53a9e75d8587d1213be98a1352f16d4
-Upstream-Status: Backport [987756f67dee237ec35f3b249ab1ae25260c5340]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/firmware/arm_ffa/driver.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c
-index d3d53fbd3d29..de6641912768 100644
---- a/drivers/firmware/arm_ffa/driver.c
-+++ b/drivers/firmware/arm_ffa/driver.c
-@@ -317,11 +317,15 @@ static int ffa_mem_first_frag(u32 func_id, phys_addr_t buf, u32 buf_sz,
- if (ret.a0 == FFA_ERROR)
- return ffa_to_linux_errno((int)ret.a2);
-
-- if (ret.a0 != FFA_SUCCESS)
-+ if (ret.a0 != FFA_SUCCESS && ret.a0 != FFA_MEM_FRAG_RX)
- return -EOPNOTSUPP;
-
-- if (handle)
-- *handle = PACK_HANDLE(ret.a2, ret.a3);
-+ if (handle) {
-+ if (ret.a0 == FFA_MEM_FRAG_RX)
-+ *handle = PACK_HANDLE(ret.a1, ret.a2);
-+ else
-+ *handle = PACK_HANDLE(ret.a2, ret.a3);
-+ }
-
- return frag_len;
- }
-@@ -345,7 +349,7 @@ static int ffa_mem_next_frag(u64 handle, u32 frag_len)
- if (ret.a0 == FFA_ERROR)
- return ffa_to_linux_errno((int)ret.a2);
-
-- if (ret.a0 != FFA_MEM_FRAG_RX)
-+ if (ret.a0 != FFA_SUCCESS && ret.a0 != FFA_MEM_FRAG_RX)
- return -EOPNOTSUPP;
-
- return ret.a3;
-2.34.1
-
deleted file mode 100644
@@ -1,111 +0,0 @@
-From 96e0bd88e2fb4fcb1625240ef36bccf0383633f6 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Tue, 17 May 2022 16:53:56 +0100
-Subject: [PATCH 07/40] Revert "optee: use driver internal tee_context for some
- rpc"
-
-This reverts commit 2922aff4339712ef004451715e94bdbd55fe38ed.
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/tee/optee/core.c | 8 --------
- drivers/tee/optee/optee_private.h | 2 --
- drivers/tee/optee/rpc.c | 8 +++-----
- 3 files changed, 3 insertions(+), 15 deletions(-)
-
-diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
-index 50c0d839fe75..5363ebebfc35 100644
---- a/drivers/tee/optee/core.c
-+++ b/drivers/tee/optee/core.c
-@@ -588,7 +588,6 @@ static int optee_remove(struct platform_device *pdev)
- /* Unregister OP-TEE specific client devices on TEE bus */
- optee_unregister_devices();
-
-- teedev_close_context(optee->ctx);
- /*
- * Ask OP-TEE to free all cached shared memory objects to decrease
- * reference counters and also avoid wild pointers in secure world
-@@ -634,7 +633,6 @@ static int optee_probe(struct platform_device *pdev)
- struct optee *optee = NULL;
- void *memremaped_shm = NULL;
- struct tee_device *teedev;
-- struct tee_context *ctx;
- u32 sec_caps;
- int rc;
-
-@@ -721,12 +719,6 @@ static int optee_probe(struct platform_device *pdev)
- optee_supp_init(&optee->supp);
- optee->memremaped_shm = memremaped_shm;
- optee->pool = pool;
-- ctx = teedev_open(optee->teedev);
-- if (IS_ERR(ctx)) {
-- rc = PTR_ERR(ctx);
-- goto err;
-- }
-- optee->ctx = ctx;
-
- /*
- * Ensure that there are no pre-existing shm objects before enabling
-diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
-index ea09533e30cd..f6bb4a763ba9 100644
---- a/drivers/tee/optee/optee_private.h
-+++ b/drivers/tee/optee/optee_private.h
-@@ -70,7 +70,6 @@ struct optee_supp {
- * struct optee - main service struct
- * @supp_teedev: supplicant device
- * @teedev: client device
-- * @ctx: driver internal TEE context
- * @invoke_fn: function to issue smc or hvc
- * @call_queue: queue of threads waiting to call @invoke_fn
- * @wait_queue: queue of threads from secure world waiting for a
-@@ -88,7 +87,6 @@ struct optee {
- struct tee_device *supp_teedev;
- struct tee_device *teedev;
- optee_invoke_fn *invoke_fn;
-- struct tee_context *ctx;
- struct optee_call_queue call_queue;
- struct optee_wait_queue wait_queue;
- struct optee_supp supp;
-diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c
-index 456833d82007..efbaff7ad7e5 100644
---- a/drivers/tee/optee/rpc.c
-+++ b/drivers/tee/optee/rpc.c
-@@ -285,7 +285,6 @@ static struct tee_shm *cmd_alloc_suppl(struct tee_context *ctx, size_t sz)
- }
-
- static void handle_rpc_func_cmd_shm_alloc(struct tee_context *ctx,
-- struct optee *optee,
- struct optee_msg_arg *arg,
- struct optee_call_ctx *call_ctx)
- {
-@@ -315,8 +314,7 @@ static void handle_rpc_func_cmd_shm_alloc(struct tee_context *ctx,
- shm = cmd_alloc_suppl(ctx, sz);
- break;
- case OPTEE_RPC_SHM_TYPE_KERNEL:
-- shm = tee_shm_alloc(optee->ctx, sz,
-- TEE_SHM_MAPPED | TEE_SHM_PRIV);
-+ shm = tee_shm_alloc(ctx, sz, TEE_SHM_MAPPED | TEE_SHM_PRIV);
- break;
- default:
- arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-@@ -473,7 +471,7 @@ static void handle_rpc_func_cmd(struct tee_context *ctx, struct optee *optee,
- break;
- case OPTEE_RPC_CMD_SHM_ALLOC:
- free_pages_list(call_ctx);
-- handle_rpc_func_cmd_shm_alloc(ctx, optee, arg, call_ctx);
-+ handle_rpc_func_cmd_shm_alloc(ctx, arg, call_ctx);
- break;
- case OPTEE_RPC_CMD_SHM_FREE:
- handle_rpc_func_cmd_shm_free(ctx, arg);
-@@ -504,7 +502,7 @@ void optee_handle_rpc(struct tee_context *ctx, struct optee_rpc_param *param,
-
- switch (OPTEE_SMC_RETURN_GET_RPC_FUNC(param->a0)) {
- case OPTEE_SMC_RPC_FUNC_ALLOC:
-- shm = tee_shm_alloc(optee->ctx, param->a1,
-+ shm = tee_shm_alloc(ctx, param->a1,
- TEE_SHM_MAPPED | TEE_SHM_PRIV);
- if (!IS_ERR(shm) && !tee_shm_get_pa(shm, 0, &pa)) {
- reg_pair_from_64(¶m->a1, ¶m->a2, pa);
-2.34.1
-
deleted file mode 100644
@@ -1,45 +0,0 @@
-From 04f76b1e265b37ab8a3acf4bbf64d1efd69a6c73 Mon Sep 17 00:00:00 2001
-From: Jens Wiklander <jens.wiklander@linaro.org>
-Date: Thu, 25 Mar 2021 15:08:44 +0100
-Subject: [PATCH 08/40] tee: add sec_world_id to struct tee_shm
-
-Adds sec_world_id to struct tee_shm which describes a shared memory
-object. sec_world_id can be used by a driver to store an id assigned by
-secure world.
-
-Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
-Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-Upstream-Status: Backport [9028b2463c1ea96f51c3ba53e2479346019ff6ad]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- include/linux/tee_drv.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h
-index 38b701b7af4c..5e1533ee3785 100644
---- a/include/linux/tee_drv.h
-+++ b/include/linux/tee_drv.h
-@@ -197,7 +197,11 @@ int tee_session_calc_client_uuid(uuid_t *uuid, u32 connection_method,
- * @num_pages: number of locked pages
- * @refcount: reference counter
- * @flags: defined by TEE_SHM_* in tee_drv.h
-- * @id: unique id of a shared memory object on this device
-+ * @id: unique id of a shared memory object on this device, shared
-+ * with user space
-+ * @sec_world_id:
-+ * secure world assigned id of this shared memory object, not
-+ * used by all drivers
- *
- * This pool is only supposed to be accessed directly from the TEE
- * subsystem and from drivers that implements their own shm pool manager.
-@@ -213,6 +217,7 @@ struct tee_shm {
- refcount_t refcount;
- u32 flags;
- int id;
-+ u64 sec_world_id;
- };
-
- /**
-2.34.1
-
deleted file mode 100644
@@ -1,181 +0,0 @@
-From 5a2565d002084a4c6b80329a4a23cb6c98c4f344 Mon Sep 17 00:00:00 2001
-From: Jens Wiklander <jens.wiklander@linaro.org>
-Date: Thu, 25 Mar 2021 15:08:46 +0100
-Subject: [PATCH 09/40] optee: simplify optee_release()
-
-Simplifies optee_release() with a new helper function,
-optee_close_session_helper() which has been factored out from
-optee_close_session().
-
-A separate optee_release_supp() is added for the supplicant device.
-
-Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
-Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-Upstream-Status: Backport [c0ab6db39a908d86ed44e8a5632548e2ec1b4dca]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/tee/optee/call.c | 31 ++++++++++-------
- drivers/tee/optee/core.c | 56 +++++++++++--------------------
- drivers/tee/optee/optee_private.h | 1 +
- 3 files changed, 39 insertions(+), 49 deletions(-)
-
-diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c
-index 945f03da0223..103976df2062 100644
---- a/drivers/tee/optee/call.c
-+++ b/drivers/tee/optee/call.c
-@@ -288,12 +288,28 @@ int optee_open_session(struct tee_context *ctx,
- return rc;
- }
-
--int optee_close_session(struct tee_context *ctx, u32 session)
-+int optee_close_session_helper(struct tee_context *ctx, u32 session)
- {
-- struct optee_context_data *ctxdata = ctx->data;
- struct tee_shm *shm;
- struct optee_msg_arg *msg_arg;
- phys_addr_t msg_parg;
-+
-+ shm = get_msg_arg(ctx, 0, &msg_arg, &msg_parg);
-+ if (IS_ERR(shm))
-+ return PTR_ERR(shm);
-+
-+ msg_arg->cmd = OPTEE_MSG_CMD_CLOSE_SESSION;
-+ msg_arg->session = session;
-+ optee_do_call_with_arg(ctx, msg_parg);
-+
-+ tee_shm_free(shm);
-+
-+ return 0;
-+}
-+
-+int optee_close_session(struct tee_context *ctx, u32 session)
-+{
-+ struct optee_context_data *ctxdata = ctx->data;
- struct optee_session *sess;
-
- /* Check that the session is valid and remove it from the list */
-@@ -306,16 +322,7 @@ int optee_close_session(struct tee_context *ctx, u32 session)
- return -EINVAL;
- kfree(sess);
-
-- shm = get_msg_arg(ctx, 0, &msg_arg, &msg_parg);
-- if (IS_ERR(shm))
-- return PTR_ERR(shm);
--
-- msg_arg->cmd = OPTEE_MSG_CMD_CLOSE_SESSION;
-- msg_arg->session = session;
-- optee_do_call_with_arg(ctx, msg_parg);
--
-- tee_shm_free(shm);
-- return 0;
-+ return optee_close_session_helper(ctx, session);
- }
-
- int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg,
-diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
-index 5363ebebfc35..79f67a79e7b7 100644
---- a/drivers/tee/optee/core.c
-+++ b/drivers/tee/optee/core.c
-@@ -264,60 +264,42 @@ static int optee_open(struct tee_context *ctx)
- return 0;
- }
-
--static void optee_release(struct tee_context *ctx)
-+static void optee_release_helper(struct tee_context *ctx,
-+ int (*close_session)(struct tee_context *ctx,
-+ u32 session))
- {
- struct optee_context_data *ctxdata = ctx->data;
-- struct tee_device *teedev = ctx->teedev;
-- struct optee *optee = tee_get_drvdata(teedev);
-- struct tee_shm *shm;
-- struct optee_msg_arg *arg = NULL;
-- phys_addr_t parg;
- struct optee_session *sess;
- struct optee_session *sess_tmp;
-
- if (!ctxdata)
- return;
-
-- shm = tee_shm_alloc(ctx, sizeof(struct optee_msg_arg),
-- TEE_SHM_MAPPED | TEE_SHM_PRIV);
-- if (!IS_ERR(shm)) {
-- arg = tee_shm_get_va(shm, 0);
-- /*
-- * If va2pa fails for some reason, we can't call into
-- * secure world, only free the memory. Secure OS will leak
-- * sessions and finally refuse more sessions, but we will
-- * at least let normal world reclaim its memory.
-- */
-- if (!IS_ERR(arg))
-- if (tee_shm_va2pa(shm, arg, &parg))
-- arg = NULL; /* prevent usage of parg below */
-- }
--
- list_for_each_entry_safe(sess, sess_tmp, &ctxdata->sess_list,
- list_node) {
- list_del(&sess->list_node);
-- if (!IS_ERR_OR_NULL(arg)) {
-- memset(arg, 0, sizeof(*arg));
-- arg->cmd = OPTEE_MSG_CMD_CLOSE_SESSION;
-- arg->session = sess->session_id;
-- optee_do_call_with_arg(ctx, parg);
-- }
-+ close_session(ctx, sess->session_id);
- kfree(sess);
- }
- kfree(ctxdata);
-+ ctx->data = NULL;
-+}
-
-- if (!IS_ERR(shm))
-- tee_shm_free(shm);
-+static void optee_release(struct tee_context *ctx)
-+{
-+ optee_release_helper(ctx, optee_close_session_helper);
-+}
-
-- ctx->data = NULL;
-+static void optee_release_supp(struct tee_context *ctx)
-+{
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
-
-- if (teedev == optee->supp_teedev) {
-- if (optee->scan_bus_wq) {
-- destroy_workqueue(optee->scan_bus_wq);
-- optee->scan_bus_wq = NULL;
-- }
-- optee_supp_release(&optee->supp);
-+ optee_release_helper(ctx, optee_close_session_helper);
-+ if (optee->scan_bus_wq) {
-+ destroy_workqueue(optee->scan_bus_wq);
-+ optee->scan_bus_wq = NULL;
- }
-+ optee_supp_release(&optee->supp);
- }
-
- static const struct tee_driver_ops optee_ops = {
-@@ -341,7 +323,7 @@ static const struct tee_desc optee_desc = {
- static const struct tee_driver_ops optee_supp_ops = {
- .get_version = optee_get_version,
- .open = optee_open,
-- .release = optee_release,
-+ .release = optee_release_supp,
- .supp_recv = optee_supp_recv,
- .supp_send = optee_supp_send,
- .shm_register = optee_shm_register_supp,
-diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
-index f6bb4a763ba9..a55793f9f6eb 100644
---- a/drivers/tee/optee/optee_private.h
-+++ b/drivers/tee/optee/optee_private.h
-@@ -152,6 +152,7 @@ u32 optee_do_call_with_arg(struct tee_context *ctx, phys_addr_t parg);
- int optee_open_session(struct tee_context *ctx,
- struct tee_ioctl_open_session_arg *arg,
- struct tee_param *param);
-+int optee_close_session_helper(struct tee_context *ctx, u32 session);
- int optee_close_session(struct tee_context *ctx, u32 session);
- int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg,
- struct tee_param *param);
-2.34.1
-
deleted file mode 100644
@@ -1,722 +0,0 @@
-From cbb24d5b6b4e6704da79bb3df76179a88a6ee14f Mon Sep 17 00:00:00 2001
-From: Jens Wiklander <jens.wiklander@linaro.org>
-Date: Thu, 25 Mar 2021 15:08:50 +0100
-Subject: [PATCH 10/40] optee: refactor driver with internal callbacks
-
-The OP-TEE driver is refactored with three internal callbacks replacing
-direct calls to optee_from_msg_param(), optee_to_msg_param() and
-optee_do_call_with_arg().
-
-These functions a central to communicating with OP-TEE in secure world
-by using the SMC Calling Convention directly.
-
-This refactoring makes room for using other primitives to communicate
-with OP-TEE in secure world while being able to reuse as much as
-possible from the present driver.
-
-Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
-Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-Upstream-Status: Backport [4602c5842f649da2fbd2cea3560af750cfbd59e3]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/tee/optee/call.c | 86 +++++++++--------
- drivers/tee/optee/core.c | 148 ++++++++++++++++++++----------
- drivers/tee/optee/optee_private.h | 35 +++++--
- drivers/tee/optee/rpc.c | 19 ++--
- 4 files changed, 182 insertions(+), 106 deletions(-)
-
-diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c
-index 103976df2062..ddedde45f1ee 100644
---- a/drivers/tee/optee/call.c
-+++ b/drivers/tee/optee/call.c
-@@ -1,6 +1,6 @@
- // SPDX-License-Identifier: GPL-2.0-only
- /*
-- * Copyright (c) 2015, Linaro Limited
-+ * Copyright (c) 2015-2021, Linaro Limited
- */
- #include <linux/arm-smccc.h>
- #include <linux/device.h>
-@@ -118,20 +118,25 @@ static struct optee_session *find_session(struct optee_context_data *ctxdata,
- /**
- * optee_do_call_with_arg() - Do an SMC to OP-TEE in secure world
- * @ctx: calling context
-- * @parg: physical address of message to pass to secure world
-+ * @arg: shared memory holding the message to pass to secure world
- *
- * Does and SMC to OP-TEE in secure world and handles eventual resulting
- * Remote Procedure Calls (RPC) from OP-TEE.
- *
- * Returns return code from secure world, 0 is OK
- */
--u32 optee_do_call_with_arg(struct tee_context *ctx, phys_addr_t parg)
-+int optee_do_call_with_arg(struct tee_context *ctx, struct tee_shm *arg)
- {
- struct optee *optee = tee_get_drvdata(ctx->teedev);
- struct optee_call_waiter w;
- struct optee_rpc_param param = { };
- struct optee_call_ctx call_ctx = { };
-- u32 ret;
-+ phys_addr_t parg;
-+ int rc;
-+
-+ rc = tee_shm_get_pa(arg, 0, &parg);
-+ if (rc)
-+ return rc;
-
- param.a0 = OPTEE_SMC_CALL_WITH_ARG;
- reg_pair_from_64(¶m.a1, ¶m.a2, parg);
-@@ -160,7 +165,7 @@ u32 optee_do_call_with_arg(struct tee_context *ctx, phys_addr_t parg)
- param.a3 = res.a3;
- optee_handle_rpc(ctx, ¶m, &call_ctx);
- } else {
-- ret = res.a0;
-+ rc = res.a0;
- break;
- }
- }
-@@ -172,14 +177,12 @@ u32 optee_do_call_with_arg(struct tee_context *ctx, phys_addr_t parg)
- */
- optee_cq_wait_final(&optee->call_queue, &w);
-
-- return ret;
-+ return rc;
- }
-
- static struct tee_shm *get_msg_arg(struct tee_context *ctx, size_t num_params,
-- struct optee_msg_arg **msg_arg,
-- phys_addr_t *msg_parg)
-+ struct optee_msg_arg **msg_arg)
- {
-- int rc;
- struct tee_shm *shm;
- struct optee_msg_arg *ma;
-
-@@ -190,22 +193,13 @@ static struct tee_shm *get_msg_arg(struct tee_context *ctx, size_t num_params,
-
- ma = tee_shm_get_va(shm, 0);
- if (IS_ERR(ma)) {
-- rc = PTR_ERR(ma);
-- goto out;
-+ tee_shm_free(shm);
-+ return (void *)ma;
- }
-
-- rc = tee_shm_get_pa(shm, 0, msg_parg);
-- if (rc)
-- goto out;
--
- memset(ma, 0, OPTEE_MSG_GET_ARG_SIZE(num_params));
- ma->num_params = num_params;
- *msg_arg = ma;
--out:
-- if (rc) {
-- tee_shm_free(shm);
-- return ERR_PTR(rc);
-- }
-
- return shm;
- }
-@@ -214,16 +208,16 @@ int optee_open_session(struct tee_context *ctx,
- struct tee_ioctl_open_session_arg *arg,
- struct tee_param *param)
- {
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
- struct optee_context_data *ctxdata = ctx->data;
- int rc;
- struct tee_shm *shm;
- struct optee_msg_arg *msg_arg;
-- phys_addr_t msg_parg;
- struct optee_session *sess = NULL;
- uuid_t client_uuid;
-
- /* +2 for the meta parameters added below */
-- shm = get_msg_arg(ctx, arg->num_params + 2, &msg_arg, &msg_parg);
-+ shm = get_msg_arg(ctx, arg->num_params + 2, &msg_arg);
- if (IS_ERR(shm))
- return PTR_ERR(shm);
-
-@@ -247,7 +241,8 @@ int optee_open_session(struct tee_context *ctx,
- goto out;
- export_uuid(msg_arg->params[1].u.octets, &client_uuid);
-
-- rc = optee_to_msg_param(msg_arg->params + 2, arg->num_params, param);
-+ rc = optee->ops->to_msg_param(optee, msg_arg->params + 2,
-+ arg->num_params, param);
- if (rc)
- goto out;
-
-@@ -257,7 +252,7 @@ int optee_open_session(struct tee_context *ctx,
- goto out;
- }
-
-- if (optee_do_call_with_arg(ctx, msg_parg)) {
-+ if (optee->ops->do_call_with_arg(ctx, shm)) {
- msg_arg->ret = TEEC_ERROR_COMMUNICATION;
- msg_arg->ret_origin = TEEC_ORIGIN_COMMS;
- }
-@@ -272,7 +267,8 @@ int optee_open_session(struct tee_context *ctx,
- kfree(sess);
- }
-
-- if (optee_from_msg_param(param, arg->num_params, msg_arg->params + 2)) {
-+ if (optee->ops->from_msg_param(optee, param, arg->num_params,
-+ msg_arg->params + 2)) {
- arg->ret = TEEC_ERROR_COMMUNICATION;
- arg->ret_origin = TEEC_ORIGIN_COMMS;
- /* Close session again to avoid leakage */
-@@ -291,16 +287,16 @@ int optee_open_session(struct tee_context *ctx,
- int optee_close_session_helper(struct tee_context *ctx, u32 session)
- {
- struct tee_shm *shm;
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
- struct optee_msg_arg *msg_arg;
-- phys_addr_t msg_parg;
-
-- shm = get_msg_arg(ctx, 0, &msg_arg, &msg_parg);
-+ shm = get_msg_arg(ctx, 0, &msg_arg);
- if (IS_ERR(shm))
- return PTR_ERR(shm);
-
- msg_arg->cmd = OPTEE_MSG_CMD_CLOSE_SESSION;
- msg_arg->session = session;
-- optee_do_call_with_arg(ctx, msg_parg);
-+ optee->ops->do_call_with_arg(ctx, shm);
-
- tee_shm_free(shm);
-
-@@ -328,10 +324,10 @@ int optee_close_session(struct tee_context *ctx, u32 session)
- int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg,
- struct tee_param *param)
- {
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
- struct optee_context_data *ctxdata = ctx->data;
- struct tee_shm *shm;
- struct optee_msg_arg *msg_arg;
-- phys_addr_t msg_parg;
- struct optee_session *sess;
- int rc;
-
-@@ -342,7 +338,7 @@ int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg,
- if (!sess)
- return -EINVAL;
-
-- shm = get_msg_arg(ctx, arg->num_params, &msg_arg, &msg_parg);
-+ shm = get_msg_arg(ctx, arg->num_params, &msg_arg);
- if (IS_ERR(shm))
- return PTR_ERR(shm);
- msg_arg->cmd = OPTEE_MSG_CMD_INVOKE_COMMAND;
-@@ -350,16 +346,18 @@ int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg,
- msg_arg->session = arg->session;
- msg_arg->cancel_id = arg->cancel_id;
-
-- rc = optee_to_msg_param(msg_arg->params, arg->num_params, param);
-+ rc = optee->ops->to_msg_param(optee, msg_arg->params, arg->num_params,
-+ param);
- if (rc)
- goto out;
-
-- if (optee_do_call_with_arg(ctx, msg_parg)) {
-+ if (optee->ops->do_call_with_arg(ctx, shm)) {
- msg_arg->ret = TEEC_ERROR_COMMUNICATION;
- msg_arg->ret_origin = TEEC_ORIGIN_COMMS;
- }
-
-- if (optee_from_msg_param(param, arg->num_params, msg_arg->params)) {
-+ if (optee->ops->from_msg_param(optee, param, arg->num_params,
-+ msg_arg->params)) {
- msg_arg->ret = TEEC_ERROR_COMMUNICATION;
- msg_arg->ret_origin = TEEC_ORIGIN_COMMS;
- }
-@@ -373,10 +371,10 @@ int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg,
-
- int optee_cancel_req(struct tee_context *ctx, u32 cancel_id, u32 session)
- {
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
- struct optee_context_data *ctxdata = ctx->data;
- struct tee_shm *shm;
- struct optee_msg_arg *msg_arg;
-- phys_addr_t msg_parg;
- struct optee_session *sess;
-
- /* Check that the session is valid */
-@@ -386,14 +384,14 @@ int optee_cancel_req(struct tee_context *ctx, u32 cancel_id, u32 session)
- if (!sess)
- return -EINVAL;
-
-- shm = get_msg_arg(ctx, 0, &msg_arg, &msg_parg);
-+ shm = get_msg_arg(ctx, 0, &msg_arg);
- if (IS_ERR(shm))
- return PTR_ERR(shm);
-
- msg_arg->cmd = OPTEE_MSG_CMD_CANCEL;
- msg_arg->session = session;
- msg_arg->cancel_id = cancel_id;
-- optee_do_call_with_arg(ctx, msg_parg);
-+ optee->ops->do_call_with_arg(ctx, shm);
-
- tee_shm_free(shm);
- return 0;
-@@ -622,10 +620,10 @@ int optee_shm_register(struct tee_context *ctx, struct tee_shm *shm,
- struct page **pages, size_t num_pages,
- unsigned long start)
- {
-- struct tee_shm *shm_arg = NULL;
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
- struct optee_msg_arg *msg_arg;
-+ struct tee_shm *shm_arg;
- u64 *pages_list;
-- phys_addr_t msg_parg;
- int rc;
-
- if (!num_pages)
-@@ -639,7 +637,7 @@ int optee_shm_register(struct tee_context *ctx, struct tee_shm *shm,
- if (!pages_list)
- return -ENOMEM;
-
-- shm_arg = get_msg_arg(ctx, 1, &msg_arg, &msg_parg);
-+ shm_arg = get_msg_arg(ctx, 1, &msg_arg);
- if (IS_ERR(shm_arg)) {
- rc = PTR_ERR(shm_arg);
- goto out;
-@@ -660,7 +658,7 @@ int optee_shm_register(struct tee_context *ctx, struct tee_shm *shm,
- msg_arg->params->u.tmem.buf_ptr = virt_to_phys(pages_list) |
- (tee_shm_get_page_offset(shm) & (OPTEE_MSG_NONCONTIG_PAGE_SIZE - 1));
-
-- if (optee_do_call_with_arg(ctx, msg_parg) ||
-+ if (optee->ops->do_call_with_arg(ctx, shm_arg) ||
- msg_arg->ret != TEEC_SUCCESS)
- rc = -EINVAL;
-
-@@ -672,12 +670,12 @@ int optee_shm_register(struct tee_context *ctx, struct tee_shm *shm,
-
- int optee_shm_unregister(struct tee_context *ctx, struct tee_shm *shm)
- {
-- struct tee_shm *shm_arg;
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
- struct optee_msg_arg *msg_arg;
-- phys_addr_t msg_parg;
-+ struct tee_shm *shm_arg;
- int rc = 0;
-
-- shm_arg = get_msg_arg(ctx, 1, &msg_arg, &msg_parg);
-+ shm_arg = get_msg_arg(ctx, 1, &msg_arg);
- if (IS_ERR(shm_arg))
- return PTR_ERR(shm_arg);
-
-@@ -686,7 +684,7 @@ int optee_shm_unregister(struct tee_context *ctx, struct tee_shm *shm)
- msg_arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_RMEM_INPUT;
- msg_arg->params[0].u.rmem.shm_ref = (unsigned long)shm;
-
-- if (optee_do_call_with_arg(ctx, msg_parg) ||
-+ if (optee->ops->do_call_with_arg(ctx, shm_arg) ||
- msg_arg->ret != TEEC_SUCCESS)
- rc = -EINVAL;
- tee_shm_free(shm_arg);
-diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
-index 79f67a79e7b7..26492d3115f5 100644
---- a/drivers/tee/optee/core.c
-+++ b/drivers/tee/optee/core.c
-@@ -1,6 +1,6 @@
- // SPDX-License-Identifier: GPL-2.0-only
- /*
-- * Copyright (c) 2015, Linaro Limited
-+ * Copyright (c) 2015-2021, Linaro Limited
- */
-
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-@@ -27,21 +27,87 @@
-
- #define OPTEE_SHM_NUM_PRIV_PAGES CONFIG_OPTEE_SHM_NUM_PRIV_PAGES
-
-+static void from_msg_param_value(struct tee_param *p, u32 attr,
-+ const struct optee_msg_param *mp)
-+{
-+ p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT +
-+ attr - OPTEE_MSG_ATTR_TYPE_VALUE_INPUT;
-+ p->u.value.a = mp->u.value.a;
-+ p->u.value.b = mp->u.value.b;
-+ p->u.value.c = mp->u.value.c;
-+}
-+
-+static int from_msg_param_tmp_mem(struct tee_param *p, u32 attr,
-+ const struct optee_msg_param *mp)
-+{
-+ struct tee_shm *shm;
-+ phys_addr_t pa;
-+ int rc;
-+
-+ p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
-+ attr - OPTEE_MSG_ATTR_TYPE_TMEM_INPUT;
-+ p->u.memref.size = mp->u.tmem.size;
-+ shm = (struct tee_shm *)(unsigned long)mp->u.tmem.shm_ref;
-+ if (!shm) {
-+ p->u.memref.shm_offs = 0;
-+ p->u.memref.shm = NULL;
-+ return 0;
-+ }
-+
-+ rc = tee_shm_get_pa(shm, 0, &pa);
-+ if (rc)
-+ return rc;
-+
-+ p->u.memref.shm_offs = mp->u.tmem.buf_ptr - pa;
-+ p->u.memref.shm = shm;
-+
-+ /* Check that the memref is covered by the shm object */
-+ if (p->u.memref.size) {
-+ size_t o = p->u.memref.shm_offs +
-+ p->u.memref.size - 1;
-+
-+ rc = tee_shm_get_pa(shm, o, NULL);
-+ if (rc)
-+ return rc;
-+ }
-+
-+ return 0;
-+}
-+
-+static void from_msg_param_reg_mem(struct tee_param *p, u32 attr,
-+ const struct optee_msg_param *mp)
-+{
-+ struct tee_shm *shm;
-+
-+ p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
-+ attr - OPTEE_MSG_ATTR_TYPE_RMEM_INPUT;
-+ p->u.memref.size = mp->u.rmem.size;
-+ shm = (struct tee_shm *)(unsigned long)mp->u.rmem.shm_ref;
-+
-+ if (shm) {
-+ p->u.memref.shm_offs = mp->u.rmem.offs;
-+ p->u.memref.shm = shm;
-+ } else {
-+ p->u.memref.shm_offs = 0;
-+ p->u.memref.shm = NULL;
-+ }
-+}
-+
- /**
- * optee_from_msg_param() - convert from OPTEE_MSG parameters to
- * struct tee_param
-+ * @optee: main service struct
- * @params: subsystem internal parameter representation
- * @num_params: number of elements in the parameter arrays
- * @msg_params: OPTEE_MSG parameters
- * Returns 0 on success or <0 on failure
- */
--int optee_from_msg_param(struct tee_param *params, size_t num_params,
-- const struct optee_msg_param *msg_params)
-+static int optee_from_msg_param(struct optee *optee, struct tee_param *params,
-+ size_t num_params,
-+ const struct optee_msg_param *msg_params)
- {
- int rc;
- size_t n;
-- struct tee_shm *shm;
-- phys_addr_t pa;
-
- for (n = 0; n < num_params; n++) {
- struct tee_param *p = params + n;
-@@ -56,48 +122,19 @@ int optee_from_msg_param(struct tee_param *params, size_t num_params,
- case OPTEE_MSG_ATTR_TYPE_VALUE_INPUT:
- case OPTEE_MSG_ATTR_TYPE_VALUE_OUTPUT:
- case OPTEE_MSG_ATTR_TYPE_VALUE_INOUT:
-- p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT +
-- attr - OPTEE_MSG_ATTR_TYPE_VALUE_INPUT;
-- p->u.value.a = mp->u.value.a;
-- p->u.value.b = mp->u.value.b;
-- p->u.value.c = mp->u.value.c;
-+ from_msg_param_value(p, attr, mp);
- break;
- case OPTEE_MSG_ATTR_TYPE_TMEM_INPUT:
- case OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT:
- case OPTEE_MSG_ATTR_TYPE_TMEM_INOUT:
-- p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
-- attr - OPTEE_MSG_ATTR_TYPE_TMEM_INPUT;
-- p->u.memref.size = mp->u.tmem.size;
-- shm = (struct tee_shm *)(unsigned long)
-- mp->u.tmem.shm_ref;
-- if (!shm) {
-- p->u.memref.shm_offs = 0;
-- p->u.memref.shm = NULL;
-- break;
-- }
-- rc = tee_shm_get_pa(shm, 0, &pa);
-+ rc = from_msg_param_tmp_mem(p, attr, mp);
- if (rc)
- return rc;
-- p->u.memref.shm_offs = mp->u.tmem.buf_ptr - pa;
-- p->u.memref.shm = shm;
- break;
- case OPTEE_MSG_ATTR_TYPE_RMEM_INPUT:
- case OPTEE_MSG_ATTR_TYPE_RMEM_OUTPUT:
- case OPTEE_MSG_ATTR_TYPE_RMEM_INOUT:
-- p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
-- attr - OPTEE_MSG_ATTR_TYPE_RMEM_INPUT;
-- p->u.memref.size = mp->u.rmem.size;
-- shm = (struct tee_shm *)(unsigned long)
-- mp->u.rmem.shm_ref;
--
-- if (!shm) {
-- p->u.memref.shm_offs = 0;
-- p->u.memref.shm = NULL;
-- break;
-- }
-- p->u.memref.shm_offs = mp->u.rmem.offs;
-- p->u.memref.shm = shm;
--
-+ from_msg_param_reg_mem(p, attr, mp);
- break;
-
- default:
-@@ -107,6 +144,16 @@ int optee_from_msg_param(struct tee_param *params, size_t num_params,
- return 0;
- }
-
-+static void to_msg_param_value(struct optee_msg_param *mp,
-+ const struct tee_param *p)
-+{
-+ mp->attr = OPTEE_MSG_ATTR_TYPE_VALUE_INPUT + p->attr -
-+ TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT;
-+ mp->u.value.a = p->u.value.a;
-+ mp->u.value.b = p->u.value.b;
-+ mp->u.value.c = p->u.value.c;
-+}
-+
- static int to_msg_param_tmp_mem(struct optee_msg_param *mp,
- const struct tee_param *p)
- {
-@@ -149,13 +196,15 @@ static int to_msg_param_reg_mem(struct optee_msg_param *mp,
-
- /**
- * optee_to_msg_param() - convert from struct tee_params to OPTEE_MSG parameters
-+ * @optee: main service struct
- * @msg_params: OPTEE_MSG parameters
- * @num_params: number of elements in the parameter arrays
- * @params: subsystem itnernal parameter representation
- * Returns 0 on success or <0 on failure
- */
--int optee_to_msg_param(struct optee_msg_param *msg_params, size_t num_params,
-- const struct tee_param *params)
-+static int optee_to_msg_param(struct optee *optee,
-+ struct optee_msg_param *msg_params,
-+ size_t num_params, const struct tee_param *params)
- {
- int rc;
- size_t n;
-@@ -172,11 +221,7 @@ int optee_to_msg_param(struct optee_msg_param *msg_params, size_t num_params,
- case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT:
- case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT:
- case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT:
-- mp->attr = OPTEE_MSG_ATTR_TYPE_VALUE_INPUT + p->attr -
-- TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT;
-- mp->u.value.a = p->u.value.a;
-- mp->u.value.b = p->u.value.b;
-- mp->u.value.c = p->u.value.c;
-+ to_msg_param_value(mp, p);
- break;
- case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT:
- case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT:
-@@ -302,7 +347,7 @@ static void optee_release_supp(struct tee_context *ctx)
- optee_supp_release(&optee->supp);
- }
-
--static const struct tee_driver_ops optee_ops = {
-+static const struct tee_driver_ops optee_clnt_ops = {
- .get_version = optee_get_version,
- .open = optee_open,
- .release = optee_release,
-@@ -314,9 +359,9 @@ static const struct tee_driver_ops optee_ops = {
- .shm_unregister = optee_shm_unregister,
- };
-
--static const struct tee_desc optee_desc = {
-+static const struct tee_desc optee_clnt_desc = {
- .name = DRIVER_NAME "-clnt",
-- .ops = &optee_ops,
-+ .ops = &optee_clnt_ops,
- .owner = THIS_MODULE,
- };
-
-@@ -337,6 +382,12 @@ static const struct tee_desc optee_supp_desc = {
- .flags = TEE_DESC_PRIVILEGED,
- };
-
-+static const struct optee_ops optee_ops = {
-+ .do_call_with_arg = optee_do_call_with_arg,
-+ .to_msg_param = optee_to_msg_param,
-+ .from_msg_param = optee_from_msg_param,
-+};
-+
- static bool optee_msg_api_uid_is_optee_api(optee_invoke_fn *invoke_fn)
- {
- struct arm_smccc_res res;
-@@ -670,10 +721,11 @@ static int optee_probe(struct platform_device *pdev)
- goto err;
- }
-
-+ optee->ops = &optee_ops;
- optee->invoke_fn = invoke_fn;
- optee->sec_caps = sec_caps;
-
-- teedev = tee_device_alloc(&optee_desc, NULL, pool, optee);
-+ teedev = tee_device_alloc(&optee_clnt_desc, NULL, pool, optee);
- if (IS_ERR(teedev)) {
- rc = PTR_ERR(teedev);
- goto err;
-diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
-index a55793f9f6eb..beca97017996 100644
---- a/drivers/tee/optee/optee_private.h
-+++ b/drivers/tee/optee/optee_private.h
-@@ -1,6 +1,6 @@
- /* SPDX-License-Identifier: GPL-2.0-only */
- /*
-- * Copyright (c) 2015, Linaro Limited
-+ * Copyright (c) 2015-2021, Linaro Limited
- */
-
- #ifndef OPTEE_PRIVATE_H
-@@ -66,9 +66,34 @@ struct optee_supp {
- struct completion reqs_c;
- };
-
-+struct optee;
-+
-+/**
-+ * struct optee_ops - OP-TEE driver internal operations
-+ * @do_call_with_arg: enters OP-TEE in secure world
-+ * @to_msg_param: converts from struct tee_param to OPTEE_MSG parameters
-+ * @from_msg_param: converts from OPTEE_MSG parameters to struct tee_param
-+ *
-+ * These OPs are only supposed to be used internally in the OP-TEE driver
-+ * as a way of abstracting the different methogs of entering OP-TEE in
-+ * secure world.
-+ */
-+struct optee_ops {
-+ int (*do_call_with_arg)(struct tee_context *ctx,
-+ struct tee_shm *shm_arg);
-+ int (*to_msg_param)(struct optee *optee,
-+ struct optee_msg_param *msg_params,
-+ size_t num_params, const struct tee_param *params);
-+ int (*from_msg_param)(struct optee *optee, struct tee_param *params,
-+ size_t num_params,
-+ const struct optee_msg_param *msg_params);
-+};
-+
- /**
- * struct optee - main service struct
- * @supp_teedev: supplicant device
-+ * @ops: internal callbacks for different ways to reach secure
-+ * world
- * @teedev: client device
- * @invoke_fn: function to issue smc or hvc
- * @call_queue: queue of threads waiting to call @invoke_fn
-@@ -86,6 +111,7 @@ struct optee_supp {
- struct optee {
- struct tee_device *supp_teedev;
- struct tee_device *teedev;
-+ const struct optee_ops *ops;
- optee_invoke_fn *invoke_fn;
- struct optee_call_queue call_queue;
- struct optee_wait_queue wait_queue;
-@@ -148,7 +174,7 @@ int optee_supp_recv(struct tee_context *ctx, u32 *func, u32 *num_params,
- int optee_supp_send(struct tee_context *ctx, u32 ret, u32 num_params,
- struct tee_param *param);
-
--u32 optee_do_call_with_arg(struct tee_context *ctx, phys_addr_t parg);
-+int optee_do_call_with_arg(struct tee_context *ctx, struct tee_shm *arg);
- int optee_open_session(struct tee_context *ctx,
- struct tee_ioctl_open_session_arg *arg,
- struct tee_param *param);
-@@ -172,11 +198,6 @@ int optee_shm_register_supp(struct tee_context *ctx, struct tee_shm *shm,
- unsigned long start);
- int optee_shm_unregister_supp(struct tee_context *ctx, struct tee_shm *shm);
-
--int optee_from_msg_param(struct tee_param *params, size_t num_params,
-- const struct optee_msg_param *msg_params);
--int optee_to_msg_param(struct optee_msg_param *msg_params, size_t num_params,
-- const struct tee_param *params);
--
- u64 *optee_allocate_pages_list(size_t num_entries);
- void optee_free_pages_list(void *array, size_t num_entries);
- void optee_fill_pages_list(u64 *dst, struct page **pages, int num_pages,
-diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c
-index efbaff7ad7e5..309258d47790 100644
---- a/drivers/tee/optee/rpc.c
-+++ b/drivers/tee/optee/rpc.c
-@@ -1,6 +1,6 @@
- // SPDX-License-Identifier: GPL-2.0-only
- /*
-- * Copyright (c) 2015-2016, Linaro Limited
-+ * Copyright (c) 2015-2021, Linaro Limited
- */
-
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-@@ -55,6 +55,7 @@ static void handle_rpc_func_cmd_get_time(struct optee_msg_arg *arg)
- static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx,
- struct optee_msg_arg *arg)
- {
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
- struct tee_param *params;
- struct i2c_adapter *adapter;
- struct i2c_msg msg = { };
-@@ -79,7 +80,8 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx,
- return;
- }
-
-- if (optee_from_msg_param(params, arg->num_params, arg->params))
-+ if (optee->ops->from_msg_param(optee, params, arg->num_params,
-+ arg->params))
- goto bad;
-
- for (i = 0; i < arg->num_params; i++) {
-@@ -122,7 +124,8 @@ static void handle_rpc_func_cmd_i2c_transfer(struct tee_context *ctx,
- arg->ret = TEEC_ERROR_COMMUNICATION;
- } else {
- params[3].u.value.a = msg.len;
-- if (optee_to_msg_param(arg->params, arg->num_params, params))
-+ if (optee->ops->to_msg_param(optee, arg->params,
-+ arg->num_params, params))
- arg->ret = TEEC_ERROR_BAD_PARAMETERS;
- else
- arg->ret = TEEC_SUCCESS;
-@@ -234,7 +237,7 @@ static void handle_rpc_func_cmd_wait(struct optee_msg_arg *arg)
- arg->ret = TEEC_ERROR_BAD_PARAMETERS;
- }
-
--static void handle_rpc_supp_cmd(struct tee_context *ctx,
-+static void handle_rpc_supp_cmd(struct tee_context *ctx, struct optee *optee,
- struct optee_msg_arg *arg)
- {
- struct tee_param *params;
-@@ -248,14 +251,16 @@ static void handle_rpc_supp_cmd(struct tee_context *ctx,
- return;
- }
-
-- if (optee_from_msg_param(params, arg->num_params, arg->params)) {
-+ if (optee->ops->from_msg_param(optee, params, arg->num_params,
-+ arg->params)) {
- arg->ret = TEEC_ERROR_BAD_PARAMETERS;
- goto out;
- }
-
- arg->ret = optee_supp_thrd_req(ctx, arg->cmd, arg->num_params, params);
-
-- if (optee_to_msg_param(arg->params, arg->num_params, params))
-+ if (optee->ops->to_msg_param(optee, arg->params, arg->num_params,
-+ params))
- arg->ret = TEEC_ERROR_BAD_PARAMETERS;
- out:
- kfree(params);
-@@ -480,7 +485,7 @@ static void handle_rpc_func_cmd(struct tee_context *ctx, struct optee *optee,
- handle_rpc_func_cmd_i2c_transfer(ctx, arg);
- break;
- default:
-- handle_rpc_supp_cmd(ctx, arg);
-+ handle_rpc_supp_cmd(ctx, optee, arg);
- }
- }
-
-2.34.1
-
deleted file mode 100644
@@ -1,3168 +0,0 @@
-From bfcb795efc2d07bf99fd6c6e4f43951bc7354d5e Mon Sep 17 00:00:00 2001
-From: Jens Wiklander <jens.wiklander@linaro.org>
-Date: Wed, 21 Jul 2021 16:30:28 +0200
-Subject: [PATCH 11/40] optee: isolate smc abi
-
-Isolate the ABI based on raw SMCs. Code specific to the raw SMC ABI is
-moved into smc_abi.c. This makes room for other ABIs with a clear
-separation.
-
-The driver changes to use module_init()/module_exit() instead of
-module_platform_driver(). The platform_driver_register() and
-platform_driver_unregister() functions called directly to keep the same
-behavior. This is needed because module_platform_driver() is based on
-module_driver() which can only be used once in a module.
-
-A function optee_rpc_cmd() is factored out from the function
-handle_rpc_func_cmd() to handle the ABI independent part of RPC
-processing.
-
-This patch is not supposed to change the driver behavior, it's only a
-matter of reorganizing the code.
-
-Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
-Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-Upstream-Status: Backport [c51a564a5b48355f30309b84cdffe3f96d1ae0d3]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/tee/optee/Makefile | 4 +-
- drivers/tee/optee/call.c | 369 +-------
- drivers/tee/optee/core.c | 721 ++-------------
- drivers/tee/optee/optee_private.h | 106 ++-
- drivers/tee/optee/rpc.c | 218 +----
- drivers/tee/optee/shm_pool.h | 14 -
- drivers/tee/optee/smc_abi.c | 1361 +++++++++++++++++++++++++++++
- 7 files changed, 1506 insertions(+), 1287 deletions(-)
- delete mode 100644 drivers/tee/optee/shm_pool.h
- create mode 100644 drivers/tee/optee/smc_abi.c
-
-diff --git a/drivers/tee/optee/Makefile b/drivers/tee/optee/Makefile
-index 3aa33ea9e6a6..97ac3ab3e1c0 100644
---- a/drivers/tee/optee/Makefile
-+++ b/drivers/tee/optee/Makefile
-@@ -4,8 +4,8 @@ optee-objs += core.o
- optee-objs += call.o
- optee-objs += rpc.o
- optee-objs += supp.o
--optee-objs += shm_pool.o
- optee-objs += device.o
-+optee-objs += smc_abi.o
-
- # for tracing framework to find optee_trace.h
--CFLAGS_call.o := -I$(src)
-+CFLAGS_smc_abi.o := -I$(src)
-diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c
-index ddedde45f1ee..9ff4f0812825 100644
---- a/drivers/tee/optee/call.c
-+++ b/drivers/tee/optee/call.c
-@@ -2,28 +2,17 @@
- /*
- * Copyright (c) 2015-2021, Linaro Limited
- */
--#include <linux/arm-smccc.h>
- #include <linux/device.h>
- #include <linux/err.h>
- #include <linux/errno.h>
- #include <linux/mm.h>
--#include <linux/sched.h>
- #include <linux/slab.h>
- #include <linux/tee_drv.h>
- #include <linux/types.h>
--#include <linux/uaccess.h>
- #include "optee_private.h"
--#include "optee_smc.h"
--#define CREATE_TRACE_POINTS
--#include "optee_trace.h"
-
--struct optee_call_waiter {
-- struct list_head list_node;
-- struct completion c;
--};
--
--static void optee_cq_wait_init(struct optee_call_queue *cq,
-- struct optee_call_waiter *w)
-+void optee_cq_wait_init(struct optee_call_queue *cq,
-+ struct optee_call_waiter *w)
- {
- /*
- * We're preparing to make a call to secure world. In case we can't
-@@ -47,8 +36,8 @@ static void optee_cq_wait_init(struct optee_call_queue *cq,
- mutex_unlock(&cq->mutex);
- }
-
--static void optee_cq_wait_for_completion(struct optee_call_queue *cq,
-- struct optee_call_waiter *w)
-+void optee_cq_wait_for_completion(struct optee_call_queue *cq,
-+ struct optee_call_waiter *w)
- {
- wait_for_completion(&w->c);
-
-@@ -74,8 +63,8 @@ static void optee_cq_complete_one(struct optee_call_queue *cq)
- }
- }
-
--static void optee_cq_wait_final(struct optee_call_queue *cq,
-- struct optee_call_waiter *w)
-+void optee_cq_wait_final(struct optee_call_queue *cq,
-+ struct optee_call_waiter *w)
- {
- /*
- * We're done with the call to secure world. The thread in secure
-@@ -115,73 +104,8 @@ static struct optee_session *find_session(struct optee_context_data *ctxdata,
- return NULL;
- }
-
--/**
-- * optee_do_call_with_arg() - Do an SMC to OP-TEE in secure world
-- * @ctx: calling context
-- * @arg: shared memory holding the message to pass to secure world
-- *
-- * Does and SMC to OP-TEE in secure world and handles eventual resulting
-- * Remote Procedure Calls (RPC) from OP-TEE.
-- *
-- * Returns return code from secure world, 0 is OK
-- */
--int optee_do_call_with_arg(struct tee_context *ctx, struct tee_shm *arg)
--{
-- struct optee *optee = tee_get_drvdata(ctx->teedev);
-- struct optee_call_waiter w;
-- struct optee_rpc_param param = { };
-- struct optee_call_ctx call_ctx = { };
-- phys_addr_t parg;
-- int rc;
--
-- rc = tee_shm_get_pa(arg, 0, &parg);
-- if (rc)
-- return rc;
--
-- param.a0 = OPTEE_SMC_CALL_WITH_ARG;
-- reg_pair_from_64(¶m.a1, ¶m.a2, parg);
-- /* Initialize waiter */
-- optee_cq_wait_init(&optee->call_queue, &w);
-- while (true) {
-- struct arm_smccc_res res;
--
-- trace_optee_invoke_fn_begin(¶m);
-- optee->invoke_fn(param.a0, param.a1, param.a2, param.a3,
-- param.a4, param.a5, param.a6, param.a7,
-- &res);
-- trace_optee_invoke_fn_end(¶m, &res);
--
-- if (res.a0 == OPTEE_SMC_RETURN_ETHREAD_LIMIT) {
-- /*
-- * Out of threads in secure world, wait for a thread
-- * become available.
-- */
-- optee_cq_wait_for_completion(&optee->call_queue, &w);
-- } else if (OPTEE_SMC_RETURN_IS_RPC(res.a0)) {
-- cond_resched();
-- param.a0 = res.a0;
-- param.a1 = res.a1;
-- param.a2 = res.a2;
-- param.a3 = res.a3;
-- optee_handle_rpc(ctx, ¶m, &call_ctx);
-- } else {
-- rc = res.a0;
-- break;
-- }
-- }
--
-- optee_rpc_finalize_call(&call_ctx);
-- /*
-- * We're done with our thread in secure world, if there's any
-- * thread waiters wake up one.
-- */
-- optee_cq_wait_final(&optee->call_queue, &w);
--
-- return rc;
--}
--
--static struct tee_shm *get_msg_arg(struct tee_context *ctx, size_t num_params,
-- struct optee_msg_arg **msg_arg)
-+struct tee_shm *optee_get_msg_arg(struct tee_context *ctx, size_t num_params,
-+ struct optee_msg_arg **msg_arg)
- {
- struct tee_shm *shm;
- struct optee_msg_arg *ma;
-@@ -217,7 +141,7 @@ int optee_open_session(struct tee_context *ctx,
- uuid_t client_uuid;
-
- /* +2 for the meta parameters added below */
-- shm = get_msg_arg(ctx, arg->num_params + 2, &msg_arg);
-+ shm = optee_get_msg_arg(ctx, arg->num_params + 2, &msg_arg);
- if (IS_ERR(shm))
- return PTR_ERR(shm);
-
-@@ -290,7 +214,7 @@ int optee_close_session_helper(struct tee_context *ctx, u32 session)
- struct optee *optee = tee_get_drvdata(ctx->teedev);
- struct optee_msg_arg *msg_arg;
-
-- shm = get_msg_arg(ctx, 0, &msg_arg);
-+ shm = optee_get_msg_arg(ctx, 0, &msg_arg);
- if (IS_ERR(shm))
- return PTR_ERR(shm);
-
-@@ -338,7 +262,7 @@ int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg,
- if (!sess)
- return -EINVAL;
-
-- shm = get_msg_arg(ctx, arg->num_params, &msg_arg);
-+ shm = optee_get_msg_arg(ctx, arg->num_params, &msg_arg);
- if (IS_ERR(shm))
- return PTR_ERR(shm);
- msg_arg->cmd = OPTEE_MSG_CMD_INVOKE_COMMAND;
-@@ -384,7 +308,7 @@ int optee_cancel_req(struct tee_context *ctx, u32 cancel_id, u32 session)
- if (!sess)
- return -EINVAL;
-
-- shm = get_msg_arg(ctx, 0, &msg_arg);
-+ shm = optee_get_msg_arg(ctx, 0, &msg_arg);
- if (IS_ERR(shm))
- return PTR_ERR(shm);
-
-@@ -397,182 +321,6 @@ int optee_cancel_req(struct tee_context *ctx, u32 cancel_id, u32 session)
- return 0;
- }
-
--/**
-- * optee_enable_shm_cache() - Enables caching of some shared memory allocation
-- * in OP-TEE
-- * @optee: main service struct
-- */
--void optee_enable_shm_cache(struct optee *optee)
--{
-- struct optee_call_waiter w;
--
-- /* We need to retry until secure world isn't busy. */
-- optee_cq_wait_init(&optee->call_queue, &w);
-- while (true) {
-- struct arm_smccc_res res;
--
-- optee->invoke_fn(OPTEE_SMC_ENABLE_SHM_CACHE, 0, 0, 0, 0, 0, 0,
-- 0, &res);
-- if (res.a0 == OPTEE_SMC_RETURN_OK)
-- break;
-- optee_cq_wait_for_completion(&optee->call_queue, &w);
-- }
-- optee_cq_wait_final(&optee->call_queue, &w);
--}
--
--/**
-- * __optee_disable_shm_cache() - Disables caching of some shared memory
-- * allocation in OP-TEE
-- * @optee: main service struct
-- * @is_mapped: true if the cached shared memory addresses were mapped by this
-- * kernel, are safe to dereference, and should be freed
-- */
--static void __optee_disable_shm_cache(struct optee *optee, bool is_mapped)
--{
-- struct optee_call_waiter w;
--
-- /* We need to retry until secure world isn't busy. */
-- optee_cq_wait_init(&optee->call_queue, &w);
-- while (true) {
-- union {
-- struct arm_smccc_res smccc;
-- struct optee_smc_disable_shm_cache_result result;
-- } res;
--
-- optee->invoke_fn(OPTEE_SMC_DISABLE_SHM_CACHE, 0, 0, 0, 0, 0, 0,
-- 0, &res.smccc);
-- if (res.result.status == OPTEE_SMC_RETURN_ENOTAVAIL)
-- break; /* All shm's freed */
-- if (res.result.status == OPTEE_SMC_RETURN_OK) {
-- struct tee_shm *shm;
--
-- /*
-- * Shared memory references that were not mapped by
-- * this kernel must be ignored to prevent a crash.
-- */
-- if (!is_mapped)
-- continue;
--
-- shm = reg_pair_to_ptr(res.result.shm_upper32,
-- res.result.shm_lower32);
-- tee_shm_free(shm);
-- } else {
-- optee_cq_wait_for_completion(&optee->call_queue, &w);
-- }
-- }
-- optee_cq_wait_final(&optee->call_queue, &w);
--}
--
--/**
-- * optee_disable_shm_cache() - Disables caching of mapped shared memory
-- * allocations in OP-TEE
-- * @optee: main service struct
-- */
--void optee_disable_shm_cache(struct optee *optee)
--{
-- return __optee_disable_shm_cache(optee, true);
--}
--
--/**
-- * optee_disable_unmapped_shm_cache() - Disables caching of shared memory
-- * allocations in OP-TEE which are not
-- * currently mapped
-- * @optee: main service struct
-- */
--void optee_disable_unmapped_shm_cache(struct optee *optee)
--{
-- return __optee_disable_shm_cache(optee, false);
--}
--
--#define PAGELIST_ENTRIES_PER_PAGE \
-- ((OPTEE_MSG_NONCONTIG_PAGE_SIZE / sizeof(u64)) - 1)
--
--/**
-- * optee_fill_pages_list() - write list of user pages to given shared
-- * buffer.
-- *
-- * @dst: page-aligned buffer where list of pages will be stored
-- * @pages: array of pages that represents shared buffer
-- * @num_pages: number of entries in @pages
-- * @page_offset: offset of user buffer from page start
-- *
-- * @dst should be big enough to hold list of user page addresses and
-- * links to the next pages of buffer
-- */
--void optee_fill_pages_list(u64 *dst, struct page **pages, int num_pages,
-- size_t page_offset)
--{
-- int n = 0;
-- phys_addr_t optee_page;
-- /*
-- * Refer to OPTEE_MSG_ATTR_NONCONTIG description in optee_msg.h
-- * for details.
-- */
-- struct {
-- u64 pages_list[PAGELIST_ENTRIES_PER_PAGE];
-- u64 next_page_data;
-- } *pages_data;
--
-- /*
-- * Currently OP-TEE uses 4k page size and it does not looks
-- * like this will change in the future. On other hand, there are
-- * no know ARM architectures with page size < 4k.
-- * Thus the next built assert looks redundant. But the following
-- * code heavily relies on this assumption, so it is better be
-- * safe than sorry.
-- */
-- BUILD_BUG_ON(PAGE_SIZE < OPTEE_MSG_NONCONTIG_PAGE_SIZE);
--
-- pages_data = (void *)dst;
-- /*
-- * If linux page is bigger than 4k, and user buffer offset is
-- * larger than 4k/8k/12k/etc this will skip first 4k pages,
-- * because they bear no value data for OP-TEE.
-- */
-- optee_page = page_to_phys(*pages) +
-- round_down(page_offset, OPTEE_MSG_NONCONTIG_PAGE_SIZE);
--
-- while (true) {
-- pages_data->pages_list[n++] = optee_page;
--
-- if (n == PAGELIST_ENTRIES_PER_PAGE) {
-- pages_data->next_page_data =
-- virt_to_phys(pages_data + 1);
-- pages_data++;
-- n = 0;
-- }
--
-- optee_page += OPTEE_MSG_NONCONTIG_PAGE_SIZE;
-- if (!(optee_page & ~PAGE_MASK)) {
-- if (!--num_pages)
-- break;
-- pages++;
-- optee_page = page_to_phys(*pages);
-- }
-- }
--}
--
--/*
-- * The final entry in each pagelist page is a pointer to the next
-- * pagelist page.
-- */
--static size_t get_pages_list_size(size_t num_entries)
--{
-- int pages = DIV_ROUND_UP(num_entries, PAGELIST_ENTRIES_PER_PAGE);
--
-- return pages * OPTEE_MSG_NONCONTIG_PAGE_SIZE;
--}
--
--u64 *optee_allocate_pages_list(size_t num_entries)
--{
-- return alloc_pages_exact(get_pages_list_size(num_entries), GFP_KERNEL);
--}
--
--void optee_free_pages_list(void *list, size_t num_entries)
--{
-- free_pages_exact(list, get_pages_list_size(num_entries));
--}
--
- static bool is_normal_memory(pgprot_t p)
- {
- #if defined(CONFIG_ARM)
-@@ -596,7 +344,7 @@ static int __check_mem_type(struct vm_area_struct *vma, unsigned long end)
- return -EINVAL;
- }
-
--static int check_mem_type(unsigned long start, size_t num_pages)
-+int optee_check_mem_type(unsigned long start, size_t num_pages)
- {
- struct mm_struct *mm = current->mm;
- int rc;
-@@ -615,94 +363,3 @@ static int check_mem_type(unsigned long start, size_t num_pages)
-
- return rc;
- }
--
--int optee_shm_register(struct tee_context *ctx, struct tee_shm *shm,
-- struct page **pages, size_t num_pages,
-- unsigned long start)
--{
-- struct optee *optee = tee_get_drvdata(ctx->teedev);
-- struct optee_msg_arg *msg_arg;
-- struct tee_shm *shm_arg;
-- u64 *pages_list;
-- int rc;
--
-- if (!num_pages)
-- return -EINVAL;
--
-- rc = check_mem_type(start, num_pages);
-- if (rc)
-- return rc;
--
-- pages_list = optee_allocate_pages_list(num_pages);
-- if (!pages_list)
-- return -ENOMEM;
--
-- shm_arg = get_msg_arg(ctx, 1, &msg_arg);
-- if (IS_ERR(shm_arg)) {
-- rc = PTR_ERR(shm_arg);
-- goto out;
-- }
--
-- optee_fill_pages_list(pages_list, pages, num_pages,
-- tee_shm_get_page_offset(shm));
--
-- msg_arg->cmd = OPTEE_MSG_CMD_REGISTER_SHM;
-- msg_arg->params->attr = OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT |
-- OPTEE_MSG_ATTR_NONCONTIG;
-- msg_arg->params->u.tmem.shm_ref = (unsigned long)shm;
-- msg_arg->params->u.tmem.size = tee_shm_get_size(shm);
-- /*
-- * In the least bits of msg_arg->params->u.tmem.buf_ptr we
-- * store buffer offset from 4k page, as described in OP-TEE ABI.
-- */
-- msg_arg->params->u.tmem.buf_ptr = virt_to_phys(pages_list) |
-- (tee_shm_get_page_offset(shm) & (OPTEE_MSG_NONCONTIG_PAGE_SIZE - 1));
--
-- if (optee->ops->do_call_with_arg(ctx, shm_arg) ||
-- msg_arg->ret != TEEC_SUCCESS)
-- rc = -EINVAL;
--
-- tee_shm_free(shm_arg);
--out:
-- optee_free_pages_list(pages_list, num_pages);
-- return rc;
--}
--
--int optee_shm_unregister(struct tee_context *ctx, struct tee_shm *shm)
--{
-- struct optee *optee = tee_get_drvdata(ctx->teedev);
-- struct optee_msg_arg *msg_arg;
-- struct tee_shm *shm_arg;
-- int rc = 0;
--
-- shm_arg = get_msg_arg(ctx, 1, &msg_arg);
-- if (IS_ERR(shm_arg))
-- return PTR_ERR(shm_arg);
--
-- msg_arg->cmd = OPTEE_MSG_CMD_UNREGISTER_SHM;
--
-- msg_arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_RMEM_INPUT;
-- msg_arg->params[0].u.rmem.shm_ref = (unsigned long)shm;
--
-- if (optee->ops->do_call_with_arg(ctx, shm_arg) ||
-- msg_arg->ret != TEEC_SUCCESS)
-- rc = -EINVAL;
-- tee_shm_free(shm_arg);
-- return rc;
--}
--
--int optee_shm_register_supp(struct tee_context *ctx, struct tee_shm *shm,
-- struct page **pages, size_t num_pages,
-- unsigned long start)
--{
-- /*
-- * We don't want to register supplicant memory in OP-TEE.
-- * Instead information about it will be passed in RPC code.
-- */
-- return check_mem_type(start, num_pages);
--}
--
--int optee_shm_unregister_supp(struct tee_context *ctx, struct tee_shm *shm)
--{
-- return 0;
--}
-diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
-index 26492d3115f5..27b855325b33 100644
---- a/drivers/tee/optee/core.c
-+++ b/drivers/tee/optee/core.c
-@@ -1,260 +1,71 @@
- // SPDX-License-Identifier: GPL-2.0-only
- /*
- * Copyright (c) 2015-2021, Linaro Limited
-+ * Copyright (c) 2016, EPAM Systems
- */
-
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
--#include <linux/arm-smccc.h>
- #include <linux/crash_dump.h>
- #include <linux/errno.h>
- #include <linux/io.h>
-+#include <linux/mm.h>
- #include <linux/module.h>
--#include <linux/of.h>
--#include <linux/of_platform.h>
--#include <linux/platform_device.h>
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/tee_drv.h>
- #include <linux/types.h>
--#include <linux/uaccess.h>
- #include <linux/workqueue.h>
- #include "optee_private.h"
--#include "optee_smc.h"
--#include "shm_pool.h"
-
--#define DRIVER_NAME "optee"
--
--#define OPTEE_SHM_NUM_PRIV_PAGES CONFIG_OPTEE_SHM_NUM_PRIV_PAGES
--
--static void from_msg_param_value(struct tee_param *p, u32 attr,
-- const struct optee_msg_param *mp)
--{
-- p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT +
-- attr - OPTEE_MSG_ATTR_TYPE_VALUE_INPUT;
-- p->u.value.a = mp->u.value.a;
-- p->u.value.b = mp->u.value.b;
-- p->u.value.c = mp->u.value.c;
--}
--
--static int from_msg_param_tmp_mem(struct tee_param *p, u32 attr,
-- const struct optee_msg_param *mp)
--{
-- struct tee_shm *shm;
-- phys_addr_t pa;
-- int rc;
--
-- p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
-- attr - OPTEE_MSG_ATTR_TYPE_TMEM_INPUT;
-- p->u.memref.size = mp->u.tmem.size;
-- shm = (struct tee_shm *)(unsigned long)mp->u.tmem.shm_ref;
-- if (!shm) {
-- p->u.memref.shm_offs = 0;
-- p->u.memref.shm = NULL;
-- return 0;
-- }
--
-- rc = tee_shm_get_pa(shm, 0, &pa);
-- if (rc)
-- return rc;
--
-- p->u.memref.shm_offs = mp->u.tmem.buf_ptr - pa;
-- p->u.memref.shm = shm;
--
-- /* Check that the memref is covered by the shm object */
-- if (p->u.memref.size) {
-- size_t o = p->u.memref.shm_offs +
-- p->u.memref.size - 1;
--
-- rc = tee_shm_get_pa(shm, o, NULL);
-- if (rc)
-- return rc;
-- }
--
-- return 0;
--}
--
--static void from_msg_param_reg_mem(struct tee_param *p, u32 attr,
-- const struct optee_msg_param *mp)
-+int optee_pool_op_alloc_helper(struct tee_shm_pool_mgr *poolm,
-+ struct tee_shm *shm, size_t size,
-+ int (*shm_register)(struct tee_context *ctx,
-+ struct tee_shm *shm,
-+ struct page **pages,
-+ size_t num_pages,
-+ unsigned long start))
- {
-- struct tee_shm *shm;
-+ unsigned int order = get_order(size);
-+ struct page *page;
-+ int rc = 0;
-
-- p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
-- attr - OPTEE_MSG_ATTR_TYPE_RMEM_INPUT;
-- p->u.memref.size = mp->u.rmem.size;
-- shm = (struct tee_shm *)(unsigned long)mp->u.rmem.shm_ref;
--
-- if (shm) {
-- p->u.memref.shm_offs = mp->u.rmem.offs;
-- p->u.memref.shm = shm;
-- } else {
-- p->u.memref.shm_offs = 0;
-- p->u.memref.shm = NULL;
-- }
--}
--
--/**
-- * optee_from_msg_param() - convert from OPTEE_MSG parameters to
-- * struct tee_param
-- * @optee: main service struct
-- * @params: subsystem internal parameter representation
-- * @num_params: number of elements in the parameter arrays
-- * @msg_params: OPTEE_MSG parameters
-- * Returns 0 on success or <0 on failure
-- */
--static int optee_from_msg_param(struct optee *optee, struct tee_param *params,
-- size_t num_params,
-- const struct optee_msg_param *msg_params)
--{
-- int rc;
-- size_t n;
-+ page = alloc_pages(GFP_KERNEL | __GFP_ZERO, order);
-+ if (!page)
-+ return -ENOMEM;
-
-- for (n = 0; n < num_params; n++) {
-- struct tee_param *p = params + n;
-- const struct optee_msg_param *mp = msg_params + n;
-- u32 attr = mp->attr & OPTEE_MSG_ATTR_TYPE_MASK;
-+ shm->kaddr = page_address(page);
-+ shm->paddr = page_to_phys(page);
-+ shm->size = PAGE_SIZE << order;
-
-- switch (attr) {
-- case OPTEE_MSG_ATTR_TYPE_NONE:
-- p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
-- memset(&p->u, 0, sizeof(p->u));
-- break;
-- case OPTEE_MSG_ATTR_TYPE_VALUE_INPUT:
-- case OPTEE_MSG_ATTR_TYPE_VALUE_OUTPUT:
-- case OPTEE_MSG_ATTR_TYPE_VALUE_INOUT:
-- from_msg_param_value(p, attr, mp);
-- break;
-- case OPTEE_MSG_ATTR_TYPE_TMEM_INPUT:
-- case OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT:
-- case OPTEE_MSG_ATTR_TYPE_TMEM_INOUT:
-- rc = from_msg_param_tmp_mem(p, attr, mp);
-- if (rc)
-- return rc;
-- break;
-- case OPTEE_MSG_ATTR_TYPE_RMEM_INPUT:
-- case OPTEE_MSG_ATTR_TYPE_RMEM_OUTPUT:
-- case OPTEE_MSG_ATTR_TYPE_RMEM_INOUT:
-- from_msg_param_reg_mem(p, attr, mp);
-- break;
-+ if (shm_register) {
-+ unsigned int nr_pages = 1 << order, i;
-+ struct page **pages;
-
-- default:
-- return -EINVAL;
-+ pages = kcalloc(nr_pages, sizeof(*pages), GFP_KERNEL);
-+ if (!pages) {
-+ rc = -ENOMEM;
-+ goto err;
- }
-- }
-- return 0;
--}
--
--static void to_msg_param_value(struct optee_msg_param *mp,
-- const struct tee_param *p)
--{
-- mp->attr = OPTEE_MSG_ATTR_TYPE_VALUE_INPUT + p->attr -
-- TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT;
-- mp->u.value.a = p->u.value.a;
-- mp->u.value.b = p->u.value.b;
-- mp->u.value.c = p->u.value.c;
--}
--
--static int to_msg_param_tmp_mem(struct optee_msg_param *mp,
-- const struct tee_param *p)
--{
-- int rc;
-- phys_addr_t pa;
-
-- mp->attr = OPTEE_MSG_ATTR_TYPE_TMEM_INPUT + p->attr -
-- TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT;
--
-- mp->u.tmem.shm_ref = (unsigned long)p->u.memref.shm;
-- mp->u.tmem.size = p->u.memref.size;
-+ for (i = 0; i < nr_pages; i++) {
-+ pages[i] = page;
-+ page++;
-+ }
-
-- if (!p->u.memref.shm) {
-- mp->u.tmem.buf_ptr = 0;
-- return 0;
-+ shm->flags |= TEE_SHM_REGISTER;
-+ rc = shm_register(shm->ctx, shm, pages, nr_pages,
-+ (unsigned long)shm->kaddr);
-+ kfree(pages);
-+ if (rc)
-+ goto err;
- }
-
-- rc = tee_shm_get_pa(p->u.memref.shm, p->u.memref.shm_offs, &pa);
-- if (rc)
-- return rc;
--
-- mp->u.tmem.buf_ptr = pa;
-- mp->attr |= OPTEE_MSG_ATTR_CACHE_PREDEFINED <<
-- OPTEE_MSG_ATTR_CACHE_SHIFT;
--
-- return 0;
--}
--
--static int to_msg_param_reg_mem(struct optee_msg_param *mp,
-- const struct tee_param *p)
--{
-- mp->attr = OPTEE_MSG_ATTR_TYPE_RMEM_INPUT + p->attr -
-- TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT;
--
-- mp->u.rmem.shm_ref = (unsigned long)p->u.memref.shm;
-- mp->u.rmem.size = p->u.memref.size;
-- mp->u.rmem.offs = p->u.memref.shm_offs;
-- return 0;
--}
--
--/**
-- * optee_to_msg_param() - convert from struct tee_params to OPTEE_MSG parameters
-- * @optee: main service struct
-- * @msg_params: OPTEE_MSG parameters
-- * @num_params: number of elements in the parameter arrays
-- * @params: subsystem itnernal parameter representation
-- * Returns 0 on success or <0 on failure
-- */
--static int optee_to_msg_param(struct optee *optee,
-- struct optee_msg_param *msg_params,
-- size_t num_params, const struct tee_param *params)
--{
-- int rc;
-- size_t n;
--
-- for (n = 0; n < num_params; n++) {
-- const struct tee_param *p = params + n;
-- struct optee_msg_param *mp = msg_params + n;
--
-- switch (p->attr) {
-- case TEE_IOCTL_PARAM_ATTR_TYPE_NONE:
-- mp->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
-- memset(&mp->u, 0, sizeof(mp->u));
-- break;
-- case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT:
-- case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT:
-- case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT:
-- to_msg_param_value(mp, p);
-- break;
-- case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT:
-- case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT:
-- case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT:
-- if (tee_shm_is_registered(p->u.memref.shm))
-- rc = to_msg_param_reg_mem(mp, p);
-- else
-- rc = to_msg_param_tmp_mem(mp, p);
-- if (rc)
-- return rc;
-- break;
-- default:
-- return -EINVAL;
-- }
-- }
- return 0;
--}
-
--static void optee_get_version(struct tee_device *teedev,
-- struct tee_ioctl_version_data *vers)
--{
-- struct tee_ioctl_version_data v = {
-- .impl_id = TEE_IMPL_ID_OPTEE,
-- .impl_caps = TEE_OPTEE_CAP_TZ,
-- .gen_caps = TEE_GEN_CAP_GP,
-- };
-- struct optee *optee = tee_get_drvdata(teedev);
--
-- if (optee->sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM)
-- v.gen_caps |= TEE_GEN_CAP_REG_MEM;
-- if (optee->sec_caps & OPTEE_SMC_SEC_CAP_MEMREF_NULL)
-- v.gen_caps |= TEE_GEN_CAP_MEMREF_NULL;
-- *vers = v;
-+err:
-+ __free_pages(page, order);
-+ return rc;
- }
-
- static void optee_bus_scan(struct work_struct *work)
-@@ -262,7 +73,7 @@ static void optee_bus_scan(struct work_struct *work)
- WARN_ON(optee_enumerate_devices(PTA_CMD_GET_DEVICES_SUPP));
- }
-
--static int optee_open(struct tee_context *ctx)
-+int optee_open(struct tee_context *ctx, bool cap_memref_null)
- {
- struct optee_context_data *ctxdata;
- struct tee_device *teedev = ctx->teedev;
-@@ -300,11 +111,7 @@ static int optee_open(struct tee_context *ctx)
- mutex_init(&ctxdata->mutex);
- INIT_LIST_HEAD(&ctxdata->sess_list);
-
-- if (optee->sec_caps & OPTEE_SMC_SEC_CAP_MEMREF_NULL)
-- ctx->cap_memref_null = true;
-- else
-- ctx->cap_memref_null = false;
--
-+ ctx->cap_memref_null = cap_memref_null;
- ctx->data = ctxdata;
- return 0;
- }
-@@ -330,12 +137,12 @@ static void optee_release_helper(struct tee_context *ctx,
- ctx->data = NULL;
- }
-
--static void optee_release(struct tee_context *ctx)
-+void optee_release(struct tee_context *ctx)
- {
- optee_release_helper(ctx, optee_close_session_helper);
- }
-
--static void optee_release_supp(struct tee_context *ctx)
-+void optee_release_supp(struct tee_context *ctx)
- {
- struct optee *optee = tee_get_drvdata(ctx->teedev);
-
-@@ -347,287 +154,11 @@ static void optee_release_supp(struct tee_context *ctx)
- optee_supp_release(&optee->supp);
- }
-
--static const struct tee_driver_ops optee_clnt_ops = {
-- .get_version = optee_get_version,
-- .open = optee_open,
-- .release = optee_release,
-- .open_session = optee_open_session,
-- .close_session = optee_close_session,
-- .invoke_func = optee_invoke_func,
-- .cancel_req = optee_cancel_req,
-- .shm_register = optee_shm_register,
-- .shm_unregister = optee_shm_unregister,
--};
--
--static const struct tee_desc optee_clnt_desc = {
-- .name = DRIVER_NAME "-clnt",
-- .ops = &optee_clnt_ops,
-- .owner = THIS_MODULE,
--};
--
--static const struct tee_driver_ops optee_supp_ops = {
-- .get_version = optee_get_version,
-- .open = optee_open,
-- .release = optee_release_supp,
-- .supp_recv = optee_supp_recv,
-- .supp_send = optee_supp_send,
-- .shm_register = optee_shm_register_supp,
-- .shm_unregister = optee_shm_unregister_supp,
--};
--
--static const struct tee_desc optee_supp_desc = {
-- .name = DRIVER_NAME "-supp",
-- .ops = &optee_supp_ops,
-- .owner = THIS_MODULE,
-- .flags = TEE_DESC_PRIVILEGED,
--};
--
--static const struct optee_ops optee_ops = {
-- .do_call_with_arg = optee_do_call_with_arg,
-- .to_msg_param = optee_to_msg_param,
-- .from_msg_param = optee_from_msg_param,
--};
--
--static bool optee_msg_api_uid_is_optee_api(optee_invoke_fn *invoke_fn)
--{
-- struct arm_smccc_res res;
--
-- invoke_fn(OPTEE_SMC_CALLS_UID, 0, 0, 0, 0, 0, 0, 0, &res);
--
-- if (res.a0 == OPTEE_MSG_UID_0 && res.a1 == OPTEE_MSG_UID_1 &&
-- res.a2 == OPTEE_MSG_UID_2 && res.a3 == OPTEE_MSG_UID_3)
-- return true;
-- return false;
--}
--
--static void optee_msg_get_os_revision(optee_invoke_fn *invoke_fn)
--{
-- union {
-- struct arm_smccc_res smccc;
-- struct optee_smc_call_get_os_revision_result result;
-- } res = {
-- .result = {
-- .build_id = 0
-- }
-- };
--
-- invoke_fn(OPTEE_SMC_CALL_GET_OS_REVISION, 0, 0, 0, 0, 0, 0, 0,
-- &res.smccc);
--
-- if (res.result.build_id)
-- pr_info("revision %lu.%lu (%08lx)", res.result.major,
-- res.result.minor, res.result.build_id);
-- else
-- pr_info("revision %lu.%lu", res.result.major, res.result.minor);
--}
--
--static bool optee_msg_api_revision_is_compatible(optee_invoke_fn *invoke_fn)
--{
-- union {
-- struct arm_smccc_res smccc;
-- struct optee_smc_calls_revision_result result;
-- } res;
--
-- invoke_fn(OPTEE_SMC_CALLS_REVISION, 0, 0, 0, 0, 0, 0, 0, &res.smccc);
--
-- if (res.result.major == OPTEE_MSG_REVISION_MAJOR &&
-- (int)res.result.minor >= OPTEE_MSG_REVISION_MINOR)
-- return true;
-- return false;
--}
--
--static bool optee_msg_exchange_capabilities(optee_invoke_fn *invoke_fn,
-- u32 *sec_caps)
--{
-- union {
-- struct arm_smccc_res smccc;
-- struct optee_smc_exchange_capabilities_result result;
-- } res;
-- u32 a1 = 0;
--
-- /*
-- * TODO This isn't enough to tell if it's UP system (from kernel
-- * point of view) or not, is_smp() returns the the information
-- * needed, but can't be called directly from here.
-- */
-- if (!IS_ENABLED(CONFIG_SMP) || nr_cpu_ids == 1)
-- a1 |= OPTEE_SMC_NSEC_CAP_UNIPROCESSOR;
--
-- invoke_fn(OPTEE_SMC_EXCHANGE_CAPABILITIES, a1, 0, 0, 0, 0, 0, 0,
-- &res.smccc);
--
-- if (res.result.status != OPTEE_SMC_RETURN_OK)
-- return false;
--
-- *sec_caps = res.result.capabilities;
-- return true;
--}
--
--static struct tee_shm_pool *optee_config_dyn_shm(void)
--{
-- struct tee_shm_pool_mgr *priv_mgr;
-- struct tee_shm_pool_mgr *dmabuf_mgr;
-- void *rc;
--
-- rc = optee_shm_pool_alloc_pages();
-- if (IS_ERR(rc))
-- return rc;
-- priv_mgr = rc;
--
-- rc = optee_shm_pool_alloc_pages();
-- if (IS_ERR(rc)) {
-- tee_shm_pool_mgr_destroy(priv_mgr);
-- return rc;
-- }
-- dmabuf_mgr = rc;
--
-- rc = tee_shm_pool_alloc(priv_mgr, dmabuf_mgr);
-- if (IS_ERR(rc)) {
-- tee_shm_pool_mgr_destroy(priv_mgr);
-- tee_shm_pool_mgr_destroy(dmabuf_mgr);
-- }
--
-- return rc;
--}
--
--static struct tee_shm_pool *
--optee_config_shm_memremap(optee_invoke_fn *invoke_fn, void **memremaped_shm)
-+void optee_remove_common(struct optee *optee)
- {
-- union {
-- struct arm_smccc_res smccc;
-- struct optee_smc_get_shm_config_result result;
-- } res;
-- unsigned long vaddr;
-- phys_addr_t paddr;
-- size_t size;
-- phys_addr_t begin;
-- phys_addr_t end;
-- void *va;
-- struct tee_shm_pool_mgr *priv_mgr;
-- struct tee_shm_pool_mgr *dmabuf_mgr;
-- void *rc;
-- const int sz = OPTEE_SHM_NUM_PRIV_PAGES * PAGE_SIZE;
--
-- invoke_fn(OPTEE_SMC_GET_SHM_CONFIG, 0, 0, 0, 0, 0, 0, 0, &res.smccc);
-- if (res.result.status != OPTEE_SMC_RETURN_OK) {
-- pr_err("static shm service not available\n");
-- return ERR_PTR(-ENOENT);
-- }
--
-- if (res.result.settings != OPTEE_SMC_SHM_CACHED) {
-- pr_err("only normal cached shared memory supported\n");
-- return ERR_PTR(-EINVAL);
-- }
--
-- begin = roundup(res.result.start, PAGE_SIZE);
-- end = rounddown(res.result.start + res.result.size, PAGE_SIZE);
-- paddr = begin;
-- size = end - begin;
--
-- if (size < 2 * OPTEE_SHM_NUM_PRIV_PAGES * PAGE_SIZE) {
-- pr_err("too small shared memory area\n");
-- return ERR_PTR(-EINVAL);
-- }
--
-- va = memremap(paddr, size, MEMREMAP_WB);
-- if (!va) {
-- pr_err("shared memory ioremap failed\n");
-- return ERR_PTR(-EINVAL);
-- }
-- vaddr = (unsigned long)va;
--
-- rc = tee_shm_pool_mgr_alloc_res_mem(vaddr, paddr, sz,
-- 3 /* 8 bytes aligned */);
-- if (IS_ERR(rc))
-- goto err_memunmap;
-- priv_mgr = rc;
--
-- vaddr += sz;
-- paddr += sz;
-- size -= sz;
--
-- rc = tee_shm_pool_mgr_alloc_res_mem(vaddr, paddr, size, PAGE_SHIFT);
-- if (IS_ERR(rc))
-- goto err_free_priv_mgr;
-- dmabuf_mgr = rc;
--
-- rc = tee_shm_pool_alloc(priv_mgr, dmabuf_mgr);
-- if (IS_ERR(rc))
-- goto err_free_dmabuf_mgr;
--
-- *memremaped_shm = va;
--
-- return rc;
--
--err_free_dmabuf_mgr:
-- tee_shm_pool_mgr_destroy(dmabuf_mgr);
--err_free_priv_mgr:
-- tee_shm_pool_mgr_destroy(priv_mgr);
--err_memunmap:
-- memunmap(va);
-- return rc;
--}
--
--/* Simple wrapper functions to be able to use a function pointer */
--static void optee_smccc_smc(unsigned long a0, unsigned long a1,
-- unsigned long a2, unsigned long a3,
-- unsigned long a4, unsigned long a5,
-- unsigned long a6, unsigned long a7,
-- struct arm_smccc_res *res)
--{
-- arm_smccc_smc(a0, a1, a2, a3, a4, a5, a6, a7, res);
--}
--
--static void optee_smccc_hvc(unsigned long a0, unsigned long a1,
-- unsigned long a2, unsigned long a3,
-- unsigned long a4, unsigned long a5,
-- unsigned long a6, unsigned long a7,
-- struct arm_smccc_res *res)
--{
-- arm_smccc_hvc(a0, a1, a2, a3, a4, a5, a6, a7, res);
--}
--
--static optee_invoke_fn *get_invoke_func(struct device *dev)
--{
-- const char *method;
--
-- pr_info("probing for conduit method.\n");
--
-- if (device_property_read_string(dev, "method", &method)) {
-- pr_warn("missing \"method\" property\n");
-- return ERR_PTR(-ENXIO);
-- }
--
-- if (!strcmp("hvc", method))
-- return optee_smccc_hvc;
-- else if (!strcmp("smc", method))
-- return optee_smccc_smc;
--
-- pr_warn("invalid \"method\" property: %s\n", method);
-- return ERR_PTR(-EINVAL);
--}
--
--/* optee_remove - Device Removal Routine
-- * @pdev: platform device information struct
-- *
-- * optee_remove is called by platform subsystem to alert the driver
-- * that it should release the device
-- */
--
--static int optee_remove(struct platform_device *pdev)
--{
-- struct optee *optee = platform_get_drvdata(pdev);
--
- /* Unregister OP-TEE specific client devices on TEE bus */
- optee_unregister_devices();
-
-- /*
-- * Ask OP-TEE to free all cached shared memory objects to decrease
-- * reference counters and also avoid wild pointers in secure world
-- * into the old shared memory range.
-- */
-- optee_disable_shm_cache(optee);
--
- /*
- * The two devices have to be unregistered before we can free the
- * other resources.
-@@ -636,39 +167,13 @@ static int optee_remove(struct platform_device *pdev)
- tee_device_unregister(optee->teedev);
-
- tee_shm_pool_free(optee->pool);
-- if (optee->memremaped_shm)
-- memunmap(optee->memremaped_shm);
- optee_wait_queue_exit(&optee->wait_queue);
- optee_supp_uninit(&optee->supp);
- mutex_destroy(&optee->call_queue.mutex);
--
-- kfree(optee);
--
-- return 0;
--}
--
--/* optee_shutdown - Device Removal Routine
-- * @pdev: platform device information struct
-- *
-- * platform_shutdown is called by the platform subsystem to alert
-- * the driver that a shutdown, reboot, or kexec is happening and
-- * device must be disabled.
-- */
--static void optee_shutdown(struct platform_device *pdev)
--{
-- optee_disable_shm_cache(platform_get_drvdata(pdev));
- }
-
--static int optee_probe(struct platform_device *pdev)
-+static int optee_core_init(void)
- {
-- optee_invoke_fn *invoke_fn;
-- struct tee_shm_pool *pool = ERR_PTR(-EINVAL);
-- struct optee *optee = NULL;
-- void *memremaped_shm = NULL;
-- struct tee_device *teedev;
-- u32 sec_caps;
-- int rc;
--
- /*
- * The kernel may have crashed at the same time that all available
- * secure world threads were suspended and we cannot reschedule the
-@@ -679,139 +184,15 @@ static int optee_probe(struct platform_device *pdev)
- if (is_kdump_kernel())
- return -ENODEV;
-
-- invoke_fn = get_invoke_func(&pdev->dev);
-- if (IS_ERR(invoke_fn))
-- return PTR_ERR(invoke_fn);
--
-- if (!optee_msg_api_uid_is_optee_api(invoke_fn)) {
-- pr_warn("api uid mismatch\n");
-- return -EINVAL;
-- }
--
-- optee_msg_get_os_revision(invoke_fn);
--
-- if (!optee_msg_api_revision_is_compatible(invoke_fn)) {
-- pr_warn("api revision mismatch\n");
-- return -EINVAL;
-- }
--
-- if (!optee_msg_exchange_capabilities(invoke_fn, &sec_caps)) {
-- pr_warn("capabilities mismatch\n");
-- return -EINVAL;
-- }
--
-- /*
-- * Try to use dynamic shared memory if possible
-- */
-- if (sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM)
-- pool = optee_config_dyn_shm();
--
-- /*
-- * If dynamic shared memory is not available or failed - try static one
-- */
-- if (IS_ERR(pool) && (sec_caps & OPTEE_SMC_SEC_CAP_HAVE_RESERVED_SHM))
-- pool = optee_config_shm_memremap(invoke_fn, &memremaped_shm);
--
-- if (IS_ERR(pool))
-- return PTR_ERR(pool);
--
-- optee = kzalloc(sizeof(*optee), GFP_KERNEL);
-- if (!optee) {
-- rc = -ENOMEM;
-- goto err;
-- }
--
-- optee->ops = &optee_ops;
-- optee->invoke_fn = invoke_fn;
-- optee->sec_caps = sec_caps;
--
-- teedev = tee_device_alloc(&optee_clnt_desc, NULL, pool, optee);
-- if (IS_ERR(teedev)) {
-- rc = PTR_ERR(teedev);
-- goto err;
-- }
-- optee->teedev = teedev;
--
-- teedev = tee_device_alloc(&optee_supp_desc, NULL, pool, optee);
-- if (IS_ERR(teedev)) {
-- rc = PTR_ERR(teedev);
-- goto err;
-- }
-- optee->supp_teedev = teedev;
--
-- rc = tee_device_register(optee->teedev);
-- if (rc)
-- goto err;
--
-- rc = tee_device_register(optee->supp_teedev);
-- if (rc)
-- goto err;
--
-- mutex_init(&optee->call_queue.mutex);
-- INIT_LIST_HEAD(&optee->call_queue.waiters);
-- optee_wait_queue_init(&optee->wait_queue);
-- optee_supp_init(&optee->supp);
-- optee->memremaped_shm = memremaped_shm;
-- optee->pool = pool;
--
-- /*
-- * Ensure that there are no pre-existing shm objects before enabling
-- * the shm cache so that there's no chance of receiving an invalid
-- * address during shutdown. This could occur, for example, if we're
-- * kexec booting from an older kernel that did not properly cleanup the
-- * shm cache.
-- */
-- optee_disable_unmapped_shm_cache(optee);
--
-- optee_enable_shm_cache(optee);
--
-- if (optee->sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM)
-- pr_info("dynamic shared memory is enabled\n");
--
-- platform_set_drvdata(pdev, optee);
--
-- rc = optee_enumerate_devices(PTA_CMD_GET_DEVICES);
-- if (rc) {
-- optee_remove(pdev);
-- return rc;
-- }
--
-- pr_info("initialized driver\n");
-- return 0;
--err:
-- if (optee) {
-- /*
-- * tee_device_unregister() is safe to call even if the
-- * devices hasn't been registered with
-- * tee_device_register() yet.
-- */
-- tee_device_unregister(optee->supp_teedev);
-- tee_device_unregister(optee->teedev);
-- kfree(optee);
-- }
-- if (pool)
-- tee_shm_pool_free(pool);
-- if (memremaped_shm)
-- memunmap(memremaped_shm);
-- return rc;
-+ return optee_smc_abi_register();
- }
-+module_init(optee_core_init);
-
--static const struct of_device_id optee_dt_match[] = {
-- { .compatible = "linaro,optee-tz" },
-- {},
--};
--MODULE_DEVICE_TABLE(of, optee_dt_match);
--
--static struct platform_driver optee_driver = {
-- .probe = optee_probe,
-- .remove = optee_remove,
-- .shutdown = optee_shutdown,
-- .driver = {
-- .name = "optee",
-- .of_match_table = optee_dt_match,
-- },
--};
--module_platform_driver(optee_driver);
-+static void optee_core_exit(void)
-+{
-+ optee_smc_abi_unregister();
-+}
-+module_exit(optee_core_exit);
-
- MODULE_AUTHOR("Linaro");
- MODULE_DESCRIPTION("OP-TEE driver");
-diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
-index beca97017996..40af6b059b20 100644
---- a/drivers/tee/optee/optee_private.h
-+++ b/drivers/tee/optee/optee_private.h
-@@ -12,6 +12,8 @@
- #include <linux/types.h>
- #include "optee_msg.h"
-
-+#define DRIVER_NAME "optee"
-+
- #define OPTEE_MAX_ARG_SIZE 1024
-
- /* Some Global Platform error codes used in this driver */
-@@ -29,6 +31,11 @@ typedef void (optee_invoke_fn)(unsigned long, unsigned long, unsigned long,
- unsigned long, unsigned long,
- struct arm_smccc_res *);
-
-+struct optee_call_waiter {
-+ struct list_head list_node;
-+ struct completion c;
-+};
-+
- struct optee_call_queue {
- /* Serializes access to this struct */
- struct mutex mutex;
-@@ -66,6 +73,19 @@ struct optee_supp {
- struct completion reqs_c;
- };
-
-+/**
-+ * struct optee_smc - SMC ABI specifics
-+ * @invoke_fn: function to issue smc or hvc
-+ * @memremaped_shm virtual address of memory in shared memory pool
-+ * @sec_caps: secure world capabilities defined by
-+ * OPTEE_SMC_SEC_CAP_* in optee_smc.h
-+ */
-+struct optee_smc {
-+ optee_invoke_fn *invoke_fn;
-+ void *memremaped_shm;
-+ u32 sec_caps;
-+};
-+
- struct optee;
-
- /**
-@@ -95,15 +115,12 @@ struct optee_ops {
- * @ops: internal callbacks for different ways to reach secure
- * world
- * @teedev: client device
-- * @invoke_fn: function to issue smc or hvc
-+ * @smc: specific to SMC ABI
- * @call_queue: queue of threads waiting to call @invoke_fn
- * @wait_queue: queue of threads from secure world waiting for a
- * secure world sync object
- * @supp: supplicant synchronization struct for RPC to supplicant
- * @pool: shared memory pool
-- * @memremaped_shm virtual address of memory in shared memory pool
-- * @sec_caps: secure world capabilities defined by
-- * OPTEE_SMC_SEC_CAP_* in optee_smc.h
- * @scan_bus_done flag if device registation was already done.
- * @scan_bus_wq workqueue to scan optee bus and register optee drivers
- * @scan_bus_work workq to scan optee bus and register optee drivers
-@@ -112,13 +129,11 @@ struct optee {
- struct tee_device *supp_teedev;
- struct tee_device *teedev;
- const struct optee_ops *ops;
-- optee_invoke_fn *invoke_fn;
-+ struct optee_smc smc;
- struct optee_call_queue call_queue;
- struct optee_wait_queue wait_queue;
- struct optee_supp supp;
- struct tee_shm_pool *pool;
-- void *memremaped_shm;
-- u32 sec_caps;
- bool scan_bus_done;
- struct workqueue_struct *scan_bus_wq;
- struct work_struct scan_bus_work;
-@@ -153,10 +168,6 @@ struct optee_call_ctx {
- size_t num_entries;
- };
-
--void optee_handle_rpc(struct tee_context *ctx, struct optee_rpc_param *param,
-- struct optee_call_ctx *call_ctx);
--void optee_rpc_finalize_call(struct optee_call_ctx *call_ctx);
--
- void optee_wait_queue_init(struct optee_wait_queue *wq);
- void optee_wait_queue_exit(struct optee_wait_queue *wq);
-
-@@ -174,7 +185,6 @@ int optee_supp_recv(struct tee_context *ctx, u32 *func, u32 *num_params,
- int optee_supp_send(struct tee_context *ctx, u32 ret, u32 num_params,
- struct tee_param *param);
-
--int optee_do_call_with_arg(struct tee_context *ctx, struct tee_shm *arg);
- int optee_open_session(struct tee_context *ctx,
- struct tee_ioctl_open_session_arg *arg,
- struct tee_param *param);
-@@ -184,30 +194,60 @@ int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg,
- struct tee_param *param);
- int optee_cancel_req(struct tee_context *ctx, u32 cancel_id, u32 session);
-
--void optee_enable_shm_cache(struct optee *optee);
--void optee_disable_shm_cache(struct optee *optee);
--void optee_disable_unmapped_shm_cache(struct optee *optee);
--
--int optee_shm_register(struct tee_context *ctx, struct tee_shm *shm,
-- struct page **pages, size_t num_pages,
-- unsigned long start);
--int optee_shm_unregister(struct tee_context *ctx, struct tee_shm *shm);
--
--int optee_shm_register_supp(struct tee_context *ctx, struct tee_shm *shm,
-- struct page **pages, size_t num_pages,
-- unsigned long start);
--int optee_shm_unregister_supp(struct tee_context *ctx, struct tee_shm *shm);
--
--u64 *optee_allocate_pages_list(size_t num_entries);
--void optee_free_pages_list(void *array, size_t num_entries);
--void optee_fill_pages_list(u64 *dst, struct page **pages, int num_pages,
-- size_t page_offset);
--
- #define PTA_CMD_GET_DEVICES 0x0
- #define PTA_CMD_GET_DEVICES_SUPP 0x1
- int optee_enumerate_devices(u32 func);
- void optee_unregister_devices(void);
-
-+int optee_pool_op_alloc_helper(struct tee_shm_pool_mgr *poolm,
-+ struct tee_shm *shm, size_t size,
-+ int (*shm_register)(struct tee_context *ctx,
-+ struct tee_shm *shm,
-+ struct page **pages,
-+ size_t num_pages,
-+ unsigned long start));
-+
-+
-+void optee_remove_common(struct optee *optee);
-+int optee_open(struct tee_context *ctx, bool cap_memref_null);
-+void optee_release(struct tee_context *ctx);
-+void optee_release_supp(struct tee_context *ctx);
-+
-+static inline void optee_from_msg_param_value(struct tee_param *p, u32 attr,
-+ const struct optee_msg_param *mp)
-+{
-+ p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT +
-+ attr - OPTEE_MSG_ATTR_TYPE_VALUE_INPUT;
-+ p->u.value.a = mp->u.value.a;
-+ p->u.value.b = mp->u.value.b;
-+ p->u.value.c = mp->u.value.c;
-+}
-+
-+static inline void optee_to_msg_param_value(struct optee_msg_param *mp,
-+ const struct tee_param *p)
-+{
-+ mp->attr = OPTEE_MSG_ATTR_TYPE_VALUE_INPUT + p->attr -
-+ TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT;
-+ mp->u.value.a = p->u.value.a;
-+ mp->u.value.b = p->u.value.b;
-+ mp->u.value.c = p->u.value.c;
-+}
-+
-+void optee_cq_wait_init(struct optee_call_queue *cq,
-+ struct optee_call_waiter *w);
-+void optee_cq_wait_for_completion(struct optee_call_queue *cq,
-+ struct optee_call_waiter *w);
-+void optee_cq_wait_final(struct optee_call_queue *cq,
-+ struct optee_call_waiter *w);
-+int optee_check_mem_type(unsigned long start, size_t num_pages);
-+struct tee_shm *optee_get_msg_arg(struct tee_context *ctx, size_t num_params,
-+ struct optee_msg_arg **msg_arg);
-+
-+struct tee_shm *optee_rpc_cmd_alloc_suppl(struct tee_context *ctx, size_t sz);
-+void optee_rpc_cmd_free_suppl(struct tee_context *ctx, struct tee_shm *shm);
-+void optee_rpc_cmd(struct tee_context *ctx, struct optee *optee,
-+ struct optee_msg_arg *arg);
-+
- /*
- * Small helpers
- */
-@@ -223,4 +263,8 @@ static inline void reg_pair_from_64(u32 *reg0, u32 *reg1, u64 val)
- *reg1 = val;
- }
-
-+/* Registration of the ABIs */
-+int optee_smc_abi_register(void);
-+void optee_smc_abi_unregister(void);
-+
- #endif /*OPTEE_PRIVATE_H*/
-diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c
-index 309258d47790..cd642e340eaf 100644
---- a/drivers/tee/optee/rpc.c
-+++ b/drivers/tee/optee/rpc.c
-@@ -6,12 +6,10 @@
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
- #include <linux/delay.h>
--#include <linux/device.h>
- #include <linux/i2c.h>
- #include <linux/slab.h>
- #include <linux/tee_drv.h>
- #include "optee_private.h"
--#include "optee_smc.h"
- #include "optee_rpc_cmd.h"
-
- struct wq_entry {
-@@ -266,7 +264,7 @@ static void handle_rpc_supp_cmd(struct tee_context *ctx, struct optee *optee,
- kfree(params);
- }
-
--static struct tee_shm *cmd_alloc_suppl(struct tee_context *ctx, size_t sz)
-+struct tee_shm *optee_rpc_cmd_alloc_suppl(struct tee_context *ctx, size_t sz)
- {
- u32 ret;
- struct tee_param param;
-@@ -289,103 +287,7 @@ static struct tee_shm *cmd_alloc_suppl(struct tee_context *ctx, size_t sz)
- return shm;
- }
-
--static void handle_rpc_func_cmd_shm_alloc(struct tee_context *ctx,
-- struct optee_msg_arg *arg,
-- struct optee_call_ctx *call_ctx)
--{
-- phys_addr_t pa;
-- struct tee_shm *shm;
-- size_t sz;
-- size_t n;
--
-- arg->ret_origin = TEEC_ORIGIN_COMMS;
--
-- if (!arg->num_params ||
-- arg->params[0].attr != OPTEE_MSG_ATTR_TYPE_VALUE_INPUT) {
-- arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-- return;
-- }
--
-- for (n = 1; n < arg->num_params; n++) {
-- if (arg->params[n].attr != OPTEE_MSG_ATTR_TYPE_NONE) {
-- arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-- return;
-- }
-- }
--
-- sz = arg->params[0].u.value.b;
-- switch (arg->params[0].u.value.a) {
-- case OPTEE_RPC_SHM_TYPE_APPL:
-- shm = cmd_alloc_suppl(ctx, sz);
-- break;
-- case OPTEE_RPC_SHM_TYPE_KERNEL:
-- shm = tee_shm_alloc(ctx, sz, TEE_SHM_MAPPED | TEE_SHM_PRIV);
-- break;
-- default:
-- arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-- return;
-- }
--
-- if (IS_ERR(shm)) {
-- arg->ret = TEEC_ERROR_OUT_OF_MEMORY;
-- return;
-- }
--
-- if (tee_shm_get_pa(shm, 0, &pa)) {
-- arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-- goto bad;
-- }
--
-- sz = tee_shm_get_size(shm);
--
-- if (tee_shm_is_registered(shm)) {
-- struct page **pages;
-- u64 *pages_list;
-- size_t page_num;
--
-- pages = tee_shm_get_pages(shm, &page_num);
-- if (!pages || !page_num) {
-- arg->ret = TEEC_ERROR_OUT_OF_MEMORY;
-- goto bad;
-- }
--
-- pages_list = optee_allocate_pages_list(page_num);
-- if (!pages_list) {
-- arg->ret = TEEC_ERROR_OUT_OF_MEMORY;
-- goto bad;
-- }
--
-- call_ctx->pages_list = pages_list;
-- call_ctx->num_entries = page_num;
--
-- arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT |
-- OPTEE_MSG_ATTR_NONCONTIG;
-- /*
-- * In the least bits of u.tmem.buf_ptr we store buffer offset
-- * from 4k page, as described in OP-TEE ABI.
-- */
-- arg->params[0].u.tmem.buf_ptr = virt_to_phys(pages_list) |
-- (tee_shm_get_page_offset(shm) &
-- (OPTEE_MSG_NONCONTIG_PAGE_SIZE - 1));
-- arg->params[0].u.tmem.size = tee_shm_get_size(shm);
-- arg->params[0].u.tmem.shm_ref = (unsigned long)shm;
--
-- optee_fill_pages_list(pages_list, pages, page_num,
-- tee_shm_get_page_offset(shm));
-- } else {
-- arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT;
-- arg->params[0].u.tmem.buf_ptr = pa;
-- arg->params[0].u.tmem.size = sz;
-- arg->params[0].u.tmem.shm_ref = (unsigned long)shm;
-- }
--
-- arg->ret = TEEC_SUCCESS;
-- return;
--bad:
-- tee_shm_free(shm);
--}
--
--static void cmd_free_suppl(struct tee_context *ctx, struct tee_shm *shm)
-+void optee_rpc_cmd_free_suppl(struct tee_context *ctx, struct tee_shm *shm)
- {
- struct tee_param param;
-
-@@ -410,60 +312,9 @@ static void cmd_free_suppl(struct tee_context *ctx, struct tee_shm *shm)
- optee_supp_thrd_req(ctx, OPTEE_RPC_CMD_SHM_FREE, 1, ¶m);
- }
-
--static void handle_rpc_func_cmd_shm_free(struct tee_context *ctx,
-- struct optee_msg_arg *arg)
--{
-- struct tee_shm *shm;
--
-- arg->ret_origin = TEEC_ORIGIN_COMMS;
--
-- if (arg->num_params != 1 ||
-- arg->params[0].attr != OPTEE_MSG_ATTR_TYPE_VALUE_INPUT) {
-- arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-- return;
-- }
--
-- shm = (struct tee_shm *)(unsigned long)arg->params[0].u.value.b;
-- switch (arg->params[0].u.value.a) {
-- case OPTEE_RPC_SHM_TYPE_APPL:
-- cmd_free_suppl(ctx, shm);
-- break;
-- case OPTEE_RPC_SHM_TYPE_KERNEL:
-- tee_shm_free(shm);
-- break;
-- default:
-- arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-- }
-- arg->ret = TEEC_SUCCESS;
--}
--
--static void free_pages_list(struct optee_call_ctx *call_ctx)
--{
-- if (call_ctx->pages_list) {
-- optee_free_pages_list(call_ctx->pages_list,
-- call_ctx->num_entries);
-- call_ctx->pages_list = NULL;
-- call_ctx->num_entries = 0;
-- }
--}
--
--void optee_rpc_finalize_call(struct optee_call_ctx *call_ctx)
--{
-- free_pages_list(call_ctx);
--}
--
--static void handle_rpc_func_cmd(struct tee_context *ctx, struct optee *optee,
-- struct tee_shm *shm,
-- struct optee_call_ctx *call_ctx)
-+void optee_rpc_cmd(struct tee_context *ctx, struct optee *optee,
-+ struct optee_msg_arg *arg)
- {
-- struct optee_msg_arg *arg;
--
-- arg = tee_shm_get_va(shm, 0);
-- if (IS_ERR(arg)) {
-- pr_err("%s: tee_shm_get_va %p failed\n", __func__, shm);
-- return;
-- }
--
- switch (arg->cmd) {
- case OPTEE_RPC_CMD_GET_TIME:
- handle_rpc_func_cmd_get_time(arg);
-@@ -474,13 +325,6 @@ static void handle_rpc_func_cmd(struct tee_context *ctx, struct optee *optee,
- case OPTEE_RPC_CMD_SUSPEND:
- handle_rpc_func_cmd_wait(arg);
- break;
-- case OPTEE_RPC_CMD_SHM_ALLOC:
-- free_pages_list(call_ctx);
-- handle_rpc_func_cmd_shm_alloc(ctx, arg, call_ctx);
-- break;
-- case OPTEE_RPC_CMD_SHM_FREE:
-- handle_rpc_func_cmd_shm_free(ctx, arg);
-- break;
- case OPTEE_RPC_CMD_I2C_TRANSFER:
- handle_rpc_func_cmd_i2c_transfer(ctx, arg);
- break;
-@@ -489,58 +333,4 @@ static void handle_rpc_func_cmd(struct tee_context *ctx, struct optee *optee,
- }
- }
-
--/**
-- * optee_handle_rpc() - handle RPC from secure world
-- * @ctx: context doing the RPC
-- * @param: value of registers for the RPC
-- * @call_ctx: call context. Preserved during one OP-TEE invocation
-- *
-- * Result of RPC is written back into @param.
-- */
--void optee_handle_rpc(struct tee_context *ctx, struct optee_rpc_param *param,
-- struct optee_call_ctx *call_ctx)
--{
-- struct tee_device *teedev = ctx->teedev;
-- struct optee *optee = tee_get_drvdata(teedev);
-- struct tee_shm *shm;
-- phys_addr_t pa;
--
-- switch (OPTEE_SMC_RETURN_GET_RPC_FUNC(param->a0)) {
-- case OPTEE_SMC_RPC_FUNC_ALLOC:
-- shm = tee_shm_alloc(ctx, param->a1,
-- TEE_SHM_MAPPED | TEE_SHM_PRIV);
-- if (!IS_ERR(shm) && !tee_shm_get_pa(shm, 0, &pa)) {
-- reg_pair_from_64(¶m->a1, ¶m->a2, pa);
-- reg_pair_from_64(¶m->a4, ¶m->a5,
-- (unsigned long)shm);
-- } else {
-- param->a1 = 0;
-- param->a2 = 0;
-- param->a4 = 0;
-- param->a5 = 0;
-- }
-- break;
-- case OPTEE_SMC_RPC_FUNC_FREE:
-- shm = reg_pair_to_ptr(param->a1, param->a2);
-- tee_shm_free(shm);
-- break;
-- case OPTEE_SMC_RPC_FUNC_FOREIGN_INTR:
-- /*
-- * A foreign interrupt was raised while secure world was
-- * executing, since they are handled in Linux a dummy RPC is
-- * performed to let Linux take the interrupt through the normal
-- * vector.
-- */
-- break;
-- case OPTEE_SMC_RPC_FUNC_CMD:
-- shm = reg_pair_to_ptr(param->a1, param->a2);
-- handle_rpc_func_cmd(ctx, optee, shm, call_ctx);
-- break;
-- default:
-- pr_warn("Unknown RPC func 0x%x\n",
-- (u32)OPTEE_SMC_RETURN_GET_RPC_FUNC(param->a0));
-- break;
-- }
-
-- param->a0 = OPTEE_SMC_CALL_RETURN_FROM_RPC;
--}
-diff --git a/drivers/tee/optee/shm_pool.h b/drivers/tee/optee/shm_pool.h
-deleted file mode 100644
-index 28109d991c4b..000000000000
---- a/drivers/tee/optee/shm_pool.h
-+++ /dev/null
-@@ -1,14 +0,0 @@
--/* SPDX-License-Identifier: GPL-2.0-only */
--/*
-- * Copyright (c) 2015, Linaro Limited
-- * Copyright (c) 2016, EPAM Systems
-- */
--
--#ifndef SHM_POOL_H
--#define SHM_POOL_H
--
--#include <linux/tee_drv.h>
--
--struct tee_shm_pool_mgr *optee_shm_pool_alloc_pages(void);
--
--#endif
-diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
-new file mode 100644
-index 000000000000..9a787fb4f5e5
---- /dev/null
-+++ b/drivers/tee/optee/smc_abi.c
-@@ -0,0 +1,1361 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Copyright (c) 2015-2021, Linaro Limited
-+ * Copyright (c) 2016, EPAM Systems
-+ */
-+
-+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-+
-+#include <linux/arm-smccc.h>
-+#include <linux/errno.h>
-+#include <linux/io.h>
-+#include <linux/sched.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_platform.h>
-+#include <linux/platform_device.h>
-+#include <linux/slab.h>
-+#include <linux/string.h>
-+#include <linux/tee_drv.h>
-+#include <linux/types.h>
-+#include <linux/workqueue.h>
-+#include "optee_private.h"
-+#include "optee_smc.h"
-+#include "optee_rpc_cmd.h"
-+#define CREATE_TRACE_POINTS
-+#include "optee_trace.h"
-+
-+/*
-+ * This file implement the SMC ABI used when communicating with secure world
-+ * OP-TEE OS via raw SMCs.
-+ * This file is divided into the following sections:
-+ * 1. Convert between struct tee_param and struct optee_msg_param
-+ * 2. Low level support functions to register shared memory in secure world
-+ * 3. Dynamic shared memory pool based on alloc_pages()
-+ * 4. Do a normal scheduled call into secure world
-+ * 5. Driver initialization.
-+ */
-+
-+#define OPTEE_SHM_NUM_PRIV_PAGES CONFIG_OPTEE_SHM_NUM_PRIV_PAGES
-+
-+/*
-+ * 1. Convert between struct tee_param and struct optee_msg_param
-+ *
-+ * optee_from_msg_param() and optee_to_msg_param() are the main
-+ * functions.
-+ */
-+
-+static int from_msg_param_tmp_mem(struct tee_param *p, u32 attr,
-+ const struct optee_msg_param *mp)
-+{
-+ struct tee_shm *shm;
-+ phys_addr_t pa;
-+ int rc;
-+
-+ p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
-+ attr - OPTEE_MSG_ATTR_TYPE_TMEM_INPUT;
-+ p->u.memref.size = mp->u.tmem.size;
-+ shm = (struct tee_shm *)(unsigned long)mp->u.tmem.shm_ref;
-+ if (!shm) {
-+ p->u.memref.shm_offs = 0;
-+ p->u.memref.shm = NULL;
-+ return 0;
-+ }
-+
-+ rc = tee_shm_get_pa(shm, 0, &pa);
-+ if (rc)
-+ return rc;
-+
-+ p->u.memref.shm_offs = mp->u.tmem.buf_ptr - pa;
-+ p->u.memref.shm = shm;
-+
-+ /* Check that the memref is covered by the shm object */
-+ if (p->u.memref.size) {
-+ size_t o = p->u.memref.shm_offs +
-+ p->u.memref.size - 1;
-+
-+ rc = tee_shm_get_pa(shm, o, NULL);
-+ if (rc)
-+ return rc;
-+ }
-+
-+ return 0;
-+}
-+
-+static void from_msg_param_reg_mem(struct tee_param *p, u32 attr,
-+ const struct optee_msg_param *mp)
-+{
-+ struct tee_shm *shm;
-+
-+ p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
-+ attr - OPTEE_MSG_ATTR_TYPE_RMEM_INPUT;
-+ p->u.memref.size = mp->u.rmem.size;
-+ shm = (struct tee_shm *)(unsigned long)mp->u.rmem.shm_ref;
-+
-+ if (shm) {
-+ p->u.memref.shm_offs = mp->u.rmem.offs;
-+ p->u.memref.shm = shm;
-+ } else {
-+ p->u.memref.shm_offs = 0;
-+ p->u.memref.shm = NULL;
-+ }
-+}
-+
-+/**
-+ * optee_from_msg_param() - convert from OPTEE_MSG parameters to
-+ * struct tee_param
-+ * @optee: main service struct
-+ * @params: subsystem internal parameter representation
-+ * @num_params: number of elements in the parameter arrays
-+ * @msg_params: OPTEE_MSG parameters
-+ * Returns 0 on success or <0 on failure
-+ */
-+static int optee_from_msg_param(struct optee *optee, struct tee_param *params,
-+ size_t num_params,
-+ const struct optee_msg_param *msg_params)
-+{
-+ int rc;
-+ size_t n;
-+
-+ for (n = 0; n < num_params; n++) {
-+ struct tee_param *p = params + n;
-+ const struct optee_msg_param *mp = msg_params + n;
-+ u32 attr = mp->attr & OPTEE_MSG_ATTR_TYPE_MASK;
-+
-+ switch (attr) {
-+ case OPTEE_MSG_ATTR_TYPE_NONE:
-+ p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
-+ memset(&p->u, 0, sizeof(p->u));
-+ break;
-+ case OPTEE_MSG_ATTR_TYPE_VALUE_INPUT:
-+ case OPTEE_MSG_ATTR_TYPE_VALUE_OUTPUT:
-+ case OPTEE_MSG_ATTR_TYPE_VALUE_INOUT:
-+ optee_from_msg_param_value(p, attr, mp);
-+ break;
-+ case OPTEE_MSG_ATTR_TYPE_TMEM_INPUT:
-+ case OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT:
-+ case OPTEE_MSG_ATTR_TYPE_TMEM_INOUT:
-+ rc = from_msg_param_tmp_mem(p, attr, mp);
-+ if (rc)
-+ return rc;
-+ break;
-+ case OPTEE_MSG_ATTR_TYPE_RMEM_INPUT:
-+ case OPTEE_MSG_ATTR_TYPE_RMEM_OUTPUT:
-+ case OPTEE_MSG_ATTR_TYPE_RMEM_INOUT:
-+ from_msg_param_reg_mem(p, attr, mp);
-+ break;
-+
-+ default:
-+ return -EINVAL;
-+ }
-+ }
-+ return 0;
-+}
-+
-+static int to_msg_param_tmp_mem(struct optee_msg_param *mp,
-+ const struct tee_param *p)
-+{
-+ int rc;
-+ phys_addr_t pa;
-+
-+ mp->attr = OPTEE_MSG_ATTR_TYPE_TMEM_INPUT + p->attr -
-+ TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT;
-+
-+ mp->u.tmem.shm_ref = (unsigned long)p->u.memref.shm;
-+ mp->u.tmem.size = p->u.memref.size;
-+
-+ if (!p->u.memref.shm) {
-+ mp->u.tmem.buf_ptr = 0;
-+ return 0;
-+ }
-+
-+ rc = tee_shm_get_pa(p->u.memref.shm, p->u.memref.shm_offs, &pa);
-+ if (rc)
-+ return rc;
-+
-+ mp->u.tmem.buf_ptr = pa;
-+ mp->attr |= OPTEE_MSG_ATTR_CACHE_PREDEFINED <<
-+ OPTEE_MSG_ATTR_CACHE_SHIFT;
-+
-+ return 0;
-+}
-+
-+static int to_msg_param_reg_mem(struct optee_msg_param *mp,
-+ const struct tee_param *p)
-+{
-+ mp->attr = OPTEE_MSG_ATTR_TYPE_RMEM_INPUT + p->attr -
-+ TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT;
-+
-+ mp->u.rmem.shm_ref = (unsigned long)p->u.memref.shm;
-+ mp->u.rmem.size = p->u.memref.size;
-+ mp->u.rmem.offs = p->u.memref.shm_offs;
-+ return 0;
-+}
-+
-+/**
-+ * optee_to_msg_param() - convert from struct tee_params to OPTEE_MSG parameters
-+ * @optee: main service struct
-+ * @msg_params: OPTEE_MSG parameters
-+ * @num_params: number of elements in the parameter arrays
-+ * @params: subsystem itnernal parameter representation
-+ * Returns 0 on success or <0 on failure
-+ */
-+static int optee_to_msg_param(struct optee *optee,
-+ struct optee_msg_param *msg_params,
-+ size_t num_params, const struct tee_param *params)
-+{
-+ int rc;
-+ size_t n;
-+
-+ for (n = 0; n < num_params; n++) {
-+ const struct tee_param *p = params + n;
-+ struct optee_msg_param *mp = msg_params + n;
-+
-+ switch (p->attr) {
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_NONE:
-+ mp->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
-+ memset(&mp->u, 0, sizeof(mp->u));
-+ break;
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT:
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT:
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT:
-+ optee_to_msg_param_value(mp, p);
-+ break;
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT:
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT:
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT:
-+ if (tee_shm_is_registered(p->u.memref.shm))
-+ rc = to_msg_param_reg_mem(mp, p);
-+ else
-+ rc = to_msg_param_tmp_mem(mp, p);
-+ if (rc)
-+ return rc;
-+ break;
-+ default:
-+ return -EINVAL;
-+ }
-+ }
-+ return 0;
-+}
-+
-+/*
-+ * 2. Low level support functions to register shared memory in secure world
-+ *
-+ * Functions to enable/disable shared memory caching in secure world, that
-+ * is, lazy freeing of previously allocated shared memory. Freeing is
-+ * performed when a request has been compled.
-+ *
-+ * Functions to register and unregister shared memory both for normal
-+ * clients and for tee-supplicant.
-+ */
-+
-+/**
-+ * optee_enable_shm_cache() - Enables caching of some shared memory allocation
-+ * in OP-TEE
-+ * @optee: main service struct
-+ */
-+static void optee_enable_shm_cache(struct optee *optee)
-+{
-+ struct optee_call_waiter w;
-+
-+ /* We need to retry until secure world isn't busy. */
-+ optee_cq_wait_init(&optee->call_queue, &w);
-+ while (true) {
-+ struct arm_smccc_res res;
-+
-+ optee->smc.invoke_fn(OPTEE_SMC_ENABLE_SHM_CACHE,
-+ 0, 0, 0, 0, 0, 0, 0, &res);
-+ if (res.a0 == OPTEE_SMC_RETURN_OK)
-+ break;
-+ optee_cq_wait_for_completion(&optee->call_queue, &w);
-+ }
-+ optee_cq_wait_final(&optee->call_queue, &w);
-+}
-+
-+/**
-+ * __optee_disable_shm_cache() - Disables caching of some shared memory
-+ * allocation in OP-TEE
-+ * @optee: main service struct
-+ * @is_mapped: true if the cached shared memory addresses were mapped by this
-+ * kernel, are safe to dereference, and should be freed
-+ */
-+static void __optee_disable_shm_cache(struct optee *optee, bool is_mapped)
-+{
-+ struct optee_call_waiter w;
-+
-+ /* We need to retry until secure world isn't busy. */
-+ optee_cq_wait_init(&optee->call_queue, &w);
-+ while (true) {
-+ union {
-+ struct arm_smccc_res smccc;
-+ struct optee_smc_disable_shm_cache_result result;
-+ } res;
-+
-+ optee->smc.invoke_fn(OPTEE_SMC_DISABLE_SHM_CACHE,
-+ 0, 0, 0, 0, 0, 0, 0, &res.smccc);
-+ if (res.result.status == OPTEE_SMC_RETURN_ENOTAVAIL)
-+ break; /* All shm's freed */
-+ if (res.result.status == OPTEE_SMC_RETURN_OK) {
-+ struct tee_shm *shm;
-+
-+ /*
-+ * Shared memory references that were not mapped by
-+ * this kernel must be ignored to prevent a crash.
-+ */
-+ if (!is_mapped)
-+ continue;
-+
-+ shm = reg_pair_to_ptr(res.result.shm_upper32,
-+ res.result.shm_lower32);
-+ tee_shm_free(shm);
-+ } else {
-+ optee_cq_wait_for_completion(&optee->call_queue, &w);
-+ }
-+ }
-+ optee_cq_wait_final(&optee->call_queue, &w);
-+}
-+
-+/**
-+ * optee_disable_shm_cache() - Disables caching of mapped shared memory
-+ * allocations in OP-TEE
-+ * @optee: main service struct
-+ */
-+static void optee_disable_shm_cache(struct optee *optee)
-+{
-+ return __optee_disable_shm_cache(optee, true);
-+}
-+
-+/**
-+ * optee_disable_unmapped_shm_cache() - Disables caching of shared memory
-+ * allocations in OP-TEE which are not
-+ * currently mapped
-+ * @optee: main service struct
-+ */
-+static void optee_disable_unmapped_shm_cache(struct optee *optee)
-+{
-+ return __optee_disable_shm_cache(optee, false);
-+}
-+
-+#define PAGELIST_ENTRIES_PER_PAGE \
-+ ((OPTEE_MSG_NONCONTIG_PAGE_SIZE / sizeof(u64)) - 1)
-+
-+/*
-+ * The final entry in each pagelist page is a pointer to the next
-+ * pagelist page.
-+ */
-+static size_t get_pages_list_size(size_t num_entries)
-+{
-+ int pages = DIV_ROUND_UP(num_entries, PAGELIST_ENTRIES_PER_PAGE);
-+
-+ return pages * OPTEE_MSG_NONCONTIG_PAGE_SIZE;
-+}
-+
-+static u64 *optee_allocate_pages_list(size_t num_entries)
-+{
-+ return alloc_pages_exact(get_pages_list_size(num_entries), GFP_KERNEL);
-+}
-+
-+static void optee_free_pages_list(void *list, size_t num_entries)
-+{
-+ free_pages_exact(list, get_pages_list_size(num_entries));
-+}
-+
-+/**
-+ * optee_fill_pages_list() - write list of user pages to given shared
-+ * buffer.
-+ *
-+ * @dst: page-aligned buffer where list of pages will be stored
-+ * @pages: array of pages that represents shared buffer
-+ * @num_pages: number of entries in @pages
-+ * @page_offset: offset of user buffer from page start
-+ *
-+ * @dst should be big enough to hold list of user page addresses and
-+ * links to the next pages of buffer
-+ */
-+static void optee_fill_pages_list(u64 *dst, struct page **pages, int num_pages,
-+ size_t page_offset)
-+{
-+ int n = 0;
-+ phys_addr_t optee_page;
-+ /*
-+ * Refer to OPTEE_MSG_ATTR_NONCONTIG description in optee_msg.h
-+ * for details.
-+ */
-+ struct {
-+ u64 pages_list[PAGELIST_ENTRIES_PER_PAGE];
-+ u64 next_page_data;
-+ } *pages_data;
-+
-+ /*
-+ * Currently OP-TEE uses 4k page size and it does not looks
-+ * like this will change in the future. On other hand, there are
-+ * no know ARM architectures with page size < 4k.
-+ * Thus the next built assert looks redundant. But the following
-+ * code heavily relies on this assumption, so it is better be
-+ * safe than sorry.
-+ */
-+ BUILD_BUG_ON(PAGE_SIZE < OPTEE_MSG_NONCONTIG_PAGE_SIZE);
-+
-+ pages_data = (void *)dst;
-+ /*
-+ * If linux page is bigger than 4k, and user buffer offset is
-+ * larger than 4k/8k/12k/etc this will skip first 4k pages,
-+ * because they bear no value data for OP-TEE.
-+ */
-+ optee_page = page_to_phys(*pages) +
-+ round_down(page_offset, OPTEE_MSG_NONCONTIG_PAGE_SIZE);
-+
-+ while (true) {
-+ pages_data->pages_list[n++] = optee_page;
-+
-+ if (n == PAGELIST_ENTRIES_PER_PAGE) {
-+ pages_data->next_page_data =
-+ virt_to_phys(pages_data + 1);
-+ pages_data++;
-+ n = 0;
-+ }
-+
-+ optee_page += OPTEE_MSG_NONCONTIG_PAGE_SIZE;
-+ if (!(optee_page & ~PAGE_MASK)) {
-+ if (!--num_pages)
-+ break;
-+ pages++;
-+ optee_page = page_to_phys(*pages);
-+ }
-+ }
-+}
-+
-+static int optee_shm_register(struct tee_context *ctx, struct tee_shm *shm,
-+ struct page **pages, size_t num_pages,
-+ unsigned long start)
-+{
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
-+ struct optee_msg_arg *msg_arg;
-+ struct tee_shm *shm_arg;
-+ u64 *pages_list;
-+ int rc;
-+
-+ if (!num_pages)
-+ return -EINVAL;
-+
-+ rc = optee_check_mem_type(start, num_pages);
-+ if (rc)
-+ return rc;
-+
-+ pages_list = optee_allocate_pages_list(num_pages);
-+ if (!pages_list)
-+ return -ENOMEM;
-+
-+ shm_arg = optee_get_msg_arg(ctx, 1, &msg_arg);
-+ if (IS_ERR(shm_arg)) {
-+ rc = PTR_ERR(shm_arg);
-+ goto out;
-+ }
-+
-+ optee_fill_pages_list(pages_list, pages, num_pages,
-+ tee_shm_get_page_offset(shm));
-+
-+ msg_arg->cmd = OPTEE_MSG_CMD_REGISTER_SHM;
-+ msg_arg->params->attr = OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT |
-+ OPTEE_MSG_ATTR_NONCONTIG;
-+ msg_arg->params->u.tmem.shm_ref = (unsigned long)shm;
-+ msg_arg->params->u.tmem.size = tee_shm_get_size(shm);
-+ /*
-+ * In the least bits of msg_arg->params->u.tmem.buf_ptr we
-+ * store buffer offset from 4k page, as described in OP-TEE ABI.
-+ */
-+ msg_arg->params->u.tmem.buf_ptr = virt_to_phys(pages_list) |
-+ (tee_shm_get_page_offset(shm) & (OPTEE_MSG_NONCONTIG_PAGE_SIZE - 1));
-+
-+ if (optee->ops->do_call_with_arg(ctx, shm_arg) ||
-+ msg_arg->ret != TEEC_SUCCESS)
-+ rc = -EINVAL;
-+
-+ tee_shm_free(shm_arg);
-+out:
-+ optee_free_pages_list(pages_list, num_pages);
-+ return rc;
-+}
-+
-+static int optee_shm_unregister(struct tee_context *ctx, struct tee_shm *shm)
-+{
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
-+ struct optee_msg_arg *msg_arg;
-+ struct tee_shm *shm_arg;
-+ int rc = 0;
-+
-+ shm_arg = optee_get_msg_arg(ctx, 1, &msg_arg);
-+ if (IS_ERR(shm_arg))
-+ return PTR_ERR(shm_arg);
-+
-+ msg_arg->cmd = OPTEE_MSG_CMD_UNREGISTER_SHM;
-+
-+ msg_arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_RMEM_INPUT;
-+ msg_arg->params[0].u.rmem.shm_ref = (unsigned long)shm;
-+
-+ if (optee->ops->do_call_with_arg(ctx, shm_arg) ||
-+ msg_arg->ret != TEEC_SUCCESS)
-+ rc = -EINVAL;
-+ tee_shm_free(shm_arg);
-+ return rc;
-+}
-+
-+static int optee_shm_register_supp(struct tee_context *ctx, struct tee_shm *shm,
-+ struct page **pages, size_t num_pages,
-+ unsigned long start)
-+{
-+ /*
-+ * We don't want to register supplicant memory in OP-TEE.
-+ * Instead information about it will be passed in RPC code.
-+ */
-+ return optee_check_mem_type(start, num_pages);
-+}
-+
-+static int optee_shm_unregister_supp(struct tee_context *ctx,
-+ struct tee_shm *shm)
-+{
-+ return 0;
-+}
-+
-+/*
-+ * 3. Dynamic shared memory pool based on alloc_pages()
-+ *
-+ * Implements an OP-TEE specific shared memory pool which is used
-+ * when dynamic shared memory is supported by secure world.
-+ *
-+ * The main function is optee_shm_pool_alloc_pages().
-+ */
-+
-+static int pool_op_alloc(struct tee_shm_pool_mgr *poolm,
-+ struct tee_shm *shm, size_t size)
-+{
-+ /*
-+ * Shared memory private to the OP-TEE driver doesn't need
-+ * to be registered with OP-TEE.
-+ */
-+ if (shm->flags & TEE_SHM_PRIV)
-+ return optee_pool_op_alloc_helper(poolm, shm, size, NULL);
-+
-+ return optee_pool_op_alloc_helper(poolm, shm, size, optee_shm_register);
-+}
-+
-+static void pool_op_free(struct tee_shm_pool_mgr *poolm,
-+ struct tee_shm *shm)
-+{
-+ if (!(shm->flags & TEE_SHM_PRIV))
-+ optee_shm_unregister(shm->ctx, shm);
-+
-+ free_pages((unsigned long)shm->kaddr, get_order(shm->size));
-+ shm->kaddr = NULL;
-+}
-+
-+static void pool_op_destroy_poolmgr(struct tee_shm_pool_mgr *poolm)
-+{
-+ kfree(poolm);
-+}
-+
-+static const struct tee_shm_pool_mgr_ops pool_ops = {
-+ .alloc = pool_op_alloc,
-+ .free = pool_op_free,
-+ .destroy_poolmgr = pool_op_destroy_poolmgr,
-+};
-+
-+/**
-+ * optee_shm_pool_alloc_pages() - create page-based allocator pool
-+ *
-+ * This pool is used when OP-TEE supports dymanic SHM. In this case
-+ * command buffers and such are allocated from kernel's own memory.
-+ */
-+static struct tee_shm_pool_mgr *optee_shm_pool_alloc_pages(void)
-+{
-+ struct tee_shm_pool_mgr *mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-+
-+ if (!mgr)
-+ return ERR_PTR(-ENOMEM);
-+
-+ mgr->ops = &pool_ops;
-+
-+ return mgr;
-+}
-+
-+/*
-+ * 4. Do a normal scheduled call into secure world
-+ *
-+ * The function optee_smc_do_call_with_arg() performs a normal scheduled
-+ * call into secure world. During this call may normal world request help
-+ * from normal world using RPCs, Remote Procedure Calls. This includes
-+ * delivery of non-secure interrupts to for instance allow rescheduling of
-+ * the current task.
-+ */
-+
-+static void handle_rpc_func_cmd_shm_free(struct tee_context *ctx,
-+ struct optee_msg_arg *arg)
-+{
-+ struct tee_shm *shm;
-+
-+ arg->ret_origin = TEEC_ORIGIN_COMMS;
-+
-+ if (arg->num_params != 1 ||
-+ arg->params[0].attr != OPTEE_MSG_ATTR_TYPE_VALUE_INPUT) {
-+ arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-+ return;
-+ }
-+
-+ shm = (struct tee_shm *)(unsigned long)arg->params[0].u.value.b;
-+ switch (arg->params[0].u.value.a) {
-+ case OPTEE_RPC_SHM_TYPE_APPL:
-+ optee_rpc_cmd_free_suppl(ctx, shm);
-+ break;
-+ case OPTEE_RPC_SHM_TYPE_KERNEL:
-+ tee_shm_free(shm);
-+ break;
-+ default:
-+ arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-+ }
-+ arg->ret = TEEC_SUCCESS;
-+}
-+
-+static void handle_rpc_func_cmd_shm_alloc(struct tee_context *ctx,
-+ struct optee_msg_arg *arg,
-+ struct optee_call_ctx *call_ctx)
-+{
-+ phys_addr_t pa;
-+ struct tee_shm *shm;
-+ size_t sz;
-+ size_t n;
-+
-+ arg->ret_origin = TEEC_ORIGIN_COMMS;
-+
-+ if (!arg->num_params ||
-+ arg->params[0].attr != OPTEE_MSG_ATTR_TYPE_VALUE_INPUT) {
-+ arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-+ return;
-+ }
-+
-+ for (n = 1; n < arg->num_params; n++) {
-+ if (arg->params[n].attr != OPTEE_MSG_ATTR_TYPE_NONE) {
-+ arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-+ return;
-+ }
-+ }
-+
-+ sz = arg->params[0].u.value.b;
-+ switch (arg->params[0].u.value.a) {
-+ case OPTEE_RPC_SHM_TYPE_APPL:
-+ shm = optee_rpc_cmd_alloc_suppl(ctx, sz);
-+ break;
-+ case OPTEE_RPC_SHM_TYPE_KERNEL:
-+ shm = tee_shm_alloc(ctx, sz, TEE_SHM_MAPPED | TEE_SHM_PRIV);
-+ break;
-+ default:
-+ arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-+ return;
-+ }
-+
-+ if (IS_ERR(shm)) {
-+ arg->ret = TEEC_ERROR_OUT_OF_MEMORY;
-+ return;
-+ }
-+
-+ if (tee_shm_get_pa(shm, 0, &pa)) {
-+ arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-+ goto bad;
-+ }
-+
-+ sz = tee_shm_get_size(shm);
-+
-+ if (tee_shm_is_registered(shm)) {
-+ struct page **pages;
-+ u64 *pages_list;
-+ size_t page_num;
-+
-+ pages = tee_shm_get_pages(shm, &page_num);
-+ if (!pages || !page_num) {
-+ arg->ret = TEEC_ERROR_OUT_OF_MEMORY;
-+ goto bad;
-+ }
-+
-+ pages_list = optee_allocate_pages_list(page_num);
-+ if (!pages_list) {
-+ arg->ret = TEEC_ERROR_OUT_OF_MEMORY;
-+ goto bad;
-+ }
-+
-+ call_ctx->pages_list = pages_list;
-+ call_ctx->num_entries = page_num;
-+
-+ arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT |
-+ OPTEE_MSG_ATTR_NONCONTIG;
-+ /*
-+ * In the least bits of u.tmem.buf_ptr we store buffer offset
-+ * from 4k page, as described in OP-TEE ABI.
-+ */
-+ arg->params[0].u.tmem.buf_ptr = virt_to_phys(pages_list) |
-+ (tee_shm_get_page_offset(shm) &
-+ (OPTEE_MSG_NONCONTIG_PAGE_SIZE - 1));
-+ arg->params[0].u.tmem.size = tee_shm_get_size(shm);
-+ arg->params[0].u.tmem.shm_ref = (unsigned long)shm;
-+
-+ optee_fill_pages_list(pages_list, pages, page_num,
-+ tee_shm_get_page_offset(shm));
-+ } else {
-+ arg->params[0].attr = OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT;
-+ arg->params[0].u.tmem.buf_ptr = pa;
-+ arg->params[0].u.tmem.size = sz;
-+ arg->params[0].u.tmem.shm_ref = (unsigned long)shm;
-+ }
-+
-+ arg->ret = TEEC_SUCCESS;
-+ return;
-+bad:
-+ tee_shm_free(shm);
-+}
-+
-+static void free_pages_list(struct optee_call_ctx *call_ctx)
-+{
-+ if (call_ctx->pages_list) {
-+ optee_free_pages_list(call_ctx->pages_list,
-+ call_ctx->num_entries);
-+ call_ctx->pages_list = NULL;
-+ call_ctx->num_entries = 0;
-+ }
-+}
-+
-+static void optee_rpc_finalize_call(struct optee_call_ctx *call_ctx)
-+{
-+ free_pages_list(call_ctx);
-+}
-+
-+static void handle_rpc_func_cmd(struct tee_context *ctx, struct optee *optee,
-+ struct tee_shm *shm,
-+ struct optee_call_ctx *call_ctx)
-+{
-+ struct optee_msg_arg *arg;
-+
-+ arg = tee_shm_get_va(shm, 0);
-+ if (IS_ERR(arg)) {
-+ pr_err("%s: tee_shm_get_va %p failed\n", __func__, shm);
-+ return;
-+ }
-+
-+ switch (arg->cmd) {
-+ case OPTEE_RPC_CMD_SHM_ALLOC:
-+ free_pages_list(call_ctx);
-+ handle_rpc_func_cmd_shm_alloc(ctx, arg, call_ctx);
-+ break;
-+ case OPTEE_RPC_CMD_SHM_FREE:
-+ handle_rpc_func_cmd_shm_free(ctx, arg);
-+ break;
-+ default:
-+ optee_rpc_cmd(ctx, optee, arg);
-+ }
-+}
-+
-+/**
-+ * optee_handle_rpc() - handle RPC from secure world
-+ * @ctx: context doing the RPC
-+ * @param: value of registers for the RPC
-+ * @call_ctx: call context. Preserved during one OP-TEE invocation
-+ *
-+ * Result of RPC is written back into @param.
-+ */
-+static void optee_handle_rpc(struct tee_context *ctx,
-+ struct optee_rpc_param *param,
-+ struct optee_call_ctx *call_ctx)
-+{
-+ struct tee_device *teedev = ctx->teedev;
-+ struct optee *optee = tee_get_drvdata(teedev);
-+ struct tee_shm *shm;
-+ phys_addr_t pa;
-+
-+ switch (OPTEE_SMC_RETURN_GET_RPC_FUNC(param->a0)) {
-+ case OPTEE_SMC_RPC_FUNC_ALLOC:
-+ shm = tee_shm_alloc(ctx, param->a1,
-+ TEE_SHM_MAPPED | TEE_SHM_PRIV);
-+ if (!IS_ERR(shm) && !tee_shm_get_pa(shm, 0, &pa)) {
-+ reg_pair_from_64(¶m->a1, ¶m->a2, pa);
-+ reg_pair_from_64(¶m->a4, ¶m->a5,
-+ (unsigned long)shm);
-+ } else {
-+ param->a1 = 0;
-+ param->a2 = 0;
-+ param->a4 = 0;
-+ param->a5 = 0;
-+ }
-+ break;
-+ case OPTEE_SMC_RPC_FUNC_FREE:
-+ shm = reg_pair_to_ptr(param->a1, param->a2);
-+ tee_shm_free(shm);
-+ break;
-+ case OPTEE_SMC_RPC_FUNC_FOREIGN_INTR:
-+ /*
-+ * A foreign interrupt was raised while secure world was
-+ * executing, since they are handled in Linux a dummy RPC is
-+ * performed to let Linux take the interrupt through the normal
-+ * vector.
-+ */
-+ break;
-+ case OPTEE_SMC_RPC_FUNC_CMD:
-+ shm = reg_pair_to_ptr(param->a1, param->a2);
-+ handle_rpc_func_cmd(ctx, optee, shm, call_ctx);
-+ break;
-+ default:
-+ pr_warn("Unknown RPC func 0x%x\n",
-+ (u32)OPTEE_SMC_RETURN_GET_RPC_FUNC(param->a0));
-+ break;
-+ }
-+
-+ param->a0 = OPTEE_SMC_CALL_RETURN_FROM_RPC;
-+}
-+
-+/**
-+ * optee_smc_do_call_with_arg() - Do an SMC to OP-TEE in secure world
-+ * @ctx: calling context
-+ * @arg: shared memory holding the message to pass to secure world
-+ *
-+ * Does and SMC to OP-TEE in secure world and handles eventual resulting
-+ * Remote Procedure Calls (RPC) from OP-TEE.
-+ *
-+ * Returns return code from secure world, 0 is OK
-+ */
-+static int optee_smc_do_call_with_arg(struct tee_context *ctx,
-+ struct tee_shm *arg)
-+{
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
-+ struct optee_call_waiter w;
-+ struct optee_rpc_param param = { };
-+ struct optee_call_ctx call_ctx = { };
-+ phys_addr_t parg;
-+ int rc;
-+
-+ rc = tee_shm_get_pa(arg, 0, &parg);
-+ if (rc)
-+ return rc;
-+
-+ param.a0 = OPTEE_SMC_CALL_WITH_ARG;
-+ reg_pair_from_64(¶m.a1, ¶m.a2, parg);
-+ /* Initialize waiter */
-+ optee_cq_wait_init(&optee->call_queue, &w);
-+ while (true) {
-+ struct arm_smccc_res res;
-+
-+ trace_optee_invoke_fn_begin(¶m);
-+ optee->smc.invoke_fn(param.a0, param.a1, param.a2, param.a3,
-+ param.a4, param.a5, param.a6, param.a7,
-+ &res);
-+ trace_optee_invoke_fn_end(¶m, &res);
-+
-+ if (res.a0 == OPTEE_SMC_RETURN_ETHREAD_LIMIT) {
-+ /*
-+ * Out of threads in secure world, wait for a thread
-+ * become available.
-+ */
-+ optee_cq_wait_for_completion(&optee->call_queue, &w);
-+ } else if (OPTEE_SMC_RETURN_IS_RPC(res.a0)) {
-+ cond_resched();
-+ param.a0 = res.a0;
-+ param.a1 = res.a1;
-+ param.a2 = res.a2;
-+ param.a3 = res.a3;
-+ optee_handle_rpc(ctx, ¶m, &call_ctx);
-+ } else {
-+ rc = res.a0;
-+ break;
-+ }
-+ }
-+
-+ optee_rpc_finalize_call(&call_ctx);
-+ /*
-+ * We're done with our thread in secure world, if there's any
-+ * thread waiters wake up one.
-+ */
-+ optee_cq_wait_final(&optee->call_queue, &w);
-+
-+ return rc;
-+}
-+
-+/*
-+ * 5. Driver initialization
-+ *
-+ * During driver inititialization is secure world probed to find out which
-+ * features it supports so the driver can be initialized with a matching
-+ * configuration. This involves for instance support for dynamic shared
-+ * memory instead of a static memory carvout.
-+ */
-+
-+static void optee_get_version(struct tee_device *teedev,
-+ struct tee_ioctl_version_data *vers)
-+{
-+ struct tee_ioctl_version_data v = {
-+ .impl_id = TEE_IMPL_ID_OPTEE,
-+ .impl_caps = TEE_OPTEE_CAP_TZ,
-+ .gen_caps = TEE_GEN_CAP_GP,
-+ };
-+ struct optee *optee = tee_get_drvdata(teedev);
-+
-+ if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM)
-+ v.gen_caps |= TEE_GEN_CAP_REG_MEM;
-+ if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_MEMREF_NULL)
-+ v.gen_caps |= TEE_GEN_CAP_MEMREF_NULL;
-+ *vers = v;
-+}
-+
-+static int optee_smc_open(struct tee_context *ctx)
-+{
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
-+ u32 sec_caps = optee->smc.sec_caps;
-+
-+ return optee_open(ctx, sec_caps & OPTEE_SMC_SEC_CAP_MEMREF_NULL);
-+}
-+
-+static const struct tee_driver_ops optee_clnt_ops = {
-+ .get_version = optee_get_version,
-+ .open = optee_smc_open,
-+ .release = optee_release,
-+ .open_session = optee_open_session,
-+ .close_session = optee_close_session,
-+ .invoke_func = optee_invoke_func,
-+ .cancel_req = optee_cancel_req,
-+ .shm_register = optee_shm_register,
-+ .shm_unregister = optee_shm_unregister,
-+};
-+
-+static const struct tee_desc optee_clnt_desc = {
-+ .name = DRIVER_NAME "-clnt",
-+ .ops = &optee_clnt_ops,
-+ .owner = THIS_MODULE,
-+};
-+
-+static const struct tee_driver_ops optee_supp_ops = {
-+ .get_version = optee_get_version,
-+ .open = optee_smc_open,
-+ .release = optee_release_supp,
-+ .supp_recv = optee_supp_recv,
-+ .supp_send = optee_supp_send,
-+ .shm_register = optee_shm_register_supp,
-+ .shm_unregister = optee_shm_unregister_supp,
-+};
-+
-+static const struct tee_desc optee_supp_desc = {
-+ .name = DRIVER_NAME "-supp",
-+ .ops = &optee_supp_ops,
-+ .owner = THIS_MODULE,
-+ .flags = TEE_DESC_PRIVILEGED,
-+};
-+
-+static const struct optee_ops optee_ops = {
-+ .do_call_with_arg = optee_smc_do_call_with_arg,
-+ .to_msg_param = optee_to_msg_param,
-+ .from_msg_param = optee_from_msg_param,
-+};
-+
-+static bool optee_msg_api_uid_is_optee_api(optee_invoke_fn *invoke_fn)
-+{
-+ struct arm_smccc_res res;
-+
-+ invoke_fn(OPTEE_SMC_CALLS_UID, 0, 0, 0, 0, 0, 0, 0, &res);
-+
-+ if (res.a0 == OPTEE_MSG_UID_0 && res.a1 == OPTEE_MSG_UID_1 &&
-+ res.a2 == OPTEE_MSG_UID_2 && res.a3 == OPTEE_MSG_UID_3)
-+ return true;
-+ return false;
-+}
-+
-+static void optee_msg_get_os_revision(optee_invoke_fn *invoke_fn)
-+{
-+ union {
-+ struct arm_smccc_res smccc;
-+ struct optee_smc_call_get_os_revision_result result;
-+ } res = {
-+ .result = {
-+ .build_id = 0
-+ }
-+ };
-+
-+ invoke_fn(OPTEE_SMC_CALL_GET_OS_REVISION, 0, 0, 0, 0, 0, 0, 0,
-+ &res.smccc);
-+
-+ if (res.result.build_id)
-+ pr_info("revision %lu.%lu (%08lx)", res.result.major,
-+ res.result.minor, res.result.build_id);
-+ else
-+ pr_info("revision %lu.%lu", res.result.major, res.result.minor);
-+}
-+
-+static bool optee_msg_api_revision_is_compatible(optee_invoke_fn *invoke_fn)
-+{
-+ union {
-+ struct arm_smccc_res smccc;
-+ struct optee_smc_calls_revision_result result;
-+ } res;
-+
-+ invoke_fn(OPTEE_SMC_CALLS_REVISION, 0, 0, 0, 0, 0, 0, 0, &res.smccc);
-+
-+ if (res.result.major == OPTEE_MSG_REVISION_MAJOR &&
-+ (int)res.result.minor >= OPTEE_MSG_REVISION_MINOR)
-+ return true;
-+ return false;
-+}
-+
-+static bool optee_msg_exchange_capabilities(optee_invoke_fn *invoke_fn,
-+ u32 *sec_caps)
-+{
-+ union {
-+ struct arm_smccc_res smccc;
-+ struct optee_smc_exchange_capabilities_result result;
-+ } res;
-+ u32 a1 = 0;
-+
-+ /*
-+ * TODO This isn't enough to tell if it's UP system (from kernel
-+ * point of view) or not, is_smp() returns the information
-+ * needed, but can't be called directly from here.
-+ */
-+ if (!IS_ENABLED(CONFIG_SMP) || nr_cpu_ids == 1)
-+ a1 |= OPTEE_SMC_NSEC_CAP_UNIPROCESSOR;
-+
-+ invoke_fn(OPTEE_SMC_EXCHANGE_CAPABILITIES, a1, 0, 0, 0, 0, 0, 0,
-+ &res.smccc);
-+
-+ if (res.result.status != OPTEE_SMC_RETURN_OK)
-+ return false;
-+
-+ *sec_caps = res.result.capabilities;
-+ return true;
-+}
-+
-+static struct tee_shm_pool *optee_config_dyn_shm(void)
-+{
-+ struct tee_shm_pool_mgr *priv_mgr;
-+ struct tee_shm_pool_mgr *dmabuf_mgr;
-+ void *rc;
-+
-+ rc = optee_shm_pool_alloc_pages();
-+ if (IS_ERR(rc))
-+ return rc;
-+ priv_mgr = rc;
-+
-+ rc = optee_shm_pool_alloc_pages();
-+ if (IS_ERR(rc)) {
-+ tee_shm_pool_mgr_destroy(priv_mgr);
-+ return rc;
-+ }
-+ dmabuf_mgr = rc;
-+
-+ rc = tee_shm_pool_alloc(priv_mgr, dmabuf_mgr);
-+ if (IS_ERR(rc)) {
-+ tee_shm_pool_mgr_destroy(priv_mgr);
-+ tee_shm_pool_mgr_destroy(dmabuf_mgr);
-+ }
-+
-+ return rc;
-+}
-+
-+static struct tee_shm_pool *
-+optee_config_shm_memremap(optee_invoke_fn *invoke_fn, void **memremaped_shm)
-+{
-+ union {
-+ struct arm_smccc_res smccc;
-+ struct optee_smc_get_shm_config_result result;
-+ } res;
-+ unsigned long vaddr;
-+ phys_addr_t paddr;
-+ size_t size;
-+ phys_addr_t begin;
-+ phys_addr_t end;
-+ void *va;
-+ struct tee_shm_pool_mgr *priv_mgr;
-+ struct tee_shm_pool_mgr *dmabuf_mgr;
-+ void *rc;
-+ const int sz = OPTEE_SHM_NUM_PRIV_PAGES * PAGE_SIZE;
-+
-+ invoke_fn(OPTEE_SMC_GET_SHM_CONFIG, 0, 0, 0, 0, 0, 0, 0, &res.smccc);
-+ if (res.result.status != OPTEE_SMC_RETURN_OK) {
-+ pr_err("static shm service not available\n");
-+ return ERR_PTR(-ENOENT);
-+ }
-+
-+ if (res.result.settings != OPTEE_SMC_SHM_CACHED) {
-+ pr_err("only normal cached shared memory supported\n");
-+ return ERR_PTR(-EINVAL);
-+ }
-+
-+ begin = roundup(res.result.start, PAGE_SIZE);
-+ end = rounddown(res.result.start + res.result.size, PAGE_SIZE);
-+ paddr = begin;
-+ size = end - begin;
-+
-+ if (size < 2 * OPTEE_SHM_NUM_PRIV_PAGES * PAGE_SIZE) {
-+ pr_err("too small shared memory area\n");
-+ return ERR_PTR(-EINVAL);
-+ }
-+
-+ va = memremap(paddr, size, MEMREMAP_WB);
-+ if (!va) {
-+ pr_err("shared memory ioremap failed\n");
-+ return ERR_PTR(-EINVAL);
-+ }
-+ vaddr = (unsigned long)va;
-+
-+ rc = tee_shm_pool_mgr_alloc_res_mem(vaddr, paddr, sz,
-+ 3 /* 8 bytes aligned */);
-+ if (IS_ERR(rc))
-+ goto err_memunmap;
-+ priv_mgr = rc;
-+
-+ vaddr += sz;
-+ paddr += sz;
-+ size -= sz;
-+
-+ rc = tee_shm_pool_mgr_alloc_res_mem(vaddr, paddr, size, PAGE_SHIFT);
-+ if (IS_ERR(rc))
-+ goto err_free_priv_mgr;
-+ dmabuf_mgr = rc;
-+
-+ rc = tee_shm_pool_alloc(priv_mgr, dmabuf_mgr);
-+ if (IS_ERR(rc))
-+ goto err_free_dmabuf_mgr;
-+
-+ *memremaped_shm = va;
-+
-+ return rc;
-+
-+err_free_dmabuf_mgr:
-+ tee_shm_pool_mgr_destroy(dmabuf_mgr);
-+err_free_priv_mgr:
-+ tee_shm_pool_mgr_destroy(priv_mgr);
-+err_memunmap:
-+ memunmap(va);
-+ return rc;
-+}
-+
-+/* Simple wrapper functions to be able to use a function pointer */
-+static void optee_smccc_smc(unsigned long a0, unsigned long a1,
-+ unsigned long a2, unsigned long a3,
-+ unsigned long a4, unsigned long a5,
-+ unsigned long a6, unsigned long a7,
-+ struct arm_smccc_res *res)
-+{
-+ arm_smccc_smc(a0, a1, a2, a3, a4, a5, a6, a7, res);
-+}
-+
-+static void optee_smccc_hvc(unsigned long a0, unsigned long a1,
-+ unsigned long a2, unsigned long a3,
-+ unsigned long a4, unsigned long a5,
-+ unsigned long a6, unsigned long a7,
-+ struct arm_smccc_res *res)
-+{
-+ arm_smccc_hvc(a0, a1, a2, a3, a4, a5, a6, a7, res);
-+}
-+
-+static optee_invoke_fn *get_invoke_func(struct device *dev)
-+{
-+ const char *method;
-+
-+ pr_info("probing for conduit method.\n");
-+
-+ if (device_property_read_string(dev, "method", &method)) {
-+ pr_warn("missing \"method\" property\n");
-+ return ERR_PTR(-ENXIO);
-+ }
-+
-+ if (!strcmp("hvc", method))
-+ return optee_smccc_hvc;
-+ else if (!strcmp("smc", method))
-+ return optee_smccc_smc;
-+
-+ pr_warn("invalid \"method\" property: %s\n", method);
-+ return ERR_PTR(-EINVAL);
-+}
-+
-+/* optee_remove - Device Removal Routine
-+ * @pdev: platform device information struct
-+ *
-+ * optee_remove is called by platform subsystem to alert the driver
-+ * that it should release the device
-+ */
-+static int optee_smc_remove(struct platform_device *pdev)
-+{
-+ struct optee *optee = platform_get_drvdata(pdev);
-+
-+ /*
-+ * Ask OP-TEE to free all cached shared memory objects to decrease
-+ * reference counters and also avoid wild pointers in secure world
-+ * into the old shared memory range.
-+ */
-+ optee_disable_shm_cache(optee);
-+
-+ optee_remove_common(optee);
-+
-+ if (optee->smc.memremaped_shm)
-+ memunmap(optee->smc.memremaped_shm);
-+
-+ kfree(optee);
-+
-+ return 0;
-+}
-+
-+/* optee_shutdown - Device Removal Routine
-+ * @pdev: platform device information struct
-+ *
-+ * platform_shutdown is called by the platform subsystem to alert
-+ * the driver that a shutdown, reboot, or kexec is happening and
-+ * device must be disabled.
-+ */
-+static void optee_shutdown(struct platform_device *pdev)
-+{
-+ optee_disable_shm_cache(platform_get_drvdata(pdev));
-+}
-+
-+static int optee_probe(struct platform_device *pdev)
-+{
-+ optee_invoke_fn *invoke_fn;
-+ struct tee_shm_pool *pool = ERR_PTR(-EINVAL);
-+ struct optee *optee = NULL;
-+ void *memremaped_shm = NULL;
-+ struct tee_device *teedev;
-+ u32 sec_caps;
-+ int rc;
-+
-+ invoke_fn = get_invoke_func(&pdev->dev);
-+ if (IS_ERR(invoke_fn))
-+ return PTR_ERR(invoke_fn);
-+
-+ if (!optee_msg_api_uid_is_optee_api(invoke_fn)) {
-+ pr_warn("api uid mismatch\n");
-+ return -EINVAL;
-+ }
-+
-+ optee_msg_get_os_revision(invoke_fn);
-+
-+ if (!optee_msg_api_revision_is_compatible(invoke_fn)) {
-+ pr_warn("api revision mismatch\n");
-+ return -EINVAL;
-+ }
-+
-+ if (!optee_msg_exchange_capabilities(invoke_fn, &sec_caps)) {
-+ pr_warn("capabilities mismatch\n");
-+ return -EINVAL;
-+ }
-+
-+ /*
-+ * Try to use dynamic shared memory if possible
-+ */
-+ if (sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM)
-+ pool = optee_config_dyn_shm();
-+
-+ /*
-+ * If dynamic shared memory is not available or failed - try static one
-+ */
-+ if (IS_ERR(pool) && (sec_caps & OPTEE_SMC_SEC_CAP_HAVE_RESERVED_SHM))
-+ pool = optee_config_shm_memremap(invoke_fn, &memremaped_shm);
-+
-+ if (IS_ERR(pool))
-+ return PTR_ERR(pool);
-+
-+ optee = kzalloc(sizeof(*optee), GFP_KERNEL);
-+ if (!optee) {
-+ rc = -ENOMEM;
-+ goto err;
-+ }
-+
-+ optee->ops = &optee_ops;
-+ optee->smc.invoke_fn = invoke_fn;
-+ optee->smc.sec_caps = sec_caps;
-+
-+ teedev = tee_device_alloc(&optee_clnt_desc, NULL, pool, optee);
-+ if (IS_ERR(teedev)) {
-+ rc = PTR_ERR(teedev);
-+ goto err;
-+ }
-+ optee->teedev = teedev;
-+
-+ teedev = tee_device_alloc(&optee_supp_desc, NULL, pool, optee);
-+ if (IS_ERR(teedev)) {
-+ rc = PTR_ERR(teedev);
-+ goto err;
-+ }
-+ optee->supp_teedev = teedev;
-+
-+ rc = tee_device_register(optee->teedev);
-+ if (rc)
-+ goto err;
-+
-+ rc = tee_device_register(optee->supp_teedev);
-+ if (rc)
-+ goto err;
-+
-+ mutex_init(&optee->call_queue.mutex);
-+ INIT_LIST_HEAD(&optee->call_queue.waiters);
-+ optee_wait_queue_init(&optee->wait_queue);
-+ optee_supp_init(&optee->supp);
-+ optee->smc.memremaped_shm = memremaped_shm;
-+ optee->pool = pool;
-+
-+ /*
-+ * Ensure that there are no pre-existing shm objects before enabling
-+ * the shm cache so that there's no chance of receiving an invalid
-+ * address during shutdown. This could occur, for example, if we're
-+ * kexec booting from an older kernel that did not properly cleanup the
-+ * shm cache.
-+ */
-+ optee_disable_unmapped_shm_cache(optee);
-+
-+ optee_enable_shm_cache(optee);
-+
-+ if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM)
-+ pr_info("dynamic shared memory is enabled\n");
-+
-+ platform_set_drvdata(pdev, optee);
-+
-+ rc = optee_enumerate_devices(PTA_CMD_GET_DEVICES);
-+ if (rc) {
-+ optee_smc_remove(pdev);
-+ return rc;
-+ }
-+
-+ pr_info("initialized driver\n");
-+ return 0;
-+err:
-+ if (optee) {
-+ /*
-+ * tee_device_unregister() is safe to call even if the
-+ * devices hasn't been registered with
-+ * tee_device_register() yet.
-+ */
-+ tee_device_unregister(optee->supp_teedev);
-+ tee_device_unregister(optee->teedev);
-+ kfree(optee);
-+ }
-+ if (pool)
-+ tee_shm_pool_free(pool);
-+ if (memremaped_shm)
-+ memunmap(memremaped_shm);
-+ return rc;
-+}
-+
-+static const struct of_device_id optee_dt_match[] = {
-+ { .compatible = "linaro,optee-tz" },
-+ {},
-+};
-+MODULE_DEVICE_TABLE(of, optee_dt_match);
-+
-+static struct platform_driver optee_driver = {
-+ .probe = optee_probe,
-+ .remove = optee_smc_remove,
-+ .shutdown = optee_shutdown,
-+ .driver = {
-+ .name = "optee",
-+ .of_match_table = optee_dt_match,
-+ },
-+};
-+
-+int optee_smc_abi_register(void)
-+{
-+ return platform_driver_register(&optee_driver);
-+}
-+
-+void optee_smc_abi_unregister(void)
-+{
-+ platform_driver_unregister(&optee_driver);
-+}
-2.34.1
-
deleted file mode 100644
@@ -1,1356 +0,0 @@
-From 2e26d6cc12475b86cfc0a42d6c21146b5ce1fe4b Mon Sep 17 00:00:00 2001
-From: Jens Wiklander <jens.wiklander@linaro.org>
-Date: Wed, 21 Jul 2021 17:45:21 +0200
-Subject: [PATCH 12/40] optee: add FF-A support
-
-Adds support for using FF-A [1] as transport to the OP-TEE driver.
-
-Introduces struct optee_msg_param_fmem which carries all information
-needed when OP-TEE is calling FFA_MEM_RETRIEVE_REQ to get the shared
-memory reference mapped by the hypervisor in S-EL2. Register usage is
-also updated to include the information needed.
-
-The FF-A part of this driver is enabled if CONFIG_ARM_FFA_TRANSPORT is
-enabled.
-
-[1] https://developer.arm.com/documentation/den0077/latest
-Acked-by: Sumit Garg <sumit.garg@linaro.org>
-Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-Upstream-Status: Backport [4615e5a34b95e0d81467f6d2176f19a5d184cb5d]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/tee/optee/Makefile | 1 +
- drivers/tee/optee/call.c | 13 +-
- drivers/tee/optee/core.c | 16 +-
- drivers/tee/optee/ffa_abi.c | 911 ++++++++++++++++++++++++++++++
- drivers/tee/optee/optee_ffa.h | 153 +++++
- drivers/tee/optee/optee_msg.h | 27 +-
- drivers/tee/optee/optee_private.h | 35 +-
- 7 files changed, 1143 insertions(+), 13 deletions(-)
- create mode 100644 drivers/tee/optee/ffa_abi.c
- create mode 100644 drivers/tee/optee/optee_ffa.h
-
-diff --git a/drivers/tee/optee/Makefile b/drivers/tee/optee/Makefile
-index 97ac3ab3e1c0..66b8a17f14c4 100644
---- a/drivers/tee/optee/Makefile
-+++ b/drivers/tee/optee/Makefile
-@@ -6,6 +6,7 @@ optee-objs += rpc.o
- optee-objs += supp.o
- optee-objs += device.o
- optee-objs += smc_abi.o
-+optee-objs += ffa_abi.o
-
- # for tracing framework to find optee_trace.h
- CFLAGS_smc_abi.o := -I$(src)
-diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c
-index 9ff4f0812825..b25cc1fac945 100644
---- a/drivers/tee/optee/call.c
-+++ b/drivers/tee/optee/call.c
-@@ -107,11 +107,20 @@ static struct optee_session *find_session(struct optee_context_data *ctxdata,
- struct tee_shm *optee_get_msg_arg(struct tee_context *ctx, size_t num_params,
- struct optee_msg_arg **msg_arg)
- {
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
-+ size_t sz = OPTEE_MSG_GET_ARG_SIZE(num_params);
- struct tee_shm *shm;
- struct optee_msg_arg *ma;
-
-- shm = tee_shm_alloc(ctx, OPTEE_MSG_GET_ARG_SIZE(num_params),
-- TEE_SHM_MAPPED | TEE_SHM_PRIV);
-+ /*
-+ * rpc_arg_count is set to the number of allocated parameters in
-+ * the RPC argument struct if a second MSG arg struct is expected.
-+ * The second arg struct will then be used for RPC.
-+ */
-+ if (optee->rpc_arg_count)
-+ sz += OPTEE_MSG_GET_ARG_SIZE(optee->rpc_arg_count);
-+
-+ shm = tee_shm_alloc(ctx, sz, TEE_SHM_MAPPED | TEE_SHM_PRIV);
- if (IS_ERR(shm))
- return shm;
-
-diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
-index 27b855325b33..ab2edfcc6c70 100644
---- a/drivers/tee/optee/core.c
-+++ b/drivers/tee/optee/core.c
-@@ -172,6 +172,9 @@ void optee_remove_common(struct optee *optee)
- mutex_destroy(&optee->call_queue.mutex);
- }
-
-+static int smc_abi_rc;
-+static int ffa_abi_rc;
-+
- static int optee_core_init(void)
- {
- /*
-@@ -184,13 +187,22 @@ static int optee_core_init(void)
- if (is_kdump_kernel())
- return -ENODEV;
-
-- return optee_smc_abi_register();
-+ smc_abi_rc = optee_smc_abi_register();
-+ ffa_abi_rc = optee_ffa_abi_register();
-+
-+ /* If both failed there's no point with this module */
-+ if (smc_abi_rc && ffa_abi_rc)
-+ return smc_abi_rc;
-+ return 0;
- }
- module_init(optee_core_init);
-
- static void optee_core_exit(void)
- {
-- optee_smc_abi_unregister();
-+ if (!smc_abi_rc)
-+ optee_smc_abi_unregister();
-+ if (!ffa_abi_rc)
-+ optee_ffa_abi_unregister();
- }
- module_exit(optee_core_exit);
-
-diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
-new file mode 100644
-index 000000000000..6defd1ec982a
---- /dev/null
-+++ b/drivers/tee/optee/ffa_abi.c
-@@ -0,0 +1,911 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Copyright (c) 2021, Linaro Limited
-+ */
-+
-+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-+
-+#include <linux/arm_ffa.h>
-+#include <linux/errno.h>
-+#include <linux/scatterlist.h>
-+#include <linux/sched.h>
-+#include <linux/slab.h>
-+#include <linux/string.h>
-+#include <linux/tee_drv.h>
-+#include <linux/types.h>
-+#include "optee_private.h"
-+#include "optee_ffa.h"
-+#include "optee_rpc_cmd.h"
-+
-+/*
-+ * This file implement the FF-A ABI used when communicating with secure world
-+ * OP-TEE OS via FF-A.
-+ * This file is divided into the following sections:
-+ * 1. Maintain a hash table for lookup of a global FF-A memory handle
-+ * 2. Convert between struct tee_param and struct optee_msg_param
-+ * 3. Low level support functions to register shared memory in secure world
-+ * 4. Dynamic shared memory pool based on alloc_pages()
-+ * 5. Do a normal scheduled call into secure world
-+ * 6. Driver initialization.
-+ */
-+
-+/*
-+ * 1. Maintain a hash table for lookup of a global FF-A memory handle
-+ *
-+ * FF-A assigns a global memory handle for each piece shared memory.
-+ * This handle is then used when communicating with secure world.
-+ *
-+ * Main functions are optee_shm_add_ffa_handle() and optee_shm_rem_ffa_handle()
-+ */
-+struct shm_rhash {
-+ struct tee_shm *shm;
-+ u64 global_id;
-+ struct rhash_head linkage;
-+};
-+
-+static void rh_free_fn(void *ptr, void *arg)
-+{
-+ kfree(ptr);
-+}
-+
-+static const struct rhashtable_params shm_rhash_params = {
-+ .head_offset = offsetof(struct shm_rhash, linkage),
-+ .key_len = sizeof(u64),
-+ .key_offset = offsetof(struct shm_rhash, global_id),
-+ .automatic_shrinking = true,
-+};
-+
-+static struct tee_shm *optee_shm_from_ffa_handle(struct optee *optee,
-+ u64 global_id)
-+{
-+ struct tee_shm *shm = NULL;
-+ struct shm_rhash *r;
-+
-+ mutex_lock(&optee->ffa.mutex);
-+ r = rhashtable_lookup_fast(&optee->ffa.global_ids, &global_id,
-+ shm_rhash_params);
-+ if (r)
-+ shm = r->shm;
-+ mutex_unlock(&optee->ffa.mutex);
-+
-+ return shm;
-+}
-+
-+static int optee_shm_add_ffa_handle(struct optee *optee, struct tee_shm *shm,
-+ u64 global_id)
-+{
-+ struct shm_rhash *r;
-+ int rc;
-+
-+ r = kmalloc(sizeof(*r), GFP_KERNEL);
-+ if (!r)
-+ return -ENOMEM;
-+ r->shm = shm;
-+ r->global_id = global_id;
-+
-+ mutex_lock(&optee->ffa.mutex);
-+ rc = rhashtable_lookup_insert_fast(&optee->ffa.global_ids, &r->linkage,
-+ shm_rhash_params);
-+ mutex_unlock(&optee->ffa.mutex);
-+
-+ if (rc)
-+ kfree(r);
-+
-+ return rc;
-+}
-+
-+static int optee_shm_rem_ffa_handle(struct optee *optee, u64 global_id)
-+{
-+ struct shm_rhash *r;
-+ int rc = -ENOENT;
-+
-+ mutex_lock(&optee->ffa.mutex);
-+ r = rhashtable_lookup_fast(&optee->ffa.global_ids, &global_id,
-+ shm_rhash_params);
-+ if (r)
-+ rc = rhashtable_remove_fast(&optee->ffa.global_ids,
-+ &r->linkage, shm_rhash_params);
-+ mutex_unlock(&optee->ffa.mutex);
-+
-+ if (!rc)
-+ kfree(r);
-+
-+ return rc;
-+}
-+
-+/*
-+ * 2. Convert between struct tee_param and struct optee_msg_param
-+ *
-+ * optee_ffa_from_msg_param() and optee_ffa_to_msg_param() are the main
-+ * functions.
-+ */
-+
-+static void from_msg_param_ffa_mem(struct optee *optee, struct tee_param *p,
-+ u32 attr, const struct optee_msg_param *mp)
-+{
-+ struct tee_shm *shm = NULL;
-+ u64 offs_high = 0;
-+ u64 offs_low = 0;
-+
-+ p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT +
-+ attr - OPTEE_MSG_ATTR_TYPE_FMEM_INPUT;
-+ p->u.memref.size = mp->u.fmem.size;
-+
-+ if (mp->u.fmem.global_id != OPTEE_MSG_FMEM_INVALID_GLOBAL_ID)
-+ shm = optee_shm_from_ffa_handle(optee, mp->u.fmem.global_id);
-+ p->u.memref.shm = shm;
-+
-+ if (shm) {
-+ offs_low = mp->u.fmem.offs_low;
-+ offs_high = mp->u.fmem.offs_high;
-+ }
-+ p->u.memref.shm_offs = offs_low | offs_high << 32;
-+}
-+
-+/**
-+ * optee_ffa_from_msg_param() - convert from OPTEE_MSG parameters to
-+ * struct tee_param
-+ * @optee: main service struct
-+ * @params: subsystem internal parameter representation
-+ * @num_params: number of elements in the parameter arrays
-+ * @msg_params: OPTEE_MSG parameters
-+ *
-+ * Returns 0 on success or <0 on failure
-+ */
-+static int optee_ffa_from_msg_param(struct optee *optee,
-+ struct tee_param *params, size_t num_params,
-+ const struct optee_msg_param *msg_params)
-+{
-+ size_t n;
-+
-+ for (n = 0; n < num_params; n++) {
-+ struct tee_param *p = params + n;
-+ const struct optee_msg_param *mp = msg_params + n;
-+ u32 attr = mp->attr & OPTEE_MSG_ATTR_TYPE_MASK;
-+
-+ switch (attr) {
-+ case OPTEE_MSG_ATTR_TYPE_NONE:
-+ p->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
-+ memset(&p->u, 0, sizeof(p->u));
-+ break;
-+ case OPTEE_MSG_ATTR_TYPE_VALUE_INPUT:
-+ case OPTEE_MSG_ATTR_TYPE_VALUE_OUTPUT:
-+ case OPTEE_MSG_ATTR_TYPE_VALUE_INOUT:
-+ optee_from_msg_param_value(p, attr, mp);
-+ break;
-+ case OPTEE_MSG_ATTR_TYPE_FMEM_INPUT:
-+ case OPTEE_MSG_ATTR_TYPE_FMEM_OUTPUT:
-+ case OPTEE_MSG_ATTR_TYPE_FMEM_INOUT:
-+ from_msg_param_ffa_mem(optee, p, attr, mp);
-+ break;
-+ default:
-+ return -EINVAL;
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+static int to_msg_param_ffa_mem(struct optee_msg_param *mp,
-+ const struct tee_param *p)
-+{
-+ struct tee_shm *shm = p->u.memref.shm;
-+
-+ mp->attr = OPTEE_MSG_ATTR_TYPE_FMEM_INPUT + p->attr -
-+ TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT;
-+
-+ if (shm) {
-+ u64 shm_offs = p->u.memref.shm_offs;
-+
-+ mp->u.fmem.internal_offs = shm->offset;
-+
-+ mp->u.fmem.offs_low = shm_offs;
-+ mp->u.fmem.offs_high = shm_offs >> 32;
-+ /* Check that the entire offset could be stored. */
-+ if (mp->u.fmem.offs_high != shm_offs >> 32)
-+ return -EINVAL;
-+
-+ mp->u.fmem.global_id = shm->sec_world_id;
-+ } else {
-+ memset(&mp->u, 0, sizeof(mp->u));
-+ mp->u.fmem.global_id = OPTEE_MSG_FMEM_INVALID_GLOBAL_ID;
-+ }
-+ mp->u.fmem.size = p->u.memref.size;
-+
-+ return 0;
-+}
-+
-+/**
-+ * optee_ffa_to_msg_param() - convert from struct tee_params to OPTEE_MSG
-+ * parameters
-+ * @optee: main service struct
-+ * @msg_params: OPTEE_MSG parameters
-+ * @num_params: number of elements in the parameter arrays
-+ * @params: subsystem itnernal parameter representation
-+ * Returns 0 on success or <0 on failure
-+ */
-+static int optee_ffa_to_msg_param(struct optee *optee,
-+ struct optee_msg_param *msg_params,
-+ size_t num_params,
-+ const struct tee_param *params)
-+{
-+ size_t n;
-+
-+ for (n = 0; n < num_params; n++) {
-+ const struct tee_param *p = params + n;
-+ struct optee_msg_param *mp = msg_params + n;
-+
-+ switch (p->attr) {
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_NONE:
-+ mp->attr = TEE_IOCTL_PARAM_ATTR_TYPE_NONE;
-+ memset(&mp->u, 0, sizeof(mp->u));
-+ break;
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT:
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT:
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INOUT:
-+ optee_to_msg_param_value(mp, p);
-+ break;
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT:
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT:
-+ case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT:
-+ if (to_msg_param_ffa_mem(mp, p))
-+ return -EINVAL;
-+ break;
-+ default:
-+ return -EINVAL;
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+/*
-+ * 3. Low level support functions to register shared memory in secure world
-+ *
-+ * Functions to register and unregister shared memory both for normal
-+ * clients and for tee-supplicant.
-+ */
-+
-+static int optee_ffa_shm_register(struct tee_context *ctx, struct tee_shm *shm,
-+ struct page **pages, size_t num_pages,
-+ unsigned long start)
-+{
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
-+ const struct ffa_dev_ops *ffa_ops = optee->ffa.ffa_ops;
-+ struct ffa_device *ffa_dev = optee->ffa.ffa_dev;
-+ struct ffa_mem_region_attributes mem_attr = {
-+ .receiver = ffa_dev->vm_id,
-+ .attrs = FFA_MEM_RW,
-+ };
-+ struct ffa_mem_ops_args args = {
-+ .use_txbuf = true,
-+ .attrs = &mem_attr,
-+ .nattrs = 1,
-+ };
-+ struct sg_table sgt;
-+ int rc;
-+
-+ rc = optee_check_mem_type(start, num_pages);
-+ if (rc)
-+ return rc;
-+
-+ rc = sg_alloc_table_from_pages(&sgt, pages, num_pages, 0,
-+ num_pages * PAGE_SIZE, GFP_KERNEL);
-+ if (rc)
-+ return rc;
-+ args.sg = sgt.sgl;
-+ rc = ffa_ops->memory_share(ffa_dev, &args);
-+ sg_free_table(&sgt);
-+ if (rc)
-+ return rc;
-+
-+ rc = optee_shm_add_ffa_handle(optee, shm, args.g_handle);
-+ if (rc) {
-+ ffa_ops->memory_reclaim(args.g_handle, 0);
-+ return rc;
-+ }
-+
-+ shm->sec_world_id = args.g_handle;
-+
-+ return 0;
-+}
-+
-+static int optee_ffa_shm_unregister(struct tee_context *ctx,
-+ struct tee_shm *shm)
-+{
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
-+ const struct ffa_dev_ops *ffa_ops = optee->ffa.ffa_ops;
-+ struct ffa_device *ffa_dev = optee->ffa.ffa_dev;
-+ u64 global_handle = shm->sec_world_id;
-+ struct ffa_send_direct_data data = {
-+ .data0 = OPTEE_FFA_UNREGISTER_SHM,
-+ .data1 = (u32)global_handle,
-+ .data2 = (u32)(global_handle >> 32)
-+ };
-+ int rc;
-+
-+ optee_shm_rem_ffa_handle(optee, global_handle);
-+ shm->sec_world_id = 0;
-+
-+ rc = ffa_ops->sync_send_receive(ffa_dev, &data);
-+ if (rc)
-+ pr_err("Unregister SHM id 0x%llx rc %d\n", global_handle, rc);
-+
-+ rc = ffa_ops->memory_reclaim(global_handle, 0);
-+ if (rc)
-+ pr_err("mem_reclain: 0x%llx %d", global_handle, rc);
-+
-+ return rc;
-+}
-+
-+static int optee_ffa_shm_unregister_supp(struct tee_context *ctx,
-+ struct tee_shm *shm)
-+{
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
-+ const struct ffa_dev_ops *ffa_ops = optee->ffa.ffa_ops;
-+ u64 global_handle = shm->sec_world_id;
-+ int rc;
-+
-+ /*
-+ * We're skipping the OPTEE_FFA_YIELDING_CALL_UNREGISTER_SHM call
-+ * since this is OP-TEE freeing via RPC so it has already retired
-+ * this ID.
-+ */
-+
-+ optee_shm_rem_ffa_handle(optee, global_handle);
-+ rc = ffa_ops->memory_reclaim(global_handle, 0);
-+ if (rc)
-+ pr_err("mem_reclain: 0x%llx %d", global_handle, rc);
-+
-+ shm->sec_world_id = 0;
-+
-+ return rc;
-+}
-+
-+/*
-+ * 4. Dynamic shared memory pool based on alloc_pages()
-+ *
-+ * Implements an OP-TEE specific shared memory pool.
-+ * The main function is optee_ffa_shm_pool_alloc_pages().
-+ */
-+
-+static int pool_ffa_op_alloc(struct tee_shm_pool_mgr *poolm,
-+ struct tee_shm *shm, size_t size)
-+{
-+ return optee_pool_op_alloc_helper(poolm, shm, size,
-+ optee_ffa_shm_register);
-+}
-+
-+static void pool_ffa_op_free(struct tee_shm_pool_mgr *poolm,
-+ struct tee_shm *shm)
-+{
-+ optee_ffa_shm_unregister(shm->ctx, shm);
-+ free_pages((unsigned long)shm->kaddr, get_order(shm->size));
-+ shm->kaddr = NULL;
-+}
-+
-+static void pool_ffa_op_destroy_poolmgr(struct tee_shm_pool_mgr *poolm)
-+{
-+ kfree(poolm);
-+}
-+
-+static const struct tee_shm_pool_mgr_ops pool_ffa_ops = {
-+ .alloc = pool_ffa_op_alloc,
-+ .free = pool_ffa_op_free,
-+ .destroy_poolmgr = pool_ffa_op_destroy_poolmgr,
-+};
-+
-+/**
-+ * optee_ffa_shm_pool_alloc_pages() - create page-based allocator pool
-+ *
-+ * This pool is used with OP-TEE over FF-A. In this case command buffers
-+ * and such are allocated from kernel's own memory.
-+ */
-+static struct tee_shm_pool_mgr *optee_ffa_shm_pool_alloc_pages(void)
-+{
-+ struct tee_shm_pool_mgr *mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-+
-+ if (!mgr)
-+ return ERR_PTR(-ENOMEM);
-+
-+ mgr->ops = &pool_ffa_ops;
-+
-+ return mgr;
-+}
-+
-+/*
-+ * 5. Do a normal scheduled call into secure world
-+ *
-+ * The function optee_ffa_do_call_with_arg() performs a normal scheduled
-+ * call into secure world. During this call may normal world request help
-+ * from normal world using RPCs, Remote Procedure Calls. This includes
-+ * delivery of non-secure interrupts to for instance allow rescheduling of
-+ * the current task.
-+ */
-+
-+static void handle_ffa_rpc_func_cmd_shm_alloc(struct tee_context *ctx,
-+ struct optee_msg_arg *arg)
-+{
-+ struct tee_shm *shm;
-+
-+ if (arg->num_params != 1 ||
-+ arg->params[0].attr != OPTEE_MSG_ATTR_TYPE_VALUE_INPUT) {
-+ arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-+ return;
-+ }
-+
-+ switch (arg->params[0].u.value.a) {
-+ case OPTEE_RPC_SHM_TYPE_APPL:
-+ shm = optee_rpc_cmd_alloc_suppl(ctx, arg->params[0].u.value.b);
-+ break;
-+ case OPTEE_RPC_SHM_TYPE_KERNEL:
-+ shm = tee_shm_alloc(ctx, arg->params[0].u.value.b,
-+ TEE_SHM_MAPPED | TEE_SHM_PRIV);
-+ break;
-+ default:
-+ arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-+ return;
-+ }
-+
-+ if (IS_ERR(shm)) {
-+ arg->ret = TEEC_ERROR_OUT_OF_MEMORY;
-+ return;
-+ }
-+
-+ arg->params[0] = (struct optee_msg_param){
-+ .attr = OPTEE_MSG_ATTR_TYPE_FMEM_OUTPUT,
-+ .u.fmem.size = tee_shm_get_size(shm),
-+ .u.fmem.global_id = shm->sec_world_id,
-+ .u.fmem.internal_offs = shm->offset,
-+ };
-+
-+ arg->ret = TEEC_SUCCESS;
-+}
-+
-+static void handle_ffa_rpc_func_cmd_shm_free(struct tee_context *ctx,
-+ struct optee *optee,
-+ struct optee_msg_arg *arg)
-+{
-+ struct tee_shm *shm;
-+
-+ if (arg->num_params != 1 ||
-+ arg->params[0].attr != OPTEE_MSG_ATTR_TYPE_VALUE_INPUT)
-+ goto err_bad_param;
-+
-+ shm = optee_shm_from_ffa_handle(optee, arg->params[0].u.value.b);
-+ if (!shm)
-+ goto err_bad_param;
-+ switch (arg->params[0].u.value.a) {
-+ case OPTEE_RPC_SHM_TYPE_APPL:
-+ optee_rpc_cmd_free_suppl(ctx, shm);
-+ break;
-+ case OPTEE_RPC_SHM_TYPE_KERNEL:
-+ tee_shm_free(shm);
-+ break;
-+ default:
-+ goto err_bad_param;
-+ }
-+ arg->ret = TEEC_SUCCESS;
-+ return;
-+
-+err_bad_param:
-+ arg->ret = TEEC_ERROR_BAD_PARAMETERS;
-+}
-+
-+static void handle_ffa_rpc_func_cmd(struct tee_context *ctx,
-+ struct optee_msg_arg *arg)
-+{
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
-+
-+ arg->ret_origin = TEEC_ORIGIN_COMMS;
-+ switch (arg->cmd) {
-+ case OPTEE_RPC_CMD_SHM_ALLOC:
-+ handle_ffa_rpc_func_cmd_shm_alloc(ctx, arg);
-+ break;
-+ case OPTEE_RPC_CMD_SHM_FREE:
-+ handle_ffa_rpc_func_cmd_shm_free(ctx, optee, arg);
-+ break;
-+ default:
-+ optee_rpc_cmd(ctx, optee, arg);
-+ }
-+}
-+
-+static void optee_handle_ffa_rpc(struct tee_context *ctx, u32 cmd,
-+ struct optee_msg_arg *arg)
-+{
-+ switch (cmd) {
-+ case OPTEE_FFA_YIELDING_CALL_RETURN_RPC_CMD:
-+ handle_ffa_rpc_func_cmd(ctx, arg);
-+ break;
-+ case OPTEE_FFA_YIELDING_CALL_RETURN_INTERRUPT:
-+ /* Interrupt delivered by now */
-+ break;
-+ default:
-+ pr_warn("Unknown RPC func 0x%x\n", cmd);
-+ break;
-+ }
-+}
-+
-+static int optee_ffa_yielding_call(struct tee_context *ctx,
-+ struct ffa_send_direct_data *data,
-+ struct optee_msg_arg *rpc_arg)
-+{
-+ struct optee *optee = tee_get_drvdata(ctx->teedev);
-+ const struct ffa_dev_ops *ffa_ops = optee->ffa.ffa_ops;
-+ struct ffa_device *ffa_dev = optee->ffa.ffa_dev;
-+ struct optee_call_waiter w;
-+ u32 cmd = data->data0;
-+ u32 w4 = data->data1;
-+ u32 w5 = data->data2;
-+ u32 w6 = data->data3;
-+ int rc;
-+
-+ /* Initialize waiter */
-+ optee_cq_wait_init(&optee->call_queue, &w);
-+ while (true) {
-+ rc = ffa_ops->sync_send_receive(ffa_dev, data);
-+ if (rc)
-+ goto done;
-+
-+ switch ((int)data->data0) {
-+ case TEEC_SUCCESS:
-+ break;
-+ case TEEC_ERROR_BUSY:
-+ if (cmd == OPTEE_FFA_YIELDING_CALL_RESUME) {
-+ rc = -EIO;
-+ goto done;
-+ }
-+
-+ /*
-+ * Out of threads in secure world, wait for a thread
-+ * become available.
-+ */
-+ optee_cq_wait_for_completion(&optee->call_queue, &w);
-+ data->data0 = cmd;
-+ data->data1 = w4;
-+ data->data2 = w5;
-+ data->data3 = w6;
-+ continue;
-+ default:
-+ rc = -EIO;
-+ goto done;
-+ }
-+
-+ if (data->data1 == OPTEE_FFA_YIELDING_CALL_RETURN_DONE)
-+ goto done;
-+
-+ /*
-+ * OP-TEE has returned with a RPC request.
-+ *
-+ * Note that data->data4 (passed in register w7) is already
-+ * filled in by ffa_ops->sync_send_receive() returning
-+ * above.
-+ */
-+ cond_resched();
-+ optee_handle_ffa_rpc(ctx, data->data1, rpc_arg);
-+ cmd = OPTEE_FFA_YIELDING_CALL_RESUME;
-+ data->data0 = cmd;
-+ data->data1 = 0;
-+ data->data2 = 0;
-+ data->data3 = 0;
-+ }
-+done:
-+ /*
-+ * We're done with our thread in secure world, if there's any
-+ * thread waiters wake up one.
-+ */
-+ optee_cq_wait_final(&optee->call_queue, &w);
-+
-+ return rc;
-+}
-+
-+/**
-+ * optee_ffa_do_call_with_arg() - Do a FF-A call to enter OP-TEE in secure world
-+ * @ctx: calling context
-+ * @shm: shared memory holding the message to pass to secure world
-+ *
-+ * Does a FF-A call to OP-TEE in secure world and handles eventual resulting
-+ * Remote Procedure Calls (RPC) from OP-TEE.
-+ *
-+ * Returns return code from FF-A, 0 is OK
-+ */
-+
-+static int optee_ffa_do_call_with_arg(struct tee_context *ctx,
-+ struct tee_shm *shm)
-+{
-+ struct ffa_send_direct_data data = {
-+ .data0 = OPTEE_FFA_YIELDING_CALL_WITH_ARG,
-+ .data1 = (u32)shm->sec_world_id,
-+ .data2 = (u32)(shm->sec_world_id >> 32),
-+ .data3 = shm->offset,
-+ };
-+ struct optee_msg_arg *arg = tee_shm_get_va(shm, 0);
-+ unsigned int rpc_arg_offs = OPTEE_MSG_GET_ARG_SIZE(arg->num_params);
-+ struct optee_msg_arg *rpc_arg = tee_shm_get_va(shm, rpc_arg_offs);
-+
-+ return optee_ffa_yielding_call(ctx, &data, rpc_arg);
-+}
-+
-+/*
-+ * 6. Driver initialization
-+ *
-+ * During driver inititialization is the OP-TEE Secure Partition is probed
-+ * to find out which features it supports so the driver can be initialized
-+ * with a matching configuration.
-+ */
-+
-+static bool optee_ffa_api_is_compatbile(struct ffa_device *ffa_dev,
-+ const struct ffa_dev_ops *ops)
-+{
-+ struct ffa_send_direct_data data = { OPTEE_FFA_GET_API_VERSION };
-+ int rc;
-+
-+ ops->mode_32bit_set(ffa_dev);
-+
-+ rc = ops->sync_send_receive(ffa_dev, &data);
-+ if (rc) {
-+ pr_err("Unexpected error %d\n", rc);
-+ return false;
-+ }
-+ if (data.data0 != OPTEE_FFA_VERSION_MAJOR ||
-+ data.data1 < OPTEE_FFA_VERSION_MINOR) {
-+ pr_err("Incompatible OP-TEE API version %lu.%lu",
-+ data.data0, data.data1);
-+ return false;
-+ }
-+
-+ data = (struct ffa_send_direct_data){ OPTEE_FFA_GET_OS_VERSION };
-+ rc = ops->sync_send_receive(ffa_dev, &data);
-+ if (rc) {
-+ pr_err("Unexpected error %d\n", rc);
-+ return false;
-+ }
-+ if (data.data2)
-+ pr_info("revision %lu.%lu (%08lx)",
-+ data.data0, data.data1, data.data2);
-+ else
-+ pr_info("revision %lu.%lu", data.data0, data.data1);
-+
-+ return true;
-+}
-+
-+static bool optee_ffa_exchange_caps(struct ffa_device *ffa_dev,
-+ const struct ffa_dev_ops *ops,
-+ unsigned int *rpc_arg_count)
-+{
-+ struct ffa_send_direct_data data = { OPTEE_FFA_EXCHANGE_CAPABILITIES };
-+ int rc;
-+
-+ rc = ops->sync_send_receive(ffa_dev, &data);
-+ if (rc) {
-+ pr_err("Unexpected error %d", rc);
-+ return false;
-+ }
-+ if (data.data0) {
-+ pr_err("Unexpected exchange error %lu", data.data0);
-+ return false;
-+ }
-+
-+ *rpc_arg_count = (u8)data.data1;
-+
-+ return true;
-+}
-+
-+static struct tee_shm_pool *optee_ffa_config_dyn_shm(void)
-+{
-+ struct tee_shm_pool_mgr *priv_mgr;
-+ struct tee_shm_pool_mgr *dmabuf_mgr;
-+ void *rc;
-+
-+ rc = optee_ffa_shm_pool_alloc_pages();
-+ if (IS_ERR(rc))
-+ return rc;
-+ priv_mgr = rc;
-+
-+ rc = optee_ffa_shm_pool_alloc_pages();
-+ if (IS_ERR(rc)) {
-+ tee_shm_pool_mgr_destroy(priv_mgr);
-+ return rc;
-+ }
-+ dmabuf_mgr = rc;
-+
-+ rc = tee_shm_pool_alloc(priv_mgr, dmabuf_mgr);
-+ if (IS_ERR(rc)) {
-+ tee_shm_pool_mgr_destroy(priv_mgr);
-+ tee_shm_pool_mgr_destroy(dmabuf_mgr);
-+ }
-+
-+ return rc;
-+}
-+
-+static void optee_ffa_get_version(struct tee_device *teedev,
-+ struct tee_ioctl_version_data *vers)
-+{
-+ struct tee_ioctl_version_data v = {
-+ .impl_id = TEE_IMPL_ID_OPTEE,
-+ .impl_caps = TEE_OPTEE_CAP_TZ,
-+ .gen_caps = TEE_GEN_CAP_GP | TEE_GEN_CAP_REG_MEM |
-+ TEE_GEN_CAP_MEMREF_NULL,
-+ };
-+
-+ *vers = v;
-+}
-+
-+static int optee_ffa_open(struct tee_context *ctx)
-+{
-+ return optee_open(ctx, true);
-+}
-+
-+static const struct tee_driver_ops optee_ffa_clnt_ops = {
-+ .get_version = optee_ffa_get_version,
-+ .open = optee_ffa_open,
-+ .release = optee_release,
-+ .open_session = optee_open_session,
-+ .close_session = optee_close_session,
-+ .invoke_func = optee_invoke_func,
-+ .cancel_req = optee_cancel_req,
-+ .shm_register = optee_ffa_shm_register,
-+ .shm_unregister = optee_ffa_shm_unregister,
-+};
-+
-+static const struct tee_desc optee_ffa_clnt_desc = {
-+ .name = DRIVER_NAME "-ffa-clnt",
-+ .ops = &optee_ffa_clnt_ops,
-+ .owner = THIS_MODULE,
-+};
-+
-+static const struct tee_driver_ops optee_ffa_supp_ops = {
-+ .get_version = optee_ffa_get_version,
-+ .open = optee_ffa_open,
-+ .release = optee_release_supp,
-+ .supp_recv = optee_supp_recv,
-+ .supp_send = optee_supp_send,
-+ .shm_register = optee_ffa_shm_register, /* same as for clnt ops */
-+ .shm_unregister = optee_ffa_shm_unregister_supp,
-+};
-+
-+static const struct tee_desc optee_ffa_supp_desc = {
-+ .name = DRIVER_NAME "-ffa-supp",
-+ .ops = &optee_ffa_supp_ops,
-+ .owner = THIS_MODULE,
-+ .flags = TEE_DESC_PRIVILEGED,
-+};
-+
-+static const struct optee_ops optee_ffa_ops = {
-+ .do_call_with_arg = optee_ffa_do_call_with_arg,
-+ .to_msg_param = optee_ffa_to_msg_param,
-+ .from_msg_param = optee_ffa_from_msg_param,
-+};
-+
-+static void optee_ffa_remove(struct ffa_device *ffa_dev)
-+{
-+ struct optee *optee = ffa_dev->dev.driver_data;
-+
-+ optee_remove_common(optee);
-+
-+ mutex_destroy(&optee->ffa.mutex);
-+ rhashtable_free_and_destroy(&optee->ffa.global_ids, rh_free_fn, NULL);
-+
-+ kfree(optee);
-+}
-+
-+static int optee_ffa_probe(struct ffa_device *ffa_dev)
-+{
-+ const struct ffa_dev_ops *ffa_ops;
-+ unsigned int rpc_arg_count;
-+ struct tee_device *teedev;
-+ struct optee *optee;
-+ int rc;
-+
-+ ffa_ops = ffa_dev_ops_get(ffa_dev);
-+ if (!ffa_ops) {
-+ pr_warn("failed \"method\" init: ffa\n");
-+ return -ENOENT;
-+ }
-+
-+ if (!optee_ffa_api_is_compatbile(ffa_dev, ffa_ops))
-+ return -EINVAL;
-+
-+ if (!optee_ffa_exchange_caps(ffa_dev, ffa_ops, &rpc_arg_count))
-+ return -EINVAL;
-+
-+ optee = kzalloc(sizeof(*optee), GFP_KERNEL);
-+ if (!optee) {
-+ rc = -ENOMEM;
-+ goto err;
-+ }
-+ optee->pool = optee_ffa_config_dyn_shm();
-+ if (IS_ERR(optee->pool)) {
-+ rc = PTR_ERR(optee->pool);
-+ optee->pool = NULL;
-+ goto err;
-+ }
-+
-+ optee->ops = &optee_ffa_ops;
-+ optee->ffa.ffa_dev = ffa_dev;
-+ optee->ffa.ffa_ops = ffa_ops;
-+ optee->rpc_arg_count = rpc_arg_count;
-+
-+ teedev = tee_device_alloc(&optee_ffa_clnt_desc, NULL, optee->pool,
-+ optee);
-+ if (IS_ERR(teedev)) {
-+ rc = PTR_ERR(teedev);
-+ goto err;
-+ }
-+ optee->teedev = teedev;
-+
-+ teedev = tee_device_alloc(&optee_ffa_supp_desc, NULL, optee->pool,
-+ optee);
-+ if (IS_ERR(teedev)) {
-+ rc = PTR_ERR(teedev);
-+ goto err;
-+ }
-+ optee->supp_teedev = teedev;
-+
-+ rc = tee_device_register(optee->teedev);
-+ if (rc)
-+ goto err;
-+
-+ rc = tee_device_register(optee->supp_teedev);
-+ if (rc)
-+ goto err;
-+
-+ rc = rhashtable_init(&optee->ffa.global_ids, &shm_rhash_params);
-+ if (rc)
-+ goto err;
-+ mutex_init(&optee->ffa.mutex);
-+ mutex_init(&optee->call_queue.mutex);
-+ INIT_LIST_HEAD(&optee->call_queue.waiters);
-+ optee_wait_queue_init(&optee->wait_queue);
-+ optee_supp_init(&optee->supp);
-+ ffa_dev_set_drvdata(ffa_dev, optee);
-+
-+ rc = optee_enumerate_devices(PTA_CMD_GET_DEVICES);
-+ if (rc) {
-+ optee_ffa_remove(ffa_dev);
-+ return rc;
-+ }
-+
-+ pr_info("initialized driver\n");
-+ return 0;
-+err:
-+ /*
-+ * tee_device_unregister() is safe to call even if the
-+ * devices hasn't been registered with
-+ * tee_device_register() yet.
-+ */
-+ tee_device_unregister(optee->supp_teedev);
-+ tee_device_unregister(optee->teedev);
-+ if (optee->pool)
-+ tee_shm_pool_free(optee->pool);
-+ kfree(optee);
-+ return rc;
-+}
-+
-+static const struct ffa_device_id optee_ffa_device_id[] = {
-+ /* 486178e0-e7f8-11e3-bc5e0002a5d5c51b */
-+ { UUID_INIT(0x486178e0, 0xe7f8, 0x11e3,
-+ 0xbc, 0x5e, 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b) },
-+ {}
-+};
-+
-+static struct ffa_driver optee_ffa_driver = {
-+ .name = "optee",
-+ .probe = optee_ffa_probe,
-+ .remove = optee_ffa_remove,
-+ .id_table = optee_ffa_device_id,
-+};
-+
-+int optee_ffa_abi_register(void)
-+{
-+ if (IS_REACHABLE(CONFIG_ARM_FFA_TRANSPORT))
-+ return ffa_register(&optee_ffa_driver);
-+ else
-+ return -EOPNOTSUPP;
-+}
-+
-+void optee_ffa_abi_unregister(void)
-+{
-+ if (IS_REACHABLE(CONFIG_ARM_FFA_TRANSPORT))
-+ ffa_unregister(&optee_ffa_driver);
-+}
-diff --git a/drivers/tee/optee/optee_ffa.h b/drivers/tee/optee/optee_ffa.h
-new file mode 100644
-index 000000000000..ee3a03fc392c
---- /dev/null
-+++ b/drivers/tee/optee/optee_ffa.h
-@@ -0,0 +1,153 @@
-+/* SPDX-License-Identifier: BSD-2-Clause */
-+/*
-+ * Copyright (c) 2019-2021, Linaro Limited
-+ */
-+
-+/*
-+ * This file is exported by OP-TEE and is kept in sync between secure world
-+ * and normal world drivers. We're using ARM FF-A 1.0 specification.
-+ */
-+
-+#ifndef __OPTEE_FFA_H
-+#define __OPTEE_FFA_H
-+
-+#include <linux/arm_ffa.h>
-+
-+/*
-+ * Normal world sends requests with FFA_MSG_SEND_DIRECT_REQ and
-+ * responses are returned with FFA_MSG_SEND_DIRECT_RESP for normal
-+ * messages.
-+ *
-+ * All requests with FFA_MSG_SEND_DIRECT_REQ and FFA_MSG_SEND_DIRECT_RESP
-+ * are using the AArch32 SMC calling convention with register usage as
-+ * defined in FF-A specification:
-+ * w0: Function ID (0x8400006F or 0x84000070)
-+ * w1: Source/Destination IDs
-+ * w2: Reserved (MBZ)
-+ * w3-w7: Implementation defined, free to be used below
-+ */
-+
-+#define OPTEE_FFA_VERSION_MAJOR 1
-+#define OPTEE_FFA_VERSION_MINOR 0
-+
-+#define OPTEE_FFA_BLOCKING_CALL(id) (id)
-+#define OPTEE_FFA_YIELDING_CALL_BIT 31
-+#define OPTEE_FFA_YIELDING_CALL(id) ((id) | BIT(OPTEE_FFA_YIELDING_CALL_BIT))
-+
-+/*
-+ * Returns the API version implemented, currently follows the FF-A version.
-+ * Call register usage:
-+ * w3: Service ID, OPTEE_FFA_GET_API_VERSION
-+ * w4-w7: Not used (MBZ)
-+ *
-+ * Return register usage:
-+ * w3: OPTEE_FFA_VERSION_MAJOR
-+ * w4: OPTEE_FFA_VERSION_MINOR
-+ * w5-w7: Not used (MBZ)
-+ */
-+#define OPTEE_FFA_GET_API_VERSION OPTEE_FFA_BLOCKING_CALL(0)
-+
-+/*
-+ * Returns the revision of OP-TEE.
-+ *
-+ * Used by non-secure world to figure out which version of the Trusted OS
-+ * is installed. Note that the returned revision is the revision of the
-+ * Trusted OS, not of the API.
-+ *
-+ * Call register usage:
-+ * w3: Service ID, OPTEE_FFA_GET_OS_VERSION
-+ * w4-w7: Unused (MBZ)
-+ *
-+ * Return register usage:
-+ * w3: CFG_OPTEE_REVISION_MAJOR
-+ * w4: CFG_OPTEE_REVISION_MINOR
-+ * w5: TEE_IMPL_GIT_SHA1 (or zero if not supported)
-+ */
-+#define OPTEE_FFA_GET_OS_VERSION OPTEE_FFA_BLOCKING_CALL(1)
-+
-+/*
-+ * Exchange capabilities between normal world and secure world.
-+ *
-+ * Currently there are no defined capabilities. When features are added new
-+ * capabilities may be added.
-+ *
-+ * Call register usage:
-+ * w3: Service ID, OPTEE_FFA_EXCHANGE_CAPABILITIES
-+ * w4-w7: Note used (MBZ)
-+ *
-+ * Return register usage:
-+ * w3: Error code, 0 on success
-+ * w4: Bit[7:0]: Number of parameters needed for RPC to be supplied
-+ * as the second MSG arg struct for
-+ * OPTEE_FFA_YIELDING_CALL_WITH_ARG.
-+ * Bit[31:8]: Reserved (MBZ)
-+ * w5-w7: Note used (MBZ)
-+ */
-+#define OPTEE_FFA_EXCHANGE_CAPABILITIES OPTEE_FFA_BLOCKING_CALL(2)
-+
-+/*
-+ * Unregister shared memory
-+ *
-+ * Call register usage:
-+ * w3: Service ID, OPTEE_FFA_YIELDING_CALL_UNREGISTER_SHM
-+ * w4: Shared memory handle, lower bits
-+ * w5: Shared memory handle, higher bits
-+ * w6-w7: Not used (MBZ)
-+ *
-+ * Return register usage:
-+ * w3: Error code, 0 on success
-+ * w4-w7: Note used (MBZ)
-+ */
-+#define OPTEE_FFA_UNREGISTER_SHM OPTEE_FFA_BLOCKING_CALL(3)
-+
-+/*
-+ * Call with struct optee_msg_arg as argument in the supplied shared memory
-+ * with a zero internal offset and normal cached memory attributes.
-+ * Register usage:
-+ * w3: Service ID, OPTEE_FFA_YIELDING_CALL_WITH_ARG
-+ * w4: Lower 32 bits of a 64-bit Shared memory handle
-+ * w5: Upper 32 bits of a 64-bit Shared memory handle
-+ * w6: Offset into shared memory pointing to a struct optee_msg_arg
-+ * right after the parameters of this struct (at offset
-+ * OPTEE_MSG_GET_ARG_SIZE(num_params) follows a struct optee_msg_arg
-+ * for RPC, this struct has reserved space for the number of RPC
-+ * parameters as returned by OPTEE_FFA_EXCHANGE_CAPABILITIES.
-+ * w7: Not used (MBZ)
-+ * Resume from RPC. Register usage:
-+ * w3: Service ID, OPTEE_FFA_YIELDING_CALL_RESUME
-+ * w4-w6: Not used (MBZ)
-+ * w7: Resume info
-+ *
-+ * Normal return (yielding call is completed). Register usage:
-+ * w3: Error code, 0 on success
-+ * w4: OPTEE_FFA_YIELDING_CALL_RETURN_DONE
-+ * w5-w7: Not used (MBZ)
-+ *
-+ * RPC interrupt return (RPC from secure world). Register usage:
-+ * w3: Error code == 0
-+ * w4: Any defined RPC code but OPTEE_FFA_YIELDING_CALL_RETURN_DONE
-+ * w5-w6: Not used (MBZ)
-+ * w7: Resume info
-+ *
-+ * Possible error codes in register w3:
-+ * 0: Success
-+ * FFA_DENIED: w4 isn't one of OPTEE_FFA_YIELDING_CALL_START
-+ * OPTEE_FFA_YIELDING_CALL_RESUME
-+ *
-+ * Possible error codes for OPTEE_FFA_YIELDING_CALL_START,
-+ * FFA_BUSY: Number of OP-TEE OS threads exceeded,
-+ * try again later
-+ * FFA_DENIED: RPC shared memory object not found
-+ * FFA_INVALID_PARAMETER: Bad shared memory handle or offset into the memory
-+ *
-+ * Possible error codes for OPTEE_FFA_YIELDING_CALL_RESUME
-+ * FFA_INVALID_PARAMETER: Bad resume info
-+ */
-+#define OPTEE_FFA_YIELDING_CALL_WITH_ARG OPTEE_FFA_YIELDING_CALL(0)
-+#define OPTEE_FFA_YIELDING_CALL_RESUME OPTEE_FFA_YIELDING_CALL(1)
-+
-+#define OPTEE_FFA_YIELDING_CALL_RETURN_DONE 0
-+#define OPTEE_FFA_YIELDING_CALL_RETURN_RPC_CMD 1
-+#define OPTEE_FFA_YIELDING_CALL_RETURN_INTERRUPT 2
-+
-+#endif /*__OPTEE_FFA_H*/
-diff --git a/drivers/tee/optee/optee_msg.h b/drivers/tee/optee/optee_msg.h
-index e3d72d09c484..2422e185d400 100644
---- a/drivers/tee/optee/optee_msg.h
-+++ b/drivers/tee/optee/optee_msg.h
-@@ -28,6 +28,9 @@
- #define OPTEE_MSG_ATTR_TYPE_RMEM_INPUT 0x5
- #define OPTEE_MSG_ATTR_TYPE_RMEM_OUTPUT 0x6
- #define OPTEE_MSG_ATTR_TYPE_RMEM_INOUT 0x7
-+#define OPTEE_MSG_ATTR_TYPE_FMEM_INPUT OPTEE_MSG_ATTR_TYPE_RMEM_INPUT
-+#define OPTEE_MSG_ATTR_TYPE_FMEM_OUTPUT OPTEE_MSG_ATTR_TYPE_RMEM_OUTPUT
-+#define OPTEE_MSG_ATTR_TYPE_FMEM_INOUT OPTEE_MSG_ATTR_TYPE_RMEM_INOUT
- #define OPTEE_MSG_ATTR_TYPE_TMEM_INPUT 0x9
- #define OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT 0xa
- #define OPTEE_MSG_ATTR_TYPE_TMEM_INOUT 0xb
-@@ -96,6 +99,8 @@
- */
- #define OPTEE_MSG_NONCONTIG_PAGE_SIZE 4096
-
-+#define OPTEE_MSG_FMEM_INVALID_GLOBAL_ID 0xffffffffffffffff
-+
- /**
- * struct optee_msg_param_tmem - temporary memory reference parameter
- * @buf_ptr: Address of the buffer
-@@ -127,6 +132,23 @@ struct optee_msg_param_rmem {
- u64 shm_ref;
- };
-
-+/**
-+ * struct optee_msg_param_fmem - ffa memory reference parameter
-+ * @offs_lower: Lower bits of offset into shared memory reference
-+ * @offs_upper: Upper bits of offset into shared memory reference
-+ * @internal_offs: Internal offset into the first page of shared memory
-+ * reference
-+ * @size: Size of the buffer
-+ * @global_id: Global identifier of Shared memory
-+ */
-+struct optee_msg_param_fmem {
-+ u32 offs_low;
-+ u16 offs_high;
-+ u16 internal_offs;
-+ u64 size;
-+ u64 global_id;
-+};
-+
- /**
- * struct optee_msg_param_value - opaque value parameter
- *
-@@ -143,13 +165,15 @@ struct optee_msg_param_value {
- * @attr: attributes
- * @tmem: parameter by temporary memory reference
- * @rmem: parameter by registered memory reference
-+ * @fmem: parameter by ffa registered memory reference
- * @value: parameter by opaque value
- * @octets: parameter by octet string
- *
- * @attr & OPTEE_MSG_ATTR_TYPE_MASK indicates if tmem, rmem or value is used in
- * the union. OPTEE_MSG_ATTR_TYPE_VALUE_* indicates value or octets,
- * OPTEE_MSG_ATTR_TYPE_TMEM_* indicates @tmem and
-- * OPTEE_MSG_ATTR_TYPE_RMEM_* indicates @rmem,
-+ * OPTEE_MSG_ATTR_TYPE_RMEM_* or the alias PTEE_MSG_ATTR_TYPE_FMEM_* indicates
-+ * @rmem or @fmem depending on the conduit.
- * OPTEE_MSG_ATTR_TYPE_NONE indicates that none of the members are used.
- */
- struct optee_msg_param {
-@@ -157,6 +181,7 @@ struct optee_msg_param {
- union {
- struct optee_msg_param_tmem tmem;
- struct optee_msg_param_rmem rmem;
-+ struct optee_msg_param_fmem fmem;
- struct optee_msg_param_value value;
- u8 octets[24];
- } u;
-diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
-index 40af6b059b20..6660e05298db 100644
---- a/drivers/tee/optee/optee_private.h
-+++ b/drivers/tee/optee/optee_private.h
-@@ -7,6 +7,7 @@
- #define OPTEE_PRIVATE_H
-
- #include <linux/arm-smccc.h>
-+#include <linux/rhashtable.h>
- #include <linux/semaphore.h>
- #include <linux/tee_drv.h>
- #include <linux/types.h>
-@@ -22,6 +23,7 @@
- #define TEEC_ERROR_NOT_SUPPORTED 0xFFFF000A
- #define TEEC_ERROR_COMMUNICATION 0xFFFF000E
- #define TEEC_ERROR_OUT_OF_MEMORY 0xFFFF000C
-+#define TEEC_ERROR_BUSY 0xFFFF000D
- #define TEEC_ERROR_SHORT_BUFFER 0xFFFF0010
-
- #define TEEC_ORIGIN_COMMS 0x00000002
-@@ -73,19 +75,28 @@ struct optee_supp {
- struct completion reqs_c;
- };
-
--/**
-- * struct optee_smc - SMC ABI specifics
-- * @invoke_fn: function to issue smc or hvc
-- * @memremaped_shm virtual address of memory in shared memory pool
-- * @sec_caps: secure world capabilities defined by
-- * OPTEE_SMC_SEC_CAP_* in optee_smc.h
-- */
- struct optee_smc {
- optee_invoke_fn *invoke_fn;
- void *memremaped_shm;
- u32 sec_caps;
- };
-
-+/**
-+ * struct optee_ffa_data - FFA communication struct
-+ * @ffa_dev FFA device, contains the destination id, the id of
-+ * OP-TEE in secure world
-+ * @ffa_ops FFA operations
-+ * @mutex Serializes access to @global_ids
-+ * @global_ids FF-A shared memory global handle translation
-+ */
-+struct optee_ffa {
-+ struct ffa_device *ffa_dev;
-+ const struct ffa_dev_ops *ffa_ops;
-+ /* Serializes access to @global_ids */
-+ struct mutex mutex;
-+ struct rhashtable global_ids;
-+};
-+
- struct optee;
-
- /**
-@@ -116,11 +127,13 @@ struct optee_ops {
- * world
- * @teedev: client device
- * @smc: specific to SMC ABI
-+ * @ffa: specific to FF-A ABI
- * @call_queue: queue of threads waiting to call @invoke_fn
- * @wait_queue: queue of threads from secure world waiting for a
- * secure world sync object
- * @supp: supplicant synchronization struct for RPC to supplicant
- * @pool: shared memory pool
-+ * @rpc_arg_count: If > 0 number of RPC parameters to make room for
- * @scan_bus_done flag if device registation was already done.
- * @scan_bus_wq workqueue to scan optee bus and register optee drivers
- * @scan_bus_work workq to scan optee bus and register optee drivers
-@@ -129,11 +142,15 @@ struct optee {
- struct tee_device *supp_teedev;
- struct tee_device *teedev;
- const struct optee_ops *ops;
-- struct optee_smc smc;
-+ union {
-+ struct optee_smc smc;
-+ struct optee_ffa ffa;
-+ };
- struct optee_call_queue call_queue;
- struct optee_wait_queue wait_queue;
- struct optee_supp supp;
- struct tee_shm_pool *pool;
-+ unsigned int rpc_arg_count;
- bool scan_bus_done;
- struct workqueue_struct *scan_bus_wq;
- struct work_struct scan_bus_work;
-@@ -266,5 +283,7 @@ static inline void reg_pair_from_64(u32 *reg0, u32 *reg1, u64 val)
- /* Registration of the ABIs */
- int optee_smc_abi_register(void);
- void optee_smc_abi_unregister(void);
-+int optee_ffa_abi_register(void);
-+void optee_ffa_abi_unregister(void);
-
- #endif /*OPTEE_PRIVATE_H*/
-2.34.1
-
deleted file mode 100644
@@ -1,63 +0,0 @@
-From 61c33344f747deac2860571ef965c20f9170efea Mon Sep 17 00:00:00 2001
-From: Jens Wiklander <jens.wiklander@linaro.org>
-Date: Thu, 21 Oct 2021 14:55:39 +0200
-Subject: [PATCH 13/40] optee: smc_abi.c: add missing #include <linux/mm.h>
-
-Adds missing #include <linux/mm.h> drivers/tee/optee/smc_abi.c to fix
-compile errors like:
-drivers/tee/optee/smc_abi.c:405:15: error: implicit
-declaration of function 'page_to_section'
-[-Werror,-Wimplicit-function-declaration]
- optee_page = page_to_phys(*pages) +
- ^
-arch/arm/include/asm/memory.h:148:43: note: expanded from
-macro 'page_to_phys'
- ^
-include/asm-generic/memory_model.h:52:21: note: expanded
-from macro 'page_to_pfn'
- ^
-include/asm-generic/memory_model.h:35:14: note: expanded
-from macro '__page_to_pfn'
- int __sec = page_to_section(__pg); \
- ^
-drivers/tee/optee/smc_abi.c:405:15: note: did you mean
-'__nr_to_section'?
-arch/arm/include/asm/memory.h:148:43: note: expanded from
-macro 'page_to_phys'
- ^
-include/asm-generic/memory_model.h:52:21: note: expanded
-from macro 'page_to_pfn'
- ^
-include/asm-generic/memory_model.h:35:14: note: expanded
-from macro '__page_to_pfn'
- int __sec = page_to_section(__pg); \
- ^
-include/linux/mmzone.h:1365:35: note: '__nr_to_section'
-declared here
-static inline struct mem_section *__nr_to_section(unsigned long nr)
-
-Fixes: c51a564a5b48 ("optee: isolate smc abi")
-Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-Link: https://lore.kernel.org/r/20211021125539.3858495-1-jens.wiklander@linaro.org'
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Upstream-Status: Backport [https://lore.kernel.org/r/20211021125539.3858495-1-jens.wiklander@linaro.org]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/tee/optee/smc_abi.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
-index 9a787fb4f5e5..6196d7c3888f 100644
---- a/drivers/tee/optee/smc_abi.c
-+++ b/drivers/tee/optee/smc_abi.c
-@@ -10,6 +10,7 @@
- #include <linux/errno.h>
- #include <linux/io.h>
- #include <linux/sched.h>
-+#include <linux/mm.h>
- #include <linux/module.h>
- #include <linux/of.h>
- #include <linux/of_platform.h>
-2.34.1
-
deleted file mode 100644
@@ -1,43 +0,0 @@
-From bf890db9200464083c44987cd41c034b1019fc5a Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.i.king@googlemail.com>
-Date: Sat, 23 Oct 2021 12:52:09 +0100
-Subject: [PATCH 14/40] optee: Fix spelling mistake "reclain" -> "reclaim"
-
-There are spelling mistakes in pr_err error messages. Fix them.
-
-Fixes: 4615e5a34b95 ("optee: add FF-A support")
-Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
-Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
-[jw: added a fixes]
-Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-Upstream-Status: Backport [1b73a9e4986a4e9065bacf1e5ab2dfda17b54161]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- drivers/tee/optee/ffa_abi.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
-index 6defd1ec982a..45424824e0f9 100644
---- a/drivers/tee/optee/ffa_abi.c
-+++ b/drivers/tee/optee/ffa_abi.c
-@@ -333,7 +333,7 @@ static int optee_ffa_shm_unregister(struct tee_context *ctx,
-
- rc = ffa_ops->memory_reclaim(global_handle, 0);
- if (rc)
-- pr_err("mem_reclain: 0x%llx %d", global_handle, rc);
-+ pr_err("mem_reclaim: 0x%llx %d", global_handle, rc);
-
- return rc;
- }
-@@ -355,7 +355,7 @@ static int optee_ffa_shm_unregister_supp(struct tee_context *ctx,
- optee_shm_rem_ffa_handle(optee, global_handle);
- rc = ffa_ops->memory_reclaim(global_handle, 0);
- if (rc)
-- pr_err("mem_reclain: 0x%llx %d", global_handle, rc);
-+ pr_err("mem_reclaim: 0x%llx %d", global_handle, rc);
-
- shm->sec_world_id = 0;
-
-2.34.1
-
deleted file mode 100644
@@ -1,44 +0,0 @@
-From 9f3b899a2e8bf79f572f408bfd86836578f46106 Mon Sep 17 00:00:00 2001
-From: Lv Ruyi <lv.ruyi@zte.com.cn>
-Date: Thu, 4 Nov 2021 11:30:47 +0000
-Subject: [PATCH 15/40] optee: fix kfree NULL pointer
-
-This patch fixes the following Coccinelle error:
-drivers/tee/optee/ffa_abi.c: 877: ERROR optee is NULL but dereferenced.
-
-If memory allocation fails, optee is null pointer. the code will goto err
-and release optee.
-
-Fixes: 4615e5a34b95 ("optee: add FF-A support")
-Reported-by: Zeal Robot <zealci@zte.com.cn>
-Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
-Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
-[jw: removed the redundant braces]
-Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-Upstream-Status: Backport [c23ca66a4dadb6f050dc57358bc8d57a747c35bf]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- drivers/tee/optee/ffa_abi.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
-index 45424824e0f9..d8c8683863aa 100644
---- a/drivers/tee/optee/ffa_abi.c
-+++ b/drivers/tee/optee/ffa_abi.c
-@@ -810,10 +810,9 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
- return -EINVAL;
-
- optee = kzalloc(sizeof(*optee), GFP_KERNEL);
-- if (!optee) {
-- rc = -ENOMEM;
-- goto err;
-- }
-+ if (!optee)
-+ return -ENOMEM;
-+
- optee->pool = optee_ffa_config_dyn_shm();
- if (IS_ERR(optee->pool)) {
- rc = PTR_ERR(optee->pool);
-2.34.1
-
deleted file mode 100644
@@ -1,107 +0,0 @@
-From a52e1e964aa4f2592ebffb30df048cc85fa5a02c Mon Sep 17 00:00:00 2001
-From: Robin Murphy <robin.murphy@arm.com>
-Date: Fri, 3 Dec 2021 11:44:51 +0000
-Subject: [PATCH 16/40] perf/arm-cmn: Account for NUMA affinity
-
-On a system with multiple CMN meshes, ideally we'd want to access each
-PMU from within its own mesh, rather than with a long CML round-trip,
-wherever feasible. Since such a system is likely to be presented as
-multiple NUMA nodes, let's also hope a proximity domain is specified
-for each CMN programming interface, and use that to guide our choice
-of IRQ affinity to favour a node-local CPU where possible.
-
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Link: https://lore.kernel.org/r/32438b0d016e0649d882d47d30ac2000484287b9.1638530442.git.robin.murphy@arm.com
-Signed-off-by: Will Deacon <will@kernel.org>
-
-Upstream-Status: Backport [https://lore.kernel.org/r/32438b0d016e0649d882d47d30ac2000484287b9.1638530442.git.robin.murphy@arm.com]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/perf/arm-cmn.c | 51 +++++++++++++++++++++++++++++++-----------
- 1 file changed, 38 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
-index 400eb7f579dc..02b898dbba91 100644
---- a/drivers/perf/arm-cmn.c
-+++ b/drivers/perf/arm-cmn.c
-@@ -1147,23 +1147,47 @@ static int arm_cmn_commit_txn(struct pmu *pmu)
- return 0;
- }
-
--static int arm_cmn_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node)
-+static void arm_cmn_migrate(struct arm_cmn *cmn, unsigned int cpu)
-+{
-+ unsigned int i;
-+
-+ perf_pmu_migrate_context(&cmn->pmu, cmn->cpu, cpu);
-+ for (i = 0; i < cmn->num_dtcs; i++)
-+ irq_set_affinity(cmn->dtc[i].irq, cpumask_of(cpu));
-+ cmn->cpu = cpu;
-+}
-+
-+static int arm_cmn_pmu_online_cpu(unsigned int cpu, struct hlist_node *cpuhp_node)
- {
- struct arm_cmn *cmn;
-- unsigned int i, target;
-+ int node;
-
-- cmn = hlist_entry_safe(node, struct arm_cmn, cpuhp_node);
-- if (cpu != cmn->cpu)
-- return 0;
-+ cmn = hlist_entry_safe(cpuhp_node, struct arm_cmn, cpuhp_node);
-+ node = dev_to_node(cmn->dev);
-+ if (node != NUMA_NO_NODE && cpu_to_node(cmn->cpu) != node && cpu_to_node(cpu) == node)
-+ arm_cmn_migrate(cmn, cpu);
-+ return 0;
-+}
-+
-+static int arm_cmn_pmu_offline_cpu(unsigned int cpu, struct hlist_node *cpuhp_node)
-+{
-+ struct arm_cmn *cmn;
-+ unsigned int target;
-+ int node;
-+ cpumask_t mask;
-
-- target = cpumask_any_but(cpu_online_mask, cpu);
-- if (target >= nr_cpu_ids)
-+ cmn = hlist_entry_safe(cpuhp_node, struct arm_cmn, cpuhp_node);
-+ if (cpu != cmn->cpu)
- return 0;
-
-- perf_pmu_migrate_context(&cmn->pmu, cpu, target);
-- for (i = 0; i < cmn->num_dtcs; i++)
-- irq_set_affinity(cmn->dtc[i].irq, cpumask_of(target));
-- cmn->cpu = target;
-+ node = dev_to_node(cmn->dev);
-+ if (cpumask_and(&mask, cpumask_of_node(node), cpu_online_mask) &&
-+ cpumask_andnot(&mask, &mask, cpumask_of(cpu)))
-+ target = cpumask_any(&mask);
-+ else
-+ target = cpumask_any_but(cpu_online_mask, cpu);
-+ if (target < nr_cpu_ids)
-+ arm_cmn_migrate(cmn, target);
- return 0;
- }
-
-@@ -1532,7 +1556,7 @@ static int arm_cmn_probe(struct platform_device *pdev)
- if (err)
- return err;
-
-- cmn->cpu = raw_smp_processor_id();
-+ cmn->cpu = cpumask_local_spread(0, dev_to_node(cmn->dev));
- cmn->pmu = (struct pmu) {
- .module = THIS_MODULE,
- .attr_groups = arm_cmn_attr_groups,
-@@ -1608,7 +1632,8 @@ static int __init arm_cmn_init(void)
- int ret;
-
- ret = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN,
-- "perf/arm/cmn:online", NULL,
-+ "perf/arm/cmn:online",
-+ arm_cmn_pmu_online_cpu,
- arm_cmn_pmu_offline_cpu);
- if (ret < 0)
- return ret;
-2.34.1
-
deleted file mode 100644
@@ -1,89 +0,0 @@
-From 16cf1b5483d4cbad8ee52fcc9945abcea6492bd1 Mon Sep 17 00:00:00 2001
-From: Robin Murphy <robin.murphy@arm.com>
-Date: Fri, 3 Dec 2021 11:44:52 +0000
-Subject: [PATCH 17/40] perf/arm-cmn: Drop compile-test restriction
-
-Although CMN is currently (and overwhelmingly likely to remain) deployed
-in arm64-only (modulo userspace) systems, the 64-bit "dependency" for
-compile-testing was just laziness due to heavy reliance on readq/writeq
-accessors. Since we only need one extra include for robustness in that
-regard, let's pull that in, widen the compile-test coverage, and fix up
-the smattering of type laziness that that brings to light.
-
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Link: https://lore.kernel.org/r/baee9ee0d0bdad8aaeb70f5a4b98d8fd4b1f5786.1638530442.git.robin.murphy@arm.com
-Signed-off-by: Will Deacon <will@kernel.org>
-
-Upstream-Status: Backport [https://lore.kernel.org/r/baee9ee0d0bdad8aaeb70f5a4b98d8fd4b1f5786.1638530442.git.robin.murphy@arm.com]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/perf/Kconfig | 2 +-
- drivers/perf/arm-cmn.c | 25 +++++++++++++------------
- 2 files changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig
-index 77522e5efe11..e453915ebc84 100644
---- a/drivers/perf/Kconfig
-+++ b/drivers/perf/Kconfig
-@@ -43,7 +43,7 @@ config ARM_CCN
-
- config ARM_CMN
- tristate "Arm CMN-600 PMU support"
-- depends on ARM64 || (COMPILE_TEST && 64BIT)
-+ depends on ARM64 || COMPILE_TEST
- help
- Support for PMU events monitoring on the Arm CMN-600 Coherent Mesh
- Network interconnect.
-diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
-index 02b898dbba91..1d52fcfe3a0d 100644
---- a/drivers/perf/arm-cmn.c
-+++ b/drivers/perf/arm-cmn.c
-@@ -7,6 +7,7 @@
- #include <linux/bitops.h>
- #include <linux/interrupt.h>
- #include <linux/io.h>
-+#include <linux/io-64-nonatomic-lo-hi.h>
- #include <linux/kernel.h>
- #include <linux/list.h>
- #include <linux/module.h>
-@@ -122,11 +123,11 @@
-
-
- /* Event attributes */
--#define CMN_CONFIG_TYPE GENMASK(15, 0)
--#define CMN_CONFIG_EVENTID GENMASK(23, 16)
--#define CMN_CONFIG_OCCUPID GENMASK(27, 24)
--#define CMN_CONFIG_BYNODEID BIT(31)
--#define CMN_CONFIG_NODEID GENMASK(47, 32)
-+#define CMN_CONFIG_TYPE GENMASK_ULL(15, 0)
-+#define CMN_CONFIG_EVENTID GENMASK_ULL(23, 16)
-+#define CMN_CONFIG_OCCUPID GENMASK_ULL(27, 24)
-+#define CMN_CONFIG_BYNODEID BIT_ULL(31)
-+#define CMN_CONFIG_NODEID GENMASK_ULL(47, 32)
-
- #define CMN_EVENT_TYPE(event) FIELD_GET(CMN_CONFIG_TYPE, (event)->attr.config)
- #define CMN_EVENT_EVENTID(event) FIELD_GET(CMN_CONFIG_EVENTID, (event)->attr.config)
-@@ -134,13 +135,13 @@
- #define CMN_EVENT_BYNODEID(event) FIELD_GET(CMN_CONFIG_BYNODEID, (event)->attr.config)
- #define CMN_EVENT_NODEID(event) FIELD_GET(CMN_CONFIG_NODEID, (event)->attr.config)
-
--#define CMN_CONFIG_WP_COMBINE GENMASK(27, 24)
--#define CMN_CONFIG_WP_DEV_SEL BIT(48)
--#define CMN_CONFIG_WP_CHN_SEL GENMASK(50, 49)
--#define CMN_CONFIG_WP_GRP BIT(52)
--#define CMN_CONFIG_WP_EXCLUSIVE BIT(53)
--#define CMN_CONFIG1_WP_VAL GENMASK(63, 0)
--#define CMN_CONFIG2_WP_MASK GENMASK(63, 0)
-+#define CMN_CONFIG_WP_COMBINE GENMASK_ULL(27, 24)
-+#define CMN_CONFIG_WP_DEV_SEL BIT_ULL(48)
-+#define CMN_CONFIG_WP_CHN_SEL GENMASK_ULL(50, 49)
-+#define CMN_CONFIG_WP_GRP BIT_ULL(52)
-+#define CMN_CONFIG_WP_EXCLUSIVE BIT_ULL(53)
-+#define CMN_CONFIG1_WP_VAL GENMASK_ULL(63, 0)
-+#define CMN_CONFIG2_WP_MASK GENMASK_ULL(63, 0)
-
- #define CMN_EVENT_WP_COMBINE(event) FIELD_GET(CMN_CONFIG_WP_COMBINE, (event)->attr.config)
- #define CMN_EVENT_WP_DEV_SEL(event) FIELD_GET(CMN_CONFIG_WP_DEV_SEL, (event)->attr.config)
-2.34.1
-
deleted file mode 100644
@@ -1,155 +0,0 @@
-From 762ba0fb54d97c08c35fbe2745c19fd4a74ded0d Mon Sep 17 00:00:00 2001
-From: Robin Murphy <robin.murphy@arm.com>
-Date: Fri, 3 Dec 2021 11:44:53 +0000
-Subject: [PATCH 18/40] perf/arm-cmn: Refactor node ID handling
-
-Add a bit more abstraction for the places where we decompose node IDs.
-This will help keep things nice and manageable when we come to add yet
-more variables which affect the node ID format. Also use the opportunity
-to move the rest of the low-level node management helpers back up to the
-logical place they were meant to be - how they ended up buried right in
-the middle of the event-related definitions is somewhat of a mystery...
-
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Link: https://lore.kernel.org/r/a2242a8c3c96056c13a04ae87bf2047e5e64d2d9.1638530442.git.robin.murphy@arm.com
-Signed-off-by: Will Deacon <will@kernel.org>
-
-Upstream-Status: Backport [https://lore.kernel.org/r/a2242a8c3c96056c13a04ae87bf2047e5e64d2d9.1638530442.git.robin.murphy@arm.com]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/perf/arm-cmn.c | 94 +++++++++++++++++++++++++-----------------
- 1 file changed, 56 insertions(+), 38 deletions(-)
-
-diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
-index 1d52fcfe3a0d..adf50d613734 100644
---- a/drivers/perf/arm-cmn.c
-+++ b/drivers/perf/arm-cmn.c
-@@ -255,6 +255,58 @@ struct arm_cmn {
-
- static int arm_cmn_hp_state;
-
-+struct arm_cmn_nodeid {
-+ u8 x;
-+ u8 y;
-+ u8 port;
-+ u8 dev;
-+};
-+
-+static int arm_cmn_xyidbits(const struct arm_cmn *cmn)
-+{
-+ int dim = max(cmn->mesh_x, cmn->mesh_y);
-+
-+ return dim > 4 ? 3 : 2;
-+}
-+
-+static struct arm_cmn_nodeid arm_cmn_nid(const struct arm_cmn *cmn, u16 id)
-+{
-+ struct arm_cmn_nodeid nid;
-+ int bits = arm_cmn_xyidbits(cmn);
-+
-+ nid.x = CMN_NODEID_X(id, bits);
-+ nid.y = CMN_NODEID_Y(id, bits);
-+ nid.port = CMN_NODEID_PID(id);
-+ nid.dev = CMN_NODEID_DEVID(id);
-+
-+ return nid;
-+}
-+
-+static void arm_cmn_init_node_to_xp(const struct arm_cmn *cmn,
-+ struct arm_cmn_node *dn)
-+{
-+ struct arm_cmn_nodeid nid = arm_cmn_nid(cmn, dn->id);
-+ int xp_idx = cmn->mesh_x * nid.y + nid.x;
-+
-+ dn->to_xp = (cmn->xps + xp_idx) - dn;
-+}
-+
-+static struct arm_cmn_node *arm_cmn_node_to_xp(struct arm_cmn_node *dn)
-+{
-+ return dn->type == CMN_TYPE_XP ? dn : dn + dn->to_xp;
-+}
-+
-+static struct arm_cmn_node *arm_cmn_node(const struct arm_cmn *cmn,
-+ enum cmn_node_type type)
-+{
-+ int i;
-+
-+ for (i = 0; i < cmn->num_dns; i++)
-+ if (cmn->dns[i].type == type)
-+ return &cmn->dns[i];
-+ return NULL;
-+}
-+
- struct arm_cmn_hw_event {
- struct arm_cmn_node *dn;
- u64 dtm_idx[2];
-@@ -295,38 +347,6 @@ struct arm_cmn_format_attr {
- int config;
- };
-
--static int arm_cmn_xyidbits(const struct arm_cmn *cmn)
--{
-- return cmn->mesh_x > 4 || cmn->mesh_y > 4 ? 3 : 2;
--}
--
--static void arm_cmn_init_node_to_xp(const struct arm_cmn *cmn,
-- struct arm_cmn_node *dn)
--{
-- int bits = arm_cmn_xyidbits(cmn);
-- int x = CMN_NODEID_X(dn->id, bits);
-- int y = CMN_NODEID_Y(dn->id, bits);
-- int xp_idx = cmn->mesh_x * y + x;
--
-- dn->to_xp = (cmn->xps + xp_idx) - dn;
--}
--
--static struct arm_cmn_node *arm_cmn_node_to_xp(struct arm_cmn_node *dn)
--{
-- return dn->type == CMN_TYPE_XP ? dn : dn + dn->to_xp;
--}
--
--static struct arm_cmn_node *arm_cmn_node(const struct arm_cmn *cmn,
-- enum cmn_node_type type)
--{
-- int i;
--
-- for (i = 0; i < cmn->num_dns; i++)
-- if (cmn->dns[i].type == type)
-- return &cmn->dns[i];
-- return NULL;
--}
--
- #define CMN_EVENT_ATTR(_name, _type, _eventid, _occupid) \
- (&((struct arm_cmn_event_attr[]) {{ \
- .attr = __ATTR(_name, 0444, arm_cmn_event_show, NULL), \
-@@ -966,11 +986,10 @@ static int arm_cmn_event_init(struct perf_event *event)
- }
-
- if (!hw->num_dns) {
-- int bits = arm_cmn_xyidbits(cmn);
-+ struct arm_cmn_nodeid nid = arm_cmn_nid(cmn, nodeid);
-
- dev_dbg(cmn->dev, "invalid node 0x%x (%d,%d,%d,%d) type 0x%x\n",
-- nodeid, CMN_NODEID_X(nodeid, bits), CMN_NODEID_Y(nodeid, bits),
-- CMN_NODEID_PID(nodeid), CMN_NODEID_DEVID(nodeid), type);
-+ nodeid, nid.x, nid.y, nid.port, nid.dev, type);
- return -EINVAL;
- }
- /*
-@@ -1068,11 +1087,10 @@ static int arm_cmn_event_add(struct perf_event *event, int flags)
- dn->wp_event[wp_idx] = dtc_idx;
- writel_relaxed(cfg, dn->pmu_base + CMN_DTM_WPn_CONFIG(wp_idx));
- } else {
-- unsigned int port = CMN_NODEID_PID(dn->id);
-- unsigned int dev = CMN_NODEID_DEVID(dn->id);
-+ struct arm_cmn_nodeid nid = arm_cmn_nid(cmn, dn->id);
-
- input_sel = CMN__PMEVCNT0_INPUT_SEL_DEV + dtm_idx +
-- (port << 4) + (dev << 2);
-+ (nid.port << 4) + (nid.dev << 2);
-
- if (arm_cmn_is_occup_event(type, CMN_EVENT_EVENTID(event))) {
- int occupid = CMN_EVENT_OCCUPID(event);
-2.34.1
-
deleted file mode 100644
@@ -1,118 +0,0 @@
-From ca15b67dc746c13a8231d11a3e2925f128982a7d Mon Sep 17 00:00:00 2001
-From: Robin Murphy <robin.murphy@arm.com>
-Date: Fri, 3 Dec 2021 11:44:54 +0000
-Subject: [PATCH 19/40] perf/arm-cmn: Streamline node iteration
-
-Refactor the places where we scan through the set of nodes to switch
-from explicit array indexing to pointer-based iteration. This leads to
-slightly simpler object code, but also makes the source less dense and
-more pleasant for further development. It also unearths an almost-bug
-in arm_cmn_event_init() where we've been depending on the "array index"
-of NULL relative to cmn->dns being a sufficiently large number, yuck.
-
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Link: https://lore.kernel.org/r/ee0c9eda9a643f46001ac43aadf3f0b1fd5660dd.1638530442.git.robin.murphy@arm.com
-Signed-off-by: Will Deacon <will@kernel.org>
-
-Upstream-Status: Backport [https://lore.kernel.org/r/ee0c9eda9a643f46001ac43aadf3f0b1fd5660dd.1638530442.git.robin.murphy@arm.com]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/perf/arm-cmn.c | 33 ++++++++++++++++++++-------------
- 1 file changed, 20 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
-index adf50d613734..da7bf779fec2 100644
---- a/drivers/perf/arm-cmn.c
-+++ b/drivers/perf/arm-cmn.c
-@@ -299,11 +299,11 @@ static struct arm_cmn_node *arm_cmn_node_to_xp(struct arm_cmn_node *dn)
- static struct arm_cmn_node *arm_cmn_node(const struct arm_cmn *cmn,
- enum cmn_node_type type)
- {
-- int i;
-+ struct arm_cmn_node *dn;
-
-- for (i = 0; i < cmn->num_dns; i++)
-- if (cmn->dns[i].type == type)
-- return &cmn->dns[i];
-+ for (dn = cmn->dns; dn->type; dn++)
-+ if (dn->type == type)
-+ return dn;
- return NULL;
- }
-
-@@ -941,8 +941,8 @@ static int arm_cmn_event_init(struct perf_event *event)
- {
- struct arm_cmn *cmn = to_cmn(event->pmu);
- struct arm_cmn_hw_event *hw = to_cmn_hw(event);
-+ struct arm_cmn_node *dn;
- enum cmn_node_type type;
-- unsigned int i;
- bool bynodeid;
- u16 nodeid, eventid;
-
-@@ -974,10 +974,12 @@ static int arm_cmn_event_init(struct perf_event *event)
- nodeid = CMN_EVENT_NODEID(event);
-
- hw->dn = arm_cmn_node(cmn, type);
-- for (i = hw->dn - cmn->dns; i < cmn->num_dns && cmn->dns[i].type == type; i++) {
-+ if (!hw->dn)
-+ return -EINVAL;
-+ for (dn = hw->dn; dn->type == type; dn++) {
- if (!bynodeid) {
- hw->num_dns++;
-- } else if (cmn->dns[i].id != nodeid) {
-+ } else if (dn->id != nodeid) {
- hw->dn++;
- } else {
- hw->num_dns = 1;
-@@ -1332,7 +1334,7 @@ static int arm_cmn_init_dtcs(struct arm_cmn *cmn)
-
- cmn->xps = arm_cmn_node(cmn, CMN_TYPE_XP);
-
-- for (dn = cmn->dns; dn < cmn->dns + cmn->num_dns; dn++) {
-+ for (dn = cmn->dns; dn->type; dn++) {
- if (dn->type != CMN_TYPE_XP)
- arm_cmn_init_node_to_xp(cmn, dn);
- else if (cmn->num_dtcs == 1)
-@@ -1382,6 +1384,7 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- u32 xp_offset[CMN_MAX_XPS];
- u64 reg;
- int i, j;
-+ size_t sz;
-
- cfg_region = cmn->base + rgn_offset;
- reg = readl_relaxed(cfg_region + CMN_CFGM_PERIPH_ID_2);
-@@ -1408,14 +1411,13 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- cmn->num_dns += FIELD_GET(CMN_CI_CHILD_COUNT, reg);
- }
-
-- /* Cheeky +1 to help terminate pointer-based iteration */
-- cmn->dns = devm_kcalloc(cmn->dev, cmn->num_dns + 1,
-- sizeof(*cmn->dns), GFP_KERNEL);
-- if (!cmn->dns)
-+ /* Cheeky +1 to help terminate pointer-based iteration later */
-+ dn = devm_kcalloc(cmn->dev, cmn->num_dns + 1, sizeof(*dn), GFP_KERNEL);
-+ if (!dn)
- return -ENOMEM;
-
- /* Pass 2: now we can actually populate the nodes */
-- dn = cmn->dns;
-+ cmn->dns = dn;
- for (i = 0; i < cmn->num_xps; i++) {
- void __iomem *xp_region = cmn->base + xp_offset[i];
- struct arm_cmn_node *xp = dn++;
-@@ -1484,6 +1486,11 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- /* Correct for any nodes we skipped */
- cmn->num_dns = dn - cmn->dns;
-
-+ sz = (void *)(dn + 1) - (void *)cmn->dns;
-+ dn = devm_krealloc(cmn->dev, cmn->dns, sz, GFP_KERNEL);
-+ if (dn)
-+ cmn->dns = dn;
-+
- /*
- * If mesh_x wasn't set during discovery then we never saw
- * an XP at (0,1), thus we must have an Nx1 configuration.
-2.34.1
-
deleted file mode 100644
@@ -1,406 +0,0 @@
-From a4c8c0c804b1a92373faceda9350512f2139562a Mon Sep 17 00:00:00 2001
-From: Robin Murphy <robin.murphy@arm.com>
-Date: Fri, 3 Dec 2021 11:44:55 +0000
-Subject: [PATCH 20/40] perf/arm-cmn: Refactor DTM handling
-
-Untangle DTMs from XPs into a dedicated abstraction. This helps make
-things a little more obvious and robust, but primarily paves the way
-for further development where new IPs can grow extra DTMs per XP.
-
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Link: https://lore.kernel.org/r/9cca18b1b98f482df7f1aaf3d3213e7f39500423.1638530442.git.robin.murphy@arm.com
-Signed-off-by: Will Deacon <will@kernel.org>
-
-Upstream-Status: Backport [https://lore.kernel.org/r/9cca18b1b98f482df7f1aaf3d3213e7f39500423.1638530442.git.robin.murphy@arm.com]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/perf/arm-cmn.c | 169 +++++++++++++++++++++--------------------
- 1 file changed, 87 insertions(+), 82 deletions(-)
-
-diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
-index da7bf779fec2..8b98ca9666d0 100644
---- a/drivers/perf/arm-cmn.c
-+++ b/drivers/perf/arm-cmn.c
-@@ -35,14 +35,9 @@
- #define CMN_CHILD_NODE_ADDR GENMASK(27, 0)
- #define CMN_CHILD_NODE_EXTERNAL BIT(31)
-
--#define CMN_ADDR_NODE_PTR GENMASK(27, 14)
--
--#define CMN_NODE_PTR_DEVID(ptr) (((ptr) >> 2) & 3)
--#define CMN_NODE_PTR_PID(ptr) ((ptr) & 1)
--#define CMN_NODE_PTR_X(ptr, bits) ((ptr) >> (6 + (bits)))
--#define CMN_NODE_PTR_Y(ptr, bits) (((ptr) >> 6) & ((1U << (bits)) - 1))
--
--#define CMN_MAX_XPS (8 * 8)
-+#define CMN_MAX_DIMENSION 8
-+#define CMN_MAX_XPS (CMN_MAX_DIMENSION * CMN_MAX_DIMENSION)
-+#define CMN_MAX_DTMS CMN_MAX_XPS
-
- /* The CFG node has one other useful purpose */
- #define CMN_CFGM_PERIPH_ID_2 0x0010
-@@ -190,32 +185,32 @@ struct arm_cmn_node {
- u16 id, logid;
- enum cmn_node_type type;
-
-+ int dtm;
- union {
-- /* Device node */
-+ /* DN/HN-F/CXHA */
- struct {
-- int to_xp;
-- /* DN/HN-F/CXHA */
-- unsigned int occupid_val;
-- unsigned int occupid_count;
-+ u8 occupid_val;
-+ u8 occupid_count;
- };
- /* XP */
-- struct {
-- int dtc;
-- u32 pmu_config_low;
-- union {
-- u8 input_sel[4];
-- __le32 pmu_config_high;
-- };
-- s8 wp_event[4];
-- };
-+ int dtc;
- };
--
- union {
- u8 event[4];
- __le32 event_sel;
- };
- };
-
-+struct arm_cmn_dtm {
-+ void __iomem *base;
-+ u32 pmu_config_low;
-+ union {
-+ u8 input_sel[4];
-+ __le32 pmu_config_high;
-+ };
-+ s8 wp_event[4];
-+};
-+
- struct arm_cmn_dtc {
- void __iomem *base;
- int irq;
-@@ -241,6 +236,7 @@ struct arm_cmn {
- struct arm_cmn_node *xps;
- struct arm_cmn_node *dns;
-
-+ struct arm_cmn_dtm *dtms;
- struct arm_cmn_dtc *dtc;
- unsigned int num_dtcs;
-
-@@ -282,20 +278,14 @@ static struct arm_cmn_nodeid arm_cmn_nid(const struct arm_cmn *cmn, u16 id)
- return nid;
- }
-
--static void arm_cmn_init_node_to_xp(const struct arm_cmn *cmn,
-- struct arm_cmn_node *dn)
-+static struct arm_cmn_node *arm_cmn_node_to_xp(const struct arm_cmn *cmn,
-+ const struct arm_cmn_node *dn)
- {
- struct arm_cmn_nodeid nid = arm_cmn_nid(cmn, dn->id);
- int xp_idx = cmn->mesh_x * nid.y + nid.x;
-
-- dn->to_xp = (cmn->xps + xp_idx) - dn;
--}
--
--static struct arm_cmn_node *arm_cmn_node_to_xp(struct arm_cmn_node *dn)
--{
-- return dn->type == CMN_TYPE_XP ? dn : dn + dn->to_xp;
-+ return cmn->xps + xp_idx;
- }
--
- static struct arm_cmn_node *arm_cmn_node(const struct arm_cmn *cmn,
- enum cmn_node_type type)
- {
-@@ -706,9 +696,9 @@ static u64 arm_cmn_read_dtm(struct arm_cmn *cmn, struct arm_cmn_hw_event *hw,
-
- offset = snapshot ? CMN_DTM_PMEVCNTSR : CMN_DTM_PMEVCNT;
- for_each_hw_dn(hw, dn, i) {
-- struct arm_cmn_node *xp = arm_cmn_node_to_xp(dn);
-+ struct arm_cmn_dtm *dtm = &cmn->dtms[dn->dtm];
- int dtm_idx = arm_cmn_get_index(hw->dtm_idx, i);
-- u64 reg = readq_relaxed(xp->pmu_base + offset);
-+ u64 reg = readq_relaxed(dtm->base + offset);
- u16 dtm_count = reg >> (dtm_idx * 16);
-
- count += dtm_count;
-@@ -835,9 +825,9 @@ static void arm_cmn_event_stop(struct perf_event *event, int flags)
- }
-
- struct arm_cmn_val {
-- u8 dtm_count[CMN_MAX_XPS];
-- u8 occupid[CMN_MAX_XPS];
-- u8 wp[CMN_MAX_XPS][4];
-+ u8 dtm_count[CMN_MAX_DTMS];
-+ u8 occupid[CMN_MAX_DTMS];
-+ u8 wp[CMN_MAX_DTMS][4];
- int dtc_count;
- bool cycles;
- };
-@@ -866,16 +856,16 @@ static void arm_cmn_val_add_event(struct arm_cmn_val *val, struct perf_event *ev
- occupid = 0;
-
- for_each_hw_dn(hw, dn, i) {
-- int wp_idx, xp = arm_cmn_node_to_xp(dn)->logid;
-+ int wp_idx, dtm = dn->dtm;
-
-- val->dtm_count[xp]++;
-- val->occupid[xp] = occupid;
-+ val->dtm_count[dtm]++;
-+ val->occupid[dtm] = occupid;
-
- if (type != CMN_TYPE_WP)
- continue;
-
- wp_idx = arm_cmn_wp_idx(event);
-- val->wp[xp][wp_idx] = CMN_EVENT_WP_COMBINE(event) + 1;
-+ val->wp[dtm][wp_idx] = CMN_EVENT_WP_COMBINE(event) + 1;
- }
- }
-
-@@ -914,22 +904,22 @@ static int arm_cmn_validate_group(struct perf_event *event)
- occupid = 0;
-
- for_each_hw_dn(hw, dn, i) {
-- int wp_idx, wp_cmb, xp = arm_cmn_node_to_xp(dn)->logid;
-+ int wp_idx, wp_cmb, dtm = dn->dtm;
-
-- if (val.dtm_count[xp] == CMN_DTM_NUM_COUNTERS)
-+ if (val.dtm_count[dtm] == CMN_DTM_NUM_COUNTERS)
- return -EINVAL;
-
-- if (occupid && val.occupid[xp] && occupid != val.occupid[xp])
-+ if (occupid && val.occupid[dtm] && occupid != val.occupid[dtm])
- return -EINVAL;
-
- if (type != CMN_TYPE_WP)
- continue;
-
- wp_idx = arm_cmn_wp_idx(event);
-- if (val.wp[xp][wp_idx])
-+ if (val.wp[dtm][wp_idx])
- return -EINVAL;
-
-- wp_cmb = val.wp[xp][wp_idx ^ 1];
-+ wp_cmb = val.wp[dtm][wp_idx ^ 1];
- if (wp_cmb && wp_cmb != CMN_EVENT_WP_COMBINE(event) + 1)
- return -EINVAL;
- }
-@@ -1010,17 +1000,17 @@ static void arm_cmn_event_clear(struct arm_cmn *cmn, struct perf_event *event,
- enum cmn_node_type type = CMN_EVENT_TYPE(event);
-
- while (i--) {
-- struct arm_cmn_node *xp = arm_cmn_node_to_xp(hw->dn + i);
-+ struct arm_cmn_dtm *dtm = &cmn->dtms[hw->dn[i].dtm];
- unsigned int dtm_idx = arm_cmn_get_index(hw->dtm_idx, i);
-
- if (type == CMN_TYPE_WP)
-- hw->dn[i].wp_event[arm_cmn_wp_idx(event)] = -1;
-+ dtm->wp_event[arm_cmn_wp_idx(event)] = -1;
-
- if (arm_cmn_is_occup_event(type, CMN_EVENT_EVENTID(event)))
- hw->dn[i].occupid_count--;
-
-- xp->pmu_config_low &= ~CMN__PMEVCNT_PAIRED(dtm_idx);
-- writel_relaxed(xp->pmu_config_low, xp->pmu_base + CMN_DTM_PMU_CONFIG);
-+ dtm->pmu_config_low &= ~CMN__PMEVCNT_PAIRED(dtm_idx);
-+ writel_relaxed(dtm->pmu_config_low, dtm->base + CMN_DTM_PMU_CONFIG);
- }
- memset(hw->dtm_idx, 0, sizeof(hw->dtm_idx));
-
-@@ -1062,12 +1052,12 @@ static int arm_cmn_event_add(struct perf_event *event, int flags)
-
- /* ...then the local counters to feed it. */
- for_each_hw_dn(hw, dn, i) {
-- struct arm_cmn_node *xp = arm_cmn_node_to_xp(dn);
-+ struct arm_cmn_dtm *dtm = &cmn->dtms[dn->dtm];
- unsigned int dtm_idx, shift;
- u64 reg;
-
- dtm_idx = 0;
-- while (xp->pmu_config_low & CMN__PMEVCNT_PAIRED(dtm_idx))
-+ while (dtm->pmu_config_low & CMN__PMEVCNT_PAIRED(dtm_idx))
- if (++dtm_idx == CMN_DTM_NUM_COUNTERS)
- goto free_dtms;
-
-@@ -1077,17 +1067,17 @@ static int arm_cmn_event_add(struct perf_event *event, int flags)
- int tmp, wp_idx = arm_cmn_wp_idx(event);
- u32 cfg = arm_cmn_wp_config(event);
-
-- if (dn->wp_event[wp_idx] >= 0)
-+ if (dtm->wp_event[wp_idx] >= 0)
- goto free_dtms;
-
-- tmp = dn->wp_event[wp_idx ^ 1];
-+ tmp = dtm->wp_event[wp_idx ^ 1];
- if (tmp >= 0 && CMN_EVENT_WP_COMBINE(event) !=
- CMN_EVENT_WP_COMBINE(dtc->counters[tmp]))
- goto free_dtms;
-
- input_sel = CMN__PMEVCNT0_INPUT_SEL_WP + wp_idx;
-- dn->wp_event[wp_idx] = dtc_idx;
-- writel_relaxed(cfg, dn->pmu_base + CMN_DTM_WPn_CONFIG(wp_idx));
-+ dtm->wp_event[wp_idx] = dtc_idx;
-+ writel_relaxed(cfg, dtm->base + CMN_DTM_WPn_CONFIG(wp_idx));
- } else {
- struct arm_cmn_nodeid nid = arm_cmn_nid(cmn, dn->id);
-
-@@ -1095,7 +1085,7 @@ static int arm_cmn_event_add(struct perf_event *event, int flags)
- (nid.port << 4) + (nid.dev << 2);
-
- if (arm_cmn_is_occup_event(type, CMN_EVENT_EVENTID(event))) {
-- int occupid = CMN_EVENT_OCCUPID(event);
-+ u8 occupid = CMN_EVENT_OCCUPID(event);
-
- if (dn->occupid_count == 0) {
- dn->occupid_val = occupid;
-@@ -1110,13 +1100,13 @@ static int arm_cmn_event_add(struct perf_event *event, int flags)
-
- arm_cmn_set_index(hw->dtm_idx, i, dtm_idx);
-
-- xp->input_sel[dtm_idx] = input_sel;
-+ dtm->input_sel[dtm_idx] = input_sel;
- shift = CMN__PMEVCNTn_GLOBAL_NUM_SHIFT(dtm_idx);
-- xp->pmu_config_low &= ~(CMN__PMEVCNT0_GLOBAL_NUM << shift);
-- xp->pmu_config_low |= FIELD_PREP(CMN__PMEVCNT0_GLOBAL_NUM, dtc_idx) << shift;
-- xp->pmu_config_low |= CMN__PMEVCNT_PAIRED(dtm_idx);
-- reg = (u64)le32_to_cpu(xp->pmu_config_high) << 32 | xp->pmu_config_low;
-- writeq_relaxed(reg, xp->pmu_base + CMN_DTM_PMU_CONFIG);
-+ dtm->pmu_config_low &= ~(CMN__PMEVCNT0_GLOBAL_NUM << shift);
-+ dtm->pmu_config_low |= FIELD_PREP(CMN__PMEVCNT0_GLOBAL_NUM, dtc_idx) << shift;
-+ dtm->pmu_config_low |= CMN__PMEVCNT_PAIRED(dtm_idx);
-+ reg = (u64)le32_to_cpu(dtm->pmu_config_high) << 32 | dtm->pmu_config_low;
-+ writeq_relaxed(reg, dtm->base + CMN_DTM_PMU_CONFIG);
- }
-
- /* Go go go! */
-@@ -1276,23 +1266,22 @@ static int arm_cmn_init_irqs(struct arm_cmn *cmn)
- return 0;
- }
-
--static void arm_cmn_init_dtm(struct arm_cmn_node *xp)
-+static void arm_cmn_init_dtm(struct arm_cmn_dtm *dtm, struct arm_cmn_node *xp)
- {
- int i;
-
-+ dtm->base = xp->pmu_base;
-+ dtm->pmu_config_low = CMN_DTM_PMU_CONFIG_PMU_EN;
- for (i = 0; i < 4; i++) {
-- xp->wp_event[i] = -1;
-- writeq_relaxed(0, xp->pmu_base + CMN_DTM_WPn_MASK(i));
-- writeq_relaxed(~0ULL, xp->pmu_base + CMN_DTM_WPn_VAL(i));
-+ dtm->wp_event[i] = -1;
-+ writeq_relaxed(0, dtm->base + CMN_DTM_WPn_MASK(i));
-+ writeq_relaxed(~0ULL, dtm->base + CMN_DTM_WPn_VAL(i));
- }
-- xp->pmu_config_low = CMN_DTM_PMU_CONFIG_PMU_EN;
-- xp->dtc = -1;
- }
-
- static int arm_cmn_init_dtc(struct arm_cmn *cmn, struct arm_cmn_node *dn, int idx)
- {
- struct arm_cmn_dtc *dtc = cmn->dtc + idx;
-- struct arm_cmn_node *xp;
-
- dtc->base = dn->pmu_base - CMN_PMU_OFFSET;
- dtc->irq = platform_get_irq(to_platform_device(cmn->dev), idx);
-@@ -1303,10 +1292,6 @@ static int arm_cmn_init_dtc(struct arm_cmn *cmn, struct arm_cmn_node *dn, int id
- writel_relaxed(0x1ff, dtc->base + CMN_DT_PMOVSR_CLR);
- writel_relaxed(CMN_DT_PMCR_OVFL_INTR_EN, dtc->base + CMN_DT_PMCR);
-
-- /* We do at least know that a DTC's XP must be in that DTC's domain */
-- xp = arm_cmn_node_to_xp(dn);
-- xp->dtc = idx;
--
- return 0;
- }
-
-@@ -1323,7 +1308,7 @@ static int arm_cmn_node_cmp(const void *a, const void *b)
-
- static int arm_cmn_init_dtcs(struct arm_cmn *cmn)
- {
-- struct arm_cmn_node *dn;
-+ struct arm_cmn_node *dn, *xp;
- int dtc_idx = 0;
-
- cmn->dtc = devm_kcalloc(cmn->dev, cmn->num_dtcs, sizeof(cmn->dtc[0]), GFP_KERNEL);
-@@ -1335,13 +1320,24 @@ static int arm_cmn_init_dtcs(struct arm_cmn *cmn)
- cmn->xps = arm_cmn_node(cmn, CMN_TYPE_XP);
-
- for (dn = cmn->dns; dn->type; dn++) {
-- if (dn->type != CMN_TYPE_XP)
-- arm_cmn_init_node_to_xp(cmn, dn);
-- else if (cmn->num_dtcs == 1)
-- dn->dtc = 0;
-+ if (dn->type == CMN_TYPE_XP) {
-+ if (dn->dtc < 0 && cmn->num_dtcs == 1)
-+ dn->dtc = 0;
-+ continue;
-+ }
-
-- if (dn->type == CMN_TYPE_DTC)
-- arm_cmn_init_dtc(cmn, dn, dtc_idx++);
-+ xp = arm_cmn_node_to_xp(cmn, dn);
-+ dn->dtm = xp->dtm;
-+
-+ if (dn->type == CMN_TYPE_DTC) {
-+ int err;
-+ /* We do at least know that a DTC's XP must be in that DTC's domain */
-+ if (xp->dtc < 0)
-+ xp->dtc = dtc_idx;
-+ err = arm_cmn_init_dtc(cmn, dn, dtc_idx++);
-+ if (err)
-+ return err;
-+ }
-
- /* To the PMU, RN-Ds don't add anything over RN-Is, so smoosh them together */
- if (dn->type == CMN_TYPE_RND)
-@@ -1380,6 +1376,7 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- {
- void __iomem *cfg_region;
- struct arm_cmn_node cfg, *dn;
-+ struct arm_cmn_dtm *dtm;
- u16 child_count, child_poff;
- u32 xp_offset[CMN_MAX_XPS];
- u64 reg;
-@@ -1416,14 +1413,18 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- if (!dn)
- return -ENOMEM;
-
-+ dtm = devm_kcalloc(cmn->dev, cmn->num_xps, sizeof(*dtm), GFP_KERNEL);
-+ if (!dtm)
-+ return -ENOMEM;
-+
- /* Pass 2: now we can actually populate the nodes */
- cmn->dns = dn;
-+ cmn->dtms = dtm;
- for (i = 0; i < cmn->num_xps; i++) {
- void __iomem *xp_region = cmn->base + xp_offset[i];
- struct arm_cmn_node *xp = dn++;
-
- arm_cmn_init_node_info(cmn, xp_offset[i], xp);
-- arm_cmn_init_dtm(xp);
- /*
- * Thanks to the order in which XP logical IDs seem to be
- * assigned, we can handily infer the mesh X dimension by
-@@ -1433,6 +1434,10 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- if (xp->id == (1 << 3))
- cmn->mesh_x = xp->logid;
-
-+ xp->dtc = -1;
-+ xp->dtm = dtm - cmn->dtms;
-+ arm_cmn_init_dtm(dtm++, xp);
-+
- reg = readq_relaxed(xp_region + CMN_CHILD_INFO);
- child_count = FIELD_GET(CMN_CI_CHILD_COUNT, reg);
- child_poff = FIELD_GET(CMN_CI_CHILD_PTR_OFFSET, reg);
-2.34.1
-
deleted file mode 100644
@@ -1,56 +0,0 @@
-From 2919ec562ca976a0ae5f70b264379b3d45abdaf5 Mon Sep 17 00:00:00 2001
-From: Robin Murphy <robin.murphy@arm.com>
-Date: Fri, 3 Dec 2021 11:44:56 +0000
-Subject: [PATCH 21/40] perf/arm-cmn: Optimise DTM counter reads
-
-When multiple nodes of the same type are connected to the same XP
-(particularly in CAL configurations), it seems that they are likely
-to be consecutive in logical ID. Therefore, we're likely to gain a
-small benefit from an easy tweak to optimise out consecutive reads
-of the same set of DTM counters for an aggregated event.
-
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Link: https://lore.kernel.org/r/7777d77c2df17693cd3dabb6e268906e15238d82.1638530442.git.robin.murphy@arm.com
-Signed-off-by: Will Deacon <will@kernel.org>
-
-Upstream-Status: Backport [https://lore.kernel.org/r/7777d77c2df17693cd3dabb6e268906e15238d82.1638530442.git.robin.murphy@arm.com]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/perf/arm-cmn.c | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
-index 8b98ca9666d0..005a0d83bcac 100644
---- a/drivers/perf/arm-cmn.c
-+++ b/drivers/perf/arm-cmn.c
-@@ -690,18 +690,19 @@ static void arm_cmn_pmu_disable(struct pmu *pmu)
- static u64 arm_cmn_read_dtm(struct arm_cmn *cmn, struct arm_cmn_hw_event *hw,
- bool snapshot)
- {
-+ struct arm_cmn_dtm *dtm = NULL;
- struct arm_cmn_node *dn;
-- unsigned int i, offset;
-- u64 count = 0;
-+ unsigned int i, offset, dtm_idx;
-+ u64 reg, count = 0;
-
- offset = snapshot ? CMN_DTM_PMEVCNTSR : CMN_DTM_PMEVCNT;
- for_each_hw_dn(hw, dn, i) {
-- struct arm_cmn_dtm *dtm = &cmn->dtms[dn->dtm];
-- int dtm_idx = arm_cmn_get_index(hw->dtm_idx, i);
-- u64 reg = readq_relaxed(dtm->base + offset);
-- u16 dtm_count = reg >> (dtm_idx * 16);
--
-- count += dtm_count;
-+ if (dtm != &cmn->dtms[dn->dtm]) {
-+ dtm = &cmn->dtms[dn->dtm];
-+ reg = readq_relaxed(dtm->base + offset);
-+ }
-+ dtm_idx = arm_cmn_get_index(hw->dtm_idx, i);
-+ count += (u16)(reg >> (dtm_idx * 16));
- }
- return count;
- }
-2.34.1
-
deleted file mode 100644
@@ -1,111 +0,0 @@
-From 1cf0522e9b4cdad7609c6ce31e848c3d8f2932d5 Mon Sep 17 00:00:00 2001
-From: Robin Murphy <robin.murphy@arm.com>
-Date: Fri, 3 Dec 2021 11:44:57 +0000
-Subject: [PATCH 22/40] perf/arm-cmn: Optimise DTC counter accesses
-
-In cases where we do know which DTC domain a node belongs to, we can
-skip initialising or reading the global count in DTCs where we know
-it won't change. The machinery to achieve that is mostly in place
-already, so finish hooking it up by converting the vestigial domain
-tracking to propagate suitable bitmaps all the way through to events.
-
-Note that this does not allow allocating such an unused counter to a
-different event on that DTC, because that is a flippin' nightmare.
-
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Link: https://lore.kernel.org/r/51d930fd945ef51c81f5889ccca055c302b0a1d0.1638530442.git.robin.murphy@arm.com
-Signed-off-by: Will Deacon <will@kernel.org>
-
-Upstream-Status: Backport [https://lore.kernel.org/r/51d930fd945ef51c81f5889ccca055c302b0a1d0.1638530442.git.robin.murphy@arm.com]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/perf/arm-cmn.c | 29 ++++++++++++-----------------
- 1 file changed, 12 insertions(+), 17 deletions(-)
-
-diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
-index 005a0d83bcac..acff8683af2c 100644
---- a/drivers/perf/arm-cmn.c
-+++ b/drivers/perf/arm-cmn.c
-@@ -193,7 +193,7 @@ struct arm_cmn_node {
- u8 occupid_count;
- };
- /* XP */
-- int dtc;
-+ u8 dtc;
- };
- union {
- u8 event[4];
-@@ -968,14 +968,14 @@ static int arm_cmn_event_init(struct perf_event *event)
- if (!hw->dn)
- return -EINVAL;
- for (dn = hw->dn; dn->type == type; dn++) {
-- if (!bynodeid) {
-- hw->num_dns++;
-- } else if (dn->id != nodeid) {
-+ if (bynodeid && dn->id != nodeid) {
- hw->dn++;
-- } else {
-- hw->num_dns = 1;
-- break;
-+ continue;
- }
-+ hw->dtcs_used |= arm_cmn_node_to_xp(cmn, dn)->dtc;
-+ hw->num_dns++;
-+ if (bynodeid)
-+ break;
- }
-
- if (!hw->num_dns) {
-@@ -985,11 +985,6 @@ static int arm_cmn_event_init(struct perf_event *event)
- nodeid, nid.x, nid.y, nid.port, nid.dev, type);
- return -EINVAL;
- }
-- /*
-- * By assuming events count in all DTC domains, we cunningly avoid
-- * needing to know anything about how XPs are assigned to domains.
-- */
-- hw->dtcs_used = (1U << cmn->num_dtcs) - 1;
-
- return arm_cmn_validate_group(event);
- }
-@@ -1311,6 +1306,7 @@ static int arm_cmn_init_dtcs(struct arm_cmn *cmn)
- {
- struct arm_cmn_node *dn, *xp;
- int dtc_idx = 0;
-+ u8 dtcs_present = (1 << cmn->num_dtcs) - 1;
-
- cmn->dtc = devm_kcalloc(cmn->dev, cmn->num_dtcs, sizeof(cmn->dtc[0]), GFP_KERNEL);
- if (!cmn->dtc)
-@@ -1322,8 +1318,7 @@ static int arm_cmn_init_dtcs(struct arm_cmn *cmn)
-
- for (dn = cmn->dns; dn->type; dn++) {
- if (dn->type == CMN_TYPE_XP) {
-- if (dn->dtc < 0 && cmn->num_dtcs == 1)
-- dn->dtc = 0;
-+ dn->dtc &= dtcs_present;
- continue;
- }
-
-@@ -1333,8 +1328,8 @@ static int arm_cmn_init_dtcs(struct arm_cmn *cmn)
- if (dn->type == CMN_TYPE_DTC) {
- int err;
- /* We do at least know that a DTC's XP must be in that DTC's domain */
-- if (xp->dtc < 0)
-- xp->dtc = dtc_idx;
-+ if (xp->dtc == 0xf)
-+ xp->dtc = 1 << dtc_idx;
- err = arm_cmn_init_dtc(cmn, dn, dtc_idx++);
- if (err)
- return err;
-@@ -1435,7 +1430,7 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- if (xp->id == (1 << 3))
- cmn->mesh_x = xp->logid;
-
-- xp->dtc = -1;
-+ xp->dtc = 0xf;
- xp->dtm = dtm - cmn->dtms;
- arm_cmn_init_dtm(dtm++, xp);
-
-2.34.1
-
deleted file mode 100644
@@ -1,108 +0,0 @@
-From 118a6499d8c5d940210c6543309addc97b48122c Mon Sep 17 00:00:00 2001
-From: Robin Murphy <robin.murphy@arm.com>
-Date: Fri, 3 Dec 2021 11:44:58 +0000
-Subject: [PATCH 23/40] perf/arm-cmn: Move group validation data off-stack
-
-With the value of CMN_MAX_DTMS increasing significantly, our validation
-data structure is set to get quite big. Technically we could pack it at
-least twice as densely, since we only need around 19 bits of information
-per DTM, but that makes the code even more mind-bogglingly impenetrable,
-and even half of "quite big" may still be uncomfortably large for a
-stack frame (~1KB). Just move it to an off-stack allocation instead.
-
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Link: https://lore.kernel.org/r/0cabff2e5839ddc0979e757c55515966f65359e4.1638530442.git.robin.murphy@arm.com
-Signed-off-by: Will Deacon <will@kernel.org>
-
-Upstream-Status: Backport [https://lore.kernel.org/r/0cabff2e5839ddc0979e757c55515966f65359e4.1638530442.git.robin.murphy@arm.com]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/perf/arm-cmn.c | 43 ++++++++++++++++++++++++------------------
- 1 file changed, 25 insertions(+), 18 deletions(-)
-
-diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
-index acff8683af2c..d2dd02f040b8 100644
---- a/drivers/perf/arm-cmn.c
-+++ b/drivers/perf/arm-cmn.c
-@@ -876,8 +876,8 @@ static int arm_cmn_validate_group(struct perf_event *event)
- struct arm_cmn_node *dn;
- struct perf_event *sibling, *leader = event->group_leader;
- enum cmn_node_type type;
-- struct arm_cmn_val val;
-- int i;
-+ struct arm_cmn_val *val;
-+ int i, ret = -EINVAL;
- u8 occupid;
-
- if (leader == event)
-@@ -886,18 +886,22 @@ static int arm_cmn_validate_group(struct perf_event *event)
- if (event->pmu != leader->pmu && !is_software_event(leader))
- return -EINVAL;
-
-- memset(&val, 0, sizeof(val));
-+ val = kzalloc(sizeof(*val), GFP_KERNEL);
-+ if (!val)
-+ return -ENOMEM;
-
-- arm_cmn_val_add_event(&val, leader);
-+ arm_cmn_val_add_event(val, leader);
- for_each_sibling_event(sibling, leader)
-- arm_cmn_val_add_event(&val, sibling);
-+ arm_cmn_val_add_event(val, sibling);
-
- type = CMN_EVENT_TYPE(event);
-- if (type == CMN_TYPE_DTC)
-- return val.cycles ? -EINVAL : 0;
-+ if (type == CMN_TYPE_DTC) {
-+ ret = val->cycles ? -EINVAL : 0;
-+ goto done;
-+ }
-
-- if (val.dtc_count == CMN_DT_NUM_COUNTERS)
-- return -EINVAL;
-+ if (val->dtc_count == CMN_DT_NUM_COUNTERS)
-+ goto done;
-
- if (arm_cmn_is_occup_event(type, CMN_EVENT_EVENTID(event)))
- occupid = CMN_EVENT_OCCUPID(event) + 1;
-@@ -907,25 +911,28 @@ static int arm_cmn_validate_group(struct perf_event *event)
- for_each_hw_dn(hw, dn, i) {
- int wp_idx, wp_cmb, dtm = dn->dtm;
-
-- if (val.dtm_count[dtm] == CMN_DTM_NUM_COUNTERS)
-- return -EINVAL;
-+ if (val->dtm_count[dtm] == CMN_DTM_NUM_COUNTERS)
-+ goto done;
-
-- if (occupid && val.occupid[dtm] && occupid != val.occupid[dtm])
-- return -EINVAL;
-+ if (occupid && val->occupid[dtm] && occupid != val->occupid[dtm])
-+ goto done;
-
- if (type != CMN_TYPE_WP)
- continue;
-
- wp_idx = arm_cmn_wp_idx(event);
-- if (val.wp[dtm][wp_idx])
-- return -EINVAL;
-+ if (val->wp[dtm][wp_idx])
-+ goto done;
-
-- wp_cmb = val.wp[dtm][wp_idx ^ 1];
-+ wp_cmb = val->wp[dtm][wp_idx ^ 1];
- if (wp_cmb && wp_cmb != CMN_EVENT_WP_COMBINE(event) + 1)
-- return -EINVAL;
-+ goto done;
- }
-
-- return 0;
-+ ret = 0;
-+done:
-+ kfree(val);
-+ return ret;
- }
-
- static int arm_cmn_event_init(struct perf_event *event)
-2.34.1
-
deleted file mode 100644
@@ -1,466 +0,0 @@
-From 86d66852aa85254b823578537f8e125915375d0b Mon Sep 17 00:00:00 2001
-From: Robin Murphy <robin.murphy@arm.com>
-Date: Fri, 3 Dec 2021 11:44:59 +0000
-Subject: [PATCH 24/40] perf/arm-cmn: Demarcate CMN-600 specifics
-
-In preparation for supporting newer CMN products, let's introduce a
-means to differentiate the features and events which are specific to a
-particular IP from those which remain common to the whole family. The
-newer designs have also smoothed off some of the rough edges in terms
-of discoverability, so separate out the parts of the flow which have
-effectively now become CMN-600 quirks.
-
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Link: https://lore.kernel.org/r/9f6368cdca4c821d801138939508a5bba54ccabb.1638530442.git.robin.murphy@arm.com
-Signed-off-by: Will Deacon <will@kernel.org>
-
-Upstream-Status: Backport [https://lore.kernel.org/r/9f6368cdca4c821d801138939508a5bba54ccabb.1638530442.git.robin.murphy@arm.com]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/perf/arm-cmn.c | 313 +++++++++++++++++++++--------------------
- 1 file changed, 162 insertions(+), 151 deletions(-)
-
-diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
-index d2dd02f040b8..ce94f923a607 100644
---- a/drivers/perf/arm-cmn.c
-+++ b/drivers/perf/arm-cmn.c
-@@ -151,7 +151,12 @@
- #define CMN_WP_DOWN 2
-
-
--/* r0px probably don't exist in silicon, thankfully */
-+enum cmn_model {
-+ CMN_ANY = -1,
-+ CMN600 = 1,
-+};
-+
-+/* CMN-600 r0px shouldn't exist in silicon, thankfully */
- enum cmn_revision {
- CMN600_R1P0,
- CMN600_R1P1,
-@@ -159,6 +164,7 @@ enum cmn_revision {
- CMN600_R1P3,
- CMN600_R2P0,
- CMN600_R3P0,
-+ CMN600_R3P1,
- };
-
- enum cmn_node_type {
-@@ -229,6 +235,7 @@ struct arm_cmn {
- void __iomem *base;
-
- enum cmn_revision rev;
-+ enum cmn_model model;
- u8 mesh_x;
- u8 mesh_y;
- u16 num_xps;
-@@ -326,6 +333,7 @@ static unsigned int arm_cmn_get_index(u64 x[], unsigned int pos)
-
- struct arm_cmn_event_attr {
- struct device_attribute attr;
-+ enum cmn_model model;
- enum cmn_node_type type;
- u8 eventid;
- u8 occupid;
-@@ -337,9 +345,10 @@ struct arm_cmn_format_attr {
- int config;
- };
-
--#define CMN_EVENT_ATTR(_name, _type, _eventid, _occupid) \
-+#define CMN_EVENT_ATTR(_model, _name, _type, _eventid, _occupid) \
- (&((struct arm_cmn_event_attr[]) {{ \
- .attr = __ATTR(_name, 0444, arm_cmn_event_show, NULL), \
-+ .model = _model, \
- .type = _type, \
- .eventid = _eventid, \
- .occupid = _occupid, \
-@@ -386,12 +395,15 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj,
- eattr = container_of(attr, typeof(*eattr), attr.attr);
- type = eattr->type;
-
-+ if (!(eattr->model & cmn->model))
-+ return 0;
-+
- /* Watchpoints aren't nodes */
- if (type == CMN_TYPE_WP)
- type = CMN_TYPE_XP;
-
- /* Revision-specific differences */
-- if (cmn->rev < CMN600_R1P2) {
-+ if (cmn->model == CMN600 && cmn->rev < CMN600_R1P2) {
- if (type == CMN_TYPE_HNF && eattr->eventid == 0x1b)
- return 0;
- }
-@@ -402,25 +414,27 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj,
- return attr->mode;
- }
-
--#define _CMN_EVENT_DVM(_name, _event, _occup) \
-- CMN_EVENT_ATTR(dn_##_name, CMN_TYPE_DVM, _event, _occup)
-+#define _CMN_EVENT_DVM(_model, _name, _event, _occup) \
-+ CMN_EVENT_ATTR(_model, dn_##_name, CMN_TYPE_DVM, _event, _occup)
- #define CMN_EVENT_DTC(_name) \
-- CMN_EVENT_ATTR(dtc_##_name, CMN_TYPE_DTC, 0, 0)
--#define _CMN_EVENT_HNF(_name, _event, _occup) \
-- CMN_EVENT_ATTR(hnf_##_name, CMN_TYPE_HNF, _event, _occup)
-+ CMN_EVENT_ATTR(CMN_ANY, dtc_##_name, CMN_TYPE_DTC, 0, 0)
-+#define _CMN_EVENT_HNF(_model, _name, _event, _occup) \
-+ CMN_EVENT_ATTR(_model, hnf_##_name, CMN_TYPE_HNF, _event, _occup)
- #define CMN_EVENT_HNI(_name, _event) \
-- CMN_EVENT_ATTR(hni_##_name, CMN_TYPE_HNI, _event, 0)
-+ CMN_EVENT_ATTR(CMN_ANY, hni_##_name, CMN_TYPE_HNI, _event, 0)
- #define __CMN_EVENT_XP(_name, _event) \
-- CMN_EVENT_ATTR(mxp_##_name, CMN_TYPE_XP, _event, 0)
--#define CMN_EVENT_SBSX(_name, _event) \
-- CMN_EVENT_ATTR(sbsx_##_name, CMN_TYPE_SBSX, _event, 0)
--#define CMN_EVENT_RNID(_name, _event) \
-- CMN_EVENT_ATTR(rnid_##_name, CMN_TYPE_RNI, _event, 0)
--
--#define CMN_EVENT_DVM(_name, _event) \
-- _CMN_EVENT_DVM(_name, _event, 0)
--#define CMN_EVENT_HNF(_name, _event) \
-- _CMN_EVENT_HNF(_name, _event, 0)
-+ CMN_EVENT_ATTR(CMN_ANY, mxp_##_name, CMN_TYPE_XP, _event, 0)
-+#define CMN_EVENT_SBSX(_model, _name, _event) \
-+ CMN_EVENT_ATTR(_model, sbsx_##_name, CMN_TYPE_SBSX, _event, 0)
-+#define CMN_EVENT_RNID(_model, _name, _event) \
-+ CMN_EVENT_ATTR(_model, rnid_##_name, CMN_TYPE_RNI, _event, 0)
-+#define CMN_EVENT_MTSX(_name, _event) \
-+ CMN_EVENT_ATTR(CMN_ANY, mtsx_##_name, CMN_TYPE_MTSX, _event, 0)
-+
-+#define CMN_EVENT_DVM(_model, _name, _event) \
-+ _CMN_EVENT_DVM(_model, _name, _event, 0)
-+#define CMN_EVENT_HNF(_model, _name, _event) \
-+ _CMN_EVENT_HNF(_model, _name, _event, 0)
- #define _CMN_EVENT_XP(_name, _event) \
- __CMN_EVENT_XP(e_##_name, (_event) | (0 << 2)), \
- __CMN_EVENT_XP(w_##_name, (_event) | (1 << 2)), \
-@@ -445,115 +459,115 @@ static struct attribute *arm_cmn_event_attrs[] = {
- * slot, but our lazy short-cut of using the DTM counter index for
- * the PMU index as well happens to avoid that by construction.
- */
-- CMN_EVENT_DVM(rxreq_dvmop, 0x01),
-- CMN_EVENT_DVM(rxreq_dvmsync, 0x02),
-- CMN_EVENT_DVM(rxreq_dvmop_vmid_filtered, 0x03),
-- CMN_EVENT_DVM(rxreq_retried, 0x04),
-- _CMN_EVENT_DVM(rxreq_trk_occupancy_all, 0x05, 0),
-- _CMN_EVENT_DVM(rxreq_trk_occupancy_dvmop, 0x05, 1),
-- _CMN_EVENT_DVM(rxreq_trk_occupancy_dvmsync, 0x05, 2),
--
-- CMN_EVENT_HNF(cache_miss, 0x01),
-- CMN_EVENT_HNF(slc_sf_cache_access, 0x02),
-- CMN_EVENT_HNF(cache_fill, 0x03),
-- CMN_EVENT_HNF(pocq_retry, 0x04),
-- CMN_EVENT_HNF(pocq_reqs_recvd, 0x05),
-- CMN_EVENT_HNF(sf_hit, 0x06),
-- CMN_EVENT_HNF(sf_evictions, 0x07),
-- CMN_EVENT_HNF(dir_snoops_sent, 0x08),
-- CMN_EVENT_HNF(brd_snoops_sent, 0x09),
-- CMN_EVENT_HNF(slc_eviction, 0x0a),
-- CMN_EVENT_HNF(slc_fill_invalid_way, 0x0b),
-- CMN_EVENT_HNF(mc_retries, 0x0c),
-- CMN_EVENT_HNF(mc_reqs, 0x0d),
-- CMN_EVENT_HNF(qos_hh_retry, 0x0e),
-- _CMN_EVENT_HNF(qos_pocq_occupancy_all, 0x0f, 0),
-- _CMN_EVENT_HNF(qos_pocq_occupancy_read, 0x0f, 1),
-- _CMN_EVENT_HNF(qos_pocq_occupancy_write, 0x0f, 2),
-- _CMN_EVENT_HNF(qos_pocq_occupancy_atomic, 0x0f, 3),
-- _CMN_EVENT_HNF(qos_pocq_occupancy_stash, 0x0f, 4),
-- CMN_EVENT_HNF(pocq_addrhaz, 0x10),
-- CMN_EVENT_HNF(pocq_atomic_addrhaz, 0x11),
-- CMN_EVENT_HNF(ld_st_swp_adq_full, 0x12),
-- CMN_EVENT_HNF(cmp_adq_full, 0x13),
-- CMN_EVENT_HNF(txdat_stall, 0x14),
-- CMN_EVENT_HNF(txrsp_stall, 0x15),
-- CMN_EVENT_HNF(seq_full, 0x16),
-- CMN_EVENT_HNF(seq_hit, 0x17),
-- CMN_EVENT_HNF(snp_sent, 0x18),
-- CMN_EVENT_HNF(sfbi_dir_snp_sent, 0x19),
-- CMN_EVENT_HNF(sfbi_brd_snp_sent, 0x1a),
-- CMN_EVENT_HNF(snp_sent_untrk, 0x1b),
-- CMN_EVENT_HNF(intv_dirty, 0x1c),
-- CMN_EVENT_HNF(stash_snp_sent, 0x1d),
-- CMN_EVENT_HNF(stash_data_pull, 0x1e),
-- CMN_EVENT_HNF(snp_fwded, 0x1f),
--
-- CMN_EVENT_HNI(rrt_rd_occ_cnt_ovfl, 0x20),
-- CMN_EVENT_HNI(rrt_wr_occ_cnt_ovfl, 0x21),
-- CMN_EVENT_HNI(rdt_rd_occ_cnt_ovfl, 0x22),
-- CMN_EVENT_HNI(rdt_wr_occ_cnt_ovfl, 0x23),
-- CMN_EVENT_HNI(wdb_occ_cnt_ovfl, 0x24),
-- CMN_EVENT_HNI(rrt_rd_alloc, 0x25),
-- CMN_EVENT_HNI(rrt_wr_alloc, 0x26),
-- CMN_EVENT_HNI(rdt_rd_alloc, 0x27),
-- CMN_EVENT_HNI(rdt_wr_alloc, 0x28),
-- CMN_EVENT_HNI(wdb_alloc, 0x29),
-- CMN_EVENT_HNI(txrsp_retryack, 0x2a),
-- CMN_EVENT_HNI(arvalid_no_arready, 0x2b),
-- CMN_EVENT_HNI(arready_no_arvalid, 0x2c),
-- CMN_EVENT_HNI(awvalid_no_awready, 0x2d),
-- CMN_EVENT_HNI(awready_no_awvalid, 0x2e),
-- CMN_EVENT_HNI(wvalid_no_wready, 0x2f),
-- CMN_EVENT_HNI(txdat_stall, 0x30),
-- CMN_EVENT_HNI(nonpcie_serialization, 0x31),
-- CMN_EVENT_HNI(pcie_serialization, 0x32),
--
-- CMN_EVENT_XP(txflit_valid, 0x01),
-- CMN_EVENT_XP(txflit_stall, 0x02),
-- CMN_EVENT_XP(partial_dat_flit, 0x03),
-+ CMN_EVENT_DVM(CMN600, rxreq_dvmop, 0x01),
-+ CMN_EVENT_DVM(CMN600, rxreq_dvmsync, 0x02),
-+ CMN_EVENT_DVM(CMN600, rxreq_dvmop_vmid_filtered, 0x03),
-+ CMN_EVENT_DVM(CMN600, rxreq_retried, 0x04),
-+ _CMN_EVENT_DVM(CMN600, rxreq_trk_occupancy_all, 0x05, 0),
-+ _CMN_EVENT_DVM(CMN600, rxreq_trk_occupancy_dvmop, 0x05, 1),
-+ _CMN_EVENT_DVM(CMN600, rxreq_trk_occupancy_dvmsync, 0x05, 2),
-+
-+ CMN_EVENT_HNF(CMN_ANY, cache_miss, 0x01),
-+ CMN_EVENT_HNF(CMN_ANY, slc_sf_cache_access, 0x02),
-+ CMN_EVENT_HNF(CMN_ANY, cache_fill, 0x03),
-+ CMN_EVENT_HNF(CMN_ANY, pocq_retry, 0x04),
-+ CMN_EVENT_HNF(CMN_ANY, pocq_reqs_recvd, 0x05),
-+ CMN_EVENT_HNF(CMN_ANY, sf_hit, 0x06),
-+ CMN_EVENT_HNF(CMN_ANY, sf_evictions, 0x07),
-+ CMN_EVENT_HNF(CMN_ANY, dir_snoops_sent, 0x08),
-+ CMN_EVENT_HNF(CMN_ANY, brd_snoops_sent, 0x09),
-+ CMN_EVENT_HNF(CMN_ANY, slc_eviction, 0x0a),
-+ CMN_EVENT_HNF(CMN_ANY, slc_fill_invalid_way, 0x0b),
-+ CMN_EVENT_HNF(CMN_ANY, mc_retries, 0x0c),
-+ CMN_EVENT_HNF(CMN_ANY, mc_reqs, 0x0d),
-+ CMN_EVENT_HNF(CMN_ANY, qos_hh_retry, 0x0e),
-+ _CMN_EVENT_HNF(CMN_ANY, qos_pocq_occupancy_all, 0x0f, 0),
-+ _CMN_EVENT_HNF(CMN_ANY, qos_pocq_occupancy_read, 0x0f, 1),
-+ _CMN_EVENT_HNF(CMN_ANY, qos_pocq_occupancy_write, 0x0f, 2),
-+ _CMN_EVENT_HNF(CMN_ANY, qos_pocq_occupancy_atomic, 0x0f, 3),
-+ _CMN_EVENT_HNF(CMN_ANY, qos_pocq_occupancy_stash, 0x0f, 4),
-+ CMN_EVENT_HNF(CMN_ANY, pocq_addrhaz, 0x10),
-+ CMN_EVENT_HNF(CMN_ANY, pocq_atomic_addrhaz, 0x11),
-+ CMN_EVENT_HNF(CMN_ANY, ld_st_swp_adq_full, 0x12),
-+ CMN_EVENT_HNF(CMN_ANY, cmp_adq_full, 0x13),
-+ CMN_EVENT_HNF(CMN_ANY, txdat_stall, 0x14),
-+ CMN_EVENT_HNF(CMN_ANY, txrsp_stall, 0x15),
-+ CMN_EVENT_HNF(CMN_ANY, seq_full, 0x16),
-+ CMN_EVENT_HNF(CMN_ANY, seq_hit, 0x17),
-+ CMN_EVENT_HNF(CMN_ANY, snp_sent, 0x18),
-+ CMN_EVENT_HNF(CMN_ANY, sfbi_dir_snp_sent, 0x19),
-+ CMN_EVENT_HNF(CMN_ANY, sfbi_brd_snp_sent, 0x1a),
-+ CMN_EVENT_HNF(CMN_ANY, snp_sent_untrk, 0x1b),
-+ CMN_EVENT_HNF(CMN_ANY, intv_dirty, 0x1c),
-+ CMN_EVENT_HNF(CMN_ANY, stash_snp_sent, 0x1d),
-+ CMN_EVENT_HNF(CMN_ANY, stash_data_pull, 0x1e),
-+ CMN_EVENT_HNF(CMN_ANY, snp_fwded, 0x1f),
-+
-+ CMN_EVENT_HNI(rrt_rd_occ_cnt_ovfl, 0x20),
-+ CMN_EVENT_HNI(rrt_wr_occ_cnt_ovfl, 0x21),
-+ CMN_EVENT_HNI(rdt_rd_occ_cnt_ovfl, 0x22),
-+ CMN_EVENT_HNI(rdt_wr_occ_cnt_ovfl, 0x23),
-+ CMN_EVENT_HNI(wdb_occ_cnt_ovfl, 0x24),
-+ CMN_EVENT_HNI(rrt_rd_alloc, 0x25),
-+ CMN_EVENT_HNI(rrt_wr_alloc, 0x26),
-+ CMN_EVENT_HNI(rdt_rd_alloc, 0x27),
-+ CMN_EVENT_HNI(rdt_wr_alloc, 0x28),
-+ CMN_EVENT_HNI(wdb_alloc, 0x29),
-+ CMN_EVENT_HNI(txrsp_retryack, 0x2a),
-+ CMN_EVENT_HNI(arvalid_no_arready, 0x2b),
-+ CMN_EVENT_HNI(arready_no_arvalid, 0x2c),
-+ CMN_EVENT_HNI(awvalid_no_awready, 0x2d),
-+ CMN_EVENT_HNI(awready_no_awvalid, 0x2e),
-+ CMN_EVENT_HNI(wvalid_no_wready, 0x2f),
-+ CMN_EVENT_HNI(txdat_stall, 0x30),
-+ CMN_EVENT_HNI(nonpcie_serialization, 0x31),
-+ CMN_EVENT_HNI(pcie_serialization, 0x32),
-+
-+ CMN_EVENT_XP(txflit_valid, 0x01),
-+ CMN_EVENT_XP(txflit_stall, 0x02),
-+ CMN_EVENT_XP(partial_dat_flit, 0x03),
- /* We treat watchpoints as a special made-up class of XP events */
-- CMN_EVENT_ATTR(watchpoint_up, CMN_TYPE_WP, 0, 0),
-- CMN_EVENT_ATTR(watchpoint_down, CMN_TYPE_WP, 2, 0),
--
-- CMN_EVENT_SBSX(rd_req, 0x01),
-- CMN_EVENT_SBSX(wr_req, 0x02),
-- CMN_EVENT_SBSX(cmo_req, 0x03),
-- CMN_EVENT_SBSX(txrsp_retryack, 0x04),
-- CMN_EVENT_SBSX(txdat_flitv, 0x05),
-- CMN_EVENT_SBSX(txrsp_flitv, 0x06),
-- CMN_EVENT_SBSX(rd_req_trkr_occ_cnt_ovfl, 0x11),
-- CMN_EVENT_SBSX(wr_req_trkr_occ_cnt_ovfl, 0x12),
-- CMN_EVENT_SBSX(cmo_req_trkr_occ_cnt_ovfl, 0x13),
-- CMN_EVENT_SBSX(wdb_occ_cnt_ovfl, 0x14),
-- CMN_EVENT_SBSX(rd_axi_trkr_occ_cnt_ovfl, 0x15),
-- CMN_EVENT_SBSX(cmo_axi_trkr_occ_cnt_ovfl, 0x16),
-- CMN_EVENT_SBSX(arvalid_no_arready, 0x21),
-- CMN_EVENT_SBSX(awvalid_no_awready, 0x22),
-- CMN_EVENT_SBSX(wvalid_no_wready, 0x23),
-- CMN_EVENT_SBSX(txdat_stall, 0x24),
-- CMN_EVENT_SBSX(txrsp_stall, 0x25),
--
-- CMN_EVENT_RNID(s0_rdata_beats, 0x01),
-- CMN_EVENT_RNID(s1_rdata_beats, 0x02),
-- CMN_EVENT_RNID(s2_rdata_beats, 0x03),
-- CMN_EVENT_RNID(rxdat_flits, 0x04),
-- CMN_EVENT_RNID(txdat_flits, 0x05),
-- CMN_EVENT_RNID(txreq_flits_total, 0x06),
-- CMN_EVENT_RNID(txreq_flits_retried, 0x07),
-- CMN_EVENT_RNID(rrt_occ_ovfl, 0x08),
-- CMN_EVENT_RNID(wrt_occ_ovfl, 0x09),
-- CMN_EVENT_RNID(txreq_flits_replayed, 0x0a),
-- CMN_EVENT_RNID(wrcancel_sent, 0x0b),
-- CMN_EVENT_RNID(s0_wdata_beats, 0x0c),
-- CMN_EVENT_RNID(s1_wdata_beats, 0x0d),
-- CMN_EVENT_RNID(s2_wdata_beats, 0x0e),
-- CMN_EVENT_RNID(rrt_alloc, 0x0f),
-- CMN_EVENT_RNID(wrt_alloc, 0x10),
-- CMN_EVENT_RNID(rdb_unord, 0x11),
-- CMN_EVENT_RNID(rdb_replay, 0x12),
-- CMN_EVENT_RNID(rdb_hybrid, 0x13),
-- CMN_EVENT_RNID(rdb_ord, 0x14),
-+ CMN_EVENT_ATTR(CMN_ANY, watchpoint_up, CMN_TYPE_WP, CMN_WP_UP, 0),
-+ CMN_EVENT_ATTR(CMN_ANY, watchpoint_down, CMN_TYPE_WP, CMN_WP_DOWN, 0),
-+
-+ CMN_EVENT_SBSX(CMN_ANY, rd_req, 0x01),
-+ CMN_EVENT_SBSX(CMN_ANY, wr_req, 0x02),
-+ CMN_EVENT_SBSX(CMN_ANY, cmo_req, 0x03),
-+ CMN_EVENT_SBSX(CMN_ANY, txrsp_retryack, 0x04),
-+ CMN_EVENT_SBSX(CMN_ANY, txdat_flitv, 0x05),
-+ CMN_EVENT_SBSX(CMN_ANY, txrsp_flitv, 0x06),
-+ CMN_EVENT_SBSX(CMN_ANY, rd_req_trkr_occ_cnt_ovfl, 0x11),
-+ CMN_EVENT_SBSX(CMN_ANY, wr_req_trkr_occ_cnt_ovfl, 0x12),
-+ CMN_EVENT_SBSX(CMN_ANY, cmo_req_trkr_occ_cnt_ovfl, 0x13),
-+ CMN_EVENT_SBSX(CMN_ANY, wdb_occ_cnt_ovfl, 0x14),
-+ CMN_EVENT_SBSX(CMN_ANY, rd_axi_trkr_occ_cnt_ovfl, 0x15),
-+ CMN_EVENT_SBSX(CMN_ANY, cmo_axi_trkr_occ_cnt_ovfl, 0x16),
-+ CMN_EVENT_SBSX(CMN_ANY, arvalid_no_arready, 0x21),
-+ CMN_EVENT_SBSX(CMN_ANY, awvalid_no_awready, 0x22),
-+ CMN_EVENT_SBSX(CMN_ANY, wvalid_no_wready, 0x23),
-+ CMN_EVENT_SBSX(CMN_ANY, txdat_stall, 0x24),
-+ CMN_EVENT_SBSX(CMN_ANY, txrsp_stall, 0x25),
-+
-+ CMN_EVENT_RNID(CMN_ANY, s0_rdata_beats, 0x01),
-+ CMN_EVENT_RNID(CMN_ANY, s1_rdata_beats, 0x02),
-+ CMN_EVENT_RNID(CMN_ANY, s2_rdata_beats, 0x03),
-+ CMN_EVENT_RNID(CMN_ANY, rxdat_flits, 0x04),
-+ CMN_EVENT_RNID(CMN_ANY, txdat_flits, 0x05),
-+ CMN_EVENT_RNID(CMN_ANY, txreq_flits_total, 0x06),
-+ CMN_EVENT_RNID(CMN_ANY, txreq_flits_retried, 0x07),
-+ CMN_EVENT_RNID(CMN_ANY, rrt_occ_ovfl, 0x08),
-+ CMN_EVENT_RNID(CMN_ANY, wrt_occ_ovfl, 0x09),
-+ CMN_EVENT_RNID(CMN_ANY, txreq_flits_replayed, 0x0a),
-+ CMN_EVENT_RNID(CMN_ANY, wrcancel_sent, 0x0b),
-+ CMN_EVENT_RNID(CMN_ANY, s0_wdata_beats, 0x0c),
-+ CMN_EVENT_RNID(CMN_ANY, s1_wdata_beats, 0x0d),
-+ CMN_EVENT_RNID(CMN_ANY, s2_wdata_beats, 0x0e),
-+ CMN_EVENT_RNID(CMN_ANY, rrt_alloc, 0x0f),
-+ CMN_EVENT_RNID(CMN_ANY, wrt_alloc, 0x10),
-+ CMN_EVENT_RNID(CMN600, rdb_unord, 0x11),
-+ CMN_EVENT_RNID(CMN600, rdb_replay, 0x12),
-+ CMN_EVENT_RNID(CMN600, rdb_hybrid, 0x13),
-+ CMN_EVENT_RNID(CMN600, rdb_ord, 0x14),
-
- NULL
- };
-@@ -1386,15 +1400,14 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- int i, j;
- size_t sz;
-
-- cfg_region = cmn->base + rgn_offset;
-- reg = readl_relaxed(cfg_region + CMN_CFGM_PERIPH_ID_2);
-- cmn->rev = FIELD_GET(CMN_CFGM_PID2_REVISION, reg);
-- dev_dbg(cmn->dev, "periph_id_2 revision: %d\n", cmn->rev);
--
- arm_cmn_init_node_info(cmn, rgn_offset, &cfg);
- if (cfg.type != CMN_TYPE_CFG)
- return -ENODEV;
-
-+ cfg_region = cmn->base + rgn_offset;
-+ reg = readl_relaxed(cfg_region + CMN_CFGM_PERIPH_ID_2);
-+ cmn->rev = FIELD_GET(CMN_CFGM_PID2_REVISION, reg);
-+
- reg = readq_relaxed(cfg_region + CMN_CHILD_INFO);
- child_count = FIELD_GET(CMN_CI_CHILD_COUNT, reg);
- child_poff = FIELD_GET(CMN_CI_CHILD_PTR_OFFSET, reg);
-@@ -1507,13 +1520,14 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- cmn->mesh_x = cmn->num_xps;
- cmn->mesh_y = cmn->num_xps / cmn->mesh_x;
-
-+ dev_dbg(cmn->dev, "model %d, periph_id_2 revision %d\n", cmn->model, cmn->rev);
- dev_dbg(cmn->dev, "mesh %dx%d, ID width %d\n",
- cmn->mesh_x, cmn->mesh_y, arm_cmn_xyidbits(cmn));
-
- return 0;
- }
-
--static int arm_cmn_acpi_probe(struct platform_device *pdev, struct arm_cmn *cmn)
-+static int arm_cmn600_acpi_probe(struct platform_device *pdev, struct arm_cmn *cmn)
- {
- struct resource *cfg, *root;
-
-@@ -1540,21 +1554,11 @@ static int arm_cmn_acpi_probe(struct platform_device *pdev, struct arm_cmn *cmn)
- return root->start - cfg->start;
- }
-
--static int arm_cmn_of_probe(struct platform_device *pdev, struct arm_cmn *cmn)
-+static int arm_cmn600_of_probe(struct device_node *np)
- {
-- struct device_node *np = pdev->dev.of_node;
- u32 rootnode;
-- int ret;
-
-- cmn->base = devm_platform_ioremap_resource(pdev, 0);
-- if (IS_ERR(cmn->base))
-- return PTR_ERR(cmn->base);
--
-- ret = of_property_read_u32(np, "arm,root-node", &rootnode);
-- if (ret)
-- return ret;
--
-- return rootnode;
-+ return of_property_read_u32(np, "arm,root-node", &rootnode) ?: rootnode;
- }
-
- static int arm_cmn_probe(struct platform_device *pdev)
-@@ -1569,12 +1573,19 @@ static int arm_cmn_probe(struct platform_device *pdev)
- return -ENOMEM;
-
- cmn->dev = &pdev->dev;
-+ cmn->model = (unsigned long)device_get_match_data(cmn->dev);
- platform_set_drvdata(pdev, cmn);
-
-- if (has_acpi_companion(cmn->dev))
-- rootnode = arm_cmn_acpi_probe(pdev, cmn);
-- else
-- rootnode = arm_cmn_of_probe(pdev, cmn);
-+ if (cmn->model == CMN600 && has_acpi_companion(cmn->dev)) {
-+ rootnode = arm_cmn600_acpi_probe(pdev, cmn);
-+ } else {
-+ rootnode = 0;
-+ cmn->base = devm_platform_ioremap_resource(pdev, 0);
-+ if (IS_ERR(cmn->base))
-+ return PTR_ERR(cmn->base);
-+ if (cmn->model == CMN600)
-+ rootnode = arm_cmn600_of_probe(pdev->dev.of_node);
-+ }
- if (rootnode < 0)
- return rootnode;
-
-@@ -1637,7 +1648,7 @@ static int arm_cmn_remove(struct platform_device *pdev)
-
- #ifdef CONFIG_OF
- static const struct of_device_id arm_cmn_of_match[] = {
-- { .compatible = "arm,cmn-600", },
-+ { .compatible = "arm,cmn-600", .data = (void *)CMN600 },
- {}
- };
- MODULE_DEVICE_TABLE(of, arm_cmn_of_match);
-@@ -1645,7 +1656,7 @@ MODULE_DEVICE_TABLE(of, arm_cmn_of_match);
-
- #ifdef CONFIG_ACPI
- static const struct acpi_device_id arm_cmn_acpi_match[] = {
-- { "ARMHC600", },
-+ { "ARMHC600", CMN600 },
- {}
- };
- MODULE_DEVICE_TABLE(acpi, arm_cmn_acpi_match);
-2.34.1
-
deleted file mode 100644
@@ -1,548 +0,0 @@
-From 821c1c36ba8883a8709bbbcdf4ebc716e69da991 Mon Sep 17 00:00:00 2001
-From: Robin Murphy <robin.murphy@arm.com>
-Date: Fri, 3 Dec 2021 11:45:00 +0000
-Subject: [PATCH 25/40] perf/arm-cmn: Support new IP features
-
-The second generation of CMN IPs add new node types and significantly
-expand the configuration space with options for extra device ports on
-edge XPs, either plumbed into the regular DTM or with extra dedicated
-DTMs to monitor them, plus larger (and smaller) mesh sizes. Add basic
-support for pulling this new information out of the hardware, piping
-it around as necessary, and handling (most of) the new choices.
-
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Link: https://lore.kernel.org/r/e58b495bcc7deec3882be4bac910ed0bf6979674.1638530442.git.robin.murphy@arm.com
-Signed-off-by: Will Deacon <will@kernel.org>
-
-Upstream-Status: Backport [https://lore.kernel.org/r/e58b495bcc7deec3882be4bac910ed0bf6979674.1638530442.git.robin.murphy@arm.com]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
----
- drivers/perf/arm-cmn.c | 218 ++++++++++++++++++++++++++++++++---------
- 1 file changed, 171 insertions(+), 47 deletions(-)
-
-diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
-index ce94f923a607..0a3f33a83c01 100644
---- a/drivers/perf/arm-cmn.c
-+++ b/drivers/perf/arm-cmn.c
-@@ -24,7 +24,10 @@
- #define CMN_NI_LOGICAL_ID GENMASK_ULL(47, 32)
-
- #define CMN_NODEID_DEVID(reg) ((reg) & 3)
-+#define CMN_NODEID_EXT_DEVID(reg) ((reg) & 1)
- #define CMN_NODEID_PID(reg) (((reg) >> 2) & 1)
-+#define CMN_NODEID_EXT_PID(reg) (((reg) >> 1) & 3)
-+#define CMN_NODEID_1x1_PID(reg) (((reg) >> 2) & 7)
- #define CMN_NODEID_X(reg, bits) ((reg) >> (3 + (bits)))
- #define CMN_NODEID_Y(reg, bits) (((reg) >> 3) & ((1U << (bits)) - 1))
-
-@@ -37,13 +40,26 @@
-
- #define CMN_MAX_DIMENSION 8
- #define CMN_MAX_XPS (CMN_MAX_DIMENSION * CMN_MAX_DIMENSION)
--#define CMN_MAX_DTMS CMN_MAX_XPS
-+#define CMN_MAX_DTMS (CMN_MAX_XPS + (CMN_MAX_DIMENSION - 1) * 4)
-
--/* The CFG node has one other useful purpose */
-+/* The CFG node has various info besides the discovery tree */
- #define CMN_CFGM_PERIPH_ID_2 0x0010
- #define CMN_CFGM_PID2_REVISION GENMASK(7, 4)
-
--/* PMU registers occupy the 3rd 4KB page of each node's 16KB space */
-+#define CMN_CFGM_INFO_GLOBAL 0x900
-+#define CMN_INFO_MULTIPLE_DTM_EN BIT_ULL(63)
-+#define CMN_INFO_RSP_VC_NUM GENMASK_ULL(53, 52)
-+#define CMN_INFO_DAT_VC_NUM GENMASK_ULL(51, 50)
-+
-+/* XPs also have some local topology info which has uses too */
-+#define CMN_MXP__CONNECT_INFO_P0 0x0008
-+#define CMN_MXP__CONNECT_INFO_P1 0x0010
-+#define CMN_MXP__CONNECT_INFO_P2 0x0028
-+#define CMN_MXP__CONNECT_INFO_P3 0x0030
-+#define CMN_MXP__CONNECT_INFO_P4 0x0038
-+#define CMN_MXP__CONNECT_INFO_P5 0x0040
-+
-+/* PMU registers occupy the 3rd 4KB page of each node's region */
- #define CMN_PMU_OFFSET 0x2000
-
- /* For most nodes, this is all there is */
-@@ -53,6 +69,7 @@
- /* DTMs live in the PMU space of XP registers */
- #define CMN_DTM_WPn(n) (0x1A0 + (n) * 0x18)
- #define CMN_DTM_WPn_CONFIG(n) (CMN_DTM_WPn(n) + 0x00)
-+#define CMN_DTM_WPn_CONFIG_WP_DEV_SEL2 GENMASK_ULL(18,17)
- #define CMN_DTM_WPn_CONFIG_WP_COMBINE BIT(6)
- #define CMN_DTM_WPn_CONFIG_WP_EXCLUSIVE BIT(5)
- #define CMN_DTM_WPn_CONFIG_WP_GRP BIT(4)
-@@ -77,7 +94,11 @@
-
- #define CMN_DTM_PMEVCNTSR 0x240
-
-+#define CMN_DTM_UNIT_INFO 0x0910
-+
- #define CMN_DTM_NUM_COUNTERS 4
-+/* Want more local counters? Why not replicate the whole DTM! Ugh... */
-+#define CMN_DTM_OFFSET(n) ((n) * 0x200)
-
- /* The DTC node is where the magic happens */
- #define CMN_DT_DTC_CTL 0x0a00
-@@ -131,10 +152,10 @@
- #define CMN_EVENT_NODEID(event) FIELD_GET(CMN_CONFIG_NODEID, (event)->attr.config)
-
- #define CMN_CONFIG_WP_COMBINE GENMASK_ULL(27, 24)
--#define CMN_CONFIG_WP_DEV_SEL BIT_ULL(48)
--#define CMN_CONFIG_WP_CHN_SEL GENMASK_ULL(50, 49)
--#define CMN_CONFIG_WP_GRP BIT_ULL(52)
--#define CMN_CONFIG_WP_EXCLUSIVE BIT_ULL(53)
-+#define CMN_CONFIG_WP_DEV_SEL GENMASK_ULL(50, 48)
-+#define CMN_CONFIG_WP_CHN_SEL GENMASK_ULL(55, 51)
-+#define CMN_CONFIG_WP_GRP BIT_ULL(56)
-+#define CMN_CONFIG_WP_EXCLUSIVE BIT_ULL(57)
- #define CMN_CONFIG1_WP_VAL GENMASK_ULL(63, 0)
- #define CMN_CONFIG2_WP_MASK GENMASK_ULL(63, 0)
-
-@@ -176,9 +197,12 @@ enum cmn_node_type {
- CMN_TYPE_HNF,
- CMN_TYPE_XP,
- CMN_TYPE_SBSX,
-- CMN_TYPE_RNI = 0xa,
-+ CMN_TYPE_MPAM_S,
-+ CMN_TYPE_MPAM_NS,
-+ CMN_TYPE_RNI,
- CMN_TYPE_RND = 0xd,
- CMN_TYPE_RNSAM = 0xf,
-+ CMN_TYPE_MTSX,
- CMN_TYPE_CXRA = 0x100,
- CMN_TYPE_CXHA = 0x101,
- CMN_TYPE_CXLA = 0x102,
-@@ -233,6 +257,7 @@ struct arm_cmn_dtc {
- struct arm_cmn {
- struct device *dev;
- void __iomem *base;
-+ unsigned int state;
-
- enum cmn_revision rev;
- enum cmn_model model;
-@@ -240,6 +265,13 @@ struct arm_cmn {
- u8 mesh_y;
- u16 num_xps;
- u16 num_dns;
-+ bool multi_dtm;
-+ u8 ports_used;
-+ struct {
-+ unsigned int rsp_vc_num : 2;
-+ unsigned int dat_vc_num : 2;
-+ };
-+
- struct arm_cmn_node *xps;
- struct arm_cmn_node *dns;
-
-@@ -250,7 +282,6 @@ struct arm_cmn {
- int cpu;
- struct hlist_node cpuhp_node;
-
-- unsigned int state;
- struct pmu pmu;
- };
-
-@@ -275,13 +306,25 @@ static int arm_cmn_xyidbits(const struct arm_cmn *cmn)
- static struct arm_cmn_nodeid arm_cmn_nid(const struct arm_cmn *cmn, u16 id)
- {
- struct arm_cmn_nodeid nid;
-- int bits = arm_cmn_xyidbits(cmn);
-
-- nid.x = CMN_NODEID_X(id, bits);
-- nid.y = CMN_NODEID_Y(id, bits);
-- nid.port = CMN_NODEID_PID(id);
-- nid.dev = CMN_NODEID_DEVID(id);
-+ if (cmn->num_xps == 1) {
-+ nid.x = 0;
-+ nid.y = 0;
-+ nid.port = CMN_NODEID_1x1_PID(id);
-+ nid.dev = CMN_NODEID_DEVID(id);
-+ } else {
-+ int bits = arm_cmn_xyidbits(cmn);
-
-+ nid.x = CMN_NODEID_X(id, bits);
-+ nid.y = CMN_NODEID_Y(id, bits);
-+ if (cmn->ports_used & 0xc) {
-+ nid.port = CMN_NODEID_EXT_PID(id);
-+ nid.dev = CMN_NODEID_EXT_DEVID(id);
-+ } else {
-+ nid.port = CMN_NODEID_PID(id);
-+ nid.dev = CMN_NODEID_DEVID(id);
-+ }
-+ }
- return nid;
- }
-
-@@ -310,6 +353,7 @@ struct arm_cmn_hw_event {
- unsigned int dtc_idx;
- u8 dtcs_used;
- u8 num_dns;
-+ u8 dtm_offset;
- };
-
- #define for_each_hw_dn(hw, dn, i) \
-@@ -354,7 +398,8 @@ struct arm_cmn_format_attr {
- .occupid = _occupid, \
- }})[0].attr.attr)
-
--static bool arm_cmn_is_occup_event(enum cmn_node_type type, unsigned int id)
-+static bool arm_cmn_is_occup_event(enum cmn_model model,
-+ enum cmn_node_type type, unsigned int id)
- {
- return (type == CMN_TYPE_DVM && id == 0x05) ||
- (type == CMN_TYPE_HNF && id == 0x0f);
-@@ -375,7 +420,7 @@ static ssize_t arm_cmn_event_show(struct device *dev,
- "type=0x%x,eventid=0x%x,wp_dev_sel=?,wp_chn_sel=?,wp_grp=?,wp_val=?,wp_mask=?\n",
- eattr->type, eattr->eventid);
-
-- if (arm_cmn_is_occup_event(eattr->type, eattr->eventid))
-+ if (arm_cmn_is_occup_event(eattr->model, eattr->type, eattr->eventid))
- return sysfs_emit(buf, "type=0x%x,eventid=0x%x,occupid=0x%x\n",
- eattr->type, eattr->eventid, eattr->occupid);
-
-@@ -390,25 +435,36 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj,
- struct device *dev = kobj_to_dev(kobj);
- struct arm_cmn *cmn = to_cmn(dev_get_drvdata(dev));
- struct arm_cmn_event_attr *eattr;
-- enum cmn_node_type type;
-
- eattr = container_of(attr, typeof(*eattr), attr.attr);
-- type = eattr->type;
-
- if (!(eattr->model & cmn->model))
- return 0;
-
-- /* Watchpoints aren't nodes */
-- if (type == CMN_TYPE_WP)
-- type = CMN_TYPE_XP;
-+ /* Watchpoints aren't nodes, so avoid confusion */
-+ if (eattr->type == CMN_TYPE_WP)
-+ return attr->mode;
-+
-+ /* Hide XP events for unused interfaces/channels */
-+ if (eattr->type == CMN_TYPE_XP) {
-+ unsigned int intf = (eattr->eventid >> 2) & 7;
-+ unsigned int chan = eattr->eventid >> 5;
-+
-+ if ((intf & 4) && !(cmn->ports_used & BIT(intf & 3)))
-+ return 0;
-+
-+ if ((chan == 5 && cmn->rsp_vc_num < 2) ||
-+ (chan == 6 && cmn->dat_vc_num < 2))
-+ return 0;
-+ }
-
- /* Revision-specific differences */
- if (cmn->model == CMN600 && cmn->rev < CMN600_R1P2) {
-- if (type == CMN_TYPE_HNF && eattr->eventid == 0x1b)
-+ if (eattr->type == CMN_TYPE_HNF && eattr->eventid == 0x1b)
- return 0;
- }
-
-- if (!arm_cmn_node(cmn, type))
-+ if (!arm_cmn_node(cmn, eattr->type))
- return 0;
-
- return attr->mode;
-@@ -669,7 +725,8 @@ static u32 arm_cmn_wp_config(struct perf_event *event)
- config = FIELD_PREP(CMN_DTM_WPn_CONFIG_WP_DEV_SEL, dev) |
- FIELD_PREP(CMN_DTM_WPn_CONFIG_WP_CHN_SEL, chn) |
- FIELD_PREP(CMN_DTM_WPn_CONFIG_WP_GRP, grp) |
-- FIELD_PREP(CMN_DTM_WPn_CONFIG_WP_EXCLUSIVE, exc);
-+ FIELD_PREP(CMN_DTM_WPn_CONFIG_WP_EXCLUSIVE, exc) |
-+ FIELD_PREP(CMN_DTM_WPn_CONFIG_WP_DEV_SEL2, dev >> 1);
- if (combine && !grp)
- config |= CMN_DTM_WPn_CONFIG_WP_COMBINE;
-
-@@ -712,7 +769,7 @@ static u64 arm_cmn_read_dtm(struct arm_cmn *cmn, struct arm_cmn_hw_event *hw,
- offset = snapshot ? CMN_DTM_PMEVCNTSR : CMN_DTM_PMEVCNT;
- for_each_hw_dn(hw, dn, i) {
- if (dtm != &cmn->dtms[dn->dtm]) {
-- dtm = &cmn->dtms[dn->dtm];
-+ dtm = &cmn->dtms[dn->dtm] + hw->dtm_offset;
- reg = readq_relaxed(dtm->base + offset);
- }
- dtm_idx = arm_cmn_get_index(hw->dtm_idx, i);
-@@ -800,8 +857,10 @@ static void arm_cmn_event_start(struct perf_event *event, int flags)
- u64 mask = CMN_EVENT_WP_MASK(event);
-
- for_each_hw_dn(hw, dn, i) {
-- writeq_relaxed(val, dn->pmu_base + CMN_DTM_WPn_VAL(wp_idx));
-- writeq_relaxed(mask, dn->pmu_base + CMN_DTM_WPn_MASK(wp_idx));
-+ void __iomem *base = dn->pmu_base + CMN_DTM_OFFSET(hw->dtm_offset);
-+
-+ writeq_relaxed(val, base + CMN_DTM_WPn_VAL(wp_idx));
-+ writeq_relaxed(mask, base + CMN_DTM_WPn_MASK(wp_idx));
- }
- } else for_each_hw_dn(hw, dn, i) {
- int dtm_idx = arm_cmn_get_index(hw->dtm_idx, i);
-@@ -826,8 +885,10 @@ static void arm_cmn_event_stop(struct perf_event *event, int flags)
- int wp_idx = arm_cmn_wp_idx(event);
-
- for_each_hw_dn(hw, dn, i) {
-- writeq_relaxed(0, dn->pmu_base + CMN_DTM_WPn_MASK(wp_idx));
-- writeq_relaxed(~0ULL, dn->pmu_base + CMN_DTM_WPn_VAL(wp_idx));
-+ void __iomem *base = dn->pmu_base + CMN_DTM_OFFSET(hw->dtm_offset);
-+
-+ writeq_relaxed(0, base + CMN_DTM_WPn_MASK(wp_idx));
-+ writeq_relaxed(~0ULL, base + CMN_DTM_WPn_VAL(wp_idx));
- }
- } else for_each_hw_dn(hw, dn, i) {
- int dtm_idx = arm_cmn_get_index(hw->dtm_idx, i);
-@@ -847,7 +908,8 @@ struct arm_cmn_val {
- bool cycles;
- };
-
--static void arm_cmn_val_add_event(struct arm_cmn_val *val, struct perf_event *event)
-+static void arm_cmn_val_add_event(struct arm_cmn *cmn, struct arm_cmn_val *val,
-+ struct perf_event *event)
- {
- struct arm_cmn_hw_event *hw = to_cmn_hw(event);
- struct arm_cmn_node *dn;
-@@ -865,7 +927,7 @@ static void arm_cmn_val_add_event(struct arm_cmn_val *val, struct perf_event *ev
- }
-
- val->dtc_count++;
-- if (arm_cmn_is_occup_event(type, CMN_EVENT_EVENTID(event)))
-+ if (arm_cmn_is_occup_event(cmn->model, type, CMN_EVENT_EVENTID(event)))
- occupid = CMN_EVENT_OCCUPID(event) + 1;
- else
- occupid = 0;
-@@ -884,7 +946,7 @@ static void arm_cmn_val_add_event(struct arm_cmn_val *val, struct perf_event *ev
- }
- }
-
--static int arm_cmn_validate_group(struct perf_event *event)
-+static int arm_cmn_validate_group(struct arm_cmn *cmn, struct perf_event *event)
- {
- struct arm_cmn_hw_event *hw = to_cmn_hw(event);
- struct arm_cmn_node *dn;
-@@ -904,9 +966,9 @@ static int arm_cmn_validate_group(struct perf_event *event)
- if (!val)
- return -ENOMEM;
-
-- arm_cmn_val_add_event(val, leader);
-+ arm_cmn_val_add_event(cmn, val, leader);
- for_each_sibling_event(sibling, leader)
-- arm_cmn_val_add_event(val, sibling);
-+ arm_cmn_val_add_event(cmn, val, sibling);
-
- type = CMN_EVENT_TYPE(event);
- if (type == CMN_TYPE_DTC) {
-@@ -917,7 +979,7 @@ static int arm_cmn_validate_group(struct perf_event *event)
- if (val->dtc_count == CMN_DT_NUM_COUNTERS)
- goto done;
-
-- if (arm_cmn_is_occup_event(type, CMN_EVENT_EVENTID(event)))
-+ if (arm_cmn_is_occup_event(cmn->model, type, CMN_EVENT_EVENTID(event)))
- occupid = CMN_EVENT_OCCUPID(event) + 1;
- else
- occupid = 0;
-@@ -980,6 +1042,9 @@ static int arm_cmn_event_init(struct perf_event *event)
- eventid = CMN_EVENT_EVENTID(event);
- if (eventid != CMN_WP_UP && eventid != CMN_WP_DOWN)
- return -EINVAL;
-+ /* ...but the DTM may depend on which port we're watching */
-+ if (cmn->multi_dtm)
-+ hw->dtm_offset = CMN_EVENT_WP_DEV_SEL(event) / 2;
- }
-
- bynodeid = CMN_EVENT_BYNODEID(event);
-@@ -1007,7 +1072,7 @@ static int arm_cmn_event_init(struct perf_event *event)
- return -EINVAL;
- }
-
-- return arm_cmn_validate_group(event);
-+ return arm_cmn_validate_group(cmn, event);
- }
-
- static void arm_cmn_event_clear(struct arm_cmn *cmn, struct perf_event *event,
-@@ -1017,13 +1082,13 @@ static void arm_cmn_event_clear(struct arm_cmn *cmn, struct perf_event *event,
- enum cmn_node_type type = CMN_EVENT_TYPE(event);
-
- while (i--) {
-- struct arm_cmn_dtm *dtm = &cmn->dtms[hw->dn[i].dtm];
-+ struct arm_cmn_dtm *dtm = &cmn->dtms[hw->dn[i].dtm] + hw->dtm_offset;
- unsigned int dtm_idx = arm_cmn_get_index(hw->dtm_idx, i);
-
- if (type == CMN_TYPE_WP)
- dtm->wp_event[arm_cmn_wp_idx(event)] = -1;
-
-- if (arm_cmn_is_occup_event(type, CMN_EVENT_EVENTID(event)))
-+ if (arm_cmn_is_occup_event(cmn->model, type, CMN_EVENT_EVENTID(event)))
- hw->dn[i].occupid_count--;
-
- dtm->pmu_config_low &= ~CMN__PMEVCNT_PAIRED(dtm_idx);
-@@ -1069,7 +1134,7 @@ static int arm_cmn_event_add(struct perf_event *event, int flags)
-
- /* ...then the local counters to feed it. */
- for_each_hw_dn(hw, dn, i) {
-- struct arm_cmn_dtm *dtm = &cmn->dtms[dn->dtm];
-+ struct arm_cmn_dtm *dtm = &cmn->dtms[dn->dtm] + hw->dtm_offset;
- unsigned int dtm_idx, shift;
- u64 reg;
-
-@@ -1098,10 +1163,13 @@ static int arm_cmn_event_add(struct perf_event *event, int flags)
- } else {
- struct arm_cmn_nodeid nid = arm_cmn_nid(cmn, dn->id);
-
-+ if (cmn->multi_dtm)
-+ nid.port %= 2;
-+
- input_sel = CMN__PMEVCNT0_INPUT_SEL_DEV + dtm_idx +
- (nid.port << 4) + (nid.dev << 2);
-
-- if (arm_cmn_is_occup_event(type, CMN_EVENT_EVENTID(event))) {
-+ if (arm_cmn_is_occup_event(cmn->model, type, CMN_EVENT_EVENTID(event))) {
- u8 occupid = CMN_EVENT_OCCUPID(event);
-
- if (dn->occupid_count == 0) {
-@@ -1283,11 +1351,11 @@ static int arm_cmn_init_irqs(struct arm_cmn *cmn)
- return 0;
- }
-
--static void arm_cmn_init_dtm(struct arm_cmn_dtm *dtm, struct arm_cmn_node *xp)
-+static void arm_cmn_init_dtm(struct arm_cmn_dtm *dtm, struct arm_cmn_node *xp, int idx)
- {
- int i;
-
-- dtm->base = xp->pmu_base;
-+ dtm->base = xp->pmu_base + CMN_DTM_OFFSET(idx);
- dtm->pmu_config_low = CMN_DTM_PMU_CONFIG_PMU_EN;
- for (i = 0; i < 4; i++) {
- dtm->wp_event[i] = -1;
-@@ -1345,6 +1413,8 @@ static int arm_cmn_init_dtcs(struct arm_cmn *cmn)
-
- xp = arm_cmn_node_to_xp(cmn, dn);
- dn->dtm = xp->dtm;
-+ if (cmn->multi_dtm)
-+ dn->dtm += arm_cmn_nid(cmn, dn->id).port / 2;
-
- if (dn->type == CMN_TYPE_DTC) {
- int err;
-@@ -1408,6 +1478,11 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- reg = readl_relaxed(cfg_region + CMN_CFGM_PERIPH_ID_2);
- cmn->rev = FIELD_GET(CMN_CFGM_PID2_REVISION, reg);
-
-+ reg = readq_relaxed(cfg_region + CMN_CFGM_INFO_GLOBAL);
-+ cmn->multi_dtm = reg & CMN_INFO_MULTIPLE_DTM_EN;
-+ cmn->rsp_vc_num = FIELD_GET(CMN_INFO_RSP_VC_NUM, reg);
-+ cmn->dat_vc_num = FIELD_GET(CMN_INFO_DAT_VC_NUM, reg);
-+
- reg = readq_relaxed(cfg_region + CMN_CHILD_INFO);
- child_count = FIELD_GET(CMN_CI_CHILD_COUNT, reg);
- child_poff = FIELD_GET(CMN_CI_CHILD_PTR_OFFSET, reg);
-@@ -1429,7 +1504,11 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- if (!dn)
- return -ENOMEM;
-
-- dtm = devm_kcalloc(cmn->dev, cmn->num_xps, sizeof(*dtm), GFP_KERNEL);
-+ /* Initial safe upper bound on DTMs for any possible mesh layout */
-+ i = cmn->num_xps;
-+ if (cmn->multi_dtm)
-+ i += cmn->num_xps + 1;
-+ dtm = devm_kcalloc(cmn->dev, i, sizeof(*dtm), GFP_KERNEL);
- if (!dtm)
- return -ENOMEM;
-
-@@ -1439,6 +1518,7 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- for (i = 0; i < cmn->num_xps; i++) {
- void __iomem *xp_region = cmn->base + xp_offset[i];
- struct arm_cmn_node *xp = dn++;
-+ unsigned int xp_ports = 0;
-
- arm_cmn_init_node_info(cmn, xp_offset[i], xp);
- /*
-@@ -1450,9 +1530,39 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- if (xp->id == (1 << 3))
- cmn->mesh_x = xp->logid;
-
-- xp->dtc = 0xf;
-+ if (cmn->model == CMN600)
-+ xp->dtc = 0xf;
-+ else
-+ xp->dtc = 1 << readl_relaxed(xp_region + CMN_DTM_UNIT_INFO);
-+
- xp->dtm = dtm - cmn->dtms;
-- arm_cmn_init_dtm(dtm++, xp);
-+ arm_cmn_init_dtm(dtm++, xp, 0);
-+ /*
-+ * Keeping track of connected ports will let us filter out
-+ * unnecessary XP events easily. We can also reliably infer the
-+ * "extra device ports" configuration for the node ID format
-+ * from this, since in that case we will see at least one XP
-+ * with port 2 connected, for the HN-D.
-+ */
-+ if (readq_relaxed(xp_region + CMN_MXP__CONNECT_INFO_P0))
-+ xp_ports |= BIT(0);
-+ if (readq_relaxed(xp_region + CMN_MXP__CONNECT_INFO_P1))
-+ xp_ports |= BIT(1);
-+ if (readq_relaxed(xp_region + CMN_MXP__CONNECT_INFO_P2))
-+ xp_ports |= BIT(2);
-+ if (readq_relaxed(xp_region + CMN_MXP__CONNECT_INFO_P3))
-+ xp_ports |= BIT(3);
-+ if (readq_relaxed(xp_region + CMN_MXP__CONNECT_INFO_P4))
-+ xp_ports |= BIT(4);
-+ if (readq_relaxed(xp_region + CMN_MXP__CONNECT_INFO_P5))
-+ xp_ports |= BIT(5);
-+
-+ if (cmn->multi_dtm && (xp_ports & 0xc))
-+ arm_cmn_init_dtm(dtm++, xp, 1);
-+ if (cmn->multi_dtm && (xp_ports & 0x30))
-+ arm_cmn_init_dtm(dtm++, xp, 2);
-+
-+ cmn->ports_used |= xp_ports;
-
- reg = readq_relaxed(xp_region + CMN_CHILD_INFO);
- child_count = FIELD_GET(CMN_CI_CHILD_COUNT, reg);
-@@ -1488,11 +1598,14 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- case CMN_TYPE_SBSX:
- case CMN_TYPE_RNI:
- case CMN_TYPE_RND:
-+ case CMN_TYPE_MTSX:
- case CMN_TYPE_CXRA:
- case CMN_TYPE_CXHA:
- dn++;
- break;
- /* Nothing to see here */
-+ case CMN_TYPE_MPAM_S:
-+ case CMN_TYPE_MPAM_NS:
- case CMN_TYPE_RNSAM:
- case CMN_TYPE_CXLA:
- break;
-@@ -1512,6 +1625,11 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- if (dn)
- cmn->dns = dn;
-
-+ sz = (void *)dtm - (void *)cmn->dtms;
-+ dtm = devm_krealloc(cmn->dev, cmn->dtms, sz, GFP_KERNEL);
-+ if (dtm)
-+ cmn->dtms = dtm;
-+
- /*
- * If mesh_x wasn't set during discovery then we never saw
- * an XP at (0,1), thus we must have an Nx1 configuration.
-@@ -1520,9 +1638,15 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
- cmn->mesh_x = cmn->num_xps;
- cmn->mesh_y = cmn->num_xps / cmn->mesh_x;
-
-+ /* 1x1 config plays havoc with XP event encodings */
-+ if (cmn->num_xps == 1)
-+ dev_warn(cmn->dev, "1x1 config not fully supported, translate XP events manually\n");
-+
- dev_dbg(cmn->dev, "model %d, periph_id_2 revision %d\n", cmn->model, cmn->rev);
-- dev_dbg(cmn->dev, "mesh %dx%d, ID width %d\n",
-- cmn->mesh_x, cmn->mesh_y, arm_cmn_xyidbits(cmn));
-+ reg = cmn->ports_used;
-+ dev_dbg(cmn->dev, "mesh %dx%d, ID width %d, ports %6pbl%s\n",
-+ cmn->mesh_x, cmn->mesh_y, arm_cmn_xyidbits(cmn), ®,
-+ cmn->multi_dtm ? ", multi-DTM" : "");
-
- return 0;
- }
-2.34.1
-
deleted file mode 100644
@@ -1,150 +0,0 @@
-From 806c281f4307dd321fe8a38ce557e8c983c3ce84 Mon Sep 17 00:00:00 2001
-From: Robin Murphy <robin.murphy@arm.com>
-Date: Fri, 3 Dec 2021 11:45:02 +0000
-Subject: [PATCH 26/40] perf/arm-cmn: Add CI-700 Support
-
-Add the identifiers and events for the CI-700 coherent interconnect.
-
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Link: https://lore.kernel.org/r/28f566ab23a83733c6c9ef9414c010b760b4549c.1638530442.git.robin.murphy@arm.com
-Signed-off-by: Will Deacon <will@kernel.org>
-
-Upstream-Status: Backport [https://lore.kernel.org/r/28f566ab23a83733c6c9ef9414c010b760b4549c.1638530442.git.robin.murphy@arm.com]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- drivers/perf/arm-cmn.c | 57 +++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 53 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
-index 0a3f33a83c01..28ab87a6cde4 100644
---- a/drivers/perf/arm-cmn.c
-+++ b/drivers/perf/arm-cmn.c
-@@ -175,6 +175,7 @@
- enum cmn_model {
- CMN_ANY = -1,
- CMN600 = 1,
-+ CI700 = 2,
- };
-
- /* CMN-600 r0px shouldn't exist in silicon, thankfully */
-@@ -186,6 +187,9 @@ enum cmn_revision {
- CMN600_R2P0,
- CMN600_R3P0,
- CMN600_R3P1,
-+ CI700_R0P0 = 0,
-+ CI700_R1P0,
-+ CI700_R2P0,
- };
-
- enum cmn_node_type {
-@@ -401,8 +405,10 @@ struct arm_cmn_format_attr {
- static bool arm_cmn_is_occup_event(enum cmn_model model,
- enum cmn_node_type type, unsigned int id)
- {
-- return (type == CMN_TYPE_DVM && id == 0x05) ||
-- (type == CMN_TYPE_HNF && id == 0x0f);
-+ if (type == CMN_TYPE_DVM)
-+ return (model == CMN600 && id == 0x05) ||
-+ (model == CI700 && id == 0x0c);
-+ return type == CMN_TYPE_HNF && id == 0x0f;
- }
-
- static ssize_t arm_cmn_event_show(struct device *dev,
-@@ -497,14 +503,19 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj,
- __CMN_EVENT_XP(n_##_name, (_event) | (2 << 2)), \
- __CMN_EVENT_XP(s_##_name, (_event) | (3 << 2)), \
- __CMN_EVENT_XP(p0_##_name, (_event) | (4 << 2)), \
-- __CMN_EVENT_XP(p1_##_name, (_event) | (5 << 2))
-+ __CMN_EVENT_XP(p1_##_name, (_event) | (5 << 2)), \
-+ __CMN_EVENT_XP(p2_##_name, (_event) | (6 << 2)), \
-+ __CMN_EVENT_XP(p3_##_name, (_event) | (7 << 2))
-
- /* Good thing there are only 3 fundamental XP events... */
- #define CMN_EVENT_XP(_name, _event) \
- _CMN_EVENT_XP(req_##_name, (_event) | (0 << 5)), \
- _CMN_EVENT_XP(rsp_##_name, (_event) | (1 << 5)), \
- _CMN_EVENT_XP(snp_##_name, (_event) | (2 << 5)), \
-- _CMN_EVENT_XP(dat_##_name, (_event) | (3 << 5))
-+ _CMN_EVENT_XP(dat_##_name, (_event) | (3 << 5)), \
-+ _CMN_EVENT_XP(pub_##_name, (_event) | (4 << 5)), \
-+ _CMN_EVENT_XP(rsp2_##_name, (_event) | (5 << 5)), \
-+ _CMN_EVENT_XP(dat2_##_name, (_event) | (6 << 5))
-
-
- static struct attribute *arm_cmn_event_attrs[] = {
-@@ -522,6 +533,20 @@ static struct attribute *arm_cmn_event_attrs[] = {
- _CMN_EVENT_DVM(CMN600, rxreq_trk_occupancy_all, 0x05, 0),
- _CMN_EVENT_DVM(CMN600, rxreq_trk_occupancy_dvmop, 0x05, 1),
- _CMN_EVENT_DVM(CMN600, rxreq_trk_occupancy_dvmsync, 0x05, 2),
-+ CMN_EVENT_DVM(CI700, dvmop_tlbi, 0x01),
-+ CMN_EVENT_DVM(CI700, dvmop_bpi, 0x02),
-+ CMN_EVENT_DVM(CI700, dvmop_pici, 0x03),
-+ CMN_EVENT_DVM(CI700, dvmop_vici, 0x04),
-+ CMN_EVENT_DVM(CI700, dvmsync, 0x05),
-+ CMN_EVENT_DVM(CI700, vmid_filtered, 0x06),
-+ CMN_EVENT_DVM(CI700, rndop_filtered, 0x07),
-+ CMN_EVENT_DVM(CI700, retry, 0x08),
-+ CMN_EVENT_DVM(CI700, txsnp_flitv, 0x09),
-+ CMN_EVENT_DVM(CI700, txsnp_stall, 0x0a),
-+ CMN_EVENT_DVM(CI700, trkfull, 0x0b),
-+ _CMN_EVENT_DVM(CI700, trk_occupancy_all, 0x0c, 0),
-+ _CMN_EVENT_DVM(CI700, trk_occupancy_dvmop, 0x0c, 1),
-+ _CMN_EVENT_DVM(CI700, trk_occupancy_dvmsync, 0x0c, 2),
-
- CMN_EVENT_HNF(CMN_ANY, cache_miss, 0x01),
- CMN_EVENT_HNF(CMN_ANY, slc_sf_cache_access, 0x02),
-@@ -558,6 +583,9 @@ static struct attribute *arm_cmn_event_attrs[] = {
- CMN_EVENT_HNF(CMN_ANY, stash_snp_sent, 0x1d),
- CMN_EVENT_HNF(CMN_ANY, stash_data_pull, 0x1e),
- CMN_EVENT_HNF(CMN_ANY, snp_fwded, 0x1f),
-+ CMN_EVENT_HNF(CI700, atomic_fwd, 0x20),
-+ CMN_EVENT_HNF(CI700, mpam_hardlim, 0x21),
-+ CMN_EVENT_HNF(CI700, mpam_softlim, 0x22),
-
- CMN_EVENT_HNI(rrt_rd_occ_cnt_ovfl, 0x20),
- CMN_EVENT_HNI(rrt_wr_occ_cnt_ovfl, 0x21),
-@@ -598,6 +626,7 @@ static struct attribute *arm_cmn_event_attrs[] = {
- CMN_EVENT_SBSX(CMN_ANY, wdb_occ_cnt_ovfl, 0x14),
- CMN_EVENT_SBSX(CMN_ANY, rd_axi_trkr_occ_cnt_ovfl, 0x15),
- CMN_EVENT_SBSX(CMN_ANY, cmo_axi_trkr_occ_cnt_ovfl, 0x16),
-+ CMN_EVENT_SBSX(CI700, rdb_occ_cnt_ovfl, 0x17),
- CMN_EVENT_SBSX(CMN_ANY, arvalid_no_arready, 0x21),
- CMN_EVENT_SBSX(CMN_ANY, awvalid_no_awready, 0x22),
- CMN_EVENT_SBSX(CMN_ANY, wvalid_no_wready, 0x23),
-@@ -624,6 +653,25 @@ static struct attribute *arm_cmn_event_attrs[] = {
- CMN_EVENT_RNID(CMN600, rdb_replay, 0x12),
- CMN_EVENT_RNID(CMN600, rdb_hybrid, 0x13),
- CMN_EVENT_RNID(CMN600, rdb_ord, 0x14),
-+ CMN_EVENT_RNID(CI700, padb_occ_ovfl, 0x11),
-+ CMN_EVENT_RNID(CI700, rpdb_occ_ovfl, 0x12),
-+ CMN_EVENT_RNID(CI700, rrt_occup_ovfl_slice1, 0x13),
-+ CMN_EVENT_RNID(CI700, rrt_occup_ovfl_slice2, 0x14),
-+ CMN_EVENT_RNID(CI700, rrt_occup_ovfl_slice3, 0x15),
-+ CMN_EVENT_RNID(CI700, wrt_throttled, 0x16),
-+
-+ CMN_EVENT_MTSX(tc_lookup, 0x01),
-+ CMN_EVENT_MTSX(tc_fill, 0x02),
-+ CMN_EVENT_MTSX(tc_miss, 0x03),
-+ CMN_EVENT_MTSX(tdb_forward, 0x04),
-+ CMN_EVENT_MTSX(tcq_hazard, 0x05),
-+ CMN_EVENT_MTSX(tcq_rd_alloc, 0x06),
-+ CMN_EVENT_MTSX(tcq_wr_alloc, 0x07),
-+ CMN_EVENT_MTSX(tcq_cmo_alloc, 0x08),
-+ CMN_EVENT_MTSX(axi_rd_req, 0x09),
-+ CMN_EVENT_MTSX(axi_wr_req, 0x0a),
-+ CMN_EVENT_MTSX(tcq_occ_cnt_ovfl, 0x0b),
-+ CMN_EVENT_MTSX(tdb_occ_cnt_ovfl, 0x0c),
-
- NULL
- };
-@@ -1773,6 +1821,7 @@ static int arm_cmn_remove(struct platform_device *pdev)
- #ifdef CONFIG_OF
- static const struct of_device_id arm_cmn_of_match[] = {
- { .compatible = "arm,cmn-600", .data = (void *)CMN600 },
-+ { .compatible = "arm,ci-700", .data = (void *)CI700 },
- {}
- };
- MODULE_DEVICE_TABLE(of, arm_cmn_of_match);
-2.34.1
-
deleted file mode 100644
@@ -1,8100 +0,0 @@
-From 8db3072225e852c2ef8bcc6c95f5b22f05104f35 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Mon, 18 Nov 2013 20:46:48 -0800
-Subject: [PATCH 27/40] ANDROID: trusty: Backport of trusty driver
-
-This adds Trusty driver from android-trusty-5.10
-
-Original commits:
-b60d55f33484 ANDROID: trusty-ipc: Allow registering multiple handles
-629a4d3318cc ANDROID: trusty: Support setting trusty_shared_mem_id_t
-94a36a1374e7 ANDROID: trusty-log: Don't copy Trusty logs to linux kernel log
-efc21cced8af ANDROID: trusty-log: rework buffer allocation
-8cb1a07ca814 ANDROID: trusty-ipc: Fix lock protection of shared_handles
-52cdd137fae0 ANDROID: trusty-log: support poll()
-24c3649dceb9 ANDROID: trusty-irq: enqueue work in trusty_irq_cpu_up
-05a05bdd921e ANDROID: trusty: Add config TRUSTY_CRASH_IS_PANIC
-b5fbdba2ec72 ANDROID: trusty-ipc: Fix crash when running out of txbuffers
-46da5b95605e ANDROID: trusty: Allow TRUSTY_LEND of buffers
-2ebfb16645af ANDROID: trusty-virtio: remove unnecessary include of dma-mapping.h
-bf9d994a65a2 ANDROID: trusty-log: Complement logging sink with unthrottled virtual file
-d5cb51d0365d ANDROID: trusty-log: Refactor logging state to support concurrent sinks
-b421a5ad3eb3 ANDROID: trusty-log: Sanitize u32 overflow of the log ring buffer write index
-58e9681c57af ANDROID: trusty-log: On trusty panic, unthrottle sink to the kernel log
-ba12be0f203a ANDROID: trusty-log: Update trusty log buffer size to hold a complete Trusty crash logs
-a8a3f83e52b6 ANDROID: trusty_qemu_defconfig: Enable dma-buf and ion system heaps
-988b52b392a1 ANDROID: trusty: Support setting FF-A Tag
-f544e96489aa ANDROID: Add trusty_qemu_defconfig
-8a9b09317f29 ANDROID: trusty-ipc: Switch from memfd to dma_buf
-5460418ec9a4 ANDROID: trusty-irq: document new way of specifying IPIs
-da3c30b943c2 ANDROID: trusty-irq: specify IPIs in new way
-5b5bb7f74856 ANDROID: trusty: Add trusty-test driver
-e80d87f422fd ANDROID: trusty: Add trusty-ipc driver
-03c248cbf693 ANDROID: trusty: Add trusty-virtio driver
-1047661edb97 ANDROID: trusty: Add trusty-log driver
-18fd5c59b423 ANDROID: trusty: Add trusty-irq driver
-479c39a683f8 ANDROID: trusty: Add trusty-core driver
-
-Upstream-Status: Backport
-Change-Id: I91f71b891a1091383a298e7fb2f9030382a19ca5
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
----
- .../devicetree/bindings/trusty/trusty-irq.txt | 67 +
- .../devicetree/bindings/trusty/trusty-smc.txt | 6 +
- arch/arm/configs/trusty_qemu_defconfig | 291 +++
- .../configs/trusty_qemu_defconfig.fragment | 26 +
- drivers/Kconfig | 2 +
- drivers/Makefile | 1 +
- drivers/trusty/Kconfig | 116 +
- drivers/trusty/Makefile | 14 +
- drivers/trusty/trusty-ipc.c | 2256 +++++++++++++++++
- drivers/trusty/trusty-irq.c | 645 +++++
- drivers/trusty/trusty-log.c | 830 ++++++
- drivers/trusty/trusty-log.h | 28 +
- drivers/trusty/trusty-mem.c | 139 +
- drivers/trusty/trusty-smc-arm.S | 41 +
- drivers/trusty/trusty-smc-arm64.S | 35 +
- drivers/trusty/trusty-smc.h | 26 +
- drivers/trusty/trusty-test.c | 440 ++++
- drivers/trusty/trusty-test.h | 13 +
- drivers/trusty/trusty-virtio.c | 840 ++++++
- drivers/trusty/trusty.c | 981 +++++++
- include/linux/trusty/arm_ffa.h | 590 +++++
- include/linux/trusty/sm_err.h | 28 +
- include/linux/trusty/smcall.h | 124 +
- include/linux/trusty/trusty.h | 131 +
- include/linux/trusty/trusty_ipc.h | 89 +
- include/uapi/linux/trusty/ipc.h | 65 +
- include/uapi/linux/virtio_ids.h | 1 +
- 27 files changed, 7825 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/trusty/trusty-irq.txt
- create mode 100644 Documentation/devicetree/bindings/trusty/trusty-smc.txt
- create mode 100644 arch/arm/configs/trusty_qemu_defconfig
- create mode 100644 arch/arm64/configs/trusty_qemu_defconfig.fragment
- create mode 100644 drivers/trusty/Kconfig
- create mode 100644 drivers/trusty/Makefile
- create mode 100644 drivers/trusty/trusty-ipc.c
- create mode 100644 drivers/trusty/trusty-irq.c
- create mode 100644 drivers/trusty/trusty-log.c
- create mode 100644 drivers/trusty/trusty-log.h
- create mode 100644 drivers/trusty/trusty-mem.c
- create mode 100644 drivers/trusty/trusty-smc-arm.S
- create mode 100644 drivers/trusty/trusty-smc-arm64.S
- create mode 100644 drivers/trusty/trusty-smc.h
- create mode 100644 drivers/trusty/trusty-test.c
- create mode 100644 drivers/trusty/trusty-test.h
- create mode 100644 drivers/trusty/trusty-virtio.c
- create mode 100644 drivers/trusty/trusty.c
- create mode 100644 include/linux/trusty/arm_ffa.h
- create mode 100644 include/linux/trusty/sm_err.h
- create mode 100644 include/linux/trusty/smcall.h
- create mode 100644 include/linux/trusty/trusty.h
- create mode 100644 include/linux/trusty/trusty_ipc.h
- create mode 100644 include/uapi/linux/trusty/ipc.h
-
-diff --git a/Documentation/devicetree/bindings/trusty/trusty-irq.txt b/Documentation/devicetree/bindings/trusty/trusty-irq.txt
-new file mode 100644
-index 000000000000..cbb545ad452b
---- /dev/null
-+++ b/Documentation/devicetree/bindings/trusty/trusty-irq.txt
-@@ -0,0 +1,67 @@
-+Trusty irq interface
-+
-+Trusty requires non-secure irqs to be forwarded to the secure OS.
-+
-+Required properties:
-+- compatible: "android,trusty-irq-v1"
-+
-+Optional properties:
-+
-+- interrupt-templates: is an optional property that works together
-+ with "interrupt-ranges" to specify secure side to kernel IRQs mapping.
-+
-+ It is a list of entries, each one of which defines a group of interrupts
-+ having common properties, and has the following format:
-+ < phandle irq_id_pos [templ_data]>
-+ phandle - phandle of interrupt controller this template is for
-+ irq_id_pos - the position of irq id in interrupt specifier array
-+ for interrupt controller referenced by phandle.
-+ templ_data - is an array of u32 values (could be empty) in the same
-+ format as interrupt specifier for interrupt controller
-+ referenced by phandle but with omitted irq id field.
-+
-+- interrupt-ranges: list of entries that specifies secure side to kernel
-+ IRQs mapping.
-+
-+ Each entry in the "interrupt-ranges" list has the following format:
-+ <beg end templ_idx>
-+ beg - first entry in this range
-+ end - last entry in this range
-+ templ_idx - index of entry in "interrupt-templates" property
-+ that must be used as a template for all interrupts
-+ in this range
-+
-+- ipi-range: optional mapping of a linear range of trusty IRQs to a linear range
-+ of IPIs (inter-processor interrupts). This has the following format:
-+ <beg end ipi_base>
-+ beg - first trusty IRQ number that is an IPI
-+ end - last trusty IRQ number that is an IPI
-+ ipi_base - IPI number of 'beg'
-+
-+Example:
-+{
-+ gic: interrupt-controller@50041000 {
-+ compatible = "arm,gic-400";
-+ #interrupt-cells = <3>;
-+ interrupt-controller;
-+ ...
-+ };
-+ ...
-+ trusty {
-+ compatible = "android,trusty-smc-v1";
-+ ranges;
-+ #address-cells = <2>;
-+ #size-cells = <2>;
-+
-+ irq {
-+ compatible = "android,trusty-irq-v1";
-+ interrupt-templates = <&gic 1 GIC_PPI 0>,
-+ <&gic 1 GIC_SPI 0>;
-+ interrupt-ranges = <16 31 0>,
-+ <32 223 1>;
-+ ipi-range = <8 15 8>;
-+ };
-+ }
-+}
-+
-+Must be a child of the node that provides the trusty std/fast call interface.
-diff --git a/Documentation/devicetree/bindings/trusty/trusty-smc.txt b/Documentation/devicetree/bindings/trusty/trusty-smc.txt
-new file mode 100644
-index 000000000000..1b39ad317c67
---- /dev/null
-+++ b/Documentation/devicetree/bindings/trusty/trusty-smc.txt
-@@ -0,0 +1,6 @@
-+Trusty smc interface
-+
-+Trusty is running in secure mode on the same (arm) cpu(s) as the current os.
-+
-+Required properties:
-+- compatible: "android,trusty-smc-v1"
-diff --git a/arch/arm/configs/trusty_qemu_defconfig b/arch/arm/configs/trusty_qemu_defconfig
-new file mode 100644
-index 000000000000..46ad9504c23d
---- /dev/null
-+++ b/arch/arm/configs/trusty_qemu_defconfig
-@@ -0,0 +1,291 @@
-+# CONFIG_LOCALVERSION_AUTO is not set
-+# CONFIG_SWAP is not set
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_AUDIT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_PREEMPT=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+CONFIG_BSD_PROCESS_ACCT_V3=y
-+CONFIG_TASKSTATS=y
-+CONFIG_TASK_DELAY_ACCT=y
-+CONFIG_TASK_XACCT=y
-+CONFIG_TASK_IO_ACCOUNTING=y
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=14
-+CONFIG_RT_GROUP_SCHED=y
-+CONFIG_CGROUP_FREEZER=y
-+CONFIG_CGROUP_CPUACCT=y
-+CONFIG_CGROUP_DEBUG=y
-+CONFIG_SCHED_AUTOGROUP=y
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_EMBEDDED=y
-+# CONFIG_COMPAT_BRK is not set
-+CONFIG_PROFILING=y
-+CONFIG_ARCH_VIRT=y
-+CONFIG_PCI=y
-+CONFIG_PCI_HOST_GENERIC=y
-+CONFIG_SMP=y
-+CONFIG_HIGHMEM=y
-+CONFIG_SECCOMP=y
-+CONFIG_CMDLINE="console=ttyAMA0"
-+CONFIG_PM_AUTOSLEEP=y
-+CONFIG_PM_WAKELOCKS=y
-+CONFIG_PM_WAKELOCKS_LIMIT=0
-+# CONFIG_PM_WAKELOCKS_GC is not set
-+CONFIG_PM_DEBUG=y
-+# CONFIG_BLK_DEV_BSG is not set
-+# CONFIG_IOSCHED_DEADLINE is not set
-+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-+CONFIG_KSM=y
-+CONFIG_NET=y
-+CONFIG_PACKET=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM_USER=y
-+CONFIG_NET_KEY=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+CONFIG_INET_ESP=y
-+CONFIG_INET_DIAG_DESTROY=y
-+CONFIG_IPV6_ROUTER_PREF=y
-+CONFIG_IPV6_ROUTE_INFO=y
-+CONFIG_IPV6_OPTIMISTIC_DAD=y
-+CONFIG_INET6_AH=y
-+CONFIG_INET6_ESP=y
-+CONFIG_INET6_IPCOMP=y
-+CONFIG_IPV6_MIP6=y
-+CONFIG_IPV6_MULTIPLE_TABLES=y
-+CONFIG_NETFILTER=y
-+CONFIG_NF_CONNTRACK=y
-+CONFIG_NF_CONNTRACK_SECMARK=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CONNTRACK_AMANDA=y
-+CONFIG_NF_CONNTRACK_FTP=y
-+CONFIG_NF_CONNTRACK_H323=y
-+CONFIG_NF_CONNTRACK_IRC=y
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=y
-+CONFIG_NF_CONNTRACK_PPTP=y
-+CONFIG_NF_CONNTRACK_SANE=y
-+CONFIG_NF_CONNTRACK_TFTP=y
-+CONFIG_NF_CT_NETLINK=y
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
-+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
-+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
-+CONFIG_NETFILTER_XT_TARGET_MARK=y
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-+CONFIG_NETFILTER_XT_TARGET_TPROXY=y
-+CONFIG_NETFILTER_XT_TARGET_TRACE=y
-+CONFIG_NETFILTER_XT_TARGET_SECMARK=y
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
-+CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
-+CONFIG_NETFILTER_XT_MATCH_HELPER=y
-+CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=y
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=y
-+CONFIG_NETFILTER_XT_MATCH_MAC=y
-+CONFIG_NETFILTER_XT_MATCH_MARK=y
-+CONFIG_NETFILTER_XT_MATCH_POLICY=y
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=y
-+CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
-+CONFIG_NETFILTER_XT_MATCH_SOCKET=y
-+CONFIG_NETFILTER_XT_MATCH_STATE=y
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
-+CONFIG_NETFILTER_XT_MATCH_STRING=y
-+CONFIG_NETFILTER_XT_MATCH_TIME=y
-+CONFIG_NETFILTER_XT_MATCH_U32=y
-+CONFIG_IP_NF_IPTABLES=y
-+CONFIG_IP_NF_MATCH_AH=y
-+CONFIG_IP_NF_MATCH_ECN=y
-+CONFIG_IP_NF_MATCH_RPFILTER=y
-+CONFIG_IP_NF_MATCH_TTL=y
-+CONFIG_IP_NF_FILTER=y
-+CONFIG_IP_NF_TARGET_REJECT=y
-+CONFIG_IP_NF_MANGLE=y
-+CONFIG_IP_NF_TARGET_ECN=y
-+CONFIG_IP_NF_TARGET_TTL=y
-+CONFIG_IP_NF_RAW=y
-+CONFIG_IP_NF_SECURITY=y
-+CONFIG_IP_NF_ARPTABLES=y
-+CONFIG_IP_NF_ARPFILTER=y
-+CONFIG_IP_NF_ARP_MANGLE=y
-+CONFIG_IP6_NF_IPTABLES=y
-+CONFIG_IP6_NF_MATCH_AH=y
-+CONFIG_IP6_NF_MATCH_EUI64=y
-+CONFIG_IP6_NF_MATCH_FRAG=y
-+CONFIG_IP6_NF_MATCH_OPTS=y
-+CONFIG_IP6_NF_MATCH_HL=y
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=y
-+CONFIG_IP6_NF_MATCH_MH=y
-+CONFIG_IP6_NF_MATCH_RT=y
-+CONFIG_IP6_NF_TARGET_HL=y
-+CONFIG_IP6_NF_FILTER=y
-+CONFIG_IP6_NF_TARGET_REJECT=y
-+CONFIG_IP6_NF_MANGLE=y
-+CONFIG_IP6_NF_RAW=y
-+CONFIG_BRIDGE=y
-+CONFIG_NET_SCHED=y
-+CONFIG_NET_SCH_HTB=y
-+CONFIG_NET_CLS_U32=y
-+CONFIG_NET_EMATCH=y
-+CONFIG_NET_EMATCH_U32=y
-+CONFIG_NET_CLS_ACT=y
-+# CONFIG_WIRELESS is not set
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_BLK_DEV_LOOP=y
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_SIZE=8192
-+CONFIG_VIRTIO_BLK=y
-+CONFIG_SCSI=y
-+# CONFIG_SCSI_PROC_FS is not set
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_SCSI_LOWLEVEL is not set
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_DM=y
-+CONFIG_DM_CRYPT=y
-+CONFIG_DM_UEVENT=y
-+CONFIG_DM_VERITY=y
-+CONFIG_DM_VERITY_FEC=y
-+CONFIG_NETDEVICES=y
-+CONFIG_TUN=y
-+CONFIG_VIRTIO_NET=y
-+CONFIG_E1000=y
-+CONFIG_E1000E=y
-+CONFIG_PPP=y
-+CONFIG_PPP_BSDCOMP=y
-+CONFIG_PPP_DEFLATE=y
-+CONFIG_PPP_MPPE=y
-+# CONFIG_WLAN is not set
-+CONFIG_INPUT_EVDEV=y
-+CONFIG_KEYBOARD_GOLDFISH_EVENTS=y
-+# CONFIG_INPUT_MOUSE is not set
-+CONFIG_INPUT_JOYSTICK=y
-+CONFIG_INPUT_TABLET=y
-+CONFIG_INPUT_MISC=y
-+CONFIG_INPUT_UINPUT=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_VT is not set
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_DEVMEM is not set
-+CONFIG_SERIAL_AMBA_PL011=y
-+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-+CONFIG_VIRTIO_CONSOLE=y
-+# CONFIG_HW_RANDOM is not set
-+CONFIG_BATTERY_GOLDFISH=y
-+# CONFIG_HWMON is not set
-+CONFIG_TRUSTY=y
-+CONFIG_MEDIA_SUPPORT=y
-+CONFIG_FB=y
-+CONFIG_FB_GOLDFISH=y
-+CONFIG_FB_SIMPLE=y
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LOGO=y
-+# CONFIG_LOGO_LINUX_MONO is not set
-+# CONFIG_LOGO_LINUX_VGA16 is not set
-+CONFIG_SOUND=y
-+CONFIG_SND=y
-+CONFIG_HIDRAW=y
-+CONFIG_UHID=y
-+CONFIG_HID_A4TECH=y
-+CONFIG_HID_ACRUX=y
-+CONFIG_HID_ACRUX_FF=y
-+CONFIG_HID_APPLE=y
-+CONFIG_HID_BELKIN=y
-+CONFIG_HID_CHERRY=y
-+CONFIG_HID_CHICONY=y
-+CONFIG_HID_PRODIKEYS=y
-+CONFIG_HID_CYPRESS=y
-+CONFIG_HID_DRAGONRISE=y
-+CONFIG_DRAGONRISE_FF=y
-+CONFIG_HID_EMS_FF=y
-+CONFIG_HID_ELECOM=y
-+CONFIG_HID_EZKEY=y
-+CONFIG_HID_KEYTOUCH=y
-+CONFIG_HID_KYE=y
-+CONFIG_HID_WALTOP=y
-+CONFIG_HID_GYRATION=y
-+CONFIG_HID_TWINHAN=y
-+CONFIG_HID_KENSINGTON=y
-+CONFIG_HID_LCPOWER=y
-+CONFIG_HID_LOGITECH=y
-+CONFIG_HID_LOGITECH_DJ=y
-+CONFIG_LOGITECH_FF=y
-+CONFIG_LOGIRUMBLEPAD2_FF=y
-+CONFIG_LOGIG940_FF=y
-+CONFIG_HID_MAGICMOUSE=y
-+CONFIG_HID_MICROSOFT=y
-+CONFIG_HID_MONTEREY=y
-+CONFIG_HID_MULTITOUCH=y
-+CONFIG_HID_ORTEK=y
-+CONFIG_HID_PANTHERLORD=y
-+CONFIG_PANTHERLORD_FF=y
-+CONFIG_HID_PETALYNX=y
-+CONFIG_HID_PICOLCD=y
-+CONFIG_HID_PRIMAX=y
-+CONFIG_HID_SAITEK=y
-+CONFIG_HID_SAMSUNG=y
-+CONFIG_HID_SPEEDLINK=y
-+CONFIG_HID_SUNPLUS=y
-+CONFIG_HID_GREENASIA=y
-+CONFIG_GREENASIA_FF=y
-+CONFIG_HID_SMARTJOYPLUS=y
-+CONFIG_SMARTJOYPLUS_FF=y
-+CONFIG_HID_TIVO=y
-+CONFIG_HID_TOPSEED=y
-+CONFIG_HID_THRUSTMASTER=y
-+CONFIG_HID_ZEROPLUS=y
-+CONFIG_HID_ZYDACRON=y
-+# CONFIG_USB_SUPPORT is not set
-+CONFIG_RTC_CLASS=y
-+CONFIG_VIRTIO_PCI=y
-+CONFIG_VIRTIO_MMIO=y
-+CONFIG_STAGING=y
-+CONFIG_ASHMEM=y
-+CONFIG_ION=y
-+CONFIG_GOLDFISH_AUDIO=y
-+CONFIG_GOLDFISH=y
-+CONFIG_GOLDFISH_PIPE=y
-+# CONFIG_IOMMU_SUPPORT is not set
-+CONFIG_ANDROID=y
-+CONFIG_ANDROID_BINDER_IPC=y
-+CONFIG_EXT2_FS=y
-+CONFIG_EXT4_FS=y
-+CONFIG_EXT4_FS_SECURITY=y
-+CONFIG_QUOTA=y
-+CONFIG_FUSE_FS=y
-+CONFIG_CUSE=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_TMPFS=y
-+CONFIG_TMPFS_POSIX_ACL=y
-+# CONFIG_MISC_FILESYSTEMS is not set
-+CONFIG_NFS_FS=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_NLS_CODEPAGE_437=y
-+CONFIG_NLS_ISO8859_1=y
-+CONFIG_SECURITY=y
-+CONFIG_SECURITY_NETWORK=y
-+CONFIG_SECURITY_SELINUX=y
-+CONFIG_DYNAMIC_DEBUG=y
-+CONFIG_DEBUG_INFO=y
-+CONFIG_DEBUG_FS=y
-+CONFIG_MAGIC_SYSRQ=y
-+CONFIG_PANIC_TIMEOUT=5
-+# CONFIG_SCHED_DEBUG is not set
-+CONFIG_SCHEDSTATS=y
-+# CONFIG_FTRACE is not set
-+CONFIG_DMA_API_DEBUG=y
-+CONFIG_ATOMIC64_SELFTEST=y
-diff --git a/arch/arm64/configs/trusty_qemu_defconfig.fragment b/arch/arm64/configs/trusty_qemu_defconfig.fragment
-new file mode 100644
-index 000000000000..166eef1797fd
---- /dev/null
-+++ b/arch/arm64/configs/trusty_qemu_defconfig.fragment
-@@ -0,0 +1,26 @@
-+# From goldfish
-+CONFIG_VIRTIO_BLK=y
-+CONFIG_VIRTIO_CONSOLE=y
-+CONFIG_VIRTIO_INPUT=y
-+CONFIG_VIRTIO_MMIO=y
-+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-+CONFIG_VIRTIO_NET=y
-+CONFIG_VIRTIO_PCI=y
-+CONFIG_VIRTIO_PMEM=y
-+# From Trusty
-+CONFIG_TRUSTY=y
-+CONFIG_DMA_API_DEBUG=y
-+CONFIG_DYNAMIC_DEBUG=y
-+CONFIG_PROVE_LOCKING=y
-+CONFIG_DEBUG_ATOMIC_SLEEP=y
-+CONFIG_SEMIHOSTING_EXIT=y
-+CONFIG_E1000=y
-+CONFIG_E1000E=y
-+CONFIG_REBOOT_EMULATOR_EXIT=y
-+CONFIG_DMABUF_HEAPS_SYSTEM=y
-+# securefb test uses ION
-+CONFIG_ION=y
-+CONFIG_ION_SYSTEM_HEAP=y
-+# LTO slows down build times considerably. Disable it.
-+# CONFIG_LTO_CLANG is not set
-+# CONFIG_LTO_CLANG_FULL is not set
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index 0d399ddaa185..e346c35f42b4 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -85,6 +85,8 @@ source "drivers/hwmon/Kconfig"
-
- source "drivers/thermal/Kconfig"
-
-+source "drivers/trusty/Kconfig"
-+
- source "drivers/watchdog/Kconfig"
-
- source "drivers/ssb/Kconfig"
-diff --git a/drivers/Makefile b/drivers/Makefile
-index a110338c860c..d3165b877622 100644
---- a/drivers/Makefile
-+++ b/drivers/Makefile
-@@ -117,6 +117,7 @@ obj-$(CONFIG_W1) += w1/
- obj-y += power/
- obj-$(CONFIG_HWMON) += hwmon/
- obj-$(CONFIG_THERMAL) += thermal/
-+obj-$(CONFIG_TRUSTY) += trusty/
- obj-$(CONFIG_WATCHDOG) += watchdog/
- obj-$(CONFIG_MD) += md/
- obj-$(CONFIG_BT) += bluetooth/
-diff --git a/drivers/trusty/Kconfig b/drivers/trusty/Kconfig
-new file mode 100644
-index 000000000000..fcde7f097acf
---- /dev/null
-+++ b/drivers/trusty/Kconfig
-@@ -0,0 +1,116 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+#
-+# Trusty driver
-+#
-+
-+menu "Trusty driver"
-+
-+config TRUSTY
-+ tristate "Trusty core driver"
-+ depends on ARM || ARM64
-+ help
-+ Trusty is a secure OS that provides a Trusted Execution Environment
-+ (TEE) for Android. Trusty runs on the same processor as Linux but is
-+ isolated from the rest of the system by both hardware and software.
-+
-+ This option enables the core part of the Linux kernel driver for
-+ Trusty. This doesn't do much by itself; you'll need to enable some of
-+ the sub-modules too.
-+
-+ If you build this as a module, it will be called trusty-core.
-+
-+if TRUSTY
-+
-+config TRUSTY_IRQ
-+ tristate "Trusty IRQ support"
-+ default y
-+ help
-+ Enable forwarding of IRQs from Linux to Trusty. This module retrieves
-+ from Trusty a list of IRQs that Trusty uses, and it registers handlers
-+ for them which notify Trusty that the IRQ has been received.
-+
-+ If you build this as a module, it will be called trusty-irq.
-+
-+ Usually this is needed for Trusty to work, so say 'y' or 'm'.
-+
-+config TRUSTY_LOG
-+ tristate "Trusty log support"
-+ default y
-+ help
-+ Print log messages generated by the secure OS to the Linux kernel log.
-+
-+ While this module is loaded, messages are retrieved and printed after
-+ each call into Trusty, and also during Linux kernel panics.
-+
-+ If you build this as a module, it will be called trusty-log.
-+
-+config TRUSTY_TEST
-+ tristate "Trusty stdcall test"
-+ default y
-+ help
-+ Allow running tests of the Trusty stdcall interface. Running these
-+ tests is initiated by userspace writing to a sysfs file.
-+
-+ This depends on having a test sevice running on the Trusty side.
-+
-+ If you build this as a module, it will be called trusty-test.
-+
-+config TRUSTY_VIRTIO
-+ tristate "Trusty virtio support"
-+ select VIRTIO
-+ default y
-+ help
-+ Enable the Trusty virtio driver, which is responsible for management
-+ and interaction with virtio devices exposed by Trusty. This driver
-+ requests the virtio device descriptors from Trusty, then parses them
-+ and adds the corresponding virtio devices.
-+
-+ If you build this as a module, it will be called trusty-virtio.
-+
-+config TRUSTY_VIRTIO_IPC
-+ tristate "Trusty Virtio IPC driver"
-+ depends on TRUSTY_VIRTIO
-+ default y
-+ help
-+ Enable support for communicating with Trusty services.
-+
-+ If you build this as a module, it will be called trusty-ipc.
-+
-+config TRUSTY_DMA_BUF_FFA_TAG
-+ bool "Availability of trusty_dma_buf_get_ffa_tag"
-+ default n
-+ help
-+ Whether trusty_dma_buf_get_ffa_tag is provided on this platform.
-+ Providing this function will allow the platform to select what tag
-+ should be passed to the SPM when attempting to transfer the buffer
-+ to secure world. The value passed here is implementation defined and
-+ may depend on your SPM.
-+
-+ If set to N, a default implementation which returns 0 will be used.
-+
-+config TRUSTY_DMA_BUF_SHARED_MEM_ID
-+ bool "Availability of trusty_dma_buf_get_shared_mem_id"
-+ default n
-+ help
-+ Whether trusty_dma_buf_get_shared_mem_id is provided on this platform.
-+ Providing this function allows the platform to manage memory
-+ transaction life cycle of DMA bufs independently of Trusty IPC driver.
-+ The latter can query trusty_shared_mem_id_t value allocated for a
-+ given DMA buf using trusty_dma_buf_get_shared_mem_id interface.
-+
-+ If set to N, a default implementation which does not allocate any IDs
-+ will be used.
-+
-+config TRUSTY_CRASH_IS_PANIC
-+ bool "When trusty panics, then panic the kernel"
-+ help
-+ This option will treat Trusty panics as fatal. This is useful if
-+ your system cannot recover from Trusty panic/halt and you require
-+ the system to reboot to recover.
-+
-+ If N, it will contine to run the kernel, but trusty operations will
-+ return errors.
-+
-+endif # TRUSTY
-+
-+endmenu
-diff --git a/drivers/trusty/Makefile b/drivers/trusty/Makefile
-new file mode 100644
-index 000000000000..2cf1cfccf97b
---- /dev/null
-+++ b/drivers/trusty/Makefile
-@@ -0,0 +1,14 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+#
-+# Makefile for trusty components
-+#
-+
-+obj-$(CONFIG_TRUSTY) += trusty-core.o
-+trusty-core-objs += trusty.o trusty-mem.o
-+trusty-core-$(CONFIG_ARM) += trusty-smc-arm.o
-+trusty-core-$(CONFIG_ARM64) += trusty-smc-arm64.o
-+obj-$(CONFIG_TRUSTY_IRQ) += trusty-irq.o
-+obj-$(CONFIG_TRUSTY_LOG) += trusty-log.o
-+obj-$(CONFIG_TRUSTY_TEST) += trusty-test.o
-+obj-$(CONFIG_TRUSTY_VIRTIO) += trusty-virtio.o
-+obj-$(CONFIG_TRUSTY_VIRTIO_IPC) += trusty-ipc.o
-diff --git a/drivers/trusty/trusty-ipc.c b/drivers/trusty/trusty-ipc.c
-new file mode 100644
-index 000000000000..82d6ddeb41f4
---- /dev/null
-+++ b/drivers/trusty/trusty-ipc.c
-@@ -0,0 +1,2256 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Copyright (C) 2020 Google, Inc.
-+ */
-+
-+#include <linux/aio.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/cdev.h>
-+#include <linux/slab.h>
-+#include <linux/fs.h>
-+#include <linux/poll.h>
-+#include <linux/idr.h>
-+#include <linux/completion.h>
-+#include <linux/dma-buf.h>
-+#include <linux/sched.h>
-+#include <linux/sched/signal.h>
-+#include <linux/compat.h>
-+#include <linux/uio.h>
-+#include <linux/file.h>
-+
-+#include <linux/virtio.h>
-+#include <linux/virtio_ids.h>
-+#include <linux/virtio_config.h>
-+
-+#include <linux/trusty/trusty.h>
-+#include <linux/trusty/trusty_ipc.h>
-+
-+#include <uapi/linux/trusty/ipc.h>
-+
-+#define MAX_DEVICES 4
-+
-+#define REPLY_TIMEOUT 5000
-+#define TXBUF_TIMEOUT 15000
-+
-+#define MAX_SRV_NAME_LEN 256
-+#define MAX_DEV_NAME_LEN 32
-+
-+#define DEFAULT_MSG_BUF_SIZE PAGE_SIZE
-+#define DEFAULT_MSG_BUF_ALIGN PAGE_SIZE
-+
-+#define TIPC_CTRL_ADDR 53
-+#define TIPC_ANY_ADDR 0xFFFFFFFF
-+
-+#define TIPC_MIN_LOCAL_ADDR 1024
-+
-+#ifdef CONFIG_COMPAT
-+#define TIPC_IOC32_CONNECT _IOW(TIPC_IOC_MAGIC, 0x80, compat_uptr_t)
-+#endif
-+
-+struct tipc_virtio_dev;
-+
-+struct tipc_dev_config {
-+ u32 msg_buf_max_size;
-+ u32 msg_buf_alignment;
-+ char dev_name[MAX_DEV_NAME_LEN];
-+} __packed;
-+
-+struct tipc_shm {
-+ trusty_shared_mem_id_t obj_id;
-+ u64 size;
-+ u64 tag;
-+};
-+
-+struct tipc_msg_hdr {
-+ u32 src;
-+ u32 dst;
-+ u16 reserved;
-+ u16 shm_cnt;
-+ u16 len;
-+ u16 flags;
-+ u8 data[];
-+} __packed;
-+
-+enum tipc_ctrl_msg_types {
-+ TIPC_CTRL_MSGTYPE_GO_ONLINE = 1,
-+ TIPC_CTRL_MSGTYPE_GO_OFFLINE,
-+ TIPC_CTRL_MSGTYPE_CONN_REQ,
-+ TIPC_CTRL_MSGTYPE_CONN_RSP,
-+ TIPC_CTRL_MSGTYPE_DISC_REQ,
-+ TIPC_CTRL_MSGTYPE_RELEASE,
-+};
-+
-+struct tipc_ctrl_msg {
-+ u32 type;
-+ u32 body_len;
-+ u8 body[];
-+} __packed;
-+
-+struct tipc_conn_req_body {
-+ char name[MAX_SRV_NAME_LEN];
-+} __packed;
-+
-+struct tipc_conn_rsp_body {
-+ u32 target;
-+ u32 status;
-+ u32 remote;
-+ u32 max_msg_size;
-+ u32 max_msg_cnt;
-+} __packed;
-+
-+struct tipc_disc_req_body {
-+ u32 target;
-+} __packed;
-+
-+struct tipc_release_body {
-+ trusty_shared_mem_id_t id;
-+} __packed;
-+
-+struct tipc_cdev_node {
-+ struct cdev cdev;
-+ struct device *dev;
-+ unsigned int minor;
-+};
-+
-+enum tipc_device_state {
-+ VDS_OFFLINE = 0,
-+ VDS_ONLINE,
-+ VDS_DEAD,
-+};
-+
-+struct tipc_virtio_dev {
-+ struct kref refcount;
-+ struct mutex lock; /* protects access to this device */
-+ struct virtio_device *vdev;
-+ struct virtqueue *rxvq;
-+ struct virtqueue *txvq;
-+ unsigned int msg_buf_cnt;
-+ unsigned int msg_buf_max_cnt;
-+ size_t msg_buf_max_sz;
-+ unsigned int free_msg_buf_cnt;
-+ struct list_head free_buf_list;
-+ wait_queue_head_t sendq;
-+ struct idr addr_idr;
-+ enum tipc_device_state state;
-+ struct tipc_cdev_node cdev_node;
-+ /* protects shared_handles, dev lock never acquired while held */
-+ struct mutex shared_handles_lock;
-+ struct rb_root shared_handles;
-+ char cdev_name[MAX_DEV_NAME_LEN];
-+};
-+
-+enum tipc_chan_state {
-+ TIPC_DISCONNECTED = 0,
-+ TIPC_CONNECTING,
-+ TIPC_CONNECTED,
-+ TIPC_STALE,
-+};
-+
-+struct tipc_chan {
-+ struct mutex lock; /* protects channel state */
-+ struct kref refcount;
-+ enum tipc_chan_state state;
-+ struct tipc_virtio_dev *vds;
-+ const struct tipc_chan_ops *ops;
-+ void *ops_arg;
-+ u32 remote;
-+ u32 local;
-+ u32 max_msg_size;
-+ u32 max_msg_cnt;
-+ char srv_name[MAX_SRV_NAME_LEN];
-+};
-+
-+struct tipc_shared_handle {
-+ struct rb_node node;
-+ struct tipc_shm tipc;
-+ struct tipc_virtio_dev *vds;
-+ struct dma_buf *dma_buf;
-+ bool shared;
-+ /*
-+ * Following fields are only used if dma_buf does not own a
-+ * trusty_shared_mem_id_t.
-+ */
-+ struct dma_buf_attachment *attach;
-+ struct sg_table *sgt;
-+};
-+
-+static struct class *tipc_class;
-+static unsigned int tipc_major;
-+
-+static struct virtio_device *default_vdev;
-+
-+static DEFINE_IDR(tipc_devices);
-+static DEFINE_MUTEX(tipc_devices_lock);
-+
-+static int _match_any(int id, void *p, void *data)
-+{
-+ return id;
-+}
-+
-+static int _match_data(int id, void *p, void *data)
-+{
-+ return (p == data);
-+}
-+
-+static void *_alloc_shareable_mem(size_t sz, gfp_t gfp)
-+{
-+ return alloc_pages_exact(sz, gfp);
-+}
-+
-+static void _free_shareable_mem(size_t sz, void *va)
-+{
-+ free_pages_exact(va, sz);
-+}
-+
-+static struct tipc_msg_buf *vds_alloc_msg_buf(struct tipc_virtio_dev *vds,
-+ bool share_write)
-+{
-+ int ret;
-+ struct tipc_msg_buf *mb;
-+ size_t sz = vds->msg_buf_max_sz;
-+ pgprot_t pgprot = share_write ? PAGE_KERNEL : PAGE_KERNEL_RO;
-+
-+ /* allocate tracking structure */
-+ mb = kzalloc(sizeof(struct tipc_msg_buf), GFP_KERNEL);
-+ if (!mb)
-+ return NULL;
-+
-+ /* allocate buffer that can be shared with secure world */
-+ mb->buf_va = _alloc_shareable_mem(sz, GFP_KERNEL);
-+ if (!mb->buf_va)
-+ goto err_alloc;
-+
-+ sg_init_one(&mb->sg, mb->buf_va, sz);
-+ ret = trusty_share_memory_compat(vds->vdev->dev.parent->parent,
-+ &mb->buf_id, &mb->sg, 1, pgprot);
-+ if (ret) {
-+ dev_err(&vds->vdev->dev, "trusty_share_memory failed: %d\n",
-+ ret);
-+ goto err_share;
-+ }
-+
-+ mb->buf_sz = sz;
-+ mb->shm_cnt = 0;
-+
-+ return mb;
-+
-+err_share:
-+ _free_shareable_mem(sz, mb->buf_va);
-+err_alloc:
-+ kfree(mb);
-+ return NULL;
-+}
-+
-+static void vds_free_msg_buf(struct tipc_virtio_dev *vds,
-+ struct tipc_msg_buf *mb)
-+{
-+ int ret;
-+
-+ ret = trusty_reclaim_memory(vds->vdev->dev.parent->parent, mb->buf_id,
-+ &mb->sg, 1);
-+ if (WARN_ON(ret)) {
-+ dev_err(&vds->vdev->dev,
-+ "trusty_revoke_memory failed: %d txbuf %lld\n",
-+ ret, mb->buf_id);
-+
-+ /*
-+ * It is not safe to free this memory if trusty_revoke_memory
-+ * fails. Leak it in that case.
-+ */
-+ } else {
-+ _free_shareable_mem(mb->buf_sz, mb->buf_va);
-+ }
-+ kfree(mb);
-+}
-+
-+static void vds_free_msg_buf_list(struct tipc_virtio_dev *vds,
-+ struct list_head *list)
-+{
-+ struct tipc_msg_buf *mb = NULL;
-+
-+ mb = list_first_entry_or_null(list, struct tipc_msg_buf, node);
-+ while (mb) {
-+ list_del(&mb->node);
-+ vds_free_msg_buf(vds, mb);
-+ mb = list_first_entry_or_null(list, struct tipc_msg_buf, node);
-+ }
-+}
-+
-+static inline void mb_reset(struct tipc_msg_buf *mb)
-+{
-+ mb->wpos = 0;
-+ mb->rpos = 0;
-+}
-+
-+static inline void mb_reset_read(struct tipc_msg_buf *mb)
-+{
-+ mb->rpos = 0;
-+}
-+
-+static void _free_vds(struct kref *kref)
-+{
-+ struct tipc_virtio_dev *vds =
-+ container_of(kref, struct tipc_virtio_dev, refcount);
-+ /*
-+ * If this WARN triggers, we're leaking remote memory references.
-+ *
-+ * No need to lock shared_handles_lock. All references to this lock
-+ * should already be gone by this point, since we are freeing it in this
-+ * function.
-+ */
-+ WARN_ON(!RB_EMPTY_ROOT(&vds->shared_handles));
-+ kfree(vds);
-+}
-+
-+static void _free_chan(struct kref *kref)
-+{
-+ struct tipc_chan *ch = container_of(kref, struct tipc_chan, refcount);
-+
-+ if (ch->ops && ch->ops->handle_release)
-+ ch->ops->handle_release(ch->ops_arg);
-+
-+ kref_put(&ch->vds->refcount, _free_vds);
-+ kfree(ch);
-+}
-+
-+static bool _put_txbuf_locked(struct tipc_virtio_dev *vds,
-+ struct tipc_msg_buf *mb)
-+{
-+ list_add_tail(&mb->node, &vds->free_buf_list);
-+ return vds->free_msg_buf_cnt++ == 0;
-+}
-+
-+static struct tipc_msg_buf *_get_txbuf_locked(struct tipc_virtio_dev *vds)
-+{
-+ struct tipc_msg_buf *mb;
-+
-+ if (vds->state != VDS_ONLINE)
-+ return ERR_PTR(-ENODEV);
-+
-+ if (vds->free_msg_buf_cnt) {
-+ /* take it out of free list */
-+ mb = list_first_entry(&vds->free_buf_list,
-+ struct tipc_msg_buf, node);
-+ list_del(&mb->node);
-+ mb->shm_cnt = 0;
-+ vds->free_msg_buf_cnt--;
-+ } else {
-+ if (vds->msg_buf_cnt >= vds->msg_buf_max_cnt)
-+ return ERR_PTR(-EAGAIN);
-+
-+ /* try to allocate it */
-+ mb = vds_alloc_msg_buf(vds, false);
-+ if (!mb)
-+ return ERR_PTR(-ENOMEM);
-+
-+ vds->msg_buf_cnt++;
-+ }
-+ return mb;
-+}
-+
-+static struct tipc_msg_buf *_vds_get_txbuf(struct tipc_virtio_dev *vds)
-+{
-+ struct tipc_msg_buf *mb;
-+
-+ mutex_lock(&vds->lock);
-+ mb = _get_txbuf_locked(vds);
-+ mutex_unlock(&vds->lock);
-+
-+ return mb;
-+}
-+
-+static void vds_put_txbuf(struct tipc_virtio_dev *vds, struct tipc_msg_buf *mb)
-+{
-+ mutex_lock(&vds->lock);
-+ _put_txbuf_locked(vds, mb);
-+ wake_up_interruptible(&vds->sendq);
-+ mutex_unlock(&vds->lock);
-+}
-+
-+static struct tipc_msg_buf *vds_get_txbuf(struct tipc_virtio_dev *vds,
-+ long timeout)
-+{
-+ struct tipc_msg_buf *mb;
-+
-+ mb = _vds_get_txbuf(vds);
-+
-+ if ((PTR_ERR(mb) == -EAGAIN) && timeout) {
-+ DEFINE_WAIT_FUNC(wait, woken_wake_function);
-+
-+ timeout = msecs_to_jiffies(timeout);
-+ add_wait_queue(&vds->sendq, &wait);
-+ for (;;) {
-+ timeout = wait_woken(&wait, TASK_INTERRUPTIBLE,
-+ timeout);
-+ if (!timeout) {
-+ mb = ERR_PTR(-ETIMEDOUT);
-+ break;
-+ }
-+
-+ if (signal_pending(current)) {
-+ mb = ERR_PTR(-ERESTARTSYS);
-+ break;
-+ }
-+
-+ mb = _vds_get_txbuf(vds);
-+ if (PTR_ERR(mb) != -EAGAIN)
-+ break;
-+ }
-+ remove_wait_queue(&vds->sendq, &wait);
-+ }
-+
-+ if (IS_ERR(mb))
-+ return mb;
-+
-+ if (WARN_ON(!mb))
-+ return ERR_PTR(-EINVAL);
-+
-+ /* reset and reserve space for message header */
-+ mb_reset(mb);
-+ mb_put_data(mb, sizeof(struct tipc_msg_hdr));
-+
-+ return mb;
-+}
-+
-+static int vds_queue_txbuf(struct tipc_virtio_dev *vds,
-+ struct tipc_msg_buf *mb)
-+{
-+ int err;
-+ struct scatterlist sg;
-+ bool need_notify = false;
-+
-+ mutex_lock(&vds->lock);
-+ if (vds->state == VDS_ONLINE) {
-+ sg_init_one(&sg, mb, mb->wpos);
-+ err = virtqueue_add_outbuf(vds->txvq, &sg, 1, mb, GFP_KERNEL);
-+ need_notify = virtqueue_kick_prepare(vds->txvq);
-+ } else {
-+ err = -ENODEV;
-+ }
-+ mutex_unlock(&vds->lock);
-+
-+ if (need_notify)
-+ virtqueue_notify(vds->txvq);
-+
-+ return err;
-+}
-+
-+static int vds_add_channel(struct tipc_virtio_dev *vds,
-+ struct tipc_chan *chan)
-+{
-+ int ret;
-+
-+ mutex_lock(&vds->lock);
-+ if (vds->state == VDS_ONLINE) {
-+ ret = idr_alloc(&vds->addr_idr, chan,
-+ TIPC_MIN_LOCAL_ADDR, TIPC_ANY_ADDR - 1,
-+ GFP_KERNEL);
-+ if (ret > 0) {
-+ chan->local = ret;
-+ kref_get(&chan->refcount);
-+ ret = 0;
-+ }
-+ } else {
-+ ret = -EINVAL;
-+ }
-+ mutex_unlock(&vds->lock);
-+
-+ return ret;
-+}
-+
-+static void vds_del_channel(struct tipc_virtio_dev *vds,
-+ struct tipc_chan *chan)
-+{
-+ mutex_lock(&vds->lock);
-+ if (chan->local) {
-+ idr_remove(&vds->addr_idr, chan->local);
-+ chan->local = 0;
-+ chan->remote = 0;
-+ kref_put(&chan->refcount, _free_chan);
-+ }
-+ mutex_unlock(&vds->lock);
-+}
-+
-+static struct tipc_chan *vds_lookup_channel(struct tipc_virtio_dev *vds,
-+ u32 addr)
-+{
-+ int id;
-+ struct tipc_chan *chan = NULL;
-+
-+ mutex_lock(&vds->lock);
-+ if (addr == TIPC_ANY_ADDR) {
-+ id = idr_for_each(&vds->addr_idr, _match_any, NULL);
-+ if (id > 0)
-+ chan = idr_find(&vds->addr_idr, id);
-+ } else {
-+ chan = idr_find(&vds->addr_idr, addr);
-+ }
-+ if (chan)
-+ kref_get(&chan->refcount);
-+ mutex_unlock(&vds->lock);
-+
-+ return chan;
-+}
-+
-+static struct tipc_chan *vds_create_channel(struct tipc_virtio_dev *vds,
-+ const struct tipc_chan_ops *ops,
-+ void *ops_arg)
-+{
-+ int ret;
-+ struct tipc_chan *chan = NULL;
-+
-+ if (!vds)
-+ return ERR_PTR(-ENOENT);
-+
-+ if (!ops)
-+ return ERR_PTR(-EINVAL);
-+
-+ chan = kzalloc(sizeof(*chan), GFP_KERNEL);
-+ if (!chan)
-+ return ERR_PTR(-ENOMEM);
-+
-+ kref_get(&vds->refcount);
-+ chan->vds = vds;
-+ chan->ops = ops;
-+ chan->ops_arg = ops_arg;
-+ mutex_init(&chan->lock);
-+ kref_init(&chan->refcount);
-+ chan->state = TIPC_DISCONNECTED;
-+
-+ ret = vds_add_channel(vds, chan);
-+ if (ret) {
-+ kfree(chan);
-+ kref_put(&vds->refcount, _free_vds);
-+ return ERR_PTR(ret);
-+ }
-+
-+ return chan;
-+}
-+
-+static void fill_msg_hdr(struct tipc_msg_buf *mb, u32 src, u32 dst)
-+{
-+ struct tipc_msg_hdr *hdr = mb_get_data(mb, sizeof(*hdr));
-+
-+ hdr->src = src;
-+ hdr->dst = dst;
-+ hdr->len = mb_avail_data(mb);
-+ hdr->flags = 0;
-+ hdr->shm_cnt = mb->shm_cnt;
-+ hdr->reserved = 0;
-+}
-+
-+static int tipc_shared_handle_new(struct tipc_shared_handle **shared_handle,
-+ struct tipc_virtio_dev *vds)
-+{
-+ struct tipc_shared_handle *out = kzalloc(sizeof(*out), GFP_KERNEL);
-+
-+ if (!out)
-+ return -ENOMEM;
-+
-+ out->vds = vds;
-+ *shared_handle = out;
-+
-+ return 0;
-+}
-+
-+static struct device *tipc_shared_handle_dev(struct tipc_shared_handle
-+ *shared_handle)
-+{
-+ return shared_handle->vds->vdev->dev.parent->parent;
-+}
-+
-+static bool is_same_memory_region(struct tipc_shared_handle *h1,
-+ struct tipc_shared_handle *h2)
-+{
-+ return h1->tipc.obj_id == h2->tipc.obj_id &&
-+ h1->tipc.size == h2->tipc.size &&
-+ h1->tipc.tag == h2->tipc.tag &&
-+ h1->dma_buf == h2->dma_buf &&
-+ h1->shared == h2->shared;
-+}
-+
-+static bool dma_buf_owns_shared_mem_id(struct tipc_shared_handle *h)
-+{
-+ /* h->shared is true only if dma_buf did not own an shared memory ID */
-+ return !h->shared;
-+}
-+
-+static void tipc_shared_handle_register(struct tipc_shared_handle
-+ *new_handle)
-+{
-+ struct tipc_virtio_dev *vds = new_handle->vds;
-+ struct rb_node **new;
-+ struct rb_node *parent = NULL;
-+
-+ mutex_lock(&vds->shared_handles_lock);
-+
-+ new = &vds->shared_handles.rb_node;
-+ while (*new) {
-+ struct tipc_shared_handle *handle =
-+ rb_entry(*new, struct tipc_shared_handle, node);
-+ parent = *new;
-+ /*
-+ * An obj_id can be registered multiple times if it's owned by a
-+ * dma_buf, because in this case we use the same obj_id across
-+ * multiple memory transfer operations.
-+ */
-+ if (handle->tipc.obj_id == new_handle->tipc.obj_id) {
-+ if (dma_buf_owns_shared_mem_id(new_handle)) {
-+ WARN_ON(!is_same_memory_region(handle,
-+ new_handle));
-+ } else {
-+ WARN(1, "This handle is already registered");
-+ goto already_registered;
-+ }
-+ }
-+
-+ if (handle->tipc.obj_id > new_handle->tipc.obj_id)
-+ new = &((*new)->rb_left);
-+ else
-+ new = &((*new)->rb_right);
-+ }
-+
-+ rb_link_node(&new_handle->node, parent, new);
-+ rb_insert_color(&new_handle->node, &vds->shared_handles);
-+
-+already_registered:
-+ mutex_unlock(&vds->shared_handles_lock);
-+}
-+
-+static struct tipc_shared_handle *tipc_shared_handle_take(struct tipc_virtio_dev
-+ *vds,
-+ trusty_shared_mem_id_t
-+ obj_id)
-+{
-+ struct rb_node *node;
-+ struct tipc_shared_handle *out = NULL;
-+
-+ mutex_lock(&vds->shared_handles_lock);
-+
-+ node = vds->shared_handles.rb_node;
-+ while (node) {
-+ struct tipc_shared_handle *handle =
-+ rb_entry(node, struct tipc_shared_handle, node);
-+ if (obj_id == handle->tipc.obj_id) {
-+ rb_erase(node, &vds->shared_handles);
-+ out = handle;
-+ break;
-+ } else if (obj_id < handle->tipc.obj_id) {
-+ node = node->rb_left;
-+ } else {
-+ node = node->rb_right;
-+ }
-+ }
-+
-+ mutex_unlock(&vds->shared_handles_lock);
-+
-+ return out;
-+}
-+
-+static int tipc_shared_handle_drop(struct tipc_shared_handle *shared_handle)
-+{
-+ int ret;
-+ struct tipc_virtio_dev *vds = shared_handle->vds;
-+ struct device *dev = tipc_shared_handle_dev(shared_handle);
-+
-+ if (shared_handle->shared) {
-+ /*
-+ * If this warning fires, it means this shared handle was still
-+ * in the set of active handles. This shouldn't happen (calling
-+ * code should ensure it is out if the tree) but this serves as
-+ * an extra check before it is released.
-+ *
-+ * However, the take itself should clean this incorrect state up
-+ * by removing the handle from the tree.
-+ *
-+ * This warning is only applicable when registering a handle
-+ * multiple times is not allowed, i.e. when dma_buf doesn't own
-+ * the handle.
-+ */
-+ WARN_ON(tipc_shared_handle_take(vds,
-+ shared_handle->tipc.obj_id));
-+
-+ ret = trusty_reclaim_memory(dev,
-+ shared_handle->tipc.obj_id,
-+ shared_handle->sgt->sgl,
-+ shared_handle->sgt->orig_nents);
-+ if (ret) {
-+ /*
-+ * We can't safely release this, it may still be in
-+ * use outside Linux.
-+ */
-+ dev_warn(dev, "Failed to drop handle, leaking...\n");
-+ return ret;
-+ }
-+ }
-+
-+ if (shared_handle->sgt)
-+ dma_buf_unmap_attachment(shared_handle->attach,
-+ shared_handle->sgt, DMA_BIDIRECTIONAL);
-+ if (shared_handle->attach)
-+ dma_buf_detach(shared_handle->dma_buf, shared_handle->attach);
-+ if (shared_handle->dma_buf)
-+ dma_buf_put(shared_handle->dma_buf);
-+
-+ kfree(shared_handle);
-+
-+ return 0;
-+}
-+
-+/*****************************************************************************/
-+
-+struct tipc_chan *tipc_create_channel(struct device *dev,
-+ const struct tipc_chan_ops *ops,
-+ void *ops_arg)
-+{
-+ struct virtio_device *vd;
-+ struct tipc_chan *chan;
-+ struct tipc_virtio_dev *vds;
-+
-+ mutex_lock(&tipc_devices_lock);
-+ if (dev) {
-+ vd = container_of(dev, struct virtio_device, dev);
-+ } else {
-+ vd = default_vdev;
-+ if (!vd) {
-+ mutex_unlock(&tipc_devices_lock);
-+ return ERR_PTR(-ENOENT);
-+ }
-+ }
-+ vds = vd->priv;
-+ kref_get(&vds->refcount);
-+ mutex_unlock(&tipc_devices_lock);
-+
-+ chan = vds_create_channel(vds, ops, ops_arg);
-+ kref_put(&vds->refcount, _free_vds);
-+ return chan;
-+}
-+EXPORT_SYMBOL(tipc_create_channel);
-+
-+struct tipc_msg_buf *tipc_chan_get_rxbuf(struct tipc_chan *chan)
-+{
-+ return vds_alloc_msg_buf(chan->vds, true);
-+}
-+EXPORT_SYMBOL(tipc_chan_get_rxbuf);
-+
-+void tipc_chan_put_rxbuf(struct tipc_chan *chan, struct tipc_msg_buf *mb)
-+{
-+ vds_free_msg_buf(chan->vds, mb);
-+}
-+EXPORT_SYMBOL(tipc_chan_put_rxbuf);
-+
-+struct tipc_msg_buf *tipc_chan_get_txbuf_timeout(struct tipc_chan *chan,
-+ long timeout)
-+{
-+ return vds_get_txbuf(chan->vds, timeout);
-+}
-+EXPORT_SYMBOL(tipc_chan_get_txbuf_timeout);
-+
-+void tipc_chan_put_txbuf(struct tipc_chan *chan, struct tipc_msg_buf *mb)
-+{
-+ vds_put_txbuf(chan->vds, mb);
-+}
-+EXPORT_SYMBOL(tipc_chan_put_txbuf);
-+
-+int tipc_chan_queue_msg(struct tipc_chan *chan, struct tipc_msg_buf *mb)
-+{
-+ int err;
-+
-+ mutex_lock(&chan->lock);
-+ switch (chan->state) {
-+ case TIPC_CONNECTED:
-+ fill_msg_hdr(mb, chan->local, chan->remote);
-+ err = vds_queue_txbuf(chan->vds, mb);
-+ if (err) {
-+ /* this should never happen */
-+ dev_err(&chan->vds->vdev->dev,
-+ "%s: failed to queue tx buffer (%d)\n",
-+ __func__, err);
-+ }
-+ break;
-+ case TIPC_DISCONNECTED:
-+ case TIPC_CONNECTING:
-+ err = -ENOTCONN;
-+ break;
-+ case TIPC_STALE:
-+ err = -ESHUTDOWN;
-+ break;
-+ default:
-+ err = -EBADFD;
-+ dev_err(&chan->vds->vdev->dev,
-+ "%s: unexpected channel state %d\n",
-+ __func__, chan->state);
-+ }
-+ mutex_unlock(&chan->lock);
-+ return err;
-+}
-+EXPORT_SYMBOL(tipc_chan_queue_msg);
-+
-+
-+int tipc_chan_connect(struct tipc_chan *chan, const char *name)
-+{
-+ int err;
-+ struct tipc_ctrl_msg *msg;
-+ struct tipc_conn_req_body *body;
-+ struct tipc_msg_buf *txbuf;
-+
-+ txbuf = vds_get_txbuf(chan->vds, TXBUF_TIMEOUT);
-+ if (IS_ERR(txbuf))
-+ return PTR_ERR(txbuf);
-+
-+ /* reserve space for connection request control message */
-+ msg = mb_put_data(txbuf, sizeof(*msg) + sizeof(*body));
-+ body = (struct tipc_conn_req_body *)msg->body;
-+
-+ /* fill message */
-+ msg->type = TIPC_CTRL_MSGTYPE_CONN_REQ;
-+ msg->body_len = sizeof(*body);
-+
-+ strncpy(body->name, name, sizeof(body->name));
-+ body->name[sizeof(body->name)-1] = '\0';
-+
-+ mutex_lock(&chan->lock);
-+ switch (chan->state) {
-+ case TIPC_DISCONNECTED:
-+ /* save service name we are connecting to */
-+ strcpy(chan->srv_name, body->name);
-+
-+ fill_msg_hdr(txbuf, chan->local, TIPC_CTRL_ADDR);
-+ err = vds_queue_txbuf(chan->vds, txbuf);
-+ if (err) {
-+ /* this should never happen */
-+ dev_err(&chan->vds->vdev->dev,
-+ "%s: failed to queue tx buffer (%d)\n",
-+ __func__, err);
-+ } else {
-+ chan->state = TIPC_CONNECTING;
-+ txbuf = NULL; /* prevents discarding buffer */
-+ }
-+ break;
-+ case TIPC_CONNECTED:
-+ case TIPC_CONNECTING:
-+ /* check if we are trying to connect to the same service */
-+ if (strcmp(chan->srv_name, body->name) == 0)
-+ err = 0;
-+ else
-+ if (chan->state == TIPC_CONNECTING)
-+ err = -EALREADY; /* in progress */
-+ else
-+ err = -EISCONN; /* already connected */
-+ break;
-+
-+ case TIPC_STALE:
-+ err = -ESHUTDOWN;
-+ break;
-+ default:
-+ err = -EBADFD;
-+ dev_err(&chan->vds->vdev->dev,
-+ "%s: unexpected channel state %d\n",
-+ __func__, chan->state);
-+ break;
-+ }
-+ mutex_unlock(&chan->lock);
-+
-+ if (txbuf)
-+ tipc_chan_put_txbuf(chan, txbuf); /* discard it */
-+
-+ return err;
-+}
-+EXPORT_SYMBOL(tipc_chan_connect);
-+
-+int tipc_chan_shutdown(struct tipc_chan *chan)
-+{
-+ int err;
-+ struct tipc_ctrl_msg *msg;
-+ struct tipc_disc_req_body *body;
-+ struct tipc_msg_buf *txbuf = NULL;
-+
-+ /* get tx buffer */
-+ txbuf = vds_get_txbuf(chan->vds, TXBUF_TIMEOUT);
-+ if (IS_ERR(txbuf))
-+ return PTR_ERR(txbuf);
-+
-+ mutex_lock(&chan->lock);
-+ if (chan->state == TIPC_CONNECTED || chan->state == TIPC_CONNECTING) {
-+ /* reserve space for disconnect request control message */
-+ msg = mb_put_data(txbuf, sizeof(*msg) + sizeof(*body));
-+ body = (struct tipc_disc_req_body *)msg->body;
-+
-+ msg->type = TIPC_CTRL_MSGTYPE_DISC_REQ;
-+ msg->body_len = sizeof(*body);
-+ body->target = chan->remote;
-+
-+ fill_msg_hdr(txbuf, chan->local, TIPC_CTRL_ADDR);
-+ err = vds_queue_txbuf(chan->vds, txbuf);
-+ if (err) {
-+ /* this should never happen */
-+ dev_err(&chan->vds->vdev->dev,
-+ "%s: failed to queue tx buffer (%d)\n",
-+ __func__, err);
-+ }
-+ } else {
-+ err = -ENOTCONN;
-+ }
-+ chan->state = TIPC_STALE;
-+ mutex_unlock(&chan->lock);
-+
-+ if (err) {
-+ /* release buffer */
-+ tipc_chan_put_txbuf(chan, txbuf);
-+ }
-+
-+ return err;
-+}
-+EXPORT_SYMBOL(tipc_chan_shutdown);
-+
-+void tipc_chan_destroy(struct tipc_chan *chan)
-+{
-+ vds_del_channel(chan->vds, chan);
-+ kref_put(&chan->refcount, _free_chan);
-+}
-+EXPORT_SYMBOL(tipc_chan_destroy);
-+
-+/***************************************************************************/
-+
-+struct tipc_dn_chan {
-+ int state;
-+ struct mutex lock; /* protects rx_msg_queue list and channel state */
-+ struct tipc_chan *chan;
-+ wait_queue_head_t readq;
-+ struct completion reply_comp;
-+ struct list_head rx_msg_queue;
-+};
-+
-+static int dn_wait_for_reply(struct tipc_dn_chan *dn, int timeout)
-+{
-+ int ret;
-+
-+ ret = wait_for_completion_interruptible_timeout(&dn->reply_comp,
-+ msecs_to_jiffies(timeout));
-+ if (ret < 0)
-+ return ret;
-+
-+ mutex_lock(&dn->lock);
-+ if (!ret) {
-+ /* no reply from remote */
-+ dn->state = TIPC_STALE;
-+ ret = -ETIMEDOUT;
-+ } else {
-+ /* got reply */
-+ if (dn->state == TIPC_CONNECTED)
-+ ret = 0;
-+ else if (dn->state == TIPC_DISCONNECTED)
-+ if (!list_empty(&dn->rx_msg_queue))
-+ ret = 0;
-+ else
-+ ret = -ENOTCONN;
-+ else
-+ ret = -EIO;
-+ }
-+ mutex_unlock(&dn->lock);
-+
-+ return ret;
-+}
-+
-+static struct tipc_msg_buf *dn_handle_msg(void *data,
-+ struct tipc_msg_buf *rxbuf)
-+{
-+ struct tipc_dn_chan *dn = data;
-+ struct tipc_msg_buf *newbuf = rxbuf;
-+
-+ mutex_lock(&dn->lock);
-+ if (dn->state == TIPC_CONNECTED) {
-+ /* get new buffer */
-+ newbuf = tipc_chan_get_rxbuf(dn->chan);
-+ if (newbuf) {
-+ /* queue an old buffer and return a new one */
-+ list_add_tail(&rxbuf->node, &dn->rx_msg_queue);
-+ wake_up_interruptible(&dn->readq);
-+ } else {
-+ /*
-+ * return an old buffer effectively discarding
-+ * incoming message
-+ */
-+ dev_err(&dn->chan->vds->vdev->dev,
-+ "%s: discard incoming message\n", __func__);
-+ newbuf = rxbuf;
-+ }
-+ }
-+ mutex_unlock(&dn->lock);
-+
-+ return newbuf;
-+}
-+
-+static void dn_connected(struct tipc_dn_chan *dn)
-+{
-+ mutex_lock(&dn->lock);
-+ dn->state = TIPC_CONNECTED;
-+
-+ /* complete all pending */
-+ complete(&dn->reply_comp);
-+
-+ mutex_unlock(&dn->lock);
-+}
-+
-+static void dn_disconnected(struct tipc_dn_chan *dn)
-+{
-+ mutex_lock(&dn->lock);
-+ dn->state = TIPC_DISCONNECTED;
-+
-+ /* complete all pending */
-+ complete(&dn->reply_comp);
-+
-+ /* wakeup all readers */
-+ wake_up_interruptible_all(&dn->readq);
-+
-+ mutex_unlock(&dn->lock);
-+}
-+
-+static void dn_shutdown(struct tipc_dn_chan *dn)
-+{
-+ mutex_lock(&dn->lock);
-+
-+ /* set state to STALE */
-+ dn->state = TIPC_STALE;
-+
-+ /* complete all pending */
-+ complete(&dn->reply_comp);
-+
-+ /* wakeup all readers */
-+ wake_up_interruptible_all(&dn->readq);
-+
-+ mutex_unlock(&dn->lock);
-+}
-+
-+static void dn_handle_event(void *data, int event)
-+{
-+ struct tipc_dn_chan *dn = data;
-+
-+ switch (event) {
-+ case TIPC_CHANNEL_SHUTDOWN:
-+ dn_shutdown(dn);
-+ break;
-+
-+ case TIPC_CHANNEL_DISCONNECTED:
-+ dn_disconnected(dn);
-+ break;
-+
-+ case TIPC_CHANNEL_CONNECTED:
-+ dn_connected(dn);
-+ break;
-+
-+ default:
-+ dev_err(&dn->chan->vds->vdev->dev,
-+ "%s: unhandled event %d\n", __func__, event);
-+ break;
-+ }
-+}
-+
-+static void dn_handle_release(void *data)
-+{
-+ kfree(data);
-+}
-+
-+static const struct tipc_chan_ops _dn_ops = {
-+ .handle_msg = dn_handle_msg,
-+ .handle_event = dn_handle_event,
-+ .handle_release = dn_handle_release,
-+};
-+
-+#define cdev_to_cdn(c) container_of((c), struct tipc_cdev_node, cdev)
-+#define cdn_to_vds(cdn) container_of((cdn), struct tipc_virtio_dev, cdev_node)
-+
-+static struct tipc_virtio_dev *_dn_lookup_vds(struct tipc_cdev_node *cdn)
-+{
-+ int ret;
-+ struct tipc_virtio_dev *vds = NULL;
-+
-+ mutex_lock(&tipc_devices_lock);
-+ ret = idr_for_each(&tipc_devices, _match_data, cdn);
-+ if (ret) {
-+ vds = cdn_to_vds(cdn);
-+ kref_get(&vds->refcount);
-+ }
-+ mutex_unlock(&tipc_devices_lock);
-+ return vds;
-+}
-+
-+static int tipc_open(struct inode *inode, struct file *filp)
-+{
-+ int ret;
-+ struct tipc_virtio_dev *vds;
-+ struct tipc_dn_chan *dn;
-+ struct tipc_cdev_node *cdn = cdev_to_cdn(inode->i_cdev);
-+
-+ vds = _dn_lookup_vds(cdn);
-+ if (!vds) {
-+ ret = -ENOENT;
-+ goto err_vds_lookup;
-+ }
-+
-+ dn = kzalloc(sizeof(*dn), GFP_KERNEL);
-+ if (!dn) {
-+ ret = -ENOMEM;
-+ goto err_alloc_chan;
-+ }
-+
-+ mutex_init(&dn->lock);
-+ init_waitqueue_head(&dn->readq);
-+ init_completion(&dn->reply_comp);
-+ INIT_LIST_HEAD(&dn->rx_msg_queue);
-+
-+ dn->state = TIPC_DISCONNECTED;
-+
-+ dn->chan = vds_create_channel(vds, &_dn_ops, dn);
-+ if (IS_ERR(dn->chan)) {
-+ ret = PTR_ERR(dn->chan);
-+ goto err_create_chan;
-+ }
-+
-+ filp->private_data = dn;
-+ kref_put(&vds->refcount, _free_vds);
-+ return 0;
-+
-+err_create_chan:
-+ kfree(dn);
-+err_alloc_chan:
-+ kref_put(&vds->refcount, _free_vds);
-+err_vds_lookup:
-+ return ret;
-+}
-+
-+
-+static int dn_connect_ioctl(struct tipc_dn_chan *dn, char __user *usr_name)
-+{
-+ int ret;
-+ char name[MAX_SRV_NAME_LEN];
-+
-+ /* copy in service name from user space */
-+ ret = strncpy_from_user(name, usr_name, sizeof(name));
-+ if (ret < 0)
-+ return ret;
-+ if (ret == sizeof(name))
-+ return -ENAMETOOLONG;
-+
-+ /* send connect request */
-+ ret = tipc_chan_connect(dn->chan, name);
-+ if (ret)
-+ return ret;
-+
-+ /* and wait for reply */
-+ return dn_wait_for_reply(dn, REPLY_TIMEOUT);
-+}
-+
-+static int dn_share_fd(struct tipc_dn_chan *dn, int fd,
-+ enum transfer_kind transfer_kind,
-+ struct tipc_shared_handle **out)
-+{
-+ int ret = 0;
-+ struct tipc_shared_handle *shared_handle = NULL;
-+ struct file *file = NULL;
-+ struct device *dev = &dn->chan->vds->vdev->dev;
-+ bool writable = false;
-+ pgprot_t prot;
-+ u64 tag = 0;
-+ trusty_shared_mem_id_t mem_id;
-+ bool lend;
-+
-+ if (dn->state != TIPC_CONNECTED) {
-+ dev_dbg(dev, "Tried to share fd while not connected\n");
-+ return -ENOTCONN;
-+ }
-+
-+ file = fget(fd);
-+ if (!file) {
-+ dev_dbg(dev, "Invalid fd (%d)\n", fd);
-+ return -EBADF;
-+ }
-+
-+ if (!(file->f_mode & FMODE_READ)) {
-+ dev_dbg(dev, "Cannot create write-only mapping\n");
-+ fput(file);
-+ return -EACCES;
-+ }
-+
-+ writable = file->f_mode & FMODE_WRITE;
-+ prot = writable ? PAGE_KERNEL : PAGE_KERNEL_RO;
-+ fput(file);
-+ file = NULL;
-+
-+ ret = tipc_shared_handle_new(&shared_handle, dn->chan->vds);
-+ if (ret)
-+ return ret;
-+
-+ shared_handle->dma_buf = dma_buf_get(fd);
-+ if (IS_ERR(shared_handle->dma_buf)) {
-+ ret = PTR_ERR(shared_handle->dma_buf);
-+ shared_handle->dma_buf = NULL;
-+ dev_dbg(dev, "Unable to get dma buf from fd (%d)\n", ret);
-+ goto cleanup_handle;
-+ }
-+
-+ tag = trusty_dma_buf_get_ffa_tag(shared_handle->dma_buf);
-+ ret = trusty_dma_buf_get_shared_mem_id(shared_handle->dma_buf, &mem_id);
-+ /*
-+ * Buffers with a preallocated mem_id should only be sent to Trusty
-+ * using TRUSTY_SEND_SECURE. And conversely, TRUSTY_SEND_SECURE should
-+ * only be used to send buffers with preallcoated mem_id.
-+ */
-+ if (!ret) {
-+ /* Use shared memory ID owned by dma_buf */
-+ /* TODO: Enforce transfer_kind == TRUSTY_SEND_SECURE */
-+ WARN_ONCE(transfer_kind != TRUSTY_SEND_SECURE,
-+ "Use TRUSTY_SEND_SECURE instead");
-+ goto mem_id_allocated;
-+ }
-+
-+ if (ret != -ENODATA) {
-+ dev_err(dev, "dma_buf can't be transferred (%d)\n", ret);
-+ goto cleanup_handle;
-+ }
-+
-+ if (transfer_kind == TRUSTY_SEND_SECURE) {
-+ dev_err(dev, "No mem ID for TRUSTY_SEND_SECURE\n");
-+ goto cleanup_handle;
-+ }
-+ lend = (transfer_kind == TRUSTY_LEND);
-+
-+ shared_handle->attach = dma_buf_attach(shared_handle->dma_buf, dev);
-+ if (IS_ERR(shared_handle->attach)) {
-+ ret = PTR_ERR(shared_handle->attach);
-+ shared_handle->attach = NULL;
-+ dev_dbg(dev, "Unable to attach to dma_buf (%d)\n", ret);
-+ goto cleanup_handle;
-+ }
-+
-+ shared_handle->sgt = dma_buf_map_attachment(shared_handle->attach,
-+ DMA_BIDIRECTIONAL);
-+ if (IS_ERR(shared_handle->sgt)) {
-+ ret = PTR_ERR(shared_handle->sgt);
-+ shared_handle->sgt = NULL;
-+ dev_dbg(dev, "Failed to match attachment (%d)\n", ret);
-+ goto cleanup_handle;
-+ }
-+
-+ ret = trusty_transfer_memory(tipc_shared_handle_dev(shared_handle),
-+ &mem_id, shared_handle->sgt->sgl,
-+ shared_handle->sgt->orig_nents, prot, tag,
-+ lend);
-+
-+ if (ret < 0) {
-+ dev_dbg(dev, "Transferring memory failed: %d\n", ret);
-+ /*
-+ * The handle now has a sgt containing the pages, so we no
-+ * longer need to clean up the pages directly.
-+ */
-+ goto cleanup_handle;
-+ }
-+ shared_handle->shared = true;
-+
-+mem_id_allocated:
-+ shared_handle->tipc.obj_id = mem_id;
-+ shared_handle->tipc.size = shared_handle->dma_buf->size;
-+ shared_handle->tipc.tag = tag;
-+ *out = shared_handle;
-+ return 0;
-+
-+cleanup_handle:
-+ tipc_shared_handle_drop(shared_handle);
-+ return ret;
-+}
-+
-+static ssize_t txbuf_write_iter(struct tipc_msg_buf *txbuf,
-+ struct iov_iter *iter)
-+{
-+ size_t len;
-+ /* message length */
-+ len = iov_iter_count(iter);
-+
-+ /* check available space */
-+ if (len > mb_avail_space(txbuf))
-+ return -EMSGSIZE;
-+
-+ /* copy in message data */
-+ if (copy_from_iter(mb_put_data(txbuf, len), len, iter) != len)
-+ return -EFAULT;
-+
-+ return len;
-+}
-+
-+static ssize_t txbuf_write_handles(struct tipc_msg_buf *txbuf,
-+ struct tipc_shared_handle **shm_handles,
-+ size_t shm_cnt)
-+{
-+ size_t idx;
-+
-+ /* message length */
-+ size_t len = shm_cnt * sizeof(struct tipc_shm);
-+
-+ /* check available space */
-+ if (len > mb_avail_space(txbuf))
-+ return -EMSGSIZE;
-+
-+ /* copy over handles */
-+ for (idx = 0; idx < shm_cnt; idx++) {
-+ memcpy(mb_put_data(txbuf, sizeof(struct tipc_shm)),
-+ &shm_handles[idx]->tipc,
-+ sizeof(struct tipc_shm));
-+ }
-+
-+ txbuf->shm_cnt += shm_cnt;
-+
-+ return len;
-+}
-+
-+static long filp_send_ioctl(struct file *filp,
-+ const struct tipc_send_msg_req __user *arg)
-+{
-+ struct tipc_send_msg_req req;
-+ struct iovec fast_iovs[UIO_FASTIOV];
-+ struct iovec *iov = fast_iovs;
-+ struct iov_iter iter;
-+ struct trusty_shm *shm = NULL;
-+ struct tipc_shared_handle **shm_handles = NULL;
-+ int shm_idx = 0;
-+ int release_idx;
-+ struct tipc_dn_chan *dn = filp->private_data;
-+ struct tipc_virtio_dev *vds = dn->chan->vds;
-+ struct device *dev = &vds->vdev->dev;
-+ long timeout = TXBUF_TIMEOUT;
-+ struct tipc_msg_buf *txbuf = NULL;
-+ long ret = 0;
-+ ssize_t data_len = 0;
-+ ssize_t shm_len = 0;
-+
-+ if (copy_from_user(&req, arg, sizeof(req)))
-+ return -EFAULT;
-+
-+ if (req.shm_cnt > U16_MAX)
-+ return -E2BIG;
-+
-+ shm = kmalloc_array(req.shm_cnt, sizeof(*shm), GFP_KERNEL);
-+ if (!shm)
-+ return -ENOMEM;
-+
-+ shm_handles = kmalloc_array(req.shm_cnt, sizeof(*shm_handles),
-+ GFP_KERNEL);
-+ if (!shm_handles) {
-+ ret = -ENOMEM;
-+ goto shm_handles_alloc_failed;
-+ }
-+
-+ if (copy_from_user(shm, u64_to_user_ptr(req.shm),
-+ req.shm_cnt * sizeof(struct trusty_shm))) {
-+ ret = -EFAULT;
-+ goto load_shm_args_failed;
-+ }
-+
-+ ret = import_iovec(READ, u64_to_user_ptr(req.iov), req.iov_cnt,
-+ ARRAY_SIZE(fast_iovs), &iov, &iter);
-+ if (ret < 0) {
-+ dev_dbg(dev, "Failed to import iovec\n");
-+ goto iov_import_failed;
-+ }
-+
-+ for (shm_idx = 0; shm_idx < req.shm_cnt; shm_idx++) {
-+ switch (shm[shm_idx].transfer) {
-+ case TRUSTY_SHARE:
-+ case TRUSTY_LEND:
-+ case TRUSTY_SEND_SECURE:
-+ break;
-+ default:
-+ dev_err(dev, "Unknown transfer type: 0x%x\n",
-+ shm[shm_idx].transfer);
-+ goto shm_share_failed;
-+ }
-+ ret = dn_share_fd(dn, shm[shm_idx].fd, shm[shm_idx].transfer,
-+ &shm_handles[shm_idx]);
-+ if (ret) {
-+ dev_dbg(dev, "Forwarding memory failed\n"
-+ );
-+ goto shm_share_failed;
-+ }
-+ }
-+
-+ if (filp->f_flags & O_NONBLOCK)
-+ timeout = 0;
-+
-+ txbuf = tipc_chan_get_txbuf_timeout(dn->chan, timeout);
-+ if (IS_ERR(txbuf)) {
-+ dev_dbg(dev, "Failed to get txbuffer\n");
-+ ret = PTR_ERR(txbuf);
-+ goto get_txbuf_failed;
-+ }
-+
-+ data_len = txbuf_write_iter(txbuf, &iter);
-+ if (data_len < 0) {
-+ ret = data_len;
-+ goto txbuf_write_failed;
-+ }
-+
-+ shm_len = txbuf_write_handles(txbuf, shm_handles, req.shm_cnt);
-+ if (shm_len < 0) {
-+ ret = shm_len;
-+ goto txbuf_write_failed;
-+ }
-+
-+ /*
-+ * These need to be aded to the index before queueing the message.
-+ * As soon as the message is sent, we may receive a message back from
-+ * Trusty saying it's no longer in use, and the shared_handle needs
-+ * to be there when that happens.
-+ */
-+ for (shm_idx = 0; shm_idx < req.shm_cnt; shm_idx++)
-+ tipc_shared_handle_register(shm_handles[shm_idx]);
-+
-+ ret = tipc_chan_queue_msg(dn->chan, txbuf);
-+
-+ if (ret)
-+ goto queue_failed;
-+
-+ ret = data_len;
-+
-+common_cleanup:
-+ kfree(iov);
-+iov_import_failed:
-+load_shm_args_failed:
-+ kfree(shm_handles);
-+shm_handles_alloc_failed:
-+ kfree(shm);
-+ return ret;
-+
-+queue_failed:
-+ for (release_idx = 0; release_idx < req.shm_cnt; release_idx++)
-+ tipc_shared_handle_take(vds,
-+ shm_handles[release_idx]->tipc.obj_id);
-+txbuf_write_failed:
-+ tipc_chan_put_txbuf(dn->chan, txbuf);
-+get_txbuf_failed:
-+shm_share_failed:
-+ for (shm_idx--; shm_idx >= 0; shm_idx--)
-+ tipc_shared_handle_drop(shm_handles[shm_idx]);
-+ goto common_cleanup;
-+}
-+
-+static long tipc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
-+{
-+ struct tipc_dn_chan *dn = filp->private_data;
-+
-+ switch (cmd) {
-+ case TIPC_IOC_CONNECT:
-+ return dn_connect_ioctl(dn, (char __user *)arg);
-+ case TIPC_IOC_SEND_MSG:
-+ return filp_send_ioctl(filp,
-+ (const struct tipc_send_msg_req __user *)
-+ arg);
-+ default:
-+ dev_dbg(&dn->chan->vds->vdev->dev,
-+ "Unhandled ioctl cmd: 0x%x\n", cmd);
-+ return -ENOTTY;
-+ }
-+}
-+
-+#ifdef CONFIG_COMPAT
-+static long tipc_compat_ioctl(struct file *filp,
-+ unsigned int cmd, unsigned long arg)
-+{
-+ struct tipc_dn_chan *dn = filp->private_data;
-+
-+ switch (cmd) {
-+ case TIPC_IOC32_CONNECT:
-+ cmd = TIPC_IOC_CONNECT;
-+ break;
-+ default:
-+ dev_dbg(&dn->chan->vds->vdev->dev,
-+ "Unhandled compat ioctl command: 0x%x\n", cmd);
-+ return -ENOTTY;
-+ }
-+ return tipc_ioctl(filp, cmd, (unsigned long)compat_ptr(arg));
-+}
-+#endif
-+
-+static inline bool _got_rx(struct tipc_dn_chan *dn)
-+{
-+ if (dn->state != TIPC_CONNECTED)
-+ return true;
-+
-+ if (!list_empty(&dn->rx_msg_queue))
-+ return true;
-+
-+ return false;
-+}
-+
-+static ssize_t tipc_read_iter(struct kiocb *iocb, struct iov_iter *iter)
-+{
-+ ssize_t ret;
-+ size_t len;
-+ struct tipc_msg_buf *mb;
-+ struct file *filp = iocb->ki_filp;
-+ struct tipc_dn_chan *dn = filp->private_data;
-+
-+ mutex_lock(&dn->lock);
-+
-+ while (list_empty(&dn->rx_msg_queue)) {
-+ if (dn->state != TIPC_CONNECTED) {
-+ if (dn->state == TIPC_CONNECTING)
-+ ret = -ENOTCONN;
-+ else if (dn->state == TIPC_DISCONNECTED)
-+ ret = -ENOTCONN;
-+ else if (dn->state == TIPC_STALE)
-+ ret = -ESHUTDOWN;
-+ else
-+ ret = -EBADFD;
-+ goto out;
-+ }
-+
-+ mutex_unlock(&dn->lock);
-+
-+ if (filp->f_flags & O_NONBLOCK)
-+ return -EAGAIN;
-+
-+ if (wait_event_interruptible(dn->readq, _got_rx(dn)))
-+ return -ERESTARTSYS;
-+
-+ mutex_lock(&dn->lock);
-+ }
-+
-+ mb = list_first_entry(&dn->rx_msg_queue, struct tipc_msg_buf, node);
-+
-+ len = mb_avail_data(mb);
-+ if (len > iov_iter_count(iter)) {
-+ ret = -EMSGSIZE;
-+ goto out;
-+ }
-+
-+ if (copy_to_iter(mb_get_data(mb, len), len, iter) != len) {
-+ ret = -EFAULT;
-+ goto out;
-+ }
-+
-+ ret = len;
-+ list_del(&mb->node);
-+ tipc_chan_put_rxbuf(dn->chan, mb);
-+
-+out:
-+ mutex_unlock(&dn->lock);
-+ return ret;
-+}
-+
-+static ssize_t tipc_write_iter(struct kiocb *iocb, struct iov_iter *iter)
-+{
-+ struct file *filp = iocb->ki_filp;
-+ struct tipc_dn_chan *dn = filp->private_data;
-+ long timeout = TXBUF_TIMEOUT;
-+ struct tipc_msg_buf *txbuf = NULL;
-+ ssize_t ret = 0;
-+ ssize_t len = 0;
-+
-+ if (filp->f_flags & O_NONBLOCK)
-+ timeout = 0;
-+
-+ txbuf = tipc_chan_get_txbuf_timeout(dn->chan, timeout);
-+
-+ if (IS_ERR(txbuf))
-+ return PTR_ERR(txbuf);
-+
-+ len = txbuf_write_iter(txbuf, iter);
-+ if (len < 0)
-+ goto err_out;
-+
-+ /* queue message */
-+ ret = tipc_chan_queue_msg(dn->chan, txbuf);
-+ if (ret)
-+ goto err_out;
-+
-+ return len;
-+
-+err_out:
-+ tipc_chan_put_txbuf(dn->chan, txbuf);
-+ return ret;
-+}
-+
-+static __poll_t tipc_poll(struct file *filp, poll_table *wait)
-+{
-+ __poll_t mask = 0;
-+ struct tipc_dn_chan *dn = filp->private_data;
-+
-+ mutex_lock(&dn->lock);
-+
-+ poll_wait(filp, &dn->readq, wait);
-+
-+ /* Writes always succeed for now */
-+ mask |= EPOLLOUT | EPOLLWRNORM;
-+
-+ if (!list_empty(&dn->rx_msg_queue))
-+ mask |= EPOLLIN | EPOLLRDNORM;
-+
-+ if (dn->state != TIPC_CONNECTED)
-+ mask |= EPOLLERR;
-+
-+ mutex_unlock(&dn->lock);
-+ return mask;
-+}
-+
-+
-+static int tipc_release(struct inode *inode, struct file *filp)
-+{
-+ struct tipc_dn_chan *dn = filp->private_data;
-+
-+ dn_shutdown(dn);
-+
-+ /* free all pending buffers */
-+ vds_free_msg_buf_list(dn->chan->vds, &dn->rx_msg_queue);
-+
-+ /* shutdown channel */
-+ tipc_chan_shutdown(dn->chan);
-+
-+ /* and destroy it */
-+ tipc_chan_destroy(dn->chan);
-+
-+ return 0;
-+}
-+
-+static const struct file_operations tipc_fops = {
-+ .open = tipc_open,
-+ .release = tipc_release,
-+ .unlocked_ioctl = tipc_ioctl,
-+#ifdef CONFIG_COMPAT
-+ .compat_ioctl = tipc_compat_ioctl,
-+#endif
-+ .read_iter = tipc_read_iter,
-+ .write_iter = tipc_write_iter,
-+ .poll = tipc_poll,
-+ .owner = THIS_MODULE,
-+};
-+
-+/*****************************************************************************/
-+
-+static void chan_trigger_event(struct tipc_chan *chan, int event)
-+{
-+ if (!event)
-+ return;
-+
-+ chan->ops->handle_event(chan->ops_arg, event);
-+}
-+
-+static void _cleanup_vq(struct tipc_virtio_dev *vds, struct virtqueue *vq)
-+{
-+ struct tipc_msg_buf *mb;
-+
-+ while ((mb = virtqueue_detach_unused_buf(vq)) != NULL)
-+ vds_free_msg_buf(vds, mb);
-+}
-+
-+static int _create_cdev_node(struct device *parent,
-+ struct tipc_cdev_node *cdn,
-+ const char *name)
-+{
-+ int ret;
-+ dev_t devt;
-+
-+ if (!name) {
-+ dev_dbg(parent, "%s: cdev name has to be provided\n",
-+ __func__);
-+ return -EINVAL;
-+ }
-+
-+ /* allocate minor */
-+ ret = idr_alloc(&tipc_devices, cdn, 0, MAX_DEVICES, GFP_KERNEL);
-+ if (ret < 0) {
-+ dev_dbg(parent, "%s: failed (%d) to get id\n",
-+ __func__, ret);
-+ return ret;
-+ }
-+
-+ cdn->minor = ret;
-+ cdev_init(&cdn->cdev, &tipc_fops);
-+ cdn->cdev.owner = THIS_MODULE;
-+
-+ /* Add character device */
-+ devt = MKDEV(tipc_major, cdn->minor);
-+ ret = cdev_add(&cdn->cdev, devt, 1);
-+ if (ret) {
-+ dev_dbg(parent, "%s: cdev_add failed (%d)\n",
-+ __func__, ret);
-+ goto err_add_cdev;
-+ }
-+
-+ /* Create a device node */
-+ cdn->dev = device_create(tipc_class, parent,
-+ devt, NULL, "trusty-ipc-%s", name);
-+ if (IS_ERR(cdn->dev)) {
-+ ret = PTR_ERR(cdn->dev);
-+ dev_dbg(parent, "%s: device_create failed: %d\n",
-+ __func__, ret);
-+ goto err_device_create;
-+ }
-+
-+ return 0;
-+
-+err_device_create:
-+ cdn->dev = NULL;
-+ cdev_del(&cdn->cdev);
-+err_add_cdev:
-+ idr_remove(&tipc_devices, cdn->minor);
-+ return ret;
-+}
-+
-+static void create_cdev_node(struct tipc_virtio_dev *vds,
-+ struct tipc_cdev_node *cdn)
-+{
-+ int err;
-+
-+ mutex_lock(&tipc_devices_lock);
-+
-+ if (!default_vdev) {
-+ kref_get(&vds->refcount);
-+ default_vdev = vds->vdev;
-+ }
-+
-+ if (vds->cdev_name[0] && !cdn->dev) {
-+ kref_get(&vds->refcount);
-+ err = _create_cdev_node(&vds->vdev->dev, cdn, vds->cdev_name);
-+ if (err) {
-+ dev_err(&vds->vdev->dev,
-+ "failed (%d) to create cdev node\n", err);
-+ kref_put(&vds->refcount, _free_vds);
-+ }
-+ }
-+ mutex_unlock(&tipc_devices_lock);
-+}
-+
-+static void destroy_cdev_node(struct tipc_virtio_dev *vds,
-+ struct tipc_cdev_node *cdn)
-+{
-+ mutex_lock(&tipc_devices_lock);
-+ if (cdn->dev) {
-+ device_destroy(tipc_class, MKDEV(tipc_major, cdn->minor));
-+ cdev_del(&cdn->cdev);
-+ idr_remove(&tipc_devices, cdn->minor);
-+ cdn->dev = NULL;
-+ kref_put(&vds->refcount, _free_vds);
-+ }
-+
-+ if (default_vdev == vds->vdev) {
-+ default_vdev = NULL;
-+ kref_put(&vds->refcount, _free_vds);
-+ }
-+
-+ mutex_unlock(&tipc_devices_lock);
-+}
-+
-+static void _go_online(struct tipc_virtio_dev *vds)
-+{
-+ mutex_lock(&vds->lock);
-+ if (vds->state == VDS_OFFLINE)
-+ vds->state = VDS_ONLINE;
-+ mutex_unlock(&vds->lock);
-+
-+ create_cdev_node(vds, &vds->cdev_node);
-+
-+ dev_info(&vds->vdev->dev, "is online\n");
-+}
-+
-+static void _go_offline(struct tipc_virtio_dev *vds)
-+{
-+ struct tipc_chan *chan;
-+
-+ /* change state to OFFLINE */
-+ mutex_lock(&vds->lock);
-+ if (vds->state != VDS_ONLINE) {
-+ mutex_unlock(&vds->lock);
-+ return;
-+ }
-+ vds->state = VDS_OFFLINE;
-+ mutex_unlock(&vds->lock);
-+
-+ /* wakeup all waiters */
-+ wake_up_interruptible_all(&vds->sendq);
-+
-+ /* shutdown all channels */
-+ while ((chan = vds_lookup_channel(vds, TIPC_ANY_ADDR))) {
-+ mutex_lock(&chan->lock);
-+ chan->state = TIPC_STALE;
-+ chan->remote = 0;
-+ chan_trigger_event(chan, TIPC_CHANNEL_SHUTDOWN);
-+ mutex_unlock(&chan->lock);
-+ kref_put(&chan->refcount, _free_chan);
-+ }
-+
-+ /* shutdown device node */
-+ destroy_cdev_node(vds, &vds->cdev_node);
-+
-+ dev_info(&vds->vdev->dev, "is offline\n");
-+}
-+
-+static void _handle_conn_rsp(struct tipc_virtio_dev *vds,
-+ struct tipc_conn_rsp_body *rsp, size_t len)
-+{
-+ struct tipc_chan *chan;
-+
-+ if (sizeof(*rsp) != len) {
-+ dev_err(&vds->vdev->dev, "%s: Invalid response length %zd\n",
-+ __func__, len);
-+ return;
-+ }
-+
-+ dev_dbg(&vds->vdev->dev,
-+ "%s: connection response: for addr 0x%x: status %d remote addr 0x%x\n",
-+ __func__, rsp->target, rsp->status, rsp->remote);
-+
-+ /* Lookup channel */
-+ chan = vds_lookup_channel(vds, rsp->target);
-+ if (chan) {
-+ mutex_lock(&chan->lock);
-+ if (chan->state == TIPC_CONNECTING) {
-+ if (!rsp->status) {
-+ chan->state = TIPC_CONNECTED;
-+ chan->remote = rsp->remote;
-+ chan->max_msg_cnt = rsp->max_msg_cnt;
-+ chan->max_msg_size = rsp->max_msg_size;
-+ chan_trigger_event(chan,
-+ TIPC_CHANNEL_CONNECTED);
-+ } else {
-+ chan->state = TIPC_DISCONNECTED;
-+ chan->remote = 0;
-+ chan_trigger_event(chan,
-+ TIPC_CHANNEL_DISCONNECTED);
-+ }
-+ }
-+ mutex_unlock(&chan->lock);
-+ kref_put(&chan->refcount, _free_chan);
-+ }
-+}
-+
-+static void _handle_disc_req(struct tipc_virtio_dev *vds,
-+ struct tipc_disc_req_body *req, size_t len)
-+{
-+ struct tipc_chan *chan;
-+
-+ if (sizeof(*req) != len) {
-+ dev_err(&vds->vdev->dev, "%s: Invalid request length %zd\n",
-+ __func__, len);
-+ return;
-+ }
-+
-+ dev_dbg(&vds->vdev->dev, "%s: disconnect request: for addr 0x%x\n",
-+ __func__, req->target);
-+
-+ chan = vds_lookup_channel(vds, req->target);
-+ if (chan) {
-+ mutex_lock(&chan->lock);
-+ if (chan->state == TIPC_CONNECTED ||
-+ chan->state == TIPC_CONNECTING) {
-+ chan->state = TIPC_DISCONNECTED;
-+ chan->remote = 0;
-+ chan_trigger_event(chan, TIPC_CHANNEL_DISCONNECTED);
-+ }
-+ mutex_unlock(&chan->lock);
-+ kref_put(&chan->refcount, _free_chan);
-+ }
-+}
-+
-+static void _handle_release(struct tipc_virtio_dev *vds,
-+ struct tipc_release_body *req, size_t len)
-+{
-+ struct tipc_shared_handle *handle = NULL;
-+ struct device *dev = &vds->vdev->dev;
-+ int ret = 0;
-+
-+ if (len < sizeof(*req)) {
-+ dev_err(dev, "Received undersized release control message\n");
-+ return;
-+ }
-+
-+ handle = tipc_shared_handle_take(vds, req->id);
-+ if (!handle) {
-+ dev_err(dev,
-+ "Received release control message for untracked handle: 0x%llx\n",
-+ req->id);
-+ return;
-+ }
-+
-+ ret = tipc_shared_handle_drop(handle);
-+
-+ if (ret) {
-+ dev_err(dev,
-+ "Failed to release handle 0x%llx upon request: (%d)\n",
-+ req->id, ret);
-+ /*
-+ * Put the handle back in case we got a spurious release now and
-+ * get a real one later. This path should not happen, we're
-+ * just trying to be robust.
-+ */
-+ tipc_shared_handle_register(handle);
-+ }
-+}
-+
-+static void _handle_ctrl_msg(struct tipc_virtio_dev *vds,
-+ void *data, int len, u32 src)
-+{
-+ struct tipc_ctrl_msg *msg = data;
-+
-+ if ((len < sizeof(*msg)) || (sizeof(*msg) + msg->body_len != len)) {
-+ dev_err(&vds->vdev->dev,
-+ "%s: Invalid message length ( %d vs. %d)\n",
-+ __func__, (int)(sizeof(*msg) + msg->body_len), len);
-+ return;
-+ }
-+
-+ dev_dbg(&vds->vdev->dev,
-+ "%s: Incoming ctrl message: src 0x%x type %d len %d\n",
-+ __func__, src, msg->type, msg->body_len);
-+
-+ switch (msg->type) {
-+ case TIPC_CTRL_MSGTYPE_GO_ONLINE:
-+ _go_online(vds);
-+ break;
-+
-+ case TIPC_CTRL_MSGTYPE_GO_OFFLINE:
-+ _go_offline(vds);
-+ break;
-+
-+ case TIPC_CTRL_MSGTYPE_CONN_RSP:
-+ _handle_conn_rsp(vds, (struct tipc_conn_rsp_body *)msg->body,
-+ msg->body_len);
-+ break;
-+
-+ case TIPC_CTRL_MSGTYPE_DISC_REQ:
-+ _handle_disc_req(vds, (struct tipc_disc_req_body *)msg->body,
-+ msg->body_len);
-+ break;
-+
-+ case TIPC_CTRL_MSGTYPE_RELEASE:
-+ _handle_release(vds, (struct tipc_release_body *)msg->body,
-+ msg->body_len);
-+ break;
-+
-+ default:
-+ dev_warn(&vds->vdev->dev,
-+ "%s: Unexpected message type: %d\n",
-+ __func__, msg->type);
-+ }
-+}
-+
-+static void handle_dropped_chan_msg(struct tipc_virtio_dev *vds,
-+ struct tipc_msg_buf *mb,
-+ struct tipc_msg_hdr *msg)
-+{
-+ int shm_idx;
-+ struct tipc_shm *shm;
-+ struct tipc_shared_handle *shared_handle;
-+ struct device *dev = &vds->vdev->dev;
-+ size_t len;
-+
-+ if (msg->len < msg->shm_cnt * sizeof(*shm)) {
-+ dev_err(dev, "shm_cnt does not fit in dropped message");
-+ /* The message is corrupt, so we can't recover resources */
-+ return;
-+ }
-+
-+ len = msg->len - msg->shm_cnt * sizeof(*shm);
-+ /* skip normal data */
-+ (void)mb_get_data(mb, len);
-+
-+ for (shm_idx = 0; shm_idx < msg->shm_cnt; shm_idx++) {
-+ shm = mb_get_data(mb, sizeof(*shm));
-+ shared_handle = tipc_shared_handle_take(vds, shm->obj_id);
-+ if (shared_handle) {
-+ if (tipc_shared_handle_drop(shared_handle))
-+ dev_err(dev,
-+ "Failed to drop handle found in dropped buffer");
-+ } else {
-+ dev_err(dev,
-+ "Found handle in dropped buffer which was not registered to tipc device...");
-+ }
-+ }
-+}
-+
-+static void handle_dropped_mb(struct tipc_virtio_dev *vds,
-+ struct tipc_msg_buf *mb)
-+{
-+ struct tipc_msg_hdr *msg;
-+
-+ mb_reset_read(mb);
-+ msg = mb_get_data(mb, sizeof(*msg));
-+ if (msg->dst != TIPC_CTRL_ADDR) {
-+ handle_dropped_chan_msg(vds, mb, msg);
-+ }
-+}
-+
-+static int _handle_rxbuf(struct tipc_virtio_dev *vds,
-+ struct tipc_msg_buf *rxbuf, size_t rxlen)
-+{
-+ int err;
-+ struct scatterlist sg;
-+ struct tipc_msg_hdr *msg;
-+ struct device *dev = &vds->vdev->dev;
-+
-+ /* message sanity check */
-+ if (rxlen > rxbuf->buf_sz) {
-+ dev_warn(dev, "inbound msg is too big: %zd\n", rxlen);
-+ goto drop_it;
-+ }
-+
-+ if (rxlen < sizeof(*msg)) {
-+ dev_warn(dev, "inbound msg is too short: %zd\n", rxlen);
-+ goto drop_it;
-+ }
-+
-+ /* reset buffer and put data */
-+ mb_reset(rxbuf);
-+ mb_put_data(rxbuf, rxlen);
-+
-+ /* get message header */
-+ msg = mb_get_data(rxbuf, sizeof(*msg));
-+ if (mb_avail_data(rxbuf) != msg->len) {
-+ dev_warn(dev, "inbound msg length mismatch: (%zu vs. %d)\n",
-+ mb_avail_data(rxbuf), msg->len);
-+ goto drop_it;
-+ }
-+
-+ dev_dbg(dev, "From: %d, To: %d, Len: %d, Flags: 0x%x, Reserved: %d, shm_cnt: %d\n",
-+ msg->src, msg->dst, msg->len, msg->flags, msg->reserved,
-+ msg->shm_cnt);
-+
-+ /* message directed to control endpoint is a special case */
-+ if (msg->dst == TIPC_CTRL_ADDR) {
-+ _handle_ctrl_msg(vds, msg->data, msg->len, msg->src);
-+ } else {
-+ struct tipc_chan *chan = NULL;
-+ /* Lookup channel */
-+ chan = vds_lookup_channel(vds, msg->dst);
-+ if (chan) {
-+ /* handle it */
-+ rxbuf = chan->ops->handle_msg(chan->ops_arg, rxbuf);
-+ kref_put(&chan->refcount, _free_chan);
-+ if (WARN_ON(!rxbuf))
-+ return -EINVAL;
-+ }
-+ }
-+
-+drop_it:
-+ /* add the buffer back to the virtqueue */
-+ sg_init_one(&sg, rxbuf, rxbuf->buf_sz);
-+ err = virtqueue_add_inbuf(vds->rxvq, &sg, 1, rxbuf, GFP_KERNEL);
-+ if (err < 0) {
-+ dev_err(dev, "failed to add a virtqueue buffer: %d\n", err);
-+ return err;
-+ }
-+
-+ return 0;
-+}
-+
-+static void _rxvq_cb(struct virtqueue *rxvq)
-+{
-+ unsigned int len;
-+ struct tipc_msg_buf *mb;
-+ unsigned int msg_cnt = 0;
-+ struct tipc_virtio_dev *vds = rxvq->vdev->priv;
-+
-+ while ((mb = virtqueue_get_buf(rxvq, &len)) != NULL) {
-+ if (_handle_rxbuf(vds, mb, len))
-+ break;
-+ msg_cnt++;
-+ }
-+
-+ /* tell the other size that we added rx buffers */
-+ if (msg_cnt)
-+ virtqueue_kick(rxvq);
-+}
-+
-+static void _txvq_cb(struct virtqueue *txvq)
-+{
-+ unsigned int len;
-+ struct tipc_msg_buf *mb;
-+ bool need_wakeup = false;
-+ struct tipc_virtio_dev *vds = txvq->vdev->priv;
-+
-+ /* detach all buffers */
-+ mutex_lock(&vds->lock);
-+ while ((mb = virtqueue_get_buf(txvq, &len)) != NULL) {
-+ if ((int)len < 0)
-+ handle_dropped_mb(vds, mb);
-+ need_wakeup |= _put_txbuf_locked(vds, mb);
-+ }
-+ mutex_unlock(&vds->lock);
-+
-+ if (need_wakeup) {
-+ /* wake up potential senders waiting for a tx buffer */
-+ wake_up_interruptible_all(&vds->sendq);
-+ }
-+}
-+
-+static int tipc_virtio_probe(struct virtio_device *vdev)
-+{
-+ int err, i;
-+ struct tipc_virtio_dev *vds;
-+ struct tipc_dev_config config;
-+ struct virtqueue *vqs[2];
-+ vq_callback_t *vq_cbs[] = {_rxvq_cb, _txvq_cb};
-+ static const char * const vq_names[] = { "rx", "tx" };
-+
-+ vds = kzalloc(sizeof(*vds), GFP_KERNEL);
-+ if (!vds)
-+ return -ENOMEM;
-+
-+ vds->vdev = vdev;
-+
-+ mutex_init(&vds->lock);
-+ mutex_init(&vds->shared_handles_lock);
-+ kref_init(&vds->refcount);
-+ init_waitqueue_head(&vds->sendq);
-+ INIT_LIST_HEAD(&vds->free_buf_list);
-+ idr_init(&vds->addr_idr);
-+ vds->shared_handles = RB_ROOT;
-+ dma_coerce_mask_and_coherent(&vds->vdev->dev,
-+ *vds->vdev->dev.parent->parent->dma_mask);
-+
-+ /* set default max message size and alignment */
-+ memset(&config, 0, sizeof(config));
-+ config.msg_buf_max_size = DEFAULT_MSG_BUF_SIZE;
-+ config.msg_buf_alignment = DEFAULT_MSG_BUF_ALIGN;
-+
-+ /* get configuration if present */
-+ vdev->config->get(vdev, 0, &config, sizeof(config));
-+
-+ /* copy dev name */
-+ strncpy(vds->cdev_name, config.dev_name, sizeof(vds->cdev_name));
-+ vds->cdev_name[sizeof(vds->cdev_name)-1] = '\0';
-+
-+ /* find tx virtqueues (rx and tx and in this order) */
-+ err = vdev->config->find_vqs(vdev, 2, vqs, vq_cbs, vq_names, NULL,
-+ NULL);
-+ if (err)
-+ goto err_find_vqs;
-+
-+ vds->rxvq = vqs[0];
-+ vds->txvq = vqs[1];
-+
-+ /* save max buffer size and count */
-+ vds->msg_buf_max_sz = config.msg_buf_max_size;
-+ vds->msg_buf_max_cnt = virtqueue_get_vring_size(vds->txvq);
-+
-+ /* set up the receive buffers */
-+ for (i = 0; i < virtqueue_get_vring_size(vds->rxvq); i++) {
-+ struct scatterlist sg;
-+ struct tipc_msg_buf *rxbuf;
-+
-+ rxbuf = vds_alloc_msg_buf(vds, true);
-+ if (!rxbuf) {
-+ dev_err(&vdev->dev, "failed to allocate rx buffer\n");
-+ err = -ENOMEM;
-+ goto err_free_rx_buffers;
-+ }
-+
-+ sg_init_one(&sg, rxbuf, rxbuf->buf_sz);
-+ err = virtqueue_add_inbuf(vds->rxvq, &sg, 1, rxbuf, GFP_KERNEL);
-+ WARN_ON(err); /* sanity check; this can't really happen */
-+ }
-+
-+ vdev->priv = vds;
-+ vds->state = VDS_OFFLINE;
-+
-+ dev_dbg(&vdev->dev, "%s: done\n", __func__);
-+ return 0;
-+
-+err_free_rx_buffers:
-+ _cleanup_vq(vds, vds->rxvq);
-+err_find_vqs:
-+ kref_put(&vds->refcount, _free_vds);
-+ return err;
-+}
-+
-+static void tipc_virtio_remove(struct virtio_device *vdev)
-+{
-+ struct tipc_virtio_dev *vds = vdev->priv;
-+
-+ _go_offline(vds);
-+
-+ mutex_lock(&vds->lock);
-+ vds->state = VDS_DEAD;
-+ vds->vdev = NULL;
-+ mutex_unlock(&vds->lock);
-+
-+ vdev->config->reset(vdev);
-+
-+ idr_destroy(&vds->addr_idr);
-+
-+ _cleanup_vq(vds, vds->rxvq);
-+ _cleanup_vq(vds, vds->txvq);
-+ vds_free_msg_buf_list(vds, &vds->free_buf_list);
-+
-+ vdev->config->del_vqs(vds->vdev);
-+
-+ kref_put(&vds->refcount, _free_vds);
-+}
-+
-+static const struct virtio_device_id tipc_virtio_id_table[] = {
-+ { VIRTIO_ID_TRUSTY_IPC, VIRTIO_DEV_ANY_ID },
-+ { 0 },
-+};
-+
-+static const unsigned int features[] = {
-+ 0,
-+};
-+
-+static struct virtio_driver virtio_tipc_driver = {
-+ .feature_table = features,
-+ .feature_table_size = ARRAY_SIZE(features),
-+ .driver.name = KBUILD_MODNAME,
-+ .driver.owner = THIS_MODULE,
-+ .id_table = tipc_virtio_id_table,
-+ .probe = tipc_virtio_probe,
-+ .remove = tipc_virtio_remove,
-+};
-+
-+static int __init tipc_init(void)
-+{
-+ int ret;
-+ dev_t dev;
-+
-+ ret = alloc_chrdev_region(&dev, 0, MAX_DEVICES, KBUILD_MODNAME);
-+ if (ret) {
-+ pr_err("%s: alloc_chrdev_region failed: %d\n", __func__, ret);
-+ return ret;
-+ }
-+
-+ tipc_major = MAJOR(dev);
-+ tipc_class = class_create(THIS_MODULE, KBUILD_MODNAME);
-+ if (IS_ERR(tipc_class)) {
-+ ret = PTR_ERR(tipc_class);
-+ pr_err("%s: class_create failed: %d\n", __func__, ret);
-+ goto err_class_create;
-+ }
-+
-+ ret = register_virtio_driver(&virtio_tipc_driver);
-+ if (ret) {
-+ pr_err("failed to register virtio driver: %d\n", ret);
-+ goto err_register_virtio_drv;
-+ }
-+
-+ return 0;
-+
-+err_register_virtio_drv:
-+ class_destroy(tipc_class);
-+
-+err_class_create:
-+ unregister_chrdev_region(dev, MAX_DEVICES);
-+ return ret;
-+}
-+
-+static void __exit tipc_exit(void)
-+{
-+ unregister_virtio_driver(&virtio_tipc_driver);
-+ class_destroy(tipc_class);
-+ unregister_chrdev_region(MKDEV(tipc_major, 0), MAX_DEVICES);
-+}
-+
-+/* We need to init this early */
-+subsys_initcall(tipc_init);
-+module_exit(tipc_exit);
-+
-+MODULE_DEVICE_TABLE(tipc, tipc_virtio_id_table);
-+MODULE_DESCRIPTION("Trusty IPC driver");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/trusty/trusty-irq.c b/drivers/trusty/trusty-irq.c
-new file mode 100644
-index 000000000000..5c6076108d0e
---- /dev/null
-+++ b/drivers/trusty/trusty-irq.c
-@@ -0,0 +1,645 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Copyright (C) 2013 Google, Inc.
-+ */
-+
-+#include <linux/cpu.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
-+#include <linux/irqdomain.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_irq.h>
-+#include <linux/platform_device.h>
-+#include <linux/slab.h>
-+#include <linux/string.h>
-+#include <linux/trusty/smcall.h>
-+#include <linux/trusty/sm_err.h>
-+#include <linux/trusty/trusty.h>
-+
-+struct trusty_irq {
-+ struct trusty_irq_state *is;
-+ struct hlist_node node;
-+ unsigned int irq;
-+ bool percpu;
-+ bool enable;
-+ bool doorbell;
-+ struct trusty_irq __percpu *percpu_ptr;
-+};
-+
-+struct trusty_irq_irqset {
-+ struct hlist_head pending;
-+ struct hlist_head inactive;
-+};
-+
-+struct trusty_irq_state {
-+ struct device *dev;
-+ struct device *trusty_dev;
-+ struct trusty_irq_irqset normal_irqs;
-+ spinlock_t normal_irqs_lock;
-+ struct trusty_irq_irqset __percpu *percpu_irqs;
-+ struct notifier_block trusty_call_notifier;
-+ struct hlist_node cpuhp_node;
-+};
-+
-+static int trusty_irq_cpuhp_slot = -1;
-+
-+static void trusty_irq_enable_pending_irqs(struct trusty_irq_state *is,
-+ struct trusty_irq_irqset *irqset,
-+ bool percpu)
-+{
-+ struct hlist_node *n;
-+ struct trusty_irq *trusty_irq;
-+
-+ hlist_for_each_entry_safe(trusty_irq, n, &irqset->pending, node) {
-+ dev_dbg(is->dev,
-+ "%s: enable pending irq %d, percpu %d, cpu %d\n",
-+ __func__, trusty_irq->irq, percpu, smp_processor_id());
-+ if (percpu)
-+ enable_percpu_irq(trusty_irq->irq, 0);
-+ else
-+ enable_irq(trusty_irq->irq);
-+ hlist_del(&trusty_irq->node);
-+ hlist_add_head(&trusty_irq->node, &irqset->inactive);
-+ }
-+}
-+
-+static void trusty_irq_enable_irqset(struct trusty_irq_state *is,
-+ struct trusty_irq_irqset *irqset)
-+{
-+ struct trusty_irq *trusty_irq;
-+
-+ hlist_for_each_entry(trusty_irq, &irqset->inactive, node) {
-+ if (trusty_irq->enable) {
-+ dev_warn(is->dev,
-+ "%s: percpu irq %d already enabled, cpu %d\n",
-+ __func__, trusty_irq->irq, smp_processor_id());
-+ continue;
-+ }
-+ dev_dbg(is->dev, "%s: enable percpu irq %d, cpu %d\n",
-+ __func__, trusty_irq->irq, smp_processor_id());
-+ enable_percpu_irq(trusty_irq->irq, 0);
-+ trusty_irq->enable = true;
-+ }
-+}
-+
-+static void trusty_irq_disable_irqset(struct trusty_irq_state *is,
-+ struct trusty_irq_irqset *irqset)
-+{
-+ struct hlist_node *n;
-+ struct trusty_irq *trusty_irq;
-+
-+ hlist_for_each_entry(trusty_irq, &irqset->inactive, node) {
-+ if (!trusty_irq->enable) {
-+ dev_warn(is->dev,
-+ "irq %d already disabled, percpu %d, cpu %d\n",
-+ trusty_irq->irq, trusty_irq->percpu,
-+ smp_processor_id());
-+ continue;
-+ }
-+ dev_dbg(is->dev, "%s: disable irq %d, percpu %d, cpu %d\n",
-+ __func__, trusty_irq->irq, trusty_irq->percpu,
-+ smp_processor_id());
-+ trusty_irq->enable = false;
-+ if (trusty_irq->percpu)
-+ disable_percpu_irq(trusty_irq->irq);
-+ else
-+ disable_irq_nosync(trusty_irq->irq);
-+ }
-+ hlist_for_each_entry_safe(trusty_irq, n, &irqset->pending, node) {
-+ if (!trusty_irq->enable) {
-+ dev_warn(is->dev,
-+ "pending irq %d already disabled, percpu %d, cpu %d\n",
-+ trusty_irq->irq, trusty_irq->percpu,
-+ smp_processor_id());
-+ }
-+ dev_dbg(is->dev,
-+ "%s: disable pending irq %d, percpu %d, cpu %d\n",
-+ __func__, trusty_irq->irq, trusty_irq->percpu,
-+ smp_processor_id());
-+ trusty_irq->enable = false;
-+ hlist_del(&trusty_irq->node);
-+ hlist_add_head(&trusty_irq->node, &irqset->inactive);
-+ }
-+}
-+
-+static int trusty_irq_call_notify(struct notifier_block *nb,
-+ unsigned long action, void *data)
-+{
-+ struct trusty_irq_state *is;
-+
-+ if (WARN_ON(!irqs_disabled()))
-+ return NOTIFY_DONE;
-+
-+ if (action != TRUSTY_CALL_PREPARE)
-+ return NOTIFY_DONE;
-+
-+ is = container_of(nb, struct trusty_irq_state, trusty_call_notifier);
-+
-+ spin_lock(&is->normal_irqs_lock);
-+ trusty_irq_enable_pending_irqs(is, &is->normal_irqs, false);
-+ spin_unlock(&is->normal_irqs_lock);
-+ trusty_irq_enable_pending_irqs(is, this_cpu_ptr(is->percpu_irqs), true);
-+
-+ return NOTIFY_OK;
-+}
-+
-+static irqreturn_t trusty_irq_handler(int irq, void *data)
-+{
-+ struct trusty_irq *trusty_irq = data;
-+ struct trusty_irq_state *is = trusty_irq->is;
-+ struct trusty_irq_irqset *irqset;
-+
-+ dev_dbg(is->dev, "%s: irq %d, percpu %d, cpu %d, enable %d\n",
-+ __func__, irq, trusty_irq->irq, smp_processor_id(),
-+ trusty_irq->enable);
-+
-+ if (!trusty_irq->doorbell) {
-+ if (trusty_irq->percpu) {
-+ disable_percpu_irq(irq);
-+ irqset = this_cpu_ptr(is->percpu_irqs);
-+ } else {
-+ disable_irq_nosync(irq);
-+ irqset = &is->normal_irqs;
-+ }
-+
-+ spin_lock(&is->normal_irqs_lock);
-+ if (trusty_irq->enable) {
-+ hlist_del(&trusty_irq->node);
-+ hlist_add_head(&trusty_irq->node, &irqset->pending);
-+ }
-+ spin_unlock(&is->normal_irqs_lock);
-+ }
-+
-+ trusty_enqueue_nop(is->trusty_dev, NULL);
-+
-+ dev_dbg(is->dev, "%s: irq %d done\n", __func__, irq);
-+
-+ return IRQ_HANDLED;
-+}
-+
-+static int trusty_irq_cpu_up(unsigned int cpu, struct hlist_node *node)
-+{
-+ unsigned long irq_flags;
-+ struct trusty_irq_state *is;
-+
-+ is = container_of(node, struct trusty_irq_state, cpuhp_node);
-+
-+ dev_dbg(is->dev, "%s: cpu %d\n", __func__, cpu);
-+
-+ local_irq_save(irq_flags);
-+ trusty_irq_enable_irqset(is, this_cpu_ptr(is->percpu_irqs));
-+ local_irq_restore(irq_flags);
-+
-+ /*
-+ * Temporary workaround blindly enqueuing work to force trusty scheduler
-+ * to run after a cpu suspend.
-+ * Root causing the workqueue being inappropriately empty
-+ * (e.g. loss of an IPI) may make this workaround unnecessary
-+ * in the future.
-+ */
-+ trusty_enqueue_nop(is->trusty_dev, NULL);
-+
-+ return 0;
-+}
-+
-+static int trusty_irq_cpu_down(unsigned int cpu, struct hlist_node *node)
-+{
-+ unsigned long irq_flags;
-+ struct trusty_irq_state *is;
-+
-+ is = container_of(node, struct trusty_irq_state, cpuhp_node);
-+
-+ dev_dbg(is->dev, "%s: cpu %d\n", __func__, cpu);
-+
-+ local_irq_save(irq_flags);
-+ trusty_irq_disable_irqset(is, this_cpu_ptr(is->percpu_irqs));
-+ local_irq_restore(irq_flags);
-+
-+ return 0;
-+}
-+
-+static int trusty_irq_map_ipi(struct trusty_irq_state *is, int irq)
-+{
-+ int ret;
-+ u32 ipi_range[3];
-+ struct device_node *gic;
-+ struct of_phandle_args oirq = {};
-+ u32 beg, end, ipi_base;
-+
-+ ret = of_property_read_u32_array(is->dev->of_node, "ipi-range",
-+ ipi_range, ARRAY_SIZE(ipi_range));
-+ if (ret != 0)
-+ return -ENODATA;
-+ beg = ipi_range[0];
-+ end = ipi_range[1];
-+ ipi_base = ipi_range[2];
-+
-+ if (irq < beg || irq > end)
-+ return -ENODATA;
-+
-+ gic = of_irq_find_parent(is->dev->of_node);
-+ if (!gic)
-+ return -ENXIO;
-+
-+ oirq.np = gic;
-+ oirq.args_count = 1;
-+ oirq.args[0] = ipi_base + (irq - beg);
-+
-+ ret = irq_create_of_mapping(&oirq);
-+
-+ of_node_put(gic);
-+ return (!ret) ? -EINVAL : ret;
-+}
-+
-+static int trusty_irq_create_irq_mapping(struct trusty_irq_state *is, int irq)
-+{
-+ int ret;
-+ int index;
-+ u32 irq_pos;
-+ u32 templ_idx;
-+ u32 range_base;
-+ u32 range_end;
-+ struct of_phandle_args oirq;
-+
-+ /* check if this is an IPI (inter-processor interrupt) */
-+ ret = trusty_irq_map_ipi(is, irq);
-+ if (ret != -ENODATA)
-+ return ret;
-+
-+ /* check if "interrupt-ranges" property is present */
-+ if (!of_find_property(is->dev->of_node, "interrupt-ranges", NULL)) {
-+ /* fallback to old behavior to be backward compatible with
-+ * systems that do not need IRQ domains.
-+ */
-+ return irq;
-+ }
-+
-+ /* find irq range */
-+ for (index = 0;; index += 3) {
-+ ret = of_property_read_u32_index(is->dev->of_node,
-+ "interrupt-ranges",
-+ index, &range_base);
-+ if (ret)
-+ return ret;
-+
-+ ret = of_property_read_u32_index(is->dev->of_node,
-+ "interrupt-ranges",
-+ index + 1, &range_end);
-+ if (ret)
-+ return ret;
-+
-+ if (irq >= range_base && irq <= range_end)
-+ break;
-+ }
-+
-+ /* read the rest of range entry: template index and irq_pos */
-+ ret = of_property_read_u32_index(is->dev->of_node,
-+ "interrupt-ranges",
-+ index + 2, &templ_idx);
-+ if (ret)
-+ return ret;
-+
-+ /* read irq template */
-+ ret = of_parse_phandle_with_args(is->dev->of_node,
-+ "interrupt-templates",
-+ "#interrupt-cells",
-+ templ_idx, &oirq);
-+ if (ret)
-+ return ret;
-+
-+ WARN_ON(!oirq.np);
-+ WARN_ON(!oirq.args_count);
-+
-+ /*
-+ * An IRQ template is a non empty array of u32 values describing group
-+ * of interrupts having common properties. The u32 entry with index
-+ * zero contains the position of irq_id in interrupt specifier array
-+ * followed by data representing interrupt specifier array with irq id
-+ * field omitted, so to convert irq template to interrupt specifier
-+ * array we have to move down one slot the first irq_pos entries and
-+ * replace the resulting gap with real irq id.
-+ */
-+ irq_pos = oirq.args[0];
-+
-+ if (irq_pos >= oirq.args_count) {
-+ dev_err(is->dev, "irq pos is out of range: %d\n", irq_pos);
-+ return -EINVAL;
-+ }
-+
-+ for (index = 1; index <= irq_pos; index++)
-+ oirq.args[index - 1] = oirq.args[index];
-+
-+ oirq.args[irq_pos] = irq - range_base;
-+
-+ ret = irq_create_of_mapping(&oirq);
-+
-+ return (!ret) ? -EINVAL : ret;
-+}
-+
-+static int trusty_irq_init_normal_irq(struct trusty_irq_state *is, int tirq)
-+{
-+ int ret;
-+ int irq;
-+ unsigned long irq_flags;
-+ struct trusty_irq *trusty_irq;
-+
-+ dev_dbg(is->dev, "%s: irq %d\n", __func__, tirq);
-+
-+ irq = trusty_irq_create_irq_mapping(is, tirq);
-+ if (irq < 0) {
-+ dev_err(is->dev,
-+ "trusty_irq_create_irq_mapping failed (%d)\n", irq);
-+ return irq;
-+ }
-+
-+ trusty_irq = kzalloc(sizeof(*trusty_irq), GFP_KERNEL);
-+ if (!trusty_irq)
-+ return -ENOMEM;
-+
-+ trusty_irq->is = is;
-+ trusty_irq->irq = irq;
-+ trusty_irq->enable = true;
-+
-+ spin_lock_irqsave(&is->normal_irqs_lock, irq_flags);
-+ hlist_add_head(&trusty_irq->node, &is->normal_irqs.inactive);
-+ spin_unlock_irqrestore(&is->normal_irqs_lock, irq_flags);
-+
-+ ret = request_irq(irq, trusty_irq_handler, IRQF_NO_THREAD,
-+ "trusty", trusty_irq);
-+ if (ret) {
-+ dev_err(is->dev, "request_irq failed %d\n", ret);
-+ goto err_request_irq;
-+ }
-+ return 0;
-+
-+err_request_irq:
-+ spin_lock_irqsave(&is->normal_irqs_lock, irq_flags);
-+ hlist_del(&trusty_irq->node);
-+ spin_unlock_irqrestore(&is->normal_irqs_lock, irq_flags);
-+ kfree(trusty_irq);
-+ return ret;
-+}
-+
-+static int trusty_irq_init_per_cpu_irq(struct trusty_irq_state *is, int tirq,
-+ unsigned int type)
-+{
-+ int ret;
-+ int irq;
-+ unsigned int cpu;
-+ struct trusty_irq __percpu *trusty_irq_handler_data;
-+
-+ dev_dbg(is->dev, "%s: irq %d\n", __func__, tirq);
-+
-+ irq = trusty_irq_create_irq_mapping(is, tirq);
-+ if (irq <= 0) {
-+ dev_err(is->dev,
-+ "trusty_irq_create_irq_mapping failed (%d)\n", irq);
-+ return irq;
-+ }
-+
-+ trusty_irq_handler_data = alloc_percpu(struct trusty_irq);
-+ if (!trusty_irq_handler_data)
-+ return -ENOMEM;
-+
-+ for_each_possible_cpu(cpu) {
-+ struct trusty_irq *trusty_irq;
-+ struct trusty_irq_irqset *irqset;
-+
-+ trusty_irq = per_cpu_ptr(trusty_irq_handler_data, cpu);
-+ irqset = per_cpu_ptr(is->percpu_irqs, cpu);
-+
-+ trusty_irq->is = is;
-+ hlist_add_head(&trusty_irq->node, &irqset->inactive);
-+ trusty_irq->irq = irq;
-+ trusty_irq->percpu = true;
-+ trusty_irq->doorbell = type == TRUSTY_IRQ_TYPE_DOORBELL;
-+ trusty_irq->percpu_ptr = trusty_irq_handler_data;
-+ }
-+
-+ ret = request_percpu_irq(irq, trusty_irq_handler, "trusty",
-+ trusty_irq_handler_data);
-+ if (ret) {
-+ dev_err(is->dev, "request_percpu_irq failed %d\n", ret);
-+ goto err_request_percpu_irq;
-+ }
-+
-+ return 0;
-+
-+err_request_percpu_irq:
-+ for_each_possible_cpu(cpu) {
-+ struct trusty_irq *trusty_irq;
-+
-+ trusty_irq = per_cpu_ptr(trusty_irq_handler_data, cpu);
-+ hlist_del(&trusty_irq->node);
-+ }
-+
-+ free_percpu(trusty_irq_handler_data);
-+ return ret;
-+}
-+
-+static int trusty_smc_get_next_irq(struct trusty_irq_state *is,
-+ unsigned long min_irq, unsigned int type)
-+{
-+ return trusty_fast_call32(is->trusty_dev, SMC_FC_GET_NEXT_IRQ,
-+ min_irq, type, 0);
-+}
-+
-+static int trusty_irq_init_one(struct trusty_irq_state *is,
-+ int irq, unsigned int type)
-+{
-+ int ret;
-+
-+ irq = trusty_smc_get_next_irq(is, irq, type);
-+ if (irq < 0)
-+ return irq;
-+
-+ if (type != TRUSTY_IRQ_TYPE_NORMAL)
-+ ret = trusty_irq_init_per_cpu_irq(is, irq, type);
-+ else
-+ ret = trusty_irq_init_normal_irq(is, irq);
-+
-+ if (ret) {
-+ dev_warn(is->dev,
-+ "failed to initialize irq %d, irq will be ignored\n",
-+ irq);
-+ }
-+
-+ return irq + 1;
-+}
-+
-+static void trusty_irq_free_irqs(struct trusty_irq_state *is)
-+{
-+ struct trusty_irq *irq;
-+ struct hlist_node *n;
-+ unsigned int cpu;
-+
-+ hlist_for_each_entry_safe(irq, n, &is->normal_irqs.inactive, node) {
-+ dev_dbg(is->dev, "%s: irq %d\n", __func__, irq->irq);
-+ free_irq(irq->irq, irq);
-+ hlist_del(&irq->node);
-+ kfree(irq);
-+ }
-+ hlist_for_each_entry_safe(irq, n,
-+ &this_cpu_ptr(is->percpu_irqs)->inactive,
-+ node) {
-+ struct trusty_irq __percpu *trusty_irq_handler_data;
-+
-+ dev_dbg(is->dev, "%s: percpu irq %d\n", __func__, irq->irq);
-+ trusty_irq_handler_data = irq->percpu_ptr;
-+ free_percpu_irq(irq->irq, trusty_irq_handler_data);
-+ for_each_possible_cpu(cpu) {
-+ struct trusty_irq *irq_tmp;
-+
-+ irq_tmp = per_cpu_ptr(trusty_irq_handler_data, cpu);
-+ hlist_del(&irq_tmp->node);
-+ }
-+ free_percpu(trusty_irq_handler_data);
-+ }
-+}
-+
-+static int trusty_irq_probe(struct platform_device *pdev)
-+{
-+ int ret;
-+ int irq;
-+ unsigned long irq_flags;
-+ struct trusty_irq_state *is;
-+
-+ is = kzalloc(sizeof(*is), GFP_KERNEL);
-+ if (!is) {
-+ ret = -ENOMEM;
-+ goto err_alloc_is;
-+ }
-+
-+ is->dev = &pdev->dev;
-+ is->trusty_dev = is->dev->parent;
-+ spin_lock_init(&is->normal_irqs_lock);
-+ is->percpu_irqs = alloc_percpu(struct trusty_irq_irqset);
-+ if (!is->percpu_irqs) {
-+ ret = -ENOMEM;
-+ goto err_alloc_pending_percpu_irqs;
-+ }
-+
-+ platform_set_drvdata(pdev, is);
-+
-+ is->trusty_call_notifier.notifier_call = trusty_irq_call_notify;
-+ ret = trusty_call_notifier_register(is->trusty_dev,
-+ &is->trusty_call_notifier);
-+ if (ret) {
-+ dev_err(&pdev->dev,
-+ "failed to register trusty call notifier\n");
-+ goto err_trusty_call_notifier_register;
-+ }
-+
-+ for (irq = 0; irq >= 0;)
-+ irq = trusty_irq_init_one(is, irq, TRUSTY_IRQ_TYPE_PER_CPU);
-+ for (irq = 0; irq >= 0;)
-+ irq = trusty_irq_init_one(is, irq, TRUSTY_IRQ_TYPE_NORMAL);
-+ for (irq = 0; irq >= 0;)
-+ irq = trusty_irq_init_one(is, irq, TRUSTY_IRQ_TYPE_DOORBELL);
-+
-+ ret = cpuhp_state_add_instance(trusty_irq_cpuhp_slot, &is->cpuhp_node);
-+ if (ret < 0) {
-+ dev_err(&pdev->dev, "cpuhp_state_add_instance failed %d\n",
-+ ret);
-+ goto err_add_cpuhp_instance;
-+ }
-+
-+ return 0;
-+
-+err_add_cpuhp_instance:
-+ spin_lock_irqsave(&is->normal_irqs_lock, irq_flags);
-+ trusty_irq_disable_irqset(is, &is->normal_irqs);
-+ spin_unlock_irqrestore(&is->normal_irqs_lock, irq_flags);
-+ trusty_irq_free_irqs(is);
-+ trusty_call_notifier_unregister(is->trusty_dev,
-+ &is->trusty_call_notifier);
-+err_trusty_call_notifier_register:
-+ free_percpu(is->percpu_irqs);
-+err_alloc_pending_percpu_irqs:
-+ kfree(is);
-+err_alloc_is:
-+ return ret;
-+}
-+
-+static int trusty_irq_remove(struct platform_device *pdev)
-+{
-+ int ret;
-+ unsigned long irq_flags;
-+ struct trusty_irq_state *is = platform_get_drvdata(pdev);
-+
-+ ret = cpuhp_state_remove_instance(trusty_irq_cpuhp_slot,
-+ &is->cpuhp_node);
-+ if (WARN_ON(ret))
-+ return ret;
-+
-+ spin_lock_irqsave(&is->normal_irqs_lock, irq_flags);
-+ trusty_irq_disable_irqset(is, &is->normal_irqs);
-+ spin_unlock_irqrestore(&is->normal_irqs_lock, irq_flags);
-+
-+ trusty_irq_free_irqs(is);
-+
-+ trusty_call_notifier_unregister(is->trusty_dev,
-+ &is->trusty_call_notifier);
-+ free_percpu(is->percpu_irqs);
-+ kfree(is);
-+
-+ return 0;
-+}
-+
-+static const struct of_device_id trusty_test_of_match[] = {
-+ { .compatible = "android,trusty-irq-v1", },
-+ {},
-+};
-+
-+MODULE_DEVICE_TABLE(trusty, trusty_test_of_match);
-+
-+static struct platform_driver trusty_irq_driver = {
-+ .probe = trusty_irq_probe,
-+ .remove = trusty_irq_remove,
-+ .driver = {
-+ .name = "trusty-irq",
-+ .of_match_table = trusty_test_of_match,
-+ },
-+};
-+
-+static int __init trusty_irq_driver_init(void)
-+{
-+ int ret;
-+
-+ /* allocate dynamic cpuhp state slot */
-+ ret = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN,
-+ "trusty-irq:cpu:online",
-+ trusty_irq_cpu_up,
-+ trusty_irq_cpu_down);
-+ if (ret < 0)
-+ return ret;
-+ trusty_irq_cpuhp_slot = ret;
-+
-+ /* Register platform driver */
-+ ret = platform_driver_register(&trusty_irq_driver);
-+ if (ret < 0)
-+ goto err_driver_register;
-+
-+ return ret;
-+
-+err_driver_register:
-+ /* undo cpuhp slot allocation */
-+ cpuhp_remove_multi_state(trusty_irq_cpuhp_slot);
-+ trusty_irq_cpuhp_slot = -1;
-+
-+ return ret;
-+}
-+
-+static void __exit trusty_irq_driver_exit(void)
-+{
-+ platform_driver_unregister(&trusty_irq_driver);
-+ cpuhp_remove_multi_state(trusty_irq_cpuhp_slot);
-+ trusty_irq_cpuhp_slot = -1;
-+}
-+
-+module_init(trusty_irq_driver_init);
-+module_exit(trusty_irq_driver_exit);
-+
-+MODULE_LICENSE("GPL v2");
-+MODULE_DESCRIPTION("Trusty IRQ driver");
-diff --git a/drivers/trusty/trusty-log.c b/drivers/trusty/trusty-log.c
-new file mode 100644
-index 000000000000..7b279fe63766
---- /dev/null
-+++ b/drivers/trusty/trusty-log.c
-@@ -0,0 +1,830 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Copyright (C) 2015 Google, Inc.
-+ */
-+#include <linux/platform_device.h>
-+#include <linux/trusty/smcall.h>
-+#include <linux/trusty/trusty.h>
-+#include <linux/notifier.h>
-+#include <linux/scatterlist.h>
-+#include <linux/slab.h>
-+#include <linux/mm.h>
-+#include <linux/mod_devicetable.h>
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/log2.h>
-+#include <linux/miscdevice.h>
-+#include <linux/poll.h>
-+#include <linux/seq_file.h>
-+#include <asm/page.h>
-+#include "trusty-log.h"
-+
-+/*
-+ * Rationale for the chosen default log buffer size:
-+ * - the log buffer shall contain unthrottled Trusty crash dump.
-+ * - the register list portion of a crash dump is about 1KB
-+ * - the memory-around-registers portion of a crash dump can be up to 12 KB
-+ * - an average size backtrace is about 1 KB
-+ * - average length of non-crash trusty logs during boot is about 85 characters
-+ * - a crash dump with 50 lines of context therefore requires up to 18 KB
-+ * - buffer size needs to be power-of-two number of bytes
-+ * - rounding up to power of two from 18 KB gives 32 KB
-+ * The log size can be adjusted by setting the "trusty_log.log_size" parameter
-+ * on the kernel command line. The specified value will be adjusted as needed.
-+ */
-+
-+#define TRUSTY_LOG_DEFAULT_SIZE (32768)
-+#define TRUSTY_LOG_MIN_SIZE (PAGE_SIZE / 2)
-+#define TRUSTY_LOG_MAX_SIZE (1 * 1024 * 1024 * 1024)
-+#define TRUSTY_LINE_BUFFER_SIZE (256)
-+
-+static size_t log_size_param = TRUSTY_LOG_DEFAULT_SIZE;
-+
-+static int trusty_log_size_set(const char *val, const struct kernel_param *kp)
-+{
-+ unsigned long long requested = memparse(val, NULL);
-+
-+ if (requested < TRUSTY_LOG_MIN_SIZE)
-+ requested = TRUSTY_LOG_MIN_SIZE;
-+ if (requested > TRUSTY_LOG_MAX_SIZE)
-+ requested = TRUSTY_LOG_MAX_SIZE;
-+ requested = rounddown_pow_of_two(requested);
-+ log_size_param = requested;
-+ return 0;
-+}
-+
-+static int trusty_log_size_get(char *buffer, const struct kernel_param *kp)
-+{
-+ sprintf(buffer, "%zu", log_size_param);
-+ return strlen(buffer);
-+}
-+
-+module_param_call(log_size, trusty_log_size_set, trusty_log_size_get, NULL,
-+ 0644);
-+/*
-+ * If we log too much and a UART or other slow source is connected, we can stall
-+ * out another thread which is doing printk.
-+ *
-+ * Trusty crash logs are currently ~16 lines, so 100 should include context and
-+ * the crash most of the time.
-+ */
-+static struct ratelimit_state trusty_log_rate_limit =
-+ RATELIMIT_STATE_INIT("trusty_log", 1 * HZ, 100);
-+
-+/**
-+ * struct trusty_log_sfile - trusty log misc device state
-+ *
-+ * @misc: misc device created for the trusty log virtual file
-+ * @device_name: misc device name following the convention
-+ * "trusty-<name><id>"
-+ */
-+struct trusty_log_sfile {
-+ struct miscdevice misc;
-+ char device_name[64];
-+};
-+
-+/**
-+ * struct trusty_log_sink_state - trusty log sink state
-+ *
-+ * @get: current read unwrapped index
-+ * @trusty_panicked: trusty panic status at the start of the sink interation
-+ * (only used for kernel log sink)
-+ * @sfile: seq_file used for sinking to a virtual file (misc device);
-+ * set to NULL for the kernel log sink.
-+ * @ignore_overflow: ignore_overflow used to coalesce overflow messages and
-+ * avoid reporting an overflow when sinking the oldest
-+ * line to the virtual file (only used for virtual file sink)
-+ *
-+ * A sink state structure is used for both the kernel log sink
-+ * and the virtual device sink.
-+ * An instance of the sink state structure is dynamically created
-+ * for each read iteration of the trusty log virtual file (misc device).
-+ *
-+ */
-+struct trusty_log_sink_state {
-+ u32 get;
-+ bool trusty_panicked;
-+
-+ /* virtual file sink specific attributes */
-+ struct seq_file *sfile;
-+ bool ignore_overflow;
-+};
-+
-+struct trusty_log_state {
-+ struct device *dev;
-+ struct device *trusty_dev;
-+ struct trusty_log_sfile log_sfile;
-+
-+ struct log_rb *log;
-+ struct trusty_log_sink_state klog_sink;
-+
-+ u32 log_num_pages;
-+ struct scatterlist *sg;
-+ trusty_shared_mem_id_t log_pages_shared_mem_id;
-+
-+ struct notifier_block call_notifier;
-+ struct notifier_block panic_notifier;
-+ char line_buffer[TRUSTY_LINE_BUFFER_SIZE];
-+ wait_queue_head_t poll_waiters;
-+ /* this lock protects access to wake_put */
-+ spinlock_t wake_up_lock;
-+ u32 last_wake_put;
-+};
-+
-+static inline u32 u32_add_overflow(u32 a, u32 b)
-+{
-+ u32 d;
-+
-+ if (check_add_overflow(a, b, &d)) {
-+ /*
-+ * silence the overflow,
-+ * what matters in the log buffer context
-+ * is the casted addition
-+ */
-+ }
-+ return d;
-+}
-+
-+static inline u32 u32_sub_overflow(u32 a, u32 b)
-+{
-+ u32 d;
-+
-+ if (check_sub_overflow(a, b, &d)) {
-+ /*
-+ * silence the overflow,
-+ * what matters in the log buffer context
-+ * is the casted substraction
-+ */
-+ }
-+ return d;
-+}
-+
-+static int log_read_line(struct trusty_log_state *s, u32 put, u32 get)
-+{
-+ struct log_rb *log = s->log;
-+ int i;
-+ char c = '\0';
-+ size_t max_to_read =
-+ min_t(size_t,
-+ u32_sub_overflow(put, get),
-+ sizeof(s->line_buffer) - 1);
-+ size_t mask = log->sz - 1;
-+
-+ for (i = 0; i < max_to_read && c != '\n';) {
-+ c = log->data[get & mask];
-+ s->line_buffer[i++] = c;
-+ get = u32_add_overflow(get, 1);
-+ }
-+ s->line_buffer[i] = '\0';
-+
-+ return i;
-+}
-+
-+/**
-+ * trusty_log_has_data() - returns true when more data is available to sink
-+ * @s: Current log state.
-+ * @sink: trusty_log_sink_state holding the get index on a given sink
-+ *
-+ * Return: true if data is available.
-+ */
-+static bool trusty_log_has_data(struct trusty_log_state *s,
-+ struct trusty_log_sink_state *sink)
-+{
-+ struct log_rb *log = s->log;
-+
-+ return (log->put != sink->get);
-+}
-+
-+/**
-+ * trusty_log_start() - initialize the sink iteration either to kernel log
-+ * or to secondary log_sfile
-+ * @s: Current log state.
-+ * @sink: trusty_log_sink_state holding the get index on a given sink
-+ * @index: Unwrapped ring buffer index from where iteration shall start
-+ *
-+ * Return: 0 if successful, negative error code otherwise
-+ */
-+static int trusty_log_start(struct trusty_log_state *s,
-+ struct trusty_log_sink_state *sink,
-+ u32 index)
-+{
-+ struct log_rb *log;
-+
-+ if (WARN_ON(!s))
-+ return -EINVAL;
-+
-+ log = s->log;
-+ if (WARN_ON(!is_power_of_2(log->sz)))
-+ return -EINVAL;
-+
-+ sink->get = index;
-+ return 0;
-+}
-+
-+/**
-+ * trusty_log_show() - sink log entry at current iteration
-+ * @s: Current log state.
-+ * @sink: trusty_log_sink_state holding the get index on a given sink
-+ */
-+static void trusty_log_show(struct trusty_log_state *s,
-+ struct trusty_log_sink_state *sink)
-+{
-+ struct log_rb *log = s->log;
-+ u32 alloc, put, get;
-+ int read_chars;
-+
-+ /*
-+ * For this ring buffer, at any given point, alloc >= put >= get.
-+ * The producer side of the buffer is not locked, so the put and alloc
-+ * pointers must be read in a defined order (put before alloc) so
-+ * that the above condition is maintained. A read barrier is needed
-+ * to make sure the hardware and compiler keep the reads ordered.
-+ */
-+ get = sink->get;
-+ put = log->put;
-+
-+ /* Make sure that the read of put occurs before the read of log data */
-+ rmb();
-+
-+ /* Read a line from the log */
-+ read_chars = log_read_line(s, put, get);
-+
-+ /* Force the loads from log_read_line to complete. */
-+ rmb();
-+ alloc = log->alloc;
-+
-+ /*
-+ * Discard the line that was just read if the data could
-+ * have been corrupted by the producer.
-+ */
-+ if (u32_sub_overflow(alloc, get) > log->sz) {
-+ /*
-+ * this condition is acceptable in the case of the sfile sink
-+ * when attempting to read the oldest entry (at alloc-log->sz)
-+ * which may be overrun by a new one when ring buffer write
-+ * index wraps around.
-+ * So the overrun is not reported in case the oldest line
-+ * was being read.
-+ */
-+ if (sink->sfile) {
-+ if (!sink->ignore_overflow)
-+ seq_puts(sink->sfile, "log overflow.\n");
-+ /* coalesce subsequent contiguous overflows. */
-+ sink->ignore_overflow = true;
-+ } else {
-+ dev_err(s->dev, "log overflow.\n");
-+ }
-+ sink->get = u32_sub_overflow(alloc, log->sz);
-+ return;
-+ }
-+ /* compute next line index */
-+ sink->get = u32_add_overflow(get, read_chars);
-+ /* once a line is valid, ignore_overflow must be disabled */
-+ sink->ignore_overflow = false;
-+ if (sink->sfile) {
-+ seq_printf(sink->sfile, "%s", s->line_buffer);
-+ } else {
-+ if (sink->trusty_panicked ||
-+ __ratelimit(&trusty_log_rate_limit)) {
-+ dev_info(s->dev, "%s", s->line_buffer);
-+ }
-+ }
-+}
-+
-+static void *trusty_log_seq_start(struct seq_file *sfile, loff_t *pos)
-+{
-+ struct trusty_log_sfile *lb;
-+ struct trusty_log_state *s;
-+ struct log_rb *log;
-+ struct trusty_log_sink_state *log_sfile_sink;
-+ u32 index;
-+ int rc;
-+
-+ if (WARN_ON(!pos))
-+ return ERR_PTR(-EINVAL);
-+
-+ lb = sfile->private;
-+ if (WARN_ON(!lb))
-+ return ERR_PTR(-EINVAL);
-+
-+ log_sfile_sink = kzalloc(sizeof(*log_sfile_sink), GFP_KERNEL);
-+ if (!log_sfile_sink)
-+ return ERR_PTR(-ENOMEM);
-+
-+ s = container_of(lb, struct trusty_log_state, log_sfile);
-+ log_sfile_sink->sfile = sfile;
-+ log = s->log;
-+ if (*pos == 0) {
-+ /* start at the oldest line */
-+ index = 0;
-+ if (log->alloc > log->sz)
-+ index = u32_sub_overflow(log->alloc, log->sz);
-+ } else {
-+ /*
-+ * '*pos>0': pos hold the 32bits unwrapped index from where
-+ * to start iterating
-+ */
-+ index = (u32)*pos;
-+ }
-+ pr_debug("%s start=%u\n", __func__, index);
-+
-+ log_sfile_sink->ignore_overflow = true;
-+ rc = trusty_log_start(s, log_sfile_sink, index);
-+ if (rc < 0)
-+ goto free_sink;
-+
-+ if (!trusty_log_has_data(s, log_sfile_sink))
-+ goto free_sink;
-+
-+ return log_sfile_sink;
-+
-+free_sink:
-+ pr_debug("%s kfree\n", __func__);
-+ kfree(log_sfile_sink);
-+ return rc < 0 ? ERR_PTR(rc) : NULL;
-+}
-+
-+static void *trusty_log_seq_next(struct seq_file *sfile, void *v, loff_t *pos)
-+{
-+ struct trusty_log_sfile *lb;
-+ struct trusty_log_state *s;
-+ struct trusty_log_sink_state *log_sfile_sink = v;
-+ int rc = 0;
-+
-+ if (WARN_ON(!log_sfile_sink))
-+ return ERR_PTR(-EINVAL);
-+
-+ lb = sfile->private;
-+ if (WARN_ON(!lb)) {
-+ rc = -EINVAL;
-+ goto end_of_iter;
-+ }
-+ s = container_of(lb, struct trusty_log_state, log_sfile);
-+
-+ if (WARN_ON(!pos)) {
-+ rc = -EINVAL;
-+ goto end_of_iter;
-+ }
-+ /*
-+ * When starting a virtual file sink, the start function is invoked
-+ * with a pos argument which value is set to zero.
-+ * Subsequent starts are invoked with pos being set to
-+ * the unwrapped read index (get).
-+ * Upon u32 wraparound, the get index could be reset to zero.
-+ * Thus a msb is used to distinguish the `get` zero value
-+ * from the `start of file` zero value.
-+ */
-+ *pos = (1UL << 32) + log_sfile_sink->get;
-+ if (!trusty_log_has_data(s, log_sfile_sink))
-+ goto end_of_iter;
-+
-+ return log_sfile_sink;
-+
-+end_of_iter:
-+ pr_debug("%s kfree\n", __func__);
-+ kfree(log_sfile_sink);
-+ return rc < 0 ? ERR_PTR(rc) : NULL;
-+}
-+
-+static void trusty_log_seq_stop(struct seq_file *sfile, void *v)
-+{
-+ /*
-+ * When iteration completes or on error, the next callback frees
-+ * the sink structure and returns NULL/error-code.
-+ * In that case stop (being invoked with void* v set to the last next
-+ * return value) would be invoked with v == NULL or error code.
-+ * When user space stops the iteration earlier than the end
-+ * (in case of user-space memory allocation limit for example)
-+ * then the stop function receives a non NULL get pointer
-+ * and is in charge or freeing the sink structure.
-+ */
-+ struct trusty_log_sink_state *log_sfile_sink = v;
-+
-+ /* nothing to do - sink structure already freed */
-+ if (IS_ERR_OR_NULL(log_sfile_sink))
-+ return;
-+
-+ kfree(log_sfile_sink);
-+
-+ pr_debug("%s kfree\n", __func__);
-+}
-+
-+static int trusty_log_seq_show(struct seq_file *sfile, void *v)
-+{
-+ struct trusty_log_sfile *lb;
-+ struct trusty_log_state *s;
-+ struct trusty_log_sink_state *log_sfile_sink = v;
-+
-+ if (WARN_ON(!log_sfile_sink))
-+ return -EINVAL;
-+
-+ lb = sfile->private;
-+ if (WARN_ON(!lb))
-+ return -EINVAL;
-+
-+ s = container_of(lb, struct trusty_log_state, log_sfile);
-+
-+ trusty_log_show(s, log_sfile_sink);
-+ return 0;
-+}
-+
-+static void trusty_dump_logs(struct trusty_log_state *s)
-+{
-+ int rc;
-+ /*
-+ * note: klog_sink.get initialized to zero by kzalloc
-+ */
-+ s->klog_sink.trusty_panicked = trusty_get_panic_status(s->trusty_dev);
-+
-+ rc = trusty_log_start(s, &s->klog_sink, s->klog_sink.get);
-+ if (rc < 0)
-+ return;
-+
-+ while (trusty_log_has_data(s, &s->klog_sink))
-+ trusty_log_show(s, &s->klog_sink);
-+}
-+
-+static int trusty_log_call_notify(struct notifier_block *nb,
-+ unsigned long action, void *data)
-+{
-+ struct trusty_log_state *s;
-+ unsigned long flags;
-+ u32 cur_put;
-+
-+ if (action != TRUSTY_CALL_RETURNED)
-+ return NOTIFY_DONE;
-+
-+ s = container_of(nb, struct trusty_log_state, call_notifier);
-+ spin_lock_irqsave(&s->wake_up_lock, flags);
-+ cur_put = s->log->put;
-+ if (cur_put != s->last_wake_put) {
-+ s->last_wake_put = cur_put;
-+ wake_up_all(&s->poll_waiters);
-+ }
-+ spin_unlock_irqrestore(&s->wake_up_lock, flags);
-+ return NOTIFY_OK;
-+}
-+
-+static int trusty_log_panic_notify(struct notifier_block *nb,
-+ unsigned long action, void *data)
-+{
-+ struct trusty_log_state *s;
-+
-+ /*
-+ * Don't grab the spin lock to hold up the panic notifier, even
-+ * though this is racy.
-+ */
-+ s = container_of(nb, struct trusty_log_state, panic_notifier);
-+ dev_info(s->dev, "panic notifier - trusty version %s",
-+ trusty_version_str_get(s->trusty_dev));
-+ trusty_dump_logs(s);
-+ return NOTIFY_OK;
-+}
-+
-+const struct seq_operations trusty_log_seq_ops = {
-+ .start = trusty_log_seq_start,
-+ .stop = trusty_log_seq_stop,
-+ .next = trusty_log_seq_next,
-+ .show = trusty_log_seq_show,
-+};
-+
-+static int trusty_log_sfile_dev_open(struct inode *inode, struct file *file)
-+{
-+ struct trusty_log_sfile *ls;
-+ struct seq_file *sfile;
-+ int rc;
-+
-+ /*
-+ * file->private_data contains a pointer to the misc_device struct
-+ * passed to misc_register()
-+ */
-+ if (WARN_ON(!file->private_data))
-+ return -EINVAL;
-+
-+ ls = container_of(file->private_data, struct trusty_log_sfile, misc);
-+
-+ /*
-+ * seq_open uses file->private_data to store the seq_file associated
-+ * with the struct file, but it must be NULL when seq_open is called
-+ */
-+ file->private_data = NULL;
-+ rc = seq_open(file, &trusty_log_seq_ops);
-+ if (rc < 0)
-+ return rc;
-+
-+ sfile = file->private_data;
-+ if (WARN_ON(!sfile))
-+ return -EINVAL;
-+
-+ sfile->private = ls;
-+ return 0;
-+}
-+
-+static unsigned int trusty_log_sfile_dev_poll(struct file *filp,
-+ struct poll_table_struct *wait)
-+{
-+ struct seq_file *sfile;
-+ struct trusty_log_sfile *lb;
-+ struct trusty_log_state *s;
-+ struct log_rb *log;
-+
-+ /*
-+ * trusty_log_sfile_dev_open() pointed filp->private_data to a
-+ * seq_file, and that seq_file->private to the trusty_log_sfile
-+ * field of a trusty_log_state
-+ */
-+ sfile = filp->private_data;
-+ lb = sfile->private;
-+ s = container_of(lb, struct trusty_log_state, log_sfile);
-+ poll_wait(filp, &s->poll_waiters, wait);
-+ log = s->log;
-+
-+ /*
-+ * Userspace has read up to filp->f_pos so far. Update klog_sink
-+ * to indicate that, so that we don't end up dumping the entire
-+ * Trusty log in case of panic.
-+ */
-+ s->klog_sink.get = (u32)filp->f_pos;
-+
-+ if (log->put != (u32)filp->f_pos) {
-+ /* data ready to read */
-+ return EPOLLIN | EPOLLRDNORM;
-+ }
-+ /* no data available, go to sleep */
-+ return 0;
-+}
-+
-+static const struct file_operations log_sfile_dev_operations = {
-+ .owner = THIS_MODULE,
-+ .open = trusty_log_sfile_dev_open,
-+ .poll = trusty_log_sfile_dev_poll,
-+ .read = seq_read,
-+ .release = seq_release,
-+};
-+
-+static int trusty_log_sfile_register(struct trusty_log_state *s)
-+{
-+ int ret;
-+ struct trusty_log_sfile *ls = &s->log_sfile;
-+
-+ if (WARN_ON(!ls))
-+ return -EINVAL;
-+
-+ snprintf(ls->device_name, sizeof(ls->device_name),
-+ "trusty-log%d", s->dev->id);
-+ ls->misc.minor = MISC_DYNAMIC_MINOR;
-+ ls->misc.name = ls->device_name;
-+ ls->misc.fops = &log_sfile_dev_operations;
-+
-+ ret = misc_register(&ls->misc);
-+ if (ret) {
-+ dev_err(s->dev,
-+ "log_sfile error while doing misc_register ret=%d\n",
-+ ret);
-+ return ret;
-+ }
-+ dev_info(s->dev, "/dev/%s registered\n",
-+ ls->device_name);
-+ return 0;
-+}
-+
-+static void trusty_log_sfile_unregister(struct trusty_log_state *s)
-+{
-+ struct trusty_log_sfile *ls = &s->log_sfile;
-+
-+ misc_deregister(&ls->misc);
-+ if (s->dev) {
-+ dev_info(s->dev, "/dev/%s unregistered\n",
-+ ls->misc.name);
-+ }
-+}
-+
-+static bool trusty_supports_logging(struct device *device)
-+{
-+ int result;
-+
-+ result = trusty_std_call32(device, SMC_SC_SHARED_LOG_VERSION,
-+ TRUSTY_LOG_API_VERSION, 0, 0);
-+ if (result == SM_ERR_UNDEFINED_SMC) {
-+ dev_info(device, "trusty-log not supported on secure side.\n");
-+ return false;
-+ } else if (result < 0) {
-+ dev_err(device,
-+ "trusty std call (SMC_SC_SHARED_LOG_VERSION) failed: %d\n",
-+ result);
-+ return false;
-+ }
-+
-+ if (result != TRUSTY_LOG_API_VERSION) {
-+ dev_info(device, "unsupported api version: %d, supported: %d\n",
-+ result, TRUSTY_LOG_API_VERSION);
-+ return false;
-+ }
-+ return true;
-+}
-+
-+static int trusty_log_init(struct platform_device *pdev)
-+{
-+ struct trusty_log_state *s;
-+ struct scatterlist *sg;
-+ unsigned char *mem;
-+ int i;
-+ int result;
-+ trusty_shared_mem_id_t mem_id;
-+ int log_size;
-+
-+ s = kzalloc(sizeof(*s), GFP_KERNEL);
-+ if (!s) {
-+ result = -ENOMEM;
-+ goto error_alloc_state;
-+ }
-+
-+ s->dev = &pdev->dev;
-+ s->trusty_dev = s->dev->parent;
-+
-+ s->log_num_pages = DIV_ROUND_UP(log_size_param + sizeof(struct log_rb),
-+ PAGE_SIZE);
-+ s->sg = kcalloc(s->log_num_pages, sizeof(*s->sg), GFP_KERNEL);
-+ if (!s->sg) {
-+ result = -ENOMEM;
-+ goto error_alloc_sg;
-+ }
-+
-+ log_size = s->log_num_pages * PAGE_SIZE;
-+ mem = vzalloc(log_size);
-+ if (!mem) {
-+ result = -ENOMEM;
-+ goto error_alloc_log;
-+ }
-+
-+ s->log = (struct log_rb *)mem;
-+
-+ sg_init_table(s->sg, s->log_num_pages);
-+ for_each_sg(s->sg, sg, s->log_num_pages, i) {
-+ struct page *pg = vmalloc_to_page(mem + (i * PAGE_SIZE));
-+
-+ if (!pg) {
-+ result = -ENOMEM;
-+ goto err_share_memory;
-+ }
-+ sg_set_page(sg, pg, PAGE_SIZE, 0);
-+ }
-+ /*
-+ * This will fail for Trusty api version < TRUSTY_API_VERSION_MEM_OBJ
-+ * if s->log_num_pages > 1
-+ * Use trusty_share_memory_compat instead of trusty_share_memory in case
-+ * s->log_num_pages == 1 and api version < TRUSTY_API_VERSION_MEM_OBJ,
-+ * In that case SMC_SC_SHARED_LOG_ADD expects a different value than
-+ * what trusty_share_memory returns
-+ */
-+ result = trusty_share_memory_compat(s->trusty_dev, &mem_id, s->sg,
-+ s->log_num_pages, PAGE_KERNEL);
-+ if (result) {
-+ dev_err(s->dev, "trusty_share_memory failed: %d\n", result);
-+ goto err_share_memory;
-+ }
-+ s->log_pages_shared_mem_id = mem_id;
-+
-+ result = trusty_std_call32(s->trusty_dev,
-+ SMC_SC_SHARED_LOG_ADD,
-+ (u32)(mem_id), (u32)(mem_id >> 32),
-+ log_size);
-+ if (result < 0) {
-+ dev_err(s->dev,
-+ "trusty std call (SMC_SC_SHARED_LOG_ADD) failed: %d 0x%llx\n",
-+ result, mem_id);
-+ goto error_std_call;
-+ }
-+
-+ init_waitqueue_head(&s->poll_waiters);
-+ spin_lock_init(&s->wake_up_lock);
-+
-+ s->call_notifier.notifier_call = trusty_log_call_notify;
-+ result = trusty_call_notifier_register(s->trusty_dev,
-+ &s->call_notifier);
-+ if (result < 0) {
-+ dev_err(&pdev->dev,
-+ "failed to register trusty call notifier\n");
-+ goto error_call_notifier;
-+ }
-+
-+ s->panic_notifier.notifier_call = trusty_log_panic_notify;
-+ result = atomic_notifier_chain_register(&panic_notifier_list,
-+ &s->panic_notifier);
-+ if (result < 0) {
-+ dev_err(&pdev->dev,
-+ "failed to register panic notifier\n");
-+ goto error_panic_notifier;
-+ }
-+
-+ result = trusty_log_sfile_register(s);
-+ if (result < 0) {
-+ dev_err(&pdev->dev, "failed to register log_sfile\n");
-+ goto error_log_sfile;
-+ }
-+
-+ platform_set_drvdata(pdev, s);
-+
-+ return 0;
-+
-+error_log_sfile:
-+ atomic_notifier_chain_unregister(&panic_notifier_list,
-+ &s->panic_notifier);
-+error_panic_notifier:
-+ trusty_call_notifier_unregister(s->trusty_dev, &s->call_notifier);
-+error_call_notifier:
-+ trusty_std_call32(s->trusty_dev, SMC_SC_SHARED_LOG_RM,
-+ (u32)mem_id, (u32)(mem_id >> 32), 0);
-+error_std_call:
-+ if (WARN_ON(trusty_reclaim_memory(s->trusty_dev, mem_id, s->sg,
-+ s->log_num_pages))) {
-+ dev_err(&pdev->dev, "trusty_revoke_memory failed: %d 0x%llx\n",
-+ result, mem_id);
-+ /*
-+ * It is not safe to free this memory if trusty_revoke_memory
-+ * fails. Leak it in that case.
-+ */
-+ } else {
-+err_share_memory:
-+ vfree(s->log);
-+ }
-+error_alloc_log:
-+ kfree(s->sg);
-+error_alloc_sg:
-+ kfree(s);
-+error_alloc_state:
-+ return result;
-+}
-+
-+static int trusty_log_probe(struct platform_device *pdev)
-+{
-+ int rc;
-+
-+ if (!trusty_supports_logging(pdev->dev.parent))
-+ return -ENXIO;
-+
-+ rc = trusty_log_init(pdev);
-+ if (rc && log_size_param > TRUSTY_LOG_MIN_SIZE) {
-+ dev_warn(&pdev->dev, "init failed, retrying with 1-page log\n");
-+ log_size_param = TRUSTY_LOG_MIN_SIZE;
-+ rc = trusty_log_init(pdev);
-+ }
-+ return rc;
-+}
-+
-+static int trusty_log_remove(struct platform_device *pdev)
-+{
-+ int result;
-+ struct trusty_log_state *s = platform_get_drvdata(pdev);
-+ trusty_shared_mem_id_t mem_id = s->log_pages_shared_mem_id;
-+
-+ trusty_log_sfile_unregister(s);
-+ atomic_notifier_chain_unregister(&panic_notifier_list,
-+ &s->panic_notifier);
-+ trusty_call_notifier_unregister(s->trusty_dev, &s->call_notifier);
-+
-+ result = trusty_std_call32(s->trusty_dev, SMC_SC_SHARED_LOG_RM,
-+ (u32)mem_id, (u32)(mem_id >> 32), 0);
-+ if (result) {
-+ dev_err(&pdev->dev,
-+ "trusty std call (SMC_SC_SHARED_LOG_RM) failed: %d\n",
-+ result);
-+ }
-+ result = trusty_reclaim_memory(s->trusty_dev, mem_id, s->sg,
-+ s->log_num_pages);
-+ if (WARN_ON(result)) {
-+ dev_err(&pdev->dev,
-+ "trusty failed to remove shared memory: %d\n", result);
-+ } else {
-+ /*
-+ * It is not safe to free this memory if trusty_revoke_memory
-+ * fails. Leak it in that case.
-+ */
-+ vfree(s->log);
-+ }
-+ kfree(s->sg);
-+ kfree(s);
-+
-+ return 0;
-+}
-+
-+static const struct of_device_id trusty_test_of_match[] = {
-+ { .compatible = "android,trusty-log-v1", },
-+ {},
-+};
-+
-+MODULE_DEVICE_TABLE(trusty, trusty_test_of_match);
-+
-+static struct platform_driver trusty_log_driver = {
-+ .probe = trusty_log_probe,
-+ .remove = trusty_log_remove,
-+ .driver = {
-+ .name = "trusty-log",
-+ .of_match_table = trusty_test_of_match,
-+ },
-+};
-+
-+module_platform_driver(trusty_log_driver);
-+
-+MODULE_LICENSE("GPL v2");
-+MODULE_DESCRIPTION("Trusty logging driver");
-diff --git a/drivers/trusty/trusty-log.h b/drivers/trusty/trusty-log.h
-new file mode 100644
-index 000000000000..7b5e6096b51e
---- /dev/null
-+++ b/drivers/trusty/trusty-log.h
-@@ -0,0 +1,28 @@
-+/* SPDX-License-Identifier: MIT */
-+/*
-+ * Copyright (c) 2015 Google, Inc.
-+ *
-+ * Trusty also has a copy of this header. Please keep the copies in sync.
-+ */
-+#ifndef _TRUSTY_LOG_H_
-+#define _TRUSTY_LOG_H_
-+
-+/*
-+ * Ring buffer that supports one secure producer thread and one
-+ * linux side consumer thread.
-+ */
-+struct log_rb {
-+ volatile uint32_t alloc;
-+ volatile uint32_t put;
-+ uint32_t sz;
-+ volatile char data[];
-+} __packed;
-+
-+#define SMC_SC_SHARED_LOG_VERSION SMC_STDCALL_NR(SMC_ENTITY_LOGGING, 0)
-+#define SMC_SC_SHARED_LOG_ADD SMC_STDCALL_NR(SMC_ENTITY_LOGGING, 1)
-+#define SMC_SC_SHARED_LOG_RM SMC_STDCALL_NR(SMC_ENTITY_LOGGING, 2)
-+
-+#define TRUSTY_LOG_API_VERSION 1
-+
-+#endif
-+
-diff --git a/drivers/trusty/trusty-mem.c b/drivers/trusty/trusty-mem.c
-new file mode 100644
-index 000000000000..8a360298e501
---- /dev/null
-+++ b/drivers/trusty/trusty-mem.c
-@@ -0,0 +1,139 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Copyright (C) 2015 Google, Inc.
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/printk.h>
-+#include <linux/trusty/arm_ffa.h>
-+#include <linux/trusty/trusty.h>
-+#include <linux/trusty/smcall.h>
-+
-+#define MEM_ATTR_STRONGLY_ORDERED (0x00U)
-+#define MEM_ATTR_DEVICE (0x04U)
-+#define MEM_ATTR_NORMAL_NON_CACHEABLE (0x44U)
-+#define MEM_ATTR_NORMAL_WRITE_THROUGH (0xAAU)
-+#define MEM_ATTR_NORMAL_WRITE_BACK_READ_ALLOCATE (0xEEU)
-+#define MEM_ATTR_NORMAL_WRITE_BACK_WRITE_ALLOCATE (0xFFU)
-+
-+#define ATTR_RDONLY (1U << 7)
-+#define ATTR_INNER_SHAREABLE (3U << 8)
-+
-+static int get_mem_attr(struct page *page, pgprot_t pgprot)
-+{
-+#if defined(CONFIG_ARM64)
-+ u64 mair;
-+ unsigned int attr_index = (pgprot_val(pgprot) & PTE_ATTRINDX_MASK) >> 2;
-+
-+ asm ("mrs %0, mair_el1\n" : "=&r" (mair));
-+ return (mair >> (attr_index * 8)) & 0xff;
-+
-+#elif defined(CONFIG_ARM_LPAE)
-+ u32 mair;
-+ unsigned int attr_index = ((pgprot_val(pgprot) & L_PTE_MT_MASK) >> 2);
-+
-+ if (attr_index >= 4) {
-+ attr_index -= 4;
-+ asm volatile("mrc p15, 0, %0, c10, c2, 1\n" : "=&r" (mair));
-+ } else {
-+ asm volatile("mrc p15, 0, %0, c10, c2, 0\n" : "=&r" (mair));
-+ }
-+ return (mair >> (attr_index * 8)) & 0xff;
-+
-+#elif defined(CONFIG_ARM)
-+ /* check memory type */
-+ switch (pgprot_val(pgprot) & L_PTE_MT_MASK) {
-+ case L_PTE_MT_WRITEALLOC:
-+ return MEM_ATTR_NORMAL_WRITE_BACK_WRITE_ALLOCATE;
-+
-+ case L_PTE_MT_BUFFERABLE:
-+ return MEM_ATTR_NORMAL_NON_CACHEABLE;
-+
-+ case L_PTE_MT_WRITEBACK:
-+ return MEM_ATTR_NORMAL_WRITE_BACK_READ_ALLOCATE;
-+
-+ case L_PTE_MT_WRITETHROUGH:
-+ return MEM_ATTR_NORMAL_WRITE_THROUGH;
-+
-+ case L_PTE_MT_UNCACHED:
-+ return MEM_ATTR_STRONGLY_ORDERED;
-+
-+ case L_PTE_MT_DEV_SHARED:
-+ case L_PTE_MT_DEV_NONSHARED:
-+ return MEM_ATTR_DEVICE;
-+
-+ default:
-+ return -EINVAL;
-+ }
-+#else
-+ return 0;
-+#endif
-+}
-+
-+int trusty_encode_page_info(struct ns_mem_page_info *inf,
-+ struct page *page, pgprot_t pgprot)
-+{
-+ int mem_attr;
-+ u64 pte;
-+ u8 ffa_mem_attr;
-+ u8 ffa_mem_perm = 0;
-+
-+ if (!inf || !page)
-+ return -EINVAL;
-+
-+ /* get physical address */
-+ pte = (u64)page_to_phys(page);
-+
-+ /* get memory attributes */
-+ mem_attr = get_mem_attr(page, pgprot);
-+ if (mem_attr < 0)
-+ return mem_attr;
-+
-+ switch (mem_attr) {
-+ case MEM_ATTR_STRONGLY_ORDERED:
-+ ffa_mem_attr = FFA_MEM_ATTR_DEVICE_NGNRNE;
-+ break;
-+
-+ case MEM_ATTR_DEVICE:
-+ ffa_mem_attr = FFA_MEM_ATTR_DEVICE_NGNRE;
-+ break;
-+
-+ case MEM_ATTR_NORMAL_NON_CACHEABLE:
-+ ffa_mem_attr = FFA_MEM_ATTR_NORMAL_MEMORY_UNCACHED;
-+ break;
-+
-+ case MEM_ATTR_NORMAL_WRITE_BACK_READ_ALLOCATE:
-+ case MEM_ATTR_NORMAL_WRITE_BACK_WRITE_ALLOCATE:
-+ ffa_mem_attr = FFA_MEM_ATTR_NORMAL_MEMORY_CACHED_WB;
-+ break;
-+
-+ default:
-+ return -EINVAL;
-+ }
-+
-+ inf->paddr = pte;
-+
-+ /* add other attributes */
-+#if defined(CONFIG_ARM64) || defined(CONFIG_ARM_LPAE)
-+ pte |= pgprot_val(pgprot);
-+#elif defined(CONFIG_ARM)
-+ if (pgprot_val(pgprot) & L_PTE_RDONLY)
-+ pte |= ATTR_RDONLY;
-+ if (pgprot_val(pgprot) & L_PTE_SHARED)
-+ pte |= ATTR_INNER_SHAREABLE; /* inner sharable */
-+#endif
-+
-+ if (!(pte & ATTR_RDONLY))
-+ ffa_mem_perm |= FFA_MEM_PERM_RW;
-+ else
-+ ffa_mem_perm |= FFA_MEM_PERM_RO;
-+
-+ if ((pte & ATTR_INNER_SHAREABLE) == ATTR_INNER_SHAREABLE)
-+ ffa_mem_attr |= FFA_MEM_ATTR_INNER_SHAREABLE;
-+
-+ inf->ffa_mem_attr = ffa_mem_attr;
-+ inf->ffa_mem_perm = ffa_mem_perm;
-+ inf->compat_attr = (pte & 0x0000FFFFFFFFFFFFull) |
-+ ((u64)mem_attr << 48);
-+ return 0;
-+}
-diff --git a/drivers/trusty/trusty-smc-arm.S b/drivers/trusty/trusty-smc-arm.S
-new file mode 100644
-index 000000000000..8ff83547d33f
---- /dev/null
-+++ b/drivers/trusty/trusty-smc-arm.S
-@@ -0,0 +1,41 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+/*
-+ * Copyright (C) 2020 Google, Inc.
-+ */
-+
-+#include <linux/linkage.h>
-+
-+.arch_extension sec
-+
-+ENTRY(trusty_smc8)
-+ /* Save stack location where r3-r7 smc arguments are stored */
-+ mov r12, sp
-+
-+ /* Save original r4-r7 values as caller expects these to be preserved */
-+ push {r4-r7}
-+
-+ /* Save return value pointer and return address */
-+ push {r0, lr}
-+
-+ /* arm abi shifts arguments when returning a struct, shift them back */
-+ mov r0, r1
-+ mov r1, r2
-+ mov r2, r3
-+
-+ /* Load stack based arguments */
-+ ldmia r12, {r3-r7}
-+
-+ smc #0
-+
-+ /* Restore return address and get return value pointer */
-+ pop {r12, lr}
-+
-+ /* Copy 8-register smc return value to struct smc_ret8 return value */
-+ stmia r12, {r0-r7}
-+
-+ /* Restore original r4-r7 values */
-+ pop {r4-r7}
-+
-+ /* Return */
-+ bx lr
-+ENDPROC(trusty_smc8)
-diff --git a/drivers/trusty/trusty-smc-arm64.S b/drivers/trusty/trusty-smc-arm64.S
-new file mode 100644
-index 000000000000..14c8fed28a5e
---- /dev/null
-+++ b/drivers/trusty/trusty-smc-arm64.S
-@@ -0,0 +1,35 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+/*
-+ * Copyright (C) 2020 Google, Inc.
-+ */
-+
-+#include <linux/linkage.h>
-+
-+.macro push ra, rb
-+stp \ra, \rb, [sp,#-16]!
-+.endm
-+
-+.macro pop ra, rb
-+ldp \ra, \rb, [sp], #16
-+.endm
-+
-+lr .req x30
-+
-+SYM_FUNC_START(trusty_smc8)
-+ /*
-+ * Save x8 (return value ptr) and lr. The SMC calling convention says el3
-+ * does not need to preserve x8. The normal ABI does not require either x8
-+ * or lr to be preserved.
-+ */
-+ push x8, lr
-+ smc #0
-+ pop x8, lr
-+
-+ /* Copy 8-register smc return value to struct smc_ret8 return value */
-+ stp x0, x1, [x8], #16
-+ stp x2, x3, [x8], #16
-+ stp x4, x5, [x8], #16
-+ stp x6, x7, [x8], #16
-+
-+ ret
-+SYM_FUNC_END(trusty_smc8)
-diff --git a/drivers/trusty/trusty-smc.h b/drivers/trusty/trusty-smc.h
-new file mode 100644
-index 000000000000..b53e5abb4d05
---- /dev/null
-+++ b/drivers/trusty/trusty-smc.h
-@@ -0,0 +1,26 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+/*
-+ * Copyright (C) 2020 Google, Inc.
-+ */
-+#ifndef _TRUSTY_SMC_H
-+#define _TRUSTY_SMC_H
-+
-+#include <linux/types.h>
-+
-+struct smc_ret8 {
-+ unsigned long r0;
-+ unsigned long r1;
-+ unsigned long r2;
-+ unsigned long r3;
-+ unsigned long r4;
-+ unsigned long r5;
-+ unsigned long r6;
-+ unsigned long r7;
-+};
-+
-+struct smc_ret8 trusty_smc8(unsigned long r0, unsigned long r1,
-+ unsigned long r2, unsigned long r3,
-+ unsigned long r4, unsigned long r5,
-+ unsigned long r6, unsigned long r7);
-+
-+#endif /* _TRUSTY_SMC_H */
-diff --git a/drivers/trusty/trusty-test.c b/drivers/trusty/trusty-test.c
-new file mode 100644
-index 000000000000..844868981fa5
---- /dev/null
-+++ b/drivers/trusty/trusty-test.c
-@@ -0,0 +1,440 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Copyright (C) 2020 Google, Inc.
-+ */
-+
-+#include <linux/ctype.h>
-+#include <linux/list.h>
-+#include <linux/platform_device.h>
-+#include <linux/trusty/smcall.h>
-+#include <linux/trusty/trusty.h>
-+#include <linux/scatterlist.h>
-+#include <linux/slab.h>
-+#include <linux/mm.h>
-+#include <linux/mod_devicetable.h>
-+#include <linux/module.h>
-+
-+#include "trusty-test.h"
-+
-+struct trusty_test_state {
-+ struct device *dev;
-+ struct device *trusty_dev;
-+};
-+
-+struct trusty_test_shmem_obj {
-+ struct list_head node;
-+ size_t page_count;
-+ struct page **pages;
-+ void *buf;
-+ struct sg_table sgt;
-+ trusty_shared_mem_id_t mem_id;
-+};
-+
-+/*
-+ * Allocate a test object with @page_count number of pages, map it and add it to
-+ * @list.
-+ * For multi-page allocations, order the pages so they are not contiguous.
-+ */
-+static int trusty_test_alloc_obj(struct trusty_test_state *s,
-+ size_t page_count,
-+ struct list_head *list)
-+{
-+ size_t i;
-+ int ret = -ENOMEM;
-+ struct trusty_test_shmem_obj *obj;
-+
-+ obj = kzalloc(sizeof(*obj), GFP_KERNEL);
-+ if (!obj)
-+ goto err_alloc_obj;
-+ obj->page_count = page_count;
-+
-+ obj->pages = kmalloc_array(page_count, sizeof(*obj->pages), GFP_KERNEL);
-+ if (!obj->pages) {
-+ ret = -ENOMEM;
-+ dev_err(s->dev, "failed to allocate page array, count %zd\n",
-+ page_count);
-+ goto err_alloc_pages;
-+ }
-+
-+ for (i = 0; i < page_count; i++) {
-+ obj->pages[i] = alloc_page(GFP_KERNEL);
-+ if (!obj->pages[i]) {
-+ ret = -ENOMEM;
-+ dev_err(s->dev, "failed to allocate page %zd/%zd\n",
-+ i, page_count);
-+ goto err_alloc_page;
-+ }
-+ if (i > 0 && obj->pages[i - 1] + 1 == obj->pages[i]) {
-+ /* swap adacent pages to increase fragmentation */
-+ swap(obj->pages[i - 1], obj->pages[i]);
-+ }
-+ }
-+
-+ obj->buf = vmap(obj->pages, page_count, VM_MAP, PAGE_KERNEL);
-+ if (!obj->buf) {
-+ ret = -ENOMEM;
-+ dev_err(s->dev, "failed to map test buffer page count %zd\n",
-+ page_count);
-+ goto err_map_pages;
-+ }
-+
-+ ret = sg_alloc_table_from_pages(&obj->sgt, obj->pages, page_count,
-+ 0, page_count * PAGE_SIZE, GFP_KERNEL);
-+ if (ret) {
-+ dev_err(s->dev, "sg_alloc_table_from_pages failed: %d\n", ret);
-+ goto err_alloc_sgt;
-+ }
-+ list_add_tail(&obj->node, list);
-+ dev_dbg(s->dev, "buffer has %d page runs\n", obj->sgt.nents);
-+ return 0;
-+
-+err_alloc_sgt:
-+ vunmap(obj->buf);
-+err_map_pages:
-+ for (i = page_count; i > 0; i--) {
-+ __free_page(obj->pages[i - 1]);
-+err_alloc_page:
-+ ;
-+ }
-+ kfree(obj->pages);
-+err_alloc_pages:
-+ kfree(obj);
-+err_alloc_obj:
-+ return ret;
-+}
-+
-+/* Unlink, unmap and free a test object and its pages */
-+static void trusty_test_free_obj(struct trusty_test_state *s,
-+ struct trusty_test_shmem_obj *obj)
-+{
-+ size_t i;
-+
-+ list_del(&obj->node);
-+ sg_free_table(&obj->sgt);
-+ vunmap(obj->buf);
-+ for (i = obj->page_count; i > 0; i--)
-+ __free_page(obj->pages[i - 1]);
-+ kfree(obj->pages);
-+ kfree(obj);
-+}
-+
-+/*
-+ * Share all the pages of all the test object in &obj_list.
-+ * If sharing a test object fails, free it so that every test object that
-+ * remains in @obj_list has been shared when this function returns.
-+ * Return a error if any test object failed to be shared.
-+ */
-+static int trusty_test_share_objs(struct trusty_test_state *s,
-+ struct list_head *obj_list, size_t size)
-+{
-+ int ret = 0;
-+ int tmpret;
-+ struct trusty_test_shmem_obj *obj;
-+ struct trusty_test_shmem_obj *next_obj;
-+ ktime_t t1;
-+ ktime_t t2;
-+
-+ list_for_each_entry_safe(obj, next_obj, obj_list, node) {
-+ t1 = ktime_get();
-+ tmpret = trusty_share_memory(s->trusty_dev, &obj->mem_id,
-+ obj->sgt.sgl, obj->sgt.nents,
-+ PAGE_KERNEL);
-+ t2 = ktime_get();
-+ if (tmpret) {
-+ ret = tmpret;
-+ dev_err(s->dev,
-+ "trusty_share_memory failed: %d, size=%zd\n",
-+ ret, size);
-+
-+ /*
-+ * Free obj and continue, so we can revoke the
-+ * whole list in trusty_test_reclaim_objs.
-+ */
-+ trusty_test_free_obj(s, obj);
-+ }
-+ dev_dbg(s->dev, "share id=0x%llx, size=%zu took %lld ns\n",
-+ obj->mem_id, size,
-+ ktime_to_ns(ktime_sub(t2, t1)));
-+ }
-+
-+ return ret;
-+}
-+
-+/* Reclaim memory shared with trusty for all test objects in @obj_list. */
-+static int trusty_test_reclaim_objs(struct trusty_test_state *s,
-+ struct list_head *obj_list, size_t size)
-+{
-+ int ret = 0;
-+ int tmpret;
-+ struct trusty_test_shmem_obj *obj;
-+ struct trusty_test_shmem_obj *next_obj;
-+ ktime_t t1;
-+ ktime_t t2;
-+
-+ list_for_each_entry_safe(obj, next_obj, obj_list, node) {
-+ t1 = ktime_get();
-+ tmpret = trusty_reclaim_memory(s->trusty_dev, obj->mem_id,
-+ obj->sgt.sgl, obj->sgt.nents);
-+ t2 = ktime_get();
-+ if (tmpret) {
-+ ret = tmpret;
-+ dev_err(s->dev,
-+ "trusty_reclaim_memory failed: %d, id=0x%llx\n",
-+ ret, obj->mem_id);
-+
-+ /*
-+ * It is not safe to free this memory if
-+ * trusty_reclaim_memory fails. Leak it in that
-+ * case.
-+ */
-+ list_del(&obj->node);
-+ }
-+ dev_dbg(s->dev, "revoke id=0x%llx, size=%zu took %lld ns\n",
-+ obj->mem_id, size,
-+ ktime_to_ns(ktime_sub(t2, t1)));
-+ }
-+
-+ return ret;
-+}
-+
-+/*
-+ * Test a test object. First, initialize the memory, then make a std call into
-+ * trusty which will read it and return an error if the initialized value does
-+ * not match what it expects. If trusty reads the correct values, it will modify
-+ * the memory and return 0. This function then checks that it can read the
-+ * correct modified value.
-+ */
-+static int trusty_test_rw(struct trusty_test_state *s,
-+ struct trusty_test_shmem_obj *obj)
-+{
-+ size_t size = obj->page_count * PAGE_SIZE;
-+ int ret;
-+ size_t i;
-+ u64 *buf = obj->buf;
-+ ktime_t t1;
-+ ktime_t t2;
-+
-+ for (i = 0; i < size / sizeof(*buf); i++)
-+ buf[i] = i;
-+
-+ t1 = ktime_get();
-+ ret = trusty_std_call32(s->trusty_dev, SMC_SC_TEST_SHARED_MEM_RW,
-+ (u32)(obj->mem_id), (u32)(obj->mem_id >> 32),
-+ size);
-+ t2 = ktime_get();
-+ if (ret < 0) {
-+ dev_err(s->dev,
-+ "trusty std call (SMC_SC_TEST_SHARED_MEM_RW) failed: %d 0x%llx\n",
-+ ret, obj->mem_id);
-+ return ret;
-+ }
-+
-+ for (i = 0; i < size / sizeof(*buf); i++) {
-+ if (buf[i] != size - i) {
-+ dev_err(s->dev,
-+ "input mismatch at %zd, got 0x%llx instead of 0x%zx\n",
-+ i, buf[i], size - i);
-+ return -EIO;
-+ }
-+ }
-+
-+ dev_dbg(s->dev, "rw id=0x%llx, size=%zu took %lld ns\n", obj->mem_id,
-+ size, ktime_to_ns(ktime_sub(t2, t1)));
-+
-+ return 0;
-+}
-+
-+/*
-+ * Run test on every test object in @obj_list. Repeat @repeat_access times.
-+ */
-+static int trusty_test_rw_objs(struct trusty_test_state *s,
-+ struct list_head *obj_list,
-+ size_t repeat_access)
-+{
-+ int ret;
-+ size_t i;
-+ struct trusty_test_shmem_obj *obj;
-+
-+ for (i = 0; i < repeat_access; i++) {
-+ /*
-+ * Repeat test in case the memory attributes don't match
-+ * and either side see old data.
-+ */
-+ list_for_each_entry(obj, obj_list, node) {
-+ ret = trusty_test_rw(s, obj);
-+ if (ret)
-+ return ret;
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+/*
-+ * Allocate @obj_count test object that each have @page_count pages. Share each
-+ * object @repeat_share times, each time running tests on every object
-+ * @repeat_access times.
-+ */
-+static int trusty_test_run(struct trusty_test_state *s, size_t page_count,
-+ size_t obj_count, size_t repeat_share,
-+ size_t repeat_access)
-+{
-+ int ret = 0;
-+ int tmpret;
-+ size_t i;
-+ size_t size = page_count * PAGE_SIZE;
-+ LIST_HEAD(obj_list);
-+ struct trusty_test_shmem_obj *obj;
-+ struct trusty_test_shmem_obj *next_obj;
-+
-+ for (i = 0; i < obj_count && !ret; i++)
-+ ret = trusty_test_alloc_obj(s, page_count, &obj_list);
-+
-+ for (i = 0; i < repeat_share && !ret; i++) {
-+ ret = trusty_test_share_objs(s, &obj_list, size);
-+ if (ret) {
-+ dev_err(s->dev,
-+ "trusty_share_memory failed: %d, i=%zd/%zd, size=%zd\n",
-+ ret, i, repeat_share, size);
-+ } else {
-+ ret = trusty_test_rw_objs(s, &obj_list, repeat_access);
-+ if (ret)
-+ dev_err(s->dev,
-+ "test failed: %d, i=%zd/%zd, size=%zd\n",
-+ ret, i, repeat_share, size);
-+ }
-+ tmpret = trusty_test_reclaim_objs(s, &obj_list, size);
-+ if (tmpret) {
-+ ret = tmpret;
-+ dev_err(s->dev,
-+ "trusty_reclaim_memory failed: %d, i=%zd/%zd\n",
-+ ret, i, repeat_share);
-+ }
-+ }
-+
-+ list_for_each_entry_safe(obj, next_obj, &obj_list, node)
-+ trusty_test_free_obj(s, obj);
-+
-+ dev_info(s->dev, "[ %s ] size %zd, obj_count %zd, repeat_share %zd, repeat_access %zd\n",
-+ ret ? "FAILED" : "PASSED", size, obj_count, repeat_share,
-+ repeat_access);
-+
-+ return ret;
-+}
-+
-+/*
-+ * Get an optional numeric argument from @buf, update @buf and return the value.
-+ * If @buf does not start with ",", return @default_val instead.
-+ */
-+static size_t trusty_test_get_arg(const char **buf, size_t default_val)
-+{
-+ char *buf_next;
-+ size_t ret;
-+
-+ if (**buf != ',')
-+ return default_val;
-+
-+ (*buf)++;
-+ ret = simple_strtoul(*buf, &buf_next, 0);
-+ if (buf_next == *buf)
-+ return default_val;
-+
-+ *buf = buf_next;
-+
-+ return ret;
-+}
-+
-+/*
-+ * Run tests described by a string in this format:
-+ * <obj_size>,<obj_count=1>,<repeat_share=1>,<repeat_access=3>
-+ */
-+static ssize_t trusty_test_run_store(struct device *dev,
-+ struct device_attribute *attr,
-+ const char *buf, size_t count)
-+{
-+ struct platform_device *pdev = to_platform_device(dev);
-+ struct trusty_test_state *s = platform_get_drvdata(pdev);
-+ size_t size;
-+ size_t obj_count;
-+ size_t repeat_share;
-+ size_t repeat_access;
-+ int ret;
-+ char *buf_next;
-+
-+ while (true) {
-+ while (isspace(*buf))
-+ buf++;
-+ size = simple_strtoul(buf, &buf_next, 0);
-+ if (buf_next == buf)
-+ return count;
-+ buf = buf_next;
-+ obj_count = trusty_test_get_arg(&buf, 1);
-+ repeat_share = trusty_test_get_arg(&buf, 1);
-+ repeat_access = trusty_test_get_arg(&buf, 3);
-+
-+ ret = trusty_test_run(s, DIV_ROUND_UP(size, PAGE_SIZE),
-+ obj_count, repeat_share, repeat_access);
-+ if (ret)
-+ return ret;
-+ }
-+}
-+
-+static DEVICE_ATTR_WO(trusty_test_run);
-+
-+static struct attribute *trusty_test_attrs[] = {
-+ &dev_attr_trusty_test_run.attr,
-+ NULL,
-+};
-+ATTRIBUTE_GROUPS(trusty_test);
-+
-+static int trusty_test_probe(struct platform_device *pdev)
-+{
-+ struct trusty_test_state *s;
-+ int ret;
-+
-+ ret = trusty_std_call32(pdev->dev.parent, SMC_SC_TEST_VERSION,
-+ TRUSTY_STDCALLTEST_API_VERSION, 0, 0);
-+ if (ret != TRUSTY_STDCALLTEST_API_VERSION)
-+ return -ENOENT;
-+
-+ s = kzalloc(sizeof(*s), GFP_KERNEL);
-+ if (!s)
-+ return -ENOMEM;
-+
-+ s->dev = &pdev->dev;
-+ s->trusty_dev = s->dev->parent;
-+
-+ platform_set_drvdata(pdev, s);
-+
-+ return 0;
-+}
-+
-+static int trusty_test_remove(struct platform_device *pdev)
-+{
-+ struct trusty_log_state *s = platform_get_drvdata(pdev);
-+
-+ kfree(s);
-+ return 0;
-+}
-+
-+static const struct of_device_id trusty_test_of_match[] = {
-+ { .compatible = "android,trusty-test-v1", },
-+ {},
-+};
-+
-+MODULE_DEVICE_TABLE(trusty, trusty_test_of_match);
-+
-+static struct platform_driver trusty_test_driver = {
-+ .probe = trusty_test_probe,
-+ .remove = trusty_test_remove,
-+ .driver = {
-+ .name = "trusty-test",
-+ .of_match_table = trusty_test_of_match,
-+ .dev_groups = trusty_test_groups,
-+ },
-+};
-+
-+module_platform_driver(trusty_test_driver);
-+
-+MODULE_LICENSE("GPL v2");
-+MODULE_DESCRIPTION("Trusty test driver");
-diff --git a/drivers/trusty/trusty-test.h b/drivers/trusty/trusty-test.h
-new file mode 100644
-index 000000000000..eea7beb96876
---- /dev/null
-+++ b/drivers/trusty/trusty-test.h
-@@ -0,0 +1,13 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+/*
-+ * Copyright (c) 2020 Google, Inc.
-+ */
-+#ifndef _TRUSTY_TEST_H
-+#define _TRUSTY_TEST_H
-+
-+#define SMC_SC_TEST_VERSION SMC_STDCALL_NR(SMC_ENTITY_TEST, 0)
-+#define SMC_SC_TEST_SHARED_MEM_RW SMC_STDCALL_NR(SMC_ENTITY_TEST, 1)
-+
-+#define TRUSTY_STDCALLTEST_API_VERSION 1
-+
-+#endif /* _TRUSTY_TEST_H */
-diff --git a/drivers/trusty/trusty-virtio.c b/drivers/trusty/trusty-virtio.c
-new file mode 100644
-index 000000000000..fea59cd2e218
---- /dev/null
-+++ b/drivers/trusty/trusty-virtio.c
-@@ -0,0 +1,840 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Trusty Virtio driver
-+ *
-+ * Copyright (C) 2015 Google, Inc.
-+ */
-+#include <linux/device.h>
-+#include <linux/err.h>
-+#include <linux/kernel.h>
-+
-+#include <linux/dma-map-ops.h>
-+#include <linux/module.h>
-+#include <linux/mutex.h>
-+#include <linux/notifier.h>
-+#include <linux/workqueue.h>
-+#include <linux/remoteproc.h>
-+#include <linux/slab.h>
-+
-+#include <linux/platform_device.h>
-+#include <linux/trusty/smcall.h>
-+#include <linux/trusty/trusty.h>
-+#include <linux/trusty/trusty_ipc.h>
-+
-+#include <linux/virtio.h>
-+#include <linux/virtio_config.h>
-+#include <linux/virtio_ids.h>
-+#include <linux/virtio_ring.h>
-+
-+#include <linux/atomic.h>
-+
-+#define RSC_DESCR_VER 1
-+
-+struct trusty_vdev;
-+
-+struct trusty_ctx {
-+ struct device *dev;
-+ void *shared_va;
-+ struct scatterlist shared_sg;
-+ trusty_shared_mem_id_t shared_id;
-+ size_t shared_sz;
-+ struct work_struct check_vqs;
-+ struct work_struct kick_vqs;
-+ struct notifier_block call_notifier;
-+ struct list_head vdev_list;
-+ struct mutex mlock; /* protects vdev_list */
-+ struct workqueue_struct *kick_wq;
-+ struct workqueue_struct *check_wq;
-+};
-+
-+struct trusty_vring {
-+ void *vaddr;
-+ struct scatterlist sg;
-+ trusty_shared_mem_id_t shared_mem_id;
-+ size_t size;
-+ unsigned int align;
-+ unsigned int elem_num;
-+ u32 notifyid;
-+ atomic_t needs_kick;
-+ struct fw_rsc_vdev_vring *vr_descr;
-+ struct virtqueue *vq;
-+ struct trusty_vdev *tvdev;
-+ struct trusty_nop kick_nop;
-+};
-+
-+struct trusty_vdev {
-+ struct list_head node;
-+ struct virtio_device vdev;
-+ struct trusty_ctx *tctx;
-+ u32 notifyid;
-+ unsigned int config_len;
-+ void *config;
-+ struct fw_rsc_vdev *vdev_descr;
-+ unsigned int vring_num;
-+ struct trusty_vring vrings[];
-+};
-+
-+#define vdev_to_tvdev(vd) container_of((vd), struct trusty_vdev, vdev)
-+
-+static void check_all_vqs(struct work_struct *work)
-+{
-+ unsigned int i;
-+ struct trusty_ctx *tctx = container_of(work, struct trusty_ctx,
-+ check_vqs);
-+ struct trusty_vdev *tvdev;
-+
-+ list_for_each_entry(tvdev, &tctx->vdev_list, node) {
-+ for (i = 0; i < tvdev->vring_num; i++)
-+ if (tvdev->vrings[i].vq)
-+ vring_interrupt(0, tvdev->vrings[i].vq);
-+ }
-+}
-+
-+static int trusty_call_notify(struct notifier_block *nb,
-+ unsigned long action, void *data)
-+{
-+ struct trusty_ctx *tctx;
-+
-+ if (action != TRUSTY_CALL_RETURNED)
-+ return NOTIFY_DONE;
-+
-+ tctx = container_of(nb, struct trusty_ctx, call_notifier);
-+ queue_work(tctx->check_wq, &tctx->check_vqs);
-+
-+ return NOTIFY_OK;
-+}
-+
-+static void kick_vq(struct trusty_ctx *tctx,
-+ struct trusty_vdev *tvdev,
-+ struct trusty_vring *tvr)
-+{
-+ int ret;
-+
-+ dev_dbg(tctx->dev, "%s: vdev_id=%d: vq_id=%d\n",
-+ __func__, tvdev->notifyid, tvr->notifyid);
-+
-+ ret = trusty_std_call32(tctx->dev->parent, SMC_SC_VDEV_KICK_VQ,
-+ tvdev->notifyid, tvr->notifyid, 0);
-+ if (ret) {
-+ dev_err(tctx->dev, "vq notify (%d, %d) returned %d\n",
-+ tvdev->notifyid, tvr->notifyid, ret);
-+ }
-+}
-+
-+static void kick_vqs(struct work_struct *work)
-+{
-+ unsigned int i;
-+ struct trusty_vdev *tvdev;
-+ struct trusty_ctx *tctx = container_of(work, struct trusty_ctx,
-+ kick_vqs);
-+ mutex_lock(&tctx->mlock);
-+ list_for_each_entry(tvdev, &tctx->vdev_list, node) {
-+ for (i = 0; i < tvdev->vring_num; i++) {
-+ struct trusty_vring *tvr = &tvdev->vrings[i];
-+
-+ if (atomic_xchg(&tvr->needs_kick, 0))
-+ kick_vq(tctx, tvdev, tvr);
-+ }
-+ }
-+ mutex_unlock(&tctx->mlock);
-+}
-+
-+static bool trusty_virtio_notify(struct virtqueue *vq)
-+{
-+ struct trusty_vring *tvr = vq->priv;
-+ struct trusty_vdev *tvdev = tvr->tvdev;
-+ struct trusty_ctx *tctx = tvdev->tctx;
-+ u32 api_ver = trusty_get_api_version(tctx->dev->parent);
-+
-+ if (api_ver < TRUSTY_API_VERSION_SMP_NOP) {
-+ atomic_set(&tvr->needs_kick, 1);
-+ queue_work(tctx->kick_wq, &tctx->kick_vqs);
-+ } else {
-+ trusty_enqueue_nop(tctx->dev->parent, &tvr->kick_nop);
-+ }
-+
-+ return true;
-+}
-+
-+static int trusty_load_device_descr(struct trusty_ctx *tctx,
-+ trusty_shared_mem_id_t id, size_t sz)
-+{
-+ int ret;
-+
-+ dev_dbg(tctx->dev, "%s: %zu bytes @ id %llu\n", __func__, sz, id);
-+
-+ ret = trusty_std_call32(tctx->dev->parent, SMC_SC_VIRTIO_GET_DESCR,
-+ (u32)id, id >> 32, sz);
-+ if (ret < 0) {
-+ dev_err(tctx->dev, "%s: virtio get descr returned (%d)\n",
-+ __func__, ret);
-+ return -ENODEV;
-+ }
-+ return ret;
-+}
-+
-+static void trusty_virtio_stop(struct trusty_ctx *tctx,
-+ trusty_shared_mem_id_t id, size_t sz)
-+{
-+ int ret;
-+
-+ dev_dbg(tctx->dev, "%s: %zu bytes @ id %llu\n", __func__, sz, id);
-+
-+ ret = trusty_std_call32(tctx->dev->parent, SMC_SC_VIRTIO_STOP,
-+ (u32)id, id >> 32, sz);
-+ if (ret) {
-+ dev_err(tctx->dev, "%s: virtio done returned (%d)\n",
-+ __func__, ret);
-+ return;
-+ }
-+}
-+
-+static int trusty_virtio_start(struct trusty_ctx *tctx,
-+ trusty_shared_mem_id_t id, size_t sz)
-+{
-+ int ret;
-+
-+ dev_dbg(tctx->dev, "%s: %zu bytes @ id %llu\n", __func__, sz, id);
-+
-+ ret = trusty_std_call32(tctx->dev->parent, SMC_SC_VIRTIO_START,
-+ (u32)id, id >> 32, sz);
-+ if (ret) {
-+ dev_err(tctx->dev, "%s: virtio start returned (%d)\n",
-+ __func__, ret);
-+ return -ENODEV;
-+ }
-+ return 0;
-+}
-+
-+static void trusty_virtio_reset(struct virtio_device *vdev)
-+{
-+ struct trusty_vdev *tvdev = vdev_to_tvdev(vdev);
-+ struct trusty_ctx *tctx = tvdev->tctx;
-+
-+ dev_dbg(&vdev->dev, "reset vdev_id=%d\n", tvdev->notifyid);
-+ trusty_std_call32(tctx->dev->parent, SMC_SC_VDEV_RESET,
-+ tvdev->notifyid, 0, 0);
-+}
-+
-+static u64 trusty_virtio_get_features(struct virtio_device *vdev)
-+{
-+ struct trusty_vdev *tvdev = vdev_to_tvdev(vdev);
-+
-+ return tvdev->vdev_descr->dfeatures |
-+ (1ULL << VIRTIO_F_ACCESS_PLATFORM);
-+}
-+
-+static int trusty_virtio_finalize_features(struct virtio_device *vdev)
-+{
-+ struct trusty_vdev *tvdev = vdev_to_tvdev(vdev);
-+ u64 features = vdev->features;
-+
-+ /*
-+ * We set VIRTIO_F_ACCESS_PLATFORM to enable the dma mapping hooks.
-+ * The other side does not need to know.
-+ */
-+ features &= ~(1ULL << VIRTIO_F_ACCESS_PLATFORM);
-+
-+ /* Make sure we don't have any features > 32 bits! */
-+ if (WARN_ON((u32)vdev->features != features))
-+ return -EINVAL;
-+
-+ tvdev->vdev_descr->gfeatures = vdev->features;
-+ return 0;
-+}
-+
-+static void trusty_virtio_get_config(struct virtio_device *vdev,
-+ unsigned int offset, void *buf,
-+ unsigned int len)
-+{
-+ struct trusty_vdev *tvdev = vdev_to_tvdev(vdev);
-+
-+ dev_dbg(&vdev->dev, "%s: %d bytes @ offset %d\n",
-+ __func__, len, offset);
-+
-+ if (tvdev->config) {
-+ if (offset + len <= tvdev->config_len)
-+ memcpy(buf, tvdev->config + offset, len);
-+ }
-+}
-+
-+static void trusty_virtio_set_config(struct virtio_device *vdev,
-+ unsigned int offset, const void *buf,
-+ unsigned int len)
-+{
-+}
-+
-+static u8 trusty_virtio_get_status(struct virtio_device *vdev)
-+{
-+ struct trusty_vdev *tvdev = vdev_to_tvdev(vdev);
-+
-+ return tvdev->vdev_descr->status;
-+}
-+
-+static void trusty_virtio_set_status(struct virtio_device *vdev, u8 status)
-+{
-+ struct trusty_vdev *tvdev = vdev_to_tvdev(vdev);
-+
-+ tvdev->vdev_descr->status = status;
-+}
-+
-+static void _del_vqs(struct virtio_device *vdev)
-+{
-+ unsigned int i;
-+ int ret;
-+ struct trusty_vdev *tvdev = vdev_to_tvdev(vdev);
-+ struct trusty_vring *tvr = &tvdev->vrings[0];
-+
-+ for (i = 0; i < tvdev->vring_num; i++, tvr++) {
-+ /* dequeue kick_nop */
-+ trusty_dequeue_nop(tvdev->tctx->dev->parent, &tvr->kick_nop);
-+
-+ /* delete vq */
-+ if (tvr->vq) {
-+ vring_del_virtqueue(tvr->vq);
-+ tvr->vq = NULL;
-+ }
-+ /* delete vring */
-+ if (tvr->vaddr) {
-+ ret = trusty_reclaim_memory(tvdev->tctx->dev->parent,
-+ tvr->shared_mem_id,
-+ &tvr->sg, 1);
-+ if (WARN_ON(ret)) {
-+ dev_err(&vdev->dev,
-+ "trusty_revoke_memory failed: %d 0x%llx\n",
-+ ret, tvr->shared_mem_id);
-+ /*
-+ * It is not safe to free this memory if
-+ * trusty_revoke_memory fails. Leak it in that
-+ * case.
-+ */
-+ } else {
-+ free_pages_exact(tvr->vaddr, tvr->size);
-+ }
-+ tvr->vaddr = NULL;
-+ }
-+ }
-+}
-+
-+static void trusty_virtio_del_vqs(struct virtio_device *vdev)
-+{
-+ _del_vqs(vdev);
-+}
-+
-+
-+static struct virtqueue *_find_vq(struct virtio_device *vdev,
-+ unsigned int id,
-+ void (*callback)(struct virtqueue *vq),
-+ const char *name,
-+ bool ctx)
-+{
-+ struct trusty_vring *tvr;
-+ struct trusty_vdev *tvdev = vdev_to_tvdev(vdev);
-+ phys_addr_t pa;
-+ int ret;
-+
-+ if (!name)
-+ return ERR_PTR(-EINVAL);
-+
-+ if (id >= tvdev->vring_num)
-+ return ERR_PTR(-EINVAL);
-+
-+ tvr = &tvdev->vrings[id];
-+
-+ /* actual size of vring (in bytes) */
-+ tvr->size = PAGE_ALIGN(vring_size(tvr->elem_num, tvr->align));
-+
-+ /* allocate memory for the vring. */
-+ tvr->vaddr = alloc_pages_exact(tvr->size, GFP_KERNEL | __GFP_ZERO);
-+ if (!tvr->vaddr) {
-+ dev_err(&vdev->dev, "vring alloc failed\n");
-+ return ERR_PTR(-ENOMEM);
-+ }
-+
-+ sg_init_one(&tvr->sg, tvr->vaddr, tvr->size);
-+ ret = trusty_share_memory_compat(tvdev->tctx->dev->parent,
-+ &tvr->shared_mem_id, &tvr->sg, 1,
-+ PAGE_KERNEL);
-+ if (ret) {
-+ pa = virt_to_phys(tvr->vaddr);
-+ dev_err(&vdev->dev, "trusty_share_memory failed: %d %pa\n",
-+ ret, &pa);
-+ goto err_share_memory;
-+ }
-+
-+ /* save vring address to shared structure */
-+ tvr->vr_descr->da = (u32)tvr->shared_mem_id;
-+
-+ /* da field is only 32 bit wide. Use previously unused 'reserved' field
-+ * to store top 32 bits of 64-bit shared_mem_id
-+ */
-+ tvr->vr_descr->pa = (u32)(tvr->shared_mem_id >> 32);
-+
-+ dev_info(&vdev->dev, "vring%d: va(id) %p(%llx) qsz %d notifyid %d\n",
-+ id, tvr->vaddr, (u64)tvr->shared_mem_id, tvr->elem_num,
-+ tvr->notifyid);
-+
-+ tvr->vq = vring_new_virtqueue(id, tvr->elem_num, tvr->align,
-+ vdev, true, ctx, tvr->vaddr,
-+ trusty_virtio_notify, callback, name);
-+ if (!tvr->vq) {
-+ dev_err(&vdev->dev, "vring_new_virtqueue %s failed\n",
-+ name);
-+ goto err_new_virtqueue;
-+ }
-+
-+ tvr->vq->priv = tvr;
-+
-+ return tvr->vq;
-+
-+err_new_virtqueue:
-+ ret = trusty_reclaim_memory(tvdev->tctx->dev->parent,
-+ tvr->shared_mem_id, &tvr->sg, 1);
-+ if (WARN_ON(ret)) {
-+ dev_err(&vdev->dev, "trusty_revoke_memory failed: %d 0x%llx\n",
-+ ret, tvr->shared_mem_id);
-+ /*
-+ * It is not safe to free this memory if trusty_revoke_memory
-+ * fails. Leak it in that case.
-+ */
-+ } else {
-+err_share_memory:
-+ free_pages_exact(tvr->vaddr, tvr->size);
-+ }
-+ tvr->vaddr = NULL;
-+ return ERR_PTR(-ENOMEM);
-+}
-+
-+static int trusty_virtio_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
-+ struct virtqueue *vqs[],
-+ vq_callback_t *callbacks[],
-+ const char * const names[],
-+ const bool *ctxs,
-+ struct irq_affinity *desc)
-+{
-+ unsigned int i;
-+ int ret;
-+ bool ctx = false;
-+
-+ for (i = 0; i < nvqs; i++) {
-+ ctx = false;
-+ if (ctxs)
-+ ctx = ctxs[i];
-+ vqs[i] = _find_vq(vdev, i, callbacks[i], names[i], ctx);
-+ if (IS_ERR(vqs[i])) {
-+ ret = PTR_ERR(vqs[i]);
-+ _del_vqs(vdev);
-+ return ret;
-+ }
-+ }
-+ return 0;
-+}
-+
-+static const char *trusty_virtio_bus_name(struct virtio_device *vdev)
-+{
-+ return "trusty-virtio";
-+}
-+
-+/* The ops structure which hooks everything together. */
-+static const struct virtio_config_ops trusty_virtio_config_ops = {
-+ .get_features = trusty_virtio_get_features,
-+ .finalize_features = trusty_virtio_finalize_features,
-+ .get = trusty_virtio_get_config,
-+ .set = trusty_virtio_set_config,
-+ .get_status = trusty_virtio_get_status,
-+ .set_status = trusty_virtio_set_status,
-+ .reset = trusty_virtio_reset,
-+ .find_vqs = trusty_virtio_find_vqs,
-+ .del_vqs = trusty_virtio_del_vqs,
-+ .bus_name = trusty_virtio_bus_name,
-+};
-+
-+static int trusty_virtio_add_device(struct trusty_ctx *tctx,
-+ struct fw_rsc_vdev *vdev_descr,
-+ struct fw_rsc_vdev_vring *vr_descr,
-+ void *config)
-+{
-+ int i, ret;
-+ struct trusty_vdev *tvdev;
-+
-+ tvdev = kzalloc(struct_size(tvdev, vrings, vdev_descr->num_of_vrings),
-+ GFP_KERNEL);
-+ if (!tvdev)
-+ return -ENOMEM;
-+
-+ /* setup vdev */
-+ tvdev->tctx = tctx;
-+ tvdev->vdev.dev.parent = tctx->dev;
-+ tvdev->vdev.id.device = vdev_descr->id;
-+ tvdev->vdev.config = &trusty_virtio_config_ops;
-+ tvdev->vdev_descr = vdev_descr;
-+ tvdev->notifyid = vdev_descr->notifyid;
-+
-+ /* setup config */
-+ tvdev->config = config;
-+ tvdev->config_len = vdev_descr->config_len;
-+
-+ /* setup vrings and vdev resource */
-+ tvdev->vring_num = vdev_descr->num_of_vrings;
-+
-+ for (i = 0; i < tvdev->vring_num; i++, vr_descr++) {
-+ struct trusty_vring *tvr = &tvdev->vrings[i];
-+
-+ tvr->tvdev = tvdev;
-+ tvr->vr_descr = vr_descr;
-+ tvr->align = vr_descr->align;
-+ tvr->elem_num = vr_descr->num;
-+ tvr->notifyid = vr_descr->notifyid;
-+ trusty_nop_init(&tvr->kick_nop, SMC_NC_VDEV_KICK_VQ,
-+ tvdev->notifyid, tvr->notifyid);
-+ }
-+
-+ /* register device */
-+ ret = register_virtio_device(&tvdev->vdev);
-+ if (ret) {
-+ dev_err(tctx->dev,
-+ "Failed (%d) to register device dev type %u\n",
-+ ret, vdev_descr->id);
-+ goto err_register;
-+ }
-+
-+ /* add it to tracking list */
-+ list_add_tail(&tvdev->node, &tctx->vdev_list);
-+
-+ return 0;
-+
-+err_register:
-+ kfree(tvdev);
-+ return ret;
-+}
-+
-+static int trusty_parse_device_descr(struct trusty_ctx *tctx,
-+ void *descr_va, size_t descr_sz)
-+{
-+ u32 i;
-+ struct resource_table *descr = descr_va;
-+
-+ if (descr_sz < sizeof(*descr)) {
-+ dev_err(tctx->dev, "descr table is too small (0x%x)\n",
-+ (int)descr_sz);
-+ return -ENODEV;
-+ }
-+
-+ if (descr->ver != RSC_DESCR_VER) {
-+ dev_err(tctx->dev, "unexpected descr ver (0x%x)\n",
-+ (int)descr->ver);
-+ return -ENODEV;
-+ }
-+
-+ if (descr_sz < (sizeof(*descr) + descr->num * sizeof(u32))) {
-+ dev_err(tctx->dev, "descr table is too small (0x%x)\n",
-+ (int)descr->ver);
-+ return -ENODEV;
-+ }
-+
-+ for (i = 0; i < descr->num; i++) {
-+ struct fw_rsc_hdr *hdr;
-+ struct fw_rsc_vdev *vd;
-+ struct fw_rsc_vdev_vring *vr;
-+ void *cfg;
-+ size_t vd_sz;
-+
-+ u32 offset = descr->offset[i];
-+
-+ if (offset >= descr_sz) {
-+ dev_err(tctx->dev, "offset is out of bounds (%u)\n",
-+ offset);
-+ return -ENODEV;
-+ }
-+
-+ /* check space for rsc header */
-+ if ((descr_sz - offset) < sizeof(struct fw_rsc_hdr)) {
-+ dev_err(tctx->dev, "no space for rsc header (%u)\n",
-+ offset);
-+ return -ENODEV;
-+ }
-+ hdr = (struct fw_rsc_hdr *)((u8 *)descr + offset);
-+ offset += sizeof(struct fw_rsc_hdr);
-+
-+ /* check type */
-+ if (hdr->type != RSC_VDEV) {
-+ dev_err(tctx->dev, "unsupported rsc type (%u)\n",
-+ hdr->type);
-+ continue;
-+ }
-+
-+ /* got vdev: check space for vdev */
-+ if ((descr_sz - offset) < sizeof(struct fw_rsc_vdev)) {
-+ dev_err(tctx->dev, "no space for vdev descr (%u)\n",
-+ offset);
-+ return -ENODEV;
-+ }
-+ vd = (struct fw_rsc_vdev *)((u8 *)descr + offset);
-+
-+ /* check space for vrings and config area */
-+ vd_sz = sizeof(struct fw_rsc_vdev) +
-+ vd->num_of_vrings * sizeof(struct fw_rsc_vdev_vring) +
-+ vd->config_len;
-+
-+ if ((descr_sz - offset) < vd_sz) {
-+ dev_err(tctx->dev, "no space for vdev (%u)\n", offset);
-+ return -ENODEV;
-+ }
-+ vr = (struct fw_rsc_vdev_vring *)vd->vring;
-+ cfg = (void *)(vr + vd->num_of_vrings);
-+
-+ trusty_virtio_add_device(tctx, vd, vr, cfg);
-+ }
-+
-+ return 0;
-+}
-+
-+static void _remove_devices_locked(struct trusty_ctx *tctx)
-+{
-+ struct trusty_vdev *tvdev, *next;
-+
-+ list_for_each_entry_safe(tvdev, next, &tctx->vdev_list, node) {
-+ list_del(&tvdev->node);
-+ unregister_virtio_device(&tvdev->vdev);
-+ kfree(tvdev);
-+ }
-+}
-+
-+static void trusty_virtio_remove_devices(struct trusty_ctx *tctx)
-+{
-+ mutex_lock(&tctx->mlock);
-+ _remove_devices_locked(tctx);
-+ mutex_unlock(&tctx->mlock);
-+}
-+
-+static int trusty_virtio_add_devices(struct trusty_ctx *tctx)
-+{
-+ int ret;
-+ int ret_tmp;
-+ void *descr_va;
-+ trusty_shared_mem_id_t descr_id;
-+ size_t descr_sz;
-+ size_t descr_buf_sz;
-+
-+ /* allocate buffer to load device descriptor into */
-+ descr_buf_sz = PAGE_SIZE;
-+ descr_va = alloc_pages_exact(descr_buf_sz, GFP_KERNEL | __GFP_ZERO);
-+ if (!descr_va) {
-+ dev_err(tctx->dev, "Failed to allocate shared area\n");
-+ return -ENOMEM;
-+ }
-+
-+ sg_init_one(&tctx->shared_sg, descr_va, descr_buf_sz);
-+ ret = trusty_share_memory(tctx->dev->parent, &descr_id,
-+ &tctx->shared_sg, 1, PAGE_KERNEL);
-+ if (ret) {
-+ dev_err(tctx->dev, "trusty_share_memory failed: %d\n", ret);
-+ goto err_share_memory;
-+ }
-+
-+ /* load device descriptors */
-+ ret = trusty_load_device_descr(tctx, descr_id, descr_buf_sz);
-+ if (ret < 0) {
-+ dev_err(tctx->dev, "failed (%d) to load device descr\n", ret);
-+ goto err_load_descr;
-+ }
-+
-+ descr_sz = (size_t)ret;
-+
-+ mutex_lock(&tctx->mlock);
-+
-+ /* parse device descriptor and add virtio devices */
-+ ret = trusty_parse_device_descr(tctx, descr_va, descr_sz);
-+ if (ret) {
-+ dev_err(tctx->dev, "failed (%d) to parse device descr\n", ret);
-+ goto err_parse_descr;
-+ }
-+
-+ /* register call notifier */
-+ ret = trusty_call_notifier_register(tctx->dev->parent,
-+ &tctx->call_notifier);
-+ if (ret) {
-+ dev_err(tctx->dev, "%s: failed (%d) to register notifier\n",
-+ __func__, ret);
-+ goto err_register_notifier;
-+ }
-+
-+ /* start virtio */
-+ ret = trusty_virtio_start(tctx, descr_id, descr_sz);
-+ if (ret) {
-+ dev_err(tctx->dev, "failed (%d) to start virtio\n", ret);
-+ goto err_start_virtio;
-+ }
-+
-+ /* attach shared area */
-+ tctx->shared_va = descr_va;
-+ tctx->shared_id = descr_id;
-+ tctx->shared_sz = descr_buf_sz;
-+
-+ mutex_unlock(&tctx->mlock);
-+
-+ return 0;
-+
-+err_start_virtio:
-+ trusty_call_notifier_unregister(tctx->dev->parent,
-+ &tctx->call_notifier);
-+ cancel_work_sync(&tctx->check_vqs);
-+err_register_notifier:
-+err_parse_descr:
-+ _remove_devices_locked(tctx);
-+ mutex_unlock(&tctx->mlock);
-+ cancel_work_sync(&tctx->kick_vqs);
-+ trusty_virtio_stop(tctx, descr_id, descr_sz);
-+err_load_descr:
-+ ret_tmp = trusty_reclaim_memory(tctx->dev->parent, descr_id,
-+ &tctx->shared_sg, 1);
-+ if (WARN_ON(ret_tmp)) {
-+ dev_err(tctx->dev, "trusty_revoke_memory failed: %d 0x%llx\n",
-+ ret_tmp, tctx->shared_id);
-+ /*
-+ * It is not safe to free this memory if trusty_revoke_memory
-+ * fails. Leak it in that case.
-+ */
-+ } else {
-+err_share_memory:
-+ free_pages_exact(descr_va, descr_buf_sz);
-+ }
-+ return ret;
-+}
-+
-+static dma_addr_t trusty_virtio_dma_map_page(struct device *dev,
-+ struct page *page,
-+ unsigned long offset, size_t size,
-+ enum dma_data_direction dir,
-+ unsigned long attrs)
-+{
-+ struct tipc_msg_buf *buf = page_to_virt(page) + offset;
-+
-+ return buf->buf_id;
-+}
-+
-+static const struct dma_map_ops trusty_virtio_dma_map_ops = {
-+ .map_page = trusty_virtio_dma_map_page,
-+};
-+
-+static int trusty_virtio_probe(struct platform_device *pdev)
-+{
-+ int ret;
-+ struct trusty_ctx *tctx;
-+
-+ tctx = kzalloc(sizeof(*tctx), GFP_KERNEL);
-+ if (!tctx)
-+ return -ENOMEM;
-+
-+ tctx->dev = &pdev->dev;
-+ tctx->call_notifier.notifier_call = trusty_call_notify;
-+ mutex_init(&tctx->mlock);
-+ INIT_LIST_HEAD(&tctx->vdev_list);
-+ INIT_WORK(&tctx->check_vqs, check_all_vqs);
-+ INIT_WORK(&tctx->kick_vqs, kick_vqs);
-+ platform_set_drvdata(pdev, tctx);
-+
-+ set_dma_ops(&pdev->dev, &trusty_virtio_dma_map_ops);
-+
-+ tctx->check_wq = alloc_workqueue("trusty-check-wq", WQ_UNBOUND, 0);
-+ if (!tctx->check_wq) {
-+ ret = -ENODEV;
-+ dev_err(&pdev->dev, "Failed create trusty-check-wq\n");
-+ goto err_create_check_wq;
-+ }
-+
-+ tctx->kick_wq = alloc_workqueue("trusty-kick-wq",
-+ WQ_UNBOUND | WQ_CPU_INTENSIVE, 0);
-+ if (!tctx->kick_wq) {
-+ ret = -ENODEV;
-+ dev_err(&pdev->dev, "Failed create trusty-kick-wq\n");
-+ goto err_create_kick_wq;
-+ }
-+
-+ ret = trusty_virtio_add_devices(tctx);
-+ if (ret) {
-+ dev_err(&pdev->dev, "Failed to add virtio devices\n");
-+ goto err_add_devices;
-+ }
-+
-+ dev_info(&pdev->dev, "initializing done\n");
-+ return 0;
-+
-+err_add_devices:
-+ destroy_workqueue(tctx->kick_wq);
-+err_create_kick_wq:
-+ destroy_workqueue(tctx->check_wq);
-+err_create_check_wq:
-+ kfree(tctx);
-+ return ret;
-+}
-+
-+static int trusty_virtio_remove(struct platform_device *pdev)
-+{
-+ struct trusty_ctx *tctx = platform_get_drvdata(pdev);
-+ int ret;
-+
-+ /* unregister call notifier and wait until workqueue is done */
-+ trusty_call_notifier_unregister(tctx->dev->parent,
-+ &tctx->call_notifier);
-+ cancel_work_sync(&tctx->check_vqs);
-+
-+ /* remove virtio devices */
-+ trusty_virtio_remove_devices(tctx);
-+ cancel_work_sync(&tctx->kick_vqs);
-+
-+ /* destroy workqueues */
-+ destroy_workqueue(tctx->kick_wq);
-+ destroy_workqueue(tctx->check_wq);
-+
-+ /* notify remote that shared area goes away */
-+ trusty_virtio_stop(tctx, tctx->shared_id, tctx->shared_sz);
-+
-+ /* free shared area */
-+ ret = trusty_reclaim_memory(tctx->dev->parent, tctx->shared_id,
-+ &tctx->shared_sg, 1);
-+ if (WARN_ON(ret)) {
-+ dev_err(tctx->dev, "trusty_revoke_memory failed: %d 0x%llx\n",
-+ ret, tctx->shared_id);
-+ /*
-+ * It is not safe to free this memory if trusty_revoke_memory
-+ * fails. Leak it in that case.
-+ */
-+ } else {
-+ free_pages_exact(tctx->shared_va, tctx->shared_sz);
-+ }
-+
-+ /* free context */
-+ kfree(tctx);
-+ return 0;
-+}
-+
-+static const struct of_device_id trusty_of_match[] = {
-+ {
-+ .compatible = "android,trusty-virtio-v1",
-+ },
-+ {},
-+};
-+
-+MODULE_DEVICE_TABLE(of, trusty_of_match);
-+
-+static struct platform_driver trusty_virtio_driver = {
-+ .probe = trusty_virtio_probe,
-+ .remove = trusty_virtio_remove,
-+ .driver = {
-+ .name = "trusty-virtio",
-+ .of_match_table = trusty_of_match,
-+ },
-+};
-+
-+module_platform_driver(trusty_virtio_driver);
-+
-+MODULE_LICENSE("GPL v2");
-+MODULE_DESCRIPTION("Trusty virtio driver");
-+/*
-+ * TODO(b/168322325): trusty-virtio and trusty-ipc should be independent.
-+ * However, trusty-virtio is not completely generic and is aware of trusty-ipc.
-+ * See header includes. Particularly, trusty-virtio.ko can't be loaded before
-+ * trusty-ipc.ko.
-+ */
-+MODULE_SOFTDEP("pre: trusty-ipc");
-diff --git a/drivers/trusty/trusty.c b/drivers/trusty/trusty.c
-new file mode 100644
-index 000000000000..265eab52aea0
---- /dev/null
-+++ b/drivers/trusty/trusty.c
-@@ -0,0 +1,981 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Copyright (C) 2013 Google, Inc.
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_platform.h>
-+#include <linux/platform_device.h>
-+#include <linux/slab.h>
-+#include <linux/stat.h>
-+#include <linux/string.h>
-+#include <linux/trusty/arm_ffa.h>
-+#include <linux/trusty/smcall.h>
-+#include <linux/trusty/sm_err.h>
-+#include <linux/trusty/trusty.h>
-+
-+#include <linux/scatterlist.h>
-+#include <linux/dma-mapping.h>
-+
-+#include "trusty-smc.h"
-+
-+struct trusty_state;
-+static struct platform_driver trusty_driver;
-+
-+struct trusty_work {
-+ struct trusty_state *ts;
-+ struct work_struct work;
-+};
-+
-+struct trusty_state {
-+ struct mutex smc_lock;
-+ struct atomic_notifier_head notifier;
-+ struct completion cpu_idle_completion;
-+ char *version_str;
-+ u32 api_version;
-+ bool trusty_panicked;
-+ struct device *dev;
-+ struct workqueue_struct *nop_wq;
-+ struct trusty_work __percpu *nop_works;
-+ struct list_head nop_queue;
-+ spinlock_t nop_lock; /* protects nop_queue */
-+ struct device_dma_parameters dma_parms;
-+ void *ffa_tx;
-+ void *ffa_rx;
-+ u16 ffa_local_id;
-+ u16 ffa_remote_id;
-+ struct mutex share_memory_msg_lock; /* protects share_memory_msg */
-+};
-+
-+static inline unsigned long smc(unsigned long r0, unsigned long r1,
-+ unsigned long r2, unsigned long r3)
-+{
-+ return trusty_smc8(r0, r1, r2, r3, 0, 0, 0, 0).r0;
-+}
-+
-+s32 trusty_fast_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ if (WARN_ON(!s))
-+ return SM_ERR_INVALID_PARAMETERS;
-+ if (WARN_ON(!SMC_IS_FASTCALL(smcnr)))
-+ return SM_ERR_INVALID_PARAMETERS;
-+ if (WARN_ON(SMC_IS_SMC64(smcnr)))
-+ return SM_ERR_INVALID_PARAMETERS;
-+
-+ return smc(smcnr, a0, a1, a2);
-+}
-+EXPORT_SYMBOL(trusty_fast_call32);
-+
-+#ifdef CONFIG_64BIT
-+s64 trusty_fast_call64(struct device *dev, u64 smcnr, u64 a0, u64 a1, u64 a2)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ if (WARN_ON(!s))
-+ return SM_ERR_INVALID_PARAMETERS;
-+ if (WARN_ON(!SMC_IS_FASTCALL(smcnr)))
-+ return SM_ERR_INVALID_PARAMETERS;
-+ if (WARN_ON(!SMC_IS_SMC64(smcnr)))
-+ return SM_ERR_INVALID_PARAMETERS;
-+
-+ return smc(smcnr, a0, a1, a2);
-+}
-+EXPORT_SYMBOL(trusty_fast_call64);
-+#endif
-+
-+static unsigned long trusty_std_call_inner(struct device *dev,
-+ unsigned long smcnr,
-+ unsigned long a0, unsigned long a1,
-+ unsigned long a2)
-+{
-+ unsigned long ret;
-+ int retry = 5;
-+
-+ dev_dbg(dev, "%s(0x%lx 0x%lx 0x%lx 0x%lx)\n",
-+ __func__, smcnr, a0, a1, a2);
-+ while (true) {
-+ ret = smc(smcnr, a0, a1, a2);
-+ while ((s32)ret == SM_ERR_FIQ_INTERRUPTED)
-+ ret = smc(SMC_SC_RESTART_FIQ, 0, 0, 0);
-+ if ((int)ret != SM_ERR_BUSY || !retry)
-+ break;
-+
-+ dev_dbg(dev, "%s(0x%lx 0x%lx 0x%lx 0x%lx) returned busy, retry\n",
-+ __func__, smcnr, a0, a1, a2);
-+ retry--;
-+ }
-+
-+ return ret;
-+}
-+
-+static unsigned long trusty_std_call_helper(struct device *dev,
-+ unsigned long smcnr,
-+ unsigned long a0, unsigned long a1,
-+ unsigned long a2)
-+{
-+ unsigned long ret;
-+ int sleep_time = 1;
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ while (true) {
-+ local_irq_disable();
-+ atomic_notifier_call_chain(&s->notifier, TRUSTY_CALL_PREPARE,
-+ NULL);
-+ ret = trusty_std_call_inner(dev, smcnr, a0, a1, a2);
-+ if (ret == SM_ERR_PANIC) {
-+ s->trusty_panicked = true;
-+ if (IS_ENABLED(CONFIG_TRUSTY_CRASH_IS_PANIC))
-+ panic("trusty crashed");
-+ else
-+ WARN_ONCE(1, "trusty crashed");
-+ }
-+
-+ atomic_notifier_call_chain(&s->notifier, TRUSTY_CALL_RETURNED,
-+ NULL);
-+ if (ret == SM_ERR_INTERRUPTED) {
-+ /*
-+ * Make sure this cpu will eventually re-enter trusty
-+ * even if the std_call resumes on another cpu.
-+ */
-+ trusty_enqueue_nop(dev, NULL);
-+ }
-+ local_irq_enable();
-+
-+ if ((int)ret != SM_ERR_BUSY)
-+ break;
-+
-+ if (sleep_time == 256)
-+ dev_warn(dev, "%s(0x%lx 0x%lx 0x%lx 0x%lx) returned busy\n",
-+ __func__, smcnr, a0, a1, a2);
-+ dev_dbg(dev, "%s(0x%lx 0x%lx 0x%lx 0x%lx) returned busy, wait %d ms\n",
-+ __func__, smcnr, a0, a1, a2, sleep_time);
-+
-+ msleep(sleep_time);
-+ if (sleep_time < 1000)
-+ sleep_time <<= 1;
-+
-+ dev_dbg(dev, "%s(0x%lx 0x%lx 0x%lx 0x%lx) retry\n",
-+ __func__, smcnr, a0, a1, a2);
-+ }
-+
-+ if (sleep_time > 256)
-+ dev_warn(dev, "%s(0x%lx 0x%lx 0x%lx 0x%lx) busy cleared\n",
-+ __func__, smcnr, a0, a1, a2);
-+
-+ return ret;
-+}
-+
-+static void trusty_std_call_cpu_idle(struct trusty_state *s)
-+{
-+ int ret;
-+
-+ ret = wait_for_completion_timeout(&s->cpu_idle_completion, HZ * 10);
-+ if (!ret) {
-+ dev_warn(s->dev,
-+ "%s: timed out waiting for cpu idle to clear, retry anyway\n",
-+ __func__);
-+ }
-+}
-+
-+s32 trusty_std_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2)
-+{
-+ int ret;
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ if (WARN_ON(SMC_IS_FASTCALL(smcnr)))
-+ return SM_ERR_INVALID_PARAMETERS;
-+
-+ if (WARN_ON(SMC_IS_SMC64(smcnr)))
-+ return SM_ERR_INVALID_PARAMETERS;
-+
-+ if (s->trusty_panicked) {
-+ /*
-+ * Avoid calling the notifiers if trusty has panicked as they
-+ * can trigger more calls.
-+ */
-+ return SM_ERR_PANIC;
-+ }
-+
-+ if (smcnr != SMC_SC_NOP) {
-+ mutex_lock(&s->smc_lock);
-+ reinit_completion(&s->cpu_idle_completion);
-+ }
-+
-+ dev_dbg(dev, "%s(0x%x 0x%x 0x%x 0x%x) started\n",
-+ __func__, smcnr, a0, a1, a2);
-+
-+ ret = trusty_std_call_helper(dev, smcnr, a0, a1, a2);
-+ while (ret == SM_ERR_INTERRUPTED || ret == SM_ERR_CPU_IDLE) {
-+ dev_dbg(dev, "%s(0x%x 0x%x 0x%x 0x%x) interrupted\n",
-+ __func__, smcnr, a0, a1, a2);
-+ if (ret == SM_ERR_CPU_IDLE)
-+ trusty_std_call_cpu_idle(s);
-+ ret = trusty_std_call_helper(dev, SMC_SC_RESTART_LAST, 0, 0, 0);
-+ }
-+ dev_dbg(dev, "%s(0x%x 0x%x 0x%x 0x%x) returned 0x%x\n",
-+ __func__, smcnr, a0, a1, a2, ret);
-+
-+ if (smcnr == SMC_SC_NOP)
-+ complete(&s->cpu_idle_completion);
-+ else
-+ mutex_unlock(&s->smc_lock);
-+
-+ return ret;
-+}
-+EXPORT_SYMBOL(trusty_std_call32);
-+
-+int trusty_share_memory(struct device *dev, u64 *id,
-+ struct scatterlist *sglist, unsigned int nents,
-+ pgprot_t pgprot)
-+{
-+ return trusty_transfer_memory(dev, id, sglist, nents, pgprot, 0,
-+ false);
-+}
-+EXPORT_SYMBOL(trusty_share_memory);
-+
-+int trusty_transfer_memory(struct device *dev, u64 *id,
-+ struct scatterlist *sglist, unsigned int nents,
-+ pgprot_t pgprot, u64 tag, bool lend)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+ int ret;
-+ struct ns_mem_page_info pg_inf;
-+ struct scatterlist *sg;
-+ size_t count;
-+ size_t i;
-+ size_t len;
-+ u64 ffa_handle = 0;
-+ size_t total_len;
-+ size_t endpoint_count = 1;
-+ struct ffa_mtd *mtd = s->ffa_tx;
-+ size_t comp_mrd_offset = offsetof(struct ffa_mtd, emad[endpoint_count]);
-+ struct ffa_comp_mrd *comp_mrd = s->ffa_tx + comp_mrd_offset;
-+ struct ffa_cons_mrd *cons_mrd = comp_mrd->address_range_array;
-+ size_t cons_mrd_offset = (void *)cons_mrd - s->ffa_tx;
-+ struct smc_ret8 smc_ret;
-+ u32 cookie_low;
-+ u32 cookie_high;
-+
-+ if (WARN_ON(dev->driver != &trusty_driver.driver))
-+ return -EINVAL;
-+
-+ if (WARN_ON(nents < 1))
-+ return -EINVAL;
-+
-+ if (nents != 1 && s->api_version < TRUSTY_API_VERSION_MEM_OBJ) {
-+ dev_err(s->dev, "%s: old trusty version does not support non-contiguous memory objects\n",
-+ __func__);
-+ return -EOPNOTSUPP;
-+ }
-+
-+ count = dma_map_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
-+ if (count != nents) {
-+ dev_err(s->dev, "failed to dma map sg_table\n");
-+ return -EINVAL;
-+ }
-+
-+ sg = sglist;
-+ ret = trusty_encode_page_info(&pg_inf, phys_to_page(sg_dma_address(sg)),
-+ pgprot);
-+ if (ret) {
-+ dev_err(s->dev, "%s: trusty_encode_page_info failed\n",
-+ __func__);
-+ goto err_encode_page_info;
-+ }
-+
-+ if (s->api_version < TRUSTY_API_VERSION_MEM_OBJ) {
-+ *id = pg_inf.compat_attr;
-+ return 0;
-+ }
-+
-+ len = 0;
-+ for_each_sg(sglist, sg, nents, i)
-+ len += sg_dma_len(sg);
-+
-+ mutex_lock(&s->share_memory_msg_lock);
-+
-+ mtd->sender_id = s->ffa_local_id;
-+ mtd->memory_region_attributes = pg_inf.ffa_mem_attr;
-+ mtd->reserved_3 = 0;
-+ mtd->flags = 0;
-+ mtd->handle = 0;
-+ mtd->tag = tag;
-+ mtd->reserved_24_27 = 0;
-+ mtd->emad_count = endpoint_count;
-+ for (i = 0; i < endpoint_count; i++) {
-+ struct ffa_emad *emad = &mtd->emad[i];
-+ /* TODO: support stream ids */
-+ emad->mapd.endpoint_id = s->ffa_remote_id;
-+ emad->mapd.memory_access_permissions = pg_inf.ffa_mem_perm;
-+ emad->mapd.flags = 0;
-+ emad->comp_mrd_offset = comp_mrd_offset;
-+ emad->reserved_8_15 = 0;
-+ }
-+ comp_mrd->total_page_count = len / PAGE_SIZE;
-+ comp_mrd->address_range_count = nents;
-+ comp_mrd->reserved_8_15 = 0;
-+
-+ total_len = cons_mrd_offset + nents * sizeof(*cons_mrd);
-+ sg = sglist;
-+ while (count) {
-+ size_t lcount =
-+ min_t(size_t, count, (PAGE_SIZE - cons_mrd_offset) /
-+ sizeof(*cons_mrd));
-+ size_t fragment_len = lcount * sizeof(*cons_mrd) +
-+ cons_mrd_offset;
-+
-+ for (i = 0; i < lcount; i++) {
-+ cons_mrd[i].address = sg_dma_address(sg);
-+ cons_mrd[i].page_count = sg_dma_len(sg) / PAGE_SIZE;
-+ cons_mrd[i].reserved_12_15 = 0;
-+ sg = sg_next(sg);
-+ }
-+ count -= lcount;
-+ if (cons_mrd_offset) {
-+ u32 smc = lend ? SMC_FC_FFA_MEM_LEND :
-+ SMC_FC_FFA_MEM_SHARE;
-+ /* First fragment */
-+ smc_ret = trusty_smc8(smc, total_len,
-+ fragment_len, 0, 0, 0, 0, 0);
-+ } else {
-+ smc_ret = trusty_smc8(SMC_FC_FFA_MEM_FRAG_TX,
-+ cookie_low, cookie_high,
-+ fragment_len, 0, 0, 0, 0);
-+ }
-+ if (smc_ret.r0 == SMC_FC_FFA_MEM_FRAG_RX) {
-+ cookie_low = smc_ret.r1;
-+ cookie_high = smc_ret.r2;
-+ dev_dbg(s->dev, "cookie %x %x", cookie_low,
-+ cookie_high);
-+ if (!count) {
-+ /*
-+ * We have sent all our descriptors. Expected
-+ * SMC_FC_FFA_SUCCESS, not a request to send
-+ * another fragment.
-+ */
-+ dev_err(s->dev, "%s: fragment_len %zd/%zd, unexpected SMC_FC_FFA_MEM_FRAG_RX\n",
-+ __func__, fragment_len, total_len);
-+ ret = -EIO;
-+ break;
-+ }
-+ } else if (smc_ret.r0 == SMC_FC_FFA_SUCCESS) {
-+ ffa_handle = smc_ret.r2 | (u64)smc_ret.r3 << 32;
-+ dev_dbg(s->dev, "%s: fragment_len %zu/%zu, got handle 0x%llx\n",
-+ __func__, fragment_len, total_len,
-+ ffa_handle);
-+ if (count) {
-+ /*
-+ * We have not sent all our descriptors.
-+ * Expected SMC_FC_FFA_MEM_FRAG_RX not
-+ * SMC_FC_FFA_SUCCESS.
-+ */
-+ dev_err(s->dev, "%s: fragment_len %zu/%zu, unexpected SMC_FC_FFA_SUCCESS, count %zu != 0\n",
-+ __func__, fragment_len, total_len,
-+ count);
-+ ret = -EIO;
-+ break;
-+ }
-+ } else {
-+ dev_err(s->dev, "%s: fragment_len %zu/%zu, SMC_FC_FFA_MEM_SHARE failed 0x%lx 0x%lx 0x%lx",
-+ __func__, fragment_len, total_len,
-+ smc_ret.r0, smc_ret.r1, smc_ret.r2);
-+ ret = -EIO;
-+ break;
-+ }
-+
-+ cons_mrd = s->ffa_tx;
-+ cons_mrd_offset = 0;
-+ }
-+
-+ mutex_unlock(&s->share_memory_msg_lock);
-+
-+ if (!ret) {
-+ *id = ffa_handle;
-+ dev_dbg(s->dev, "%s: done\n", __func__);
-+ return 0;
-+ }
-+
-+ dev_err(s->dev, "%s: failed %d", __func__, ret);
-+
-+err_encode_page_info:
-+ dma_unmap_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
-+ return ret;
-+}
-+EXPORT_SYMBOL(trusty_transfer_memory);
-+
-+/*
-+ * trusty_share_memory_compat - trusty_share_memory wrapper for old apis
-+ *
-+ * Call trusty_share_memory and filter out memory attributes if trusty version
-+ * is old. Used by clients that used to pass just a physical address to trusty
-+ * instead of a physical address plus memory attributes value.
-+ */
-+int trusty_share_memory_compat(struct device *dev, u64 *id,
-+ struct scatterlist *sglist, unsigned int nents,
-+ pgprot_t pgprot)
-+{
-+ int ret;
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ ret = trusty_share_memory(dev, id, sglist, nents, pgprot);
-+ if (!ret && s->api_version < TRUSTY_API_VERSION_PHYS_MEM_OBJ)
-+ *id &= 0x0000FFFFFFFFF000ull;
-+
-+ return ret;
-+}
-+EXPORT_SYMBOL(trusty_share_memory_compat);
-+
-+int trusty_reclaim_memory(struct device *dev, u64 id,
-+ struct scatterlist *sglist, unsigned int nents)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+ int ret = 0;
-+ struct smc_ret8 smc_ret;
-+
-+ if (WARN_ON(dev->driver != &trusty_driver.driver))
-+ return -EINVAL;
-+
-+ if (WARN_ON(nents < 1))
-+ return -EINVAL;
-+
-+ if (s->api_version < TRUSTY_API_VERSION_MEM_OBJ) {
-+ if (nents != 1) {
-+ dev_err(s->dev, "%s: not supported\n", __func__);
-+ return -EOPNOTSUPP;
-+ }
-+
-+ dma_unmap_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
-+
-+ dev_dbg(s->dev, "%s: done\n", __func__);
-+ return 0;
-+ }
-+
-+ mutex_lock(&s->share_memory_msg_lock);
-+
-+ smc_ret = trusty_smc8(SMC_FC_FFA_MEM_RECLAIM, (u32)id, id >> 32, 0, 0,
-+ 0, 0, 0);
-+ if (smc_ret.r0 != SMC_FC_FFA_SUCCESS) {
-+ dev_err(s->dev, "%s: SMC_FC_FFA_MEM_RECLAIM failed 0x%lx 0x%lx 0x%lx",
-+ __func__, smc_ret.r0, smc_ret.r1, smc_ret.r2);
-+ if (smc_ret.r0 == SMC_FC_FFA_ERROR &&
-+ smc_ret.r2 == FFA_ERROR_DENIED)
-+ ret = -EBUSY;
-+ else
-+ ret = -EIO;
-+ }
-+
-+ mutex_unlock(&s->share_memory_msg_lock);
-+
-+ if (ret != 0)
-+ return ret;
-+
-+ dma_unmap_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
-+
-+ dev_dbg(s->dev, "%s: done\n", __func__);
-+ return 0;
-+}
-+EXPORT_SYMBOL(trusty_reclaim_memory);
-+
-+int trusty_call_notifier_register(struct device *dev, struct notifier_block *n)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ return atomic_notifier_chain_register(&s->notifier, n);
-+}
-+EXPORT_SYMBOL(trusty_call_notifier_register);
-+
-+int trusty_call_notifier_unregister(struct device *dev,
-+ struct notifier_block *n)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ return atomic_notifier_chain_unregister(&s->notifier, n);
-+}
-+EXPORT_SYMBOL(trusty_call_notifier_unregister);
-+
-+static int trusty_remove_child(struct device *dev, void *data)
-+{
-+ platform_device_unregister(to_platform_device(dev));
-+ return 0;
-+}
-+
-+static ssize_t trusty_version_show(struct device *dev,
-+ struct device_attribute *attr, char *buf)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ return scnprintf(buf, PAGE_SIZE, "%s\n", s->version_str ?: "unknown");
-+}
-+
-+static DEVICE_ATTR(trusty_version, 0400, trusty_version_show, NULL);
-+
-+static struct attribute *trusty_attrs[] = {
-+ &dev_attr_trusty_version.attr,
-+ NULL,
-+};
-+ATTRIBUTE_GROUPS(trusty);
-+
-+const char *trusty_version_str_get(struct device *dev)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ return s->version_str;
-+}
-+EXPORT_SYMBOL(trusty_version_str_get);
-+
-+static int trusty_init_msg_buf(struct trusty_state *s, struct device *dev)
-+{
-+ phys_addr_t tx_paddr;
-+ phys_addr_t rx_paddr;
-+ int ret;
-+ struct smc_ret8 smc_ret;
-+
-+ if (s->api_version < TRUSTY_API_VERSION_MEM_OBJ)
-+ return 0;
-+
-+ /* Get supported FF-A version and check if it is compatible */
-+ smc_ret = trusty_smc8(SMC_FC_FFA_VERSION, FFA_CURRENT_VERSION, 0, 0,
-+ 0, 0, 0, 0);
-+ if (FFA_VERSION_TO_MAJOR(smc_ret.r0) != FFA_CURRENT_VERSION_MAJOR) {
-+ dev_err(s->dev,
-+ "%s: Unsupported FF-A version 0x%lx, expected 0x%x\n",
-+ __func__, smc_ret.r0, FFA_CURRENT_VERSION);
-+ ret = -EIO;
-+ goto err_version;
-+ }
-+
-+ /* Check that SMC_FC_FFA_MEM_SHARE is implemented */
-+ smc_ret = trusty_smc8(SMC_FC_FFA_FEATURES, SMC_FC_FFA_MEM_SHARE, 0, 0,
-+ 0, 0, 0, 0);
-+ if (smc_ret.r0 != SMC_FC_FFA_SUCCESS) {
-+ dev_err(s->dev,
-+ "%s: SMC_FC_FFA_FEATURES(SMC_FC_FFA_MEM_SHARE) failed 0x%lx 0x%lx 0x%lx\n",
-+ __func__, smc_ret.r0, smc_ret.r1, smc_ret.r2);
-+ ret = -EIO;
-+ goto err_features;
-+ }
-+
-+ /*
-+ * Set FF-A endpoint IDs.
-+ *
-+ * Hardcode 0x8000 for the secure os.
-+ * TODO: Use FF-A call or device tree to configure this dynamically
-+ */
-+ smc_ret = trusty_smc8(SMC_FC_FFA_ID_GET, 0, 0, 0, 0, 0, 0, 0);
-+ if (smc_ret.r0 != SMC_FC_FFA_SUCCESS) {
-+ dev_err(s->dev,
-+ "%s: SMC_FC_FFA_ID_GET failed 0x%lx 0x%lx 0x%lx\n",
-+ __func__, smc_ret.r0, smc_ret.r1, smc_ret.r2);
-+ ret = -EIO;
-+ goto err_id_get;
-+ }
-+
-+ s->ffa_local_id = smc_ret.r2;
-+ s->ffa_remote_id = 0x8000;
-+
-+ s->ffa_tx = kmalloc(PAGE_SIZE, GFP_KERNEL);
-+ if (!s->ffa_tx) {
-+ ret = -ENOMEM;
-+ goto err_alloc_tx;
-+ }
-+ tx_paddr = virt_to_phys(s->ffa_tx);
-+ if (WARN_ON(tx_paddr & (PAGE_SIZE - 1))) {
-+ ret = -EINVAL;
-+ goto err_unaligned_tx_buf;
-+ }
-+
-+ s->ffa_rx = kmalloc(PAGE_SIZE, GFP_KERNEL);
-+ if (!s->ffa_rx) {
-+ ret = -ENOMEM;
-+ goto err_alloc_rx;
-+ }
-+ rx_paddr = virt_to_phys(s->ffa_rx);
-+ if (WARN_ON(rx_paddr & (PAGE_SIZE - 1))) {
-+ ret = -EINVAL;
-+ goto err_unaligned_rx_buf;
-+ }
-+
-+ smc_ret = trusty_smc8(SMC_FCZ_FFA_RXTX_MAP, tx_paddr, rx_paddr, 1, 0,
-+ 0, 0, 0);
-+ if (smc_ret.r0 != SMC_FC_FFA_SUCCESS) {
-+ dev_err(s->dev, "%s: SMC_FCZ_FFA_RXTX_MAP failed 0x%lx 0x%lx 0x%lx\n",
-+ __func__, smc_ret.r0, smc_ret.r1, smc_ret.r2);
-+ ret = -EIO;
-+ goto err_rxtx_map;
-+ }
-+
-+ return 0;
-+
-+err_rxtx_map:
-+err_unaligned_rx_buf:
-+ kfree(s->ffa_rx);
-+ s->ffa_rx = NULL;
-+err_alloc_rx:
-+err_unaligned_tx_buf:
-+ kfree(s->ffa_tx);
-+ s->ffa_tx = NULL;
-+err_alloc_tx:
-+err_id_get:
-+err_features:
-+err_version:
-+ return ret;
-+}
-+
-+static void trusty_free_msg_buf(struct trusty_state *s, struct device *dev)
-+{
-+ struct smc_ret8 smc_ret;
-+
-+ smc_ret = trusty_smc8(SMC_FC_FFA_RXTX_UNMAP, 0, 0, 0, 0, 0, 0, 0);
-+ if (smc_ret.r0 != SMC_FC_FFA_SUCCESS) {
-+ dev_err(s->dev, "%s: SMC_FC_FFA_RXTX_UNMAP failed 0x%lx 0x%lx 0x%lx\n",
-+ __func__, smc_ret.r0, smc_ret.r1, smc_ret.r2);
-+ } else {
-+ kfree(s->ffa_rx);
-+ kfree(s->ffa_tx);
-+ }
-+}
-+
-+static void trusty_init_version(struct trusty_state *s, struct device *dev)
-+{
-+ int ret;
-+ int i;
-+ int version_str_len;
-+
-+ ret = trusty_fast_call32(dev, SMC_FC_GET_VERSION_STR, -1, 0, 0);
-+ if (ret <= 0)
-+ goto err_get_size;
-+
-+ version_str_len = ret;
-+
-+ s->version_str = kmalloc(version_str_len + 1, GFP_KERNEL);
-+ for (i = 0; i < version_str_len; i++) {
-+ ret = trusty_fast_call32(dev, SMC_FC_GET_VERSION_STR, i, 0, 0);
-+ if (ret < 0)
-+ goto err_get_char;
-+ s->version_str[i] = ret;
-+ }
-+ s->version_str[i] = '\0';
-+
-+ dev_info(dev, "trusty version: %s\n", s->version_str);
-+ return;
-+
-+err_get_char:
-+ kfree(s->version_str);
-+ s->version_str = NULL;
-+err_get_size:
-+ dev_err(dev, "failed to get version: %d\n", ret);
-+}
-+
-+u32 trusty_get_api_version(struct device *dev)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ return s->api_version;
-+}
-+EXPORT_SYMBOL(trusty_get_api_version);
-+
-+bool trusty_get_panic_status(struct device *dev)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+ if (WARN_ON(dev->driver != &trusty_driver.driver))
-+ return false;
-+ return s->trusty_panicked;
-+}
-+EXPORT_SYMBOL(trusty_get_panic_status);
-+
-+static int trusty_init_api_version(struct trusty_state *s, struct device *dev)
-+{
-+ u32 api_version;
-+
-+ api_version = trusty_fast_call32(dev, SMC_FC_API_VERSION,
-+ TRUSTY_API_VERSION_CURRENT, 0, 0);
-+ if (api_version == SM_ERR_UNDEFINED_SMC)
-+ api_version = 0;
-+
-+ if (api_version > TRUSTY_API_VERSION_CURRENT) {
-+ dev_err(dev, "unsupported api version %u > %u\n",
-+ api_version, TRUSTY_API_VERSION_CURRENT);
-+ return -EINVAL;
-+ }
-+
-+ dev_info(dev, "selected api version: %u (requested %u)\n",
-+ api_version, TRUSTY_API_VERSION_CURRENT);
-+ s->api_version = api_version;
-+
-+ return 0;
-+}
-+
-+static bool dequeue_nop(struct trusty_state *s, u32 *args)
-+{
-+ unsigned long flags;
-+ struct trusty_nop *nop = NULL;
-+
-+ spin_lock_irqsave(&s->nop_lock, flags);
-+ if (!list_empty(&s->nop_queue)) {
-+ nop = list_first_entry(&s->nop_queue,
-+ struct trusty_nop, node);
-+ list_del_init(&nop->node);
-+ args[0] = nop->args[0];
-+ args[1] = nop->args[1];
-+ args[2] = nop->args[2];
-+ } else {
-+ args[0] = 0;
-+ args[1] = 0;
-+ args[2] = 0;
-+ }
-+ spin_unlock_irqrestore(&s->nop_lock, flags);
-+ return nop;
-+}
-+
-+static void locked_nop_work_func(struct work_struct *work)
-+{
-+ int ret;
-+ struct trusty_work *tw = container_of(work, struct trusty_work, work);
-+ struct trusty_state *s = tw->ts;
-+
-+ ret = trusty_std_call32(s->dev, SMC_SC_LOCKED_NOP, 0, 0, 0);
-+ if (ret != 0)
-+ dev_err(s->dev, "%s: SMC_SC_LOCKED_NOP failed %d",
-+ __func__, ret);
-+
-+ dev_dbg(s->dev, "%s: done\n", __func__);
-+}
-+
-+static void nop_work_func(struct work_struct *work)
-+{
-+ int ret;
-+ bool next;
-+ u32 args[3];
-+ u32 last_arg0;
-+ struct trusty_work *tw = container_of(work, struct trusty_work, work);
-+ struct trusty_state *s = tw->ts;
-+
-+ dequeue_nop(s, args);
-+ do {
-+ dev_dbg(s->dev, "%s: %x %x %x\n",
-+ __func__, args[0], args[1], args[2]);
-+
-+ last_arg0 = args[0];
-+ ret = trusty_std_call32(s->dev, SMC_SC_NOP,
-+ args[0], args[1], args[2]);
-+
-+ next = dequeue_nop(s, args);
-+
-+ if (ret == SM_ERR_NOP_INTERRUPTED) {
-+ next = true;
-+ } else if (ret != SM_ERR_NOP_DONE) {
-+ dev_err(s->dev, "%s: SMC_SC_NOP %x failed %d",
-+ __func__, last_arg0, ret);
-+ if (last_arg0) {
-+ /*
-+ * Don't break out of the loop if a non-default
-+ * nop-handler returns an error.
-+ */
-+ next = true;
-+ }
-+ }
-+ } while (next);
-+
-+ dev_dbg(s->dev, "%s: done\n", __func__);
-+}
-+
-+void trusty_enqueue_nop(struct device *dev, struct trusty_nop *nop)
-+{
-+ unsigned long flags;
-+ struct trusty_work *tw;
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ preempt_disable();
-+ tw = this_cpu_ptr(s->nop_works);
-+ if (nop) {
-+ WARN_ON(s->api_version < TRUSTY_API_VERSION_SMP_NOP);
-+
-+ spin_lock_irqsave(&s->nop_lock, flags);
-+ if (list_empty(&nop->node))
-+ list_add_tail(&nop->node, &s->nop_queue);
-+ spin_unlock_irqrestore(&s->nop_lock, flags);
-+ }
-+ queue_work(s->nop_wq, &tw->work);
-+ preempt_enable();
-+}
-+EXPORT_SYMBOL(trusty_enqueue_nop);
-+
-+void trusty_dequeue_nop(struct device *dev, struct trusty_nop *nop)
-+{
-+ unsigned long flags;
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ if (WARN_ON(!nop))
-+ return;
-+
-+ spin_lock_irqsave(&s->nop_lock, flags);
-+ if (!list_empty(&nop->node))
-+ list_del_init(&nop->node);
-+ spin_unlock_irqrestore(&s->nop_lock, flags);
-+}
-+EXPORT_SYMBOL(trusty_dequeue_nop);
-+
-+static int trusty_probe(struct platform_device *pdev)
-+{
-+ int ret;
-+ unsigned int cpu;
-+ work_func_t work_func;
-+ struct trusty_state *s;
-+ struct device_node *node = pdev->dev.of_node;
-+
-+ if (!node) {
-+ dev_err(&pdev->dev, "of_node required\n");
-+ return -EINVAL;
-+ }
-+
-+ s = kzalloc(sizeof(*s), GFP_KERNEL);
-+ if (!s) {
-+ ret = -ENOMEM;
-+ goto err_allocate_state;
-+ }
-+
-+ s->dev = &pdev->dev;
-+ spin_lock_init(&s->nop_lock);
-+ INIT_LIST_HEAD(&s->nop_queue);
-+ mutex_init(&s->smc_lock);
-+ mutex_init(&s->share_memory_msg_lock);
-+ ATOMIC_INIT_NOTIFIER_HEAD(&s->notifier);
-+ init_completion(&s->cpu_idle_completion);
-+
-+ s->dev->dma_parms = &s->dma_parms;
-+ dma_set_max_seg_size(s->dev, 0xfffff000); /* dma_parms limit */
-+ /*
-+ * Set dma mask to 48 bits. This is the current limit of
-+ * trusty_encode_page_info.
-+ */
-+ dma_coerce_mask_and_coherent(s->dev, DMA_BIT_MASK(48));
-+
-+ platform_set_drvdata(pdev, s);
-+
-+ trusty_init_version(s, &pdev->dev);
-+
-+ ret = trusty_init_api_version(s, &pdev->dev);
-+ if (ret < 0)
-+ goto err_api_version;
-+
-+ ret = trusty_init_msg_buf(s, &pdev->dev);
-+ if (ret < 0)
-+ goto err_init_msg_buf;
-+
-+ s->nop_wq = alloc_workqueue("trusty-nop-wq", WQ_CPU_INTENSIVE, 0);
-+ if (!s->nop_wq) {
-+ ret = -ENODEV;
-+ dev_err(&pdev->dev, "Failed create trusty-nop-wq\n");
-+ goto err_create_nop_wq;
-+ }
-+
-+ s->nop_works = alloc_percpu(struct trusty_work);
-+ if (!s->nop_works) {
-+ ret = -ENOMEM;
-+ dev_err(&pdev->dev, "Failed to allocate works\n");
-+ goto err_alloc_works;
-+ }
-+
-+ if (s->api_version < TRUSTY_API_VERSION_SMP)
-+ work_func = locked_nop_work_func;
-+ else
-+ work_func = nop_work_func;
-+
-+ for_each_possible_cpu(cpu) {
-+ struct trusty_work *tw = per_cpu_ptr(s->nop_works, cpu);
-+
-+ tw->ts = s;
-+ INIT_WORK(&tw->work, work_func);
-+ }
-+
-+ ret = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);
-+ if (ret < 0) {
-+ dev_err(&pdev->dev, "Failed to add children: %d\n", ret);
-+ goto err_add_children;
-+ }
-+
-+ return 0;
-+
-+err_add_children:
-+ for_each_possible_cpu(cpu) {
-+ struct trusty_work *tw = per_cpu_ptr(s->nop_works, cpu);
-+
-+ flush_work(&tw->work);
-+ }
-+ free_percpu(s->nop_works);
-+err_alloc_works:
-+ destroy_workqueue(s->nop_wq);
-+err_create_nop_wq:
-+ trusty_free_msg_buf(s, &pdev->dev);
-+err_init_msg_buf:
-+err_api_version:
-+ s->dev->dma_parms = NULL;
-+ kfree(s->version_str);
-+ device_for_each_child(&pdev->dev, NULL, trusty_remove_child);
-+ mutex_destroy(&s->share_memory_msg_lock);
-+ mutex_destroy(&s->smc_lock);
-+ kfree(s);
-+err_allocate_state:
-+ return ret;
-+}
-+
-+static int trusty_remove(struct platform_device *pdev)
-+{
-+ unsigned int cpu;
-+ struct trusty_state *s = platform_get_drvdata(pdev);
-+
-+ device_for_each_child(&pdev->dev, NULL, trusty_remove_child);
-+
-+ for_each_possible_cpu(cpu) {
-+ struct trusty_work *tw = per_cpu_ptr(s->nop_works, cpu);
-+
-+ flush_work(&tw->work);
-+ }
-+ free_percpu(s->nop_works);
-+ destroy_workqueue(s->nop_wq);
-+
-+ mutex_destroy(&s->share_memory_msg_lock);
-+ mutex_destroy(&s->smc_lock);
-+ trusty_free_msg_buf(s, &pdev->dev);
-+ s->dev->dma_parms = NULL;
-+ kfree(s->version_str);
-+ kfree(s);
-+ return 0;
-+}
-+
-+static const struct of_device_id trusty_of_match[] = {
-+ { .compatible = "android,trusty-smc-v1", },
-+ {},
-+};
-+
-+MODULE_DEVICE_TABLE(trusty, trusty_of_match);
-+
-+static struct platform_driver trusty_driver = {
-+ .probe = trusty_probe,
-+ .remove = trusty_remove,
-+ .driver = {
-+ .name = "trusty",
-+ .of_match_table = trusty_of_match,
-+ .dev_groups = trusty_groups,
-+ },
-+};
-+
-+static int __init trusty_driver_init(void)
-+{
-+ return platform_driver_register(&trusty_driver);
-+}
-+
-+static void __exit trusty_driver_exit(void)
-+{
-+ platform_driver_unregister(&trusty_driver);
-+}
-+
-+subsys_initcall(trusty_driver_init);
-+module_exit(trusty_driver_exit);
-+
-+MODULE_LICENSE("GPL v2");
-+MODULE_DESCRIPTION("Trusty core driver");
-diff --git a/include/linux/trusty/arm_ffa.h b/include/linux/trusty/arm_ffa.h
-new file mode 100644
-index 000000000000..ab7b2afb794c
---- /dev/null
-+++ b/include/linux/trusty/arm_ffa.h
-@@ -0,0 +1,590 @@
-+/* SPDX-License-Identifier: MIT */
-+/*
-+ * Copyright (C) 2020 Google, Inc.
-+ *
-+ * Trusty and TF-A also have a copy of this header.
-+ * Please keep the copies in sync.
-+ */
-+#ifndef __LINUX_TRUSTY_ARM_FFA_H
-+#define __LINUX_TRUSTY_ARM_FFA_H
-+
-+/*
-+ * Subset of Arm PSA Firmware Framework for Arm v8-A 1.0 EAC 1_0
-+ * (https://developer.arm.com/docs/den0077/a) needed for shared memory.
-+ */
-+
-+#include "smcall.h"
-+
-+#ifndef STATIC_ASSERT
-+#define STATIC_ASSERT(e) _Static_assert(e, #e)
-+#endif
-+
-+#define FFA_CURRENT_VERSION_MAJOR (1U)
-+#define FFA_CURRENT_VERSION_MINOR (0U)
-+
-+#define FFA_VERSION_TO_MAJOR(version) ((version) >> 16)
-+#define FFA_VERSION_TO_MINOR(version) ((version) & (0xffff))
-+#define FFA_VERSION(major, minor) (((major) << 16) | (minor))
-+#define FFA_CURRENT_VERSION \
-+ FFA_VERSION(FFA_CURRENT_VERSION_MAJOR, FFA_CURRENT_VERSION_MINOR)
-+
-+#define SMC_ENTITY_SHARED_MEMORY 4
-+
-+#define SMC_FASTCALL_NR_SHARED_MEMORY(nr) \
-+ SMC_FASTCALL_NR(SMC_ENTITY_SHARED_MEMORY, nr)
-+#define SMC_FASTCALL64_NR_SHARED_MEMORY(nr) \
-+ SMC_FASTCALL64_NR(SMC_ENTITY_SHARED_MEMORY, nr)
-+
-+/**
-+ * typedef ffa_endpoint_id16_t - Endpoint ID
-+ *
-+ * Current implementation only supports VMIDs. FFA spec also support stream
-+ * endpoint ids.
-+ */
-+typedef uint16_t ffa_endpoint_id16_t;
-+
-+/**
-+ * struct ffa_cons_mrd - Constituent memory region descriptor
-+ * @address:
-+ * Start address of contiguous memory region. Must be 4K page aligned.
-+ * @page_count:
-+ * Number of 4K pages in region.
-+ * @reserved_12_15:
-+ * Reserve bytes 12-15 to pad struct size to 16 bytes.
-+ */
-+struct ffa_cons_mrd {
-+ uint64_t address;
-+ uint32_t page_count;
-+ uint32_t reserved_12_15;
-+};
-+STATIC_ASSERT(sizeof(struct ffa_cons_mrd) == 16);
-+
-+/**
-+ * struct ffa_comp_mrd - Composite memory region descriptor
-+ * @total_page_count:
-+ * Number of 4k pages in memory region. Must match sum of
-+ * @address_range_array[].page_count.
-+ * @address_range_count:
-+ * Number of entries in @address_range_array.
-+ * @reserved_8_15:
-+ * Reserve bytes 8-15 to pad struct size to 16 byte alignment and
-+ * make @address_range_array 16 byte aligned.
-+ * @address_range_array:
-+ * Array of &struct ffa_cons_mrd entries.
-+ */
-+struct ffa_comp_mrd {
-+ uint32_t total_page_count;
-+ uint32_t address_range_count;
-+ uint64_t reserved_8_15;
-+ struct ffa_cons_mrd address_range_array[];
-+};
-+STATIC_ASSERT(sizeof(struct ffa_comp_mrd) == 16);
-+
-+/**
-+ * typedef ffa_mem_attr8_t - Memory region attributes
-+ *
-+ * * @FFA_MEM_ATTR_DEVICE_NGNRNE:
-+ * Device-nGnRnE.
-+ * * @FFA_MEM_ATTR_DEVICE_NGNRE:
-+ * Device-nGnRE.
-+ * * @FFA_MEM_ATTR_DEVICE_NGRE:
-+ * Device-nGRE.
-+ * * @FFA_MEM_ATTR_DEVICE_GRE:
-+ * Device-GRE.
-+ * * @FFA_MEM_ATTR_NORMAL_MEMORY_UNCACHED
-+ * Normal memory. Non-cacheable.
-+ * * @FFA_MEM_ATTR_NORMAL_MEMORY_CACHED_WB
-+ * Normal memory. Write-back cached.
-+ * * @FFA_MEM_ATTR_NON_SHAREABLE
-+ * Non-shareable. Combine with FFA_MEM_ATTR_NORMAL_MEMORY_*.
-+ * * @FFA_MEM_ATTR_OUTER_SHAREABLE
-+ * Outer Shareable. Combine with FFA_MEM_ATTR_NORMAL_MEMORY_*.
-+ * * @FFA_MEM_ATTR_INNER_SHAREABLE
-+ * Inner Shareable. Combine with FFA_MEM_ATTR_NORMAL_MEMORY_*.
-+ */
-+typedef uint8_t ffa_mem_attr8_t;
-+#define FFA_MEM_ATTR_DEVICE_NGNRNE ((1U << 4) | (0x0U << 2))
-+#define FFA_MEM_ATTR_DEVICE_NGNRE ((1U << 4) | (0x1U << 2))
-+#define FFA_MEM_ATTR_DEVICE_NGRE ((1U << 4) | (0x2U << 2))
-+#define FFA_MEM_ATTR_DEVICE_GRE ((1U << 4) | (0x3U << 2))
-+#define FFA_MEM_ATTR_NORMAL_MEMORY_UNCACHED ((2U << 4) | (0x1U << 2))
-+#define FFA_MEM_ATTR_NORMAL_MEMORY_CACHED_WB ((2U << 4) | (0x3U << 2))
-+#define FFA_MEM_ATTR_NON_SHAREABLE (0x0U << 0)
-+#define FFA_MEM_ATTR_OUTER_SHAREABLE (0x2U << 0)
-+#define FFA_MEM_ATTR_INNER_SHAREABLE (0x3U << 0)
-+
-+/**
-+ * typedef ffa_mem_perm8_t - Memory access permissions
-+ *
-+ * * @FFA_MEM_ATTR_RO
-+ * Request or specify read-only mapping.
-+ * * @FFA_MEM_ATTR_RW
-+ * Request or allow read-write mapping.
-+ * * @FFA_MEM_PERM_NX
-+ * Deny executable mapping.
-+ * * @FFA_MEM_PERM_X
-+ * Request executable mapping.
-+ */
-+typedef uint8_t ffa_mem_perm8_t;
-+#define FFA_MEM_PERM_RO (1U << 0)
-+#define FFA_MEM_PERM_RW (1U << 1)
-+#define FFA_MEM_PERM_NX (1U << 2)
-+#define FFA_MEM_PERM_X (1U << 3)
-+
-+/**
-+ * typedef ffa_mem_flag8_t - Endpoint memory flags
-+ *
-+ * * @FFA_MEM_FLAG_OTHER
-+ * Other borrower. Memory region must not be or was not retrieved on behalf
-+ * of this endpoint.
-+ */
-+typedef uint8_t ffa_mem_flag8_t;
-+#define FFA_MEM_FLAG_OTHER (1U << 0)
-+
-+/**
-+ * typedef ffa_mtd_flag32_t - Memory transaction descriptor flags
-+ *
-+ * * @FFA_MTD_FLAG_ZERO_MEMORY
-+ * Zero memory after unmapping from sender (must be 0 for share).
-+ * * @FFA_MTD_FLAG_TIME_SLICING
-+ * Not supported by this implementation.
-+ * * @FFA_MTD_FLAG_ZERO_MEMORY_AFTER_RELINQUISH
-+ * Zero memory after unmapping from borrowers (must be 0 for share).
-+ * * @FFA_MTD_FLAG_TYPE_MASK
-+ * Bit-mask to extract memory management transaction type from flags.
-+ * * @FFA_MTD_FLAG_TYPE_SHARE_MEMORY
-+ * Share memory transaction flag.
-+ * Used by @SMC_FC_FFA_MEM_RETRIEVE_RESP to indicate that memory came from
-+ * @SMC_FC_FFA_MEM_SHARE and by @SMC_FC_FFA_MEM_RETRIEVE_REQ to specify that
-+ * it must have.
-+ * * @FFA_MTD_FLAG_ADDRESS_RANGE_ALIGNMENT_HINT_MASK
-+ * Not supported by this implementation.
-+ */
-+typedef uint32_t ffa_mtd_flag32_t;
-+#define FFA_MTD_FLAG_ZERO_MEMORY (1U << 0)
-+#define FFA_MTD_FLAG_TIME_SLICING (1U << 1)
-+#define FFA_MTD_FLAG_ZERO_MEMORY_AFTER_RELINQUISH (1U << 2)
-+#define FFA_MTD_FLAG_TYPE_MASK (3U << 3)
-+#define FFA_MTD_FLAG_TYPE_SHARE_MEMORY (1U << 3)
-+#define FFA_MTD_FLAG_ADDRESS_RANGE_ALIGNMENT_HINT_MASK (0x1FU << 5)
-+
-+/**
-+ * struct ffa_mapd - Memory access permissions descriptor
-+ * @endpoint_id:
-+ * Endpoint id that @memory_access_permissions and @flags apply to.
-+ * (&typedef ffa_endpoint_id16_t).
-+ * @memory_access_permissions:
-+ * FFA_MEM_PERM_* values or'ed together (&typedef ffa_mem_perm8_t).
-+ * @flags:
-+ * FFA_MEM_FLAG_* values or'ed together (&typedef ffa_mem_flag8_t).
-+ */
-+struct ffa_mapd {
-+ ffa_endpoint_id16_t endpoint_id;
-+ ffa_mem_perm8_t memory_access_permissions;
-+ ffa_mem_flag8_t flags;
-+};
-+STATIC_ASSERT(sizeof(struct ffa_mapd) == 4);
-+
-+/**
-+ * struct ffa_emad - Endpoint memory access descriptor.
-+ * @mapd: &struct ffa_mapd.
-+ * @comp_mrd_offset:
-+ * Offset of &struct ffa_comp_mrd form start of &struct ffa_mtd.
-+ * @reserved_8_15:
-+ * Reserved bytes 8-15. Must be 0.
-+ */
-+struct ffa_emad {
-+ struct ffa_mapd mapd;
-+ uint32_t comp_mrd_offset;
-+ uint64_t reserved_8_15;
-+};
-+STATIC_ASSERT(sizeof(struct ffa_emad) == 16);
-+
-+/**
-+ * struct ffa_mtd - Memory transaction descriptor.
-+ * @sender_id:
-+ * Sender endpoint id.
-+ * @memory_region_attributes:
-+ * FFA_MEM_ATTR_* values or'ed together (&typedef ffa_mem_attr8_t).
-+ * @reserved_3:
-+ * Reserved bytes 3. Must be 0.
-+ * @flags:
-+ * FFA_MTD_FLAG_* values or'ed together (&typedef ffa_mtd_flag32_t).
-+ * @handle:
-+ * Id of shared memory object. Most be 0 for MEM_SHARE.
-+ * @tag: Client allocated tag. Must match original value.
-+ * @reserved_24_27:
-+ * Reserved bytes 24-27. Must be 0.
-+ * @emad_count:
-+ * Number of entries in @emad. Must be 1 in current implementation.
-+ * FFA spec allows more entries.
-+ * @emad:
-+ * Endpoint memory access descriptor array (see @struct ffa_emad).
-+ */
-+struct ffa_mtd {
-+ ffa_endpoint_id16_t sender_id;
-+ ffa_mem_attr8_t memory_region_attributes;
-+ uint8_t reserved_3;
-+ ffa_mtd_flag32_t flags;
-+ uint64_t handle;
-+ uint64_t tag;
-+ uint32_t reserved_24_27;
-+ uint32_t emad_count;
-+ struct ffa_emad emad[];
-+};
-+STATIC_ASSERT(sizeof(struct ffa_mtd) == 32);
-+
-+/**
-+ * struct ffa_mem_relinquish_descriptor - Relinquish request descriptor.
-+ * @handle:
-+ * Id of shared memory object to relinquish.
-+ * @flags:
-+ * If bit 0 is set clear memory after unmapping from borrower. Must be 0
-+ * for share. Bit[1]: Time slicing. Not supported, must be 0. All other
-+ * bits are reserved 0.
-+ * @endpoint_count:
-+ * Number of entries in @endpoint_array.
-+ * @endpoint_array:
-+ * Array of endpoint ids.
-+ */
-+struct ffa_mem_relinquish_descriptor {
-+ uint64_t handle;
-+ uint32_t flags;
-+ uint32_t endpoint_count;
-+ ffa_endpoint_id16_t endpoint_array[];
-+};
-+STATIC_ASSERT(sizeof(struct ffa_mem_relinquish_descriptor) == 16);
-+
-+/**
-+ * enum ffa_error - FF-A error code
-+ * @FFA_ERROR_NOT_SUPPORTED:
-+ * Operation contained possibly valid parameters not supported by the
-+ * current implementation. Does not match FF-A 1.0 EAC 1_0 definition.
-+ * @FFA_ERROR_INVALID_PARAMETERS:
-+ * Invalid parameters. Conditions function specific.
-+ * @FFA_ERROR_NO_MEMORY:
-+ * Not enough memory.
-+ * @FFA_ERROR_DENIED:
-+ * Operation not allowed. Conditions function specific.
-+ *
-+ * FF-A 1.0 EAC 1_0 defines other error codes as well but the current
-+ * implementation does not use them.
-+ */
-+enum ffa_error {
-+ FFA_ERROR_NOT_SUPPORTED = -1,
-+ FFA_ERROR_INVALID_PARAMETERS = -2,
-+ FFA_ERROR_NO_MEMORY = -3,
-+ FFA_ERROR_DENIED = -6,
-+};
-+
-+/**
-+ * SMC_FC32_FFA_MIN - First 32 bit SMC opcode reserved for FFA
-+ */
-+#define SMC_FC32_FFA_MIN SMC_FASTCALL_NR_SHARED_MEMORY(0x60)
-+
-+/**
-+ * SMC_FC32_FFA_MAX - Last 32 bit SMC opcode reserved for FFA
-+ */
-+#define SMC_FC32_FFA_MAX SMC_FASTCALL_NR_SHARED_MEMORY(0x7F)
-+
-+/**
-+ * SMC_FC64_FFA_MIN - First 64 bit SMC opcode reserved for FFA
-+ */
-+#define SMC_FC64_FFA_MIN SMC_FASTCALL64_NR_SHARED_MEMORY(0x60)
-+
-+/**
-+ * SMC_FC64_FFA_MAX - Last 64 bit SMC opcode reserved for FFA
-+ */
-+#define SMC_FC64_FFA_MAX SMC_FASTCALL64_NR_SHARED_MEMORY(0x7F)
-+
-+/**
-+ * SMC_FC_FFA_ERROR - SMC error return opcode
-+ *
-+ * Register arguments:
-+ *
-+ * * w1: VMID in [31:16], vCPU in [15:0]
-+ * * w2: Error code (&enum ffa_error)
-+ */
-+#define SMC_FC_FFA_ERROR SMC_FASTCALL_NR_SHARED_MEMORY(0x60)
-+
-+/**
-+ * SMC_FC_FFA_SUCCESS - 32 bit SMC success return opcode
-+ *
-+ * Register arguments:
-+ *
-+ * * w1: VMID in [31:16], vCPU in [15:0]
-+ * * w2-w7: Function specific
-+ */
-+#define SMC_FC_FFA_SUCCESS SMC_FASTCALL_NR_SHARED_MEMORY(0x61)
-+
-+/**
-+ * SMC_FC64_FFA_SUCCESS - 64 bit SMC success return opcode
-+ *
-+ * Register arguments:
-+ *
-+ * * w1: VMID in [31:16], vCPU in [15:0]
-+ * * w2/x2-w7/x7: Function specific
-+ */
-+#define SMC_FC64_FFA_SUCCESS SMC_FASTCALL64_NR_SHARED_MEMORY(0x61)
-+
-+/**
-+ * SMC_FC_FFA_VERSION - SMC opcode to return supported FF-A version
-+ *
-+ * Register arguments:
-+ *
-+ * * w1: Major version bit[30:16] and minor version in bit[15:0] supported
-+ * by caller. Bit[31] must be 0.
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_SUCCESS
-+ * * w2: Major version bit[30:16], minor version in bit[15:0], bit[31] must
-+ * be 0.
-+ *
-+ * or
-+ *
-+ * * w0: SMC_FC_FFA_ERROR
-+ * * w2: FFA_ERROR_NOT_SUPPORTED if major version passed in is less than the
-+ * minimum major version supported.
-+ */
-+#define SMC_FC_FFA_VERSION SMC_FASTCALL_NR_SHARED_MEMORY(0x63)
-+
-+/**
-+ * SMC_FC_FFA_FEATURES - SMC opcode to check optional feature support
-+ *
-+ * Register arguments:
-+ *
-+ * * w1: FF-A function ID
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_SUCCESS
-+ * * w2: Bit[0]: Supports custom buffers for memory transactions.
-+ * Bit[1:0]: For RXTX_MAP min buffer size and alignment boundary.
-+ * Other bits must be 0.
-+ * * w3: For FFA_MEM_RETRIEVE_REQ, bit[7-0]: Number of times receiver can
-+ * retrieve each memory region before relinquishing it specified as
-+ * ((1U << (value + 1)) - 1 (or value = bits in reference count - 1).
-+ * For all other bits and commands: must be 0.
-+ * or
-+ *
-+ * * w0: SMC_FC_FFA_ERROR
-+ * * w2: FFA_ERROR_NOT_SUPPORTED if function is not implemented, or
-+ * FFA_ERROR_INVALID_PARAMETERS if function id is not valid.
-+ */
-+#define SMC_FC_FFA_FEATURES SMC_FASTCALL_NR_SHARED_MEMORY(0x64)
-+
-+/**
-+ * SMC_FC_FFA_RXTX_MAP - 32 bit SMC opcode to map message buffers
-+ *
-+ * Register arguments:
-+ *
-+ * * w1: TX address
-+ * * w2: RX address
-+ * * w3: RX/TX page count in bit[5:0]
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_SUCCESS
-+ */
-+#define SMC_FC_FFA_RXTX_MAP SMC_FASTCALL_NR_SHARED_MEMORY(0x66)
-+
-+/**
-+ * SMC_FC64_FFA_RXTX_MAP - 64 bit SMC opcode to map message buffers
-+ *
-+ * Register arguments:
-+ *
-+ * * x1: TX address
-+ * * x2: RX address
-+ * * x3: RX/TX page count in bit[5:0]
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_SUCCESS
-+ */
-+#define SMC_FC64_FFA_RXTX_MAP SMC_FASTCALL64_NR_SHARED_MEMORY(0x66)
-+#ifdef CONFIG_64BIT
-+#define SMC_FCZ_FFA_RXTX_MAP SMC_FC64_FFA_RXTX_MAP
-+#else
-+#define SMC_FCZ_FFA_RXTX_MAP SMC_FC_FFA_RXTX_MAP
-+#endif
-+
-+/**
-+ * SMC_FC_FFA_RXTX_UNMAP - SMC opcode to unmap message buffers
-+ *
-+ * Register arguments:
-+ *
-+ * * w1: ID in [31:16]
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_SUCCESS
-+ */
-+#define SMC_FC_FFA_RXTX_UNMAP SMC_FASTCALL_NR_SHARED_MEMORY(0x67)
-+
-+/**
-+ * SMC_FC_FFA_ID_GET - SMC opcode to get endpoint id of caller
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_SUCCESS
-+ * * w2: ID in bit[15:0], bit[31:16] must be 0.
-+ */
-+#define SMC_FC_FFA_ID_GET SMC_FASTCALL_NR_SHARED_MEMORY(0x69)
-+
-+/**
-+ * SMC_FC_FFA_MEM_DONATE - 32 bit SMC opcode to donate memory
-+ *
-+ * Not supported.
-+ */
-+#define SMC_FC_FFA_MEM_DONATE SMC_FASTCALL_NR_SHARED_MEMORY(0x71)
-+
-+/**
-+ * SMC_FC_FFA_MEM_LEND - 32 bit SMC opcode to lend memory
-+ *
-+ * Not currently supported.
-+ */
-+#define SMC_FC_FFA_MEM_LEND SMC_FASTCALL_NR_SHARED_MEMORY(0x72)
-+
-+/**
-+ * SMC_FC_FFA_MEM_SHARE - 32 bit SMC opcode to share memory
-+ *
-+ * Register arguments:
-+ *
-+ * * w1: Total length
-+ * * w2: Fragment length
-+ * * w3: Address
-+ * * w4: Page count
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_SUCCESS
-+ * * w2/w3: Handle
-+ *
-+ * or
-+ *
-+ * * w0: &SMC_FC_FFA_MEM_FRAG_RX
-+ * * w1-: See &SMC_FC_FFA_MEM_FRAG_RX
-+ *
-+ * or
-+ *
-+ * * w0: SMC_FC_FFA_ERROR
-+ * * w2: Error code (&enum ffa_error)
-+ */
-+#define SMC_FC_FFA_MEM_SHARE SMC_FASTCALL_NR_SHARED_MEMORY(0x73)
-+
-+/**
-+ * SMC_FC64_FFA_MEM_SHARE - 64 bit SMC opcode to share memory
-+ *
-+ * Register arguments:
-+ *
-+ * * w1: Total length
-+ * * w2: Fragment length
-+ * * x3: Address
-+ * * w4: Page count
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_SUCCESS
-+ * * w2/w3: Handle
-+ *
-+ * or
-+ *
-+ * * w0: &SMC_FC_FFA_MEM_FRAG_RX
-+ * * w1-: See &SMC_FC_FFA_MEM_FRAG_RX
-+ *
-+ * or
-+ *
-+ * * w0: SMC_FC_FFA_ERROR
-+ * * w2: Error code (&enum ffa_error)
-+ */
-+#define SMC_FC64_FFA_MEM_SHARE SMC_FASTCALL64_NR_SHARED_MEMORY(0x73)
-+
-+/**
-+ * SMC_FC_FFA_MEM_RETRIEVE_REQ - 32 bit SMC opcode to retrieve shared memory
-+ *
-+ * Register arguments:
-+ *
-+ * * w1: Total length
-+ * * w2: Fragment length
-+ * * w3: Address
-+ * * w4: Page count
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_MEM_RETRIEVE_RESP
-+ * * w1/x1-w5/x5: See &SMC_FC_FFA_MEM_RETRIEVE_RESP
-+ */
-+#define SMC_FC_FFA_MEM_RETRIEVE_REQ SMC_FASTCALL_NR_SHARED_MEMORY(0x74)
-+
-+/**
-+ * SMC_FC64_FFA_MEM_RETRIEVE_REQ - 64 bit SMC opcode to retrieve shared memory
-+ *
-+ * Register arguments:
-+ *
-+ * * w1: Total length
-+ * * w2: Fragment length
-+ * * x3: Address
-+ * * w4: Page count
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_MEM_RETRIEVE_RESP
-+ * * w1/x1-w5/x5: See &SMC_FC_FFA_MEM_RETRIEVE_RESP
-+ */
-+#define SMC_FC64_FFA_MEM_RETRIEVE_REQ SMC_FASTCALL64_NR_SHARED_MEMORY(0x74)
-+
-+/**
-+ * SMC_FC_FFA_MEM_RETRIEVE_RESP - Retrieve 32 bit SMC return opcode
-+ *
-+ * Register arguments:
-+ *
-+ * * w1: Total length
-+ * * w2: Fragment length
-+ */
-+#define SMC_FC_FFA_MEM_RETRIEVE_RESP SMC_FASTCALL_NR_SHARED_MEMORY(0x75)
-+
-+/**
-+ * SMC_FC_FFA_MEM_RELINQUISH - SMC opcode to relinquish shared memory
-+ *
-+ * Input in &struct ffa_mem_relinquish_descriptor format in message buffer.
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_SUCCESS
-+ */
-+#define SMC_FC_FFA_MEM_RELINQUISH SMC_FASTCALL_NR_SHARED_MEMORY(0x76)
-+
-+/**
-+ * SMC_FC_FFA_MEM_RECLAIM - SMC opcode to reclaim shared memory
-+ *
-+ * Register arguments:
-+ *
-+ * * w1/w2: Handle
-+ * * w3: Flags
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_SUCCESS
-+ */
-+#define SMC_FC_FFA_MEM_RECLAIM SMC_FASTCALL_NR_SHARED_MEMORY(0x77)
-+
-+/**
-+ * SMC_FC_FFA_MEM_FRAG_RX - SMC opcode to request next fragment.
-+ *
-+ * Register arguments:
-+ *
-+ * * w1/w2: Cookie
-+ * * w3: Fragment offset.
-+ * * w4: Endpoint id ID in [31:16], if client is hypervisor.
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_MEM_FRAG_TX
-+ * * w1/x1-w5/x5: See &SMC_FC_FFA_MEM_FRAG_TX
-+ */
-+#define SMC_FC_FFA_MEM_FRAG_RX SMC_FASTCALL_NR_SHARED_MEMORY(0x7A)
-+
-+/**
-+ * SMC_FC_FFA_MEM_FRAG_TX - SMC opcode to transmit next fragment
-+ *
-+ * Register arguments:
-+ *
-+ * * w1/w2: Cookie
-+ * * w3: Fragment length.
-+ * * w4: Sender endpoint id ID in [31:16], if client is hypervisor.
-+ *
-+ * Return:
-+ * * w0: &SMC_FC_FFA_MEM_FRAG_RX or &SMC_FC_FFA_SUCCESS.
-+ * * w1/x1-w5/x5: See opcode in w0.
-+ */
-+#define SMC_FC_FFA_MEM_FRAG_TX SMC_FASTCALL_NR_SHARED_MEMORY(0x7B)
-+
-+#endif /* __LINUX_TRUSTY_ARM_FFA_H */
-diff --git a/include/linux/trusty/sm_err.h b/include/linux/trusty/sm_err.h
-new file mode 100644
-index 000000000000..f6504448c6c3
---- /dev/null
-+++ b/include/linux/trusty/sm_err.h
-@@ -0,0 +1,28 @@
-+/* SPDX-License-Identifier: MIT */
-+/*
-+ * Copyright (c) 2013 Google Inc. All rights reserved
-+ *
-+ * Trusty and TF-A also have a copy of this header.
-+ * Please keep the copies in sync.
-+ */
-+#ifndef __LINUX_TRUSTY_SM_ERR_H
-+#define __LINUX_TRUSTY_SM_ERR_H
-+
-+/* Errors from the secure monitor */
-+#define SM_ERR_UNDEFINED_SMC 0xFFFFFFFF /* Unknown SMC (defined by ARM DEN 0028A(0.9.0) */
-+#define SM_ERR_INVALID_PARAMETERS -2
-+#define SM_ERR_INTERRUPTED -3 /* Got interrupted. Call back with restart SMC */
-+#define SM_ERR_UNEXPECTED_RESTART -4 /* Got an restart SMC when we didn't expect it */
-+#define SM_ERR_BUSY -5 /* Temporarily busy. Call back with original args */
-+#define SM_ERR_INTERLEAVED_SMC -6 /* Got a trusted_service SMC when a restart SMC is required */
-+#define SM_ERR_INTERNAL_FAILURE -7 /* Unknown error */
-+#define SM_ERR_NOT_SUPPORTED -8
-+#define SM_ERR_NOT_ALLOWED -9 /* SMC call not allowed */
-+#define SM_ERR_END_OF_INPUT -10
-+#define SM_ERR_PANIC -11 /* Secure OS crashed */
-+#define SM_ERR_FIQ_INTERRUPTED -12 /* Got interrupted by FIQ. Call back with SMC_SC_RESTART_FIQ on same CPU */
-+#define SM_ERR_CPU_IDLE -13 /* SMC call waiting for another CPU */
-+#define SM_ERR_NOP_INTERRUPTED -14 /* Got interrupted. Call back with new SMC_SC_NOP */
-+#define SM_ERR_NOP_DONE -15 /* Cpu idle after SMC_SC_NOP (not an error) */
-+
-+#endif
-diff --git a/include/linux/trusty/smcall.h b/include/linux/trusty/smcall.h
-new file mode 100644
-index 000000000000..aea3f6068593
---- /dev/null
-+++ b/include/linux/trusty/smcall.h
-@@ -0,0 +1,124 @@
-+/* SPDX-License-Identifier: MIT */
-+/*
-+ * Copyright (c) 2013-2014 Google Inc. All rights reserved
-+ *
-+ * Trusty and TF-A also have a copy of this header.
-+ * Please keep the copies in sync.
-+ */
-+#ifndef __LINUX_TRUSTY_SMCALL_H
-+#define __LINUX_TRUSTY_SMCALL_H
-+
-+#define SMC_NUM_ENTITIES 64
-+#define SMC_NUM_ARGS 4
-+#define SMC_NUM_PARAMS (SMC_NUM_ARGS - 1)
-+
-+#define SMC_IS_FASTCALL(smc_nr) ((smc_nr) & 0x80000000)
-+#define SMC_IS_SMC64(smc_nr) ((smc_nr) & 0x40000000)
-+#define SMC_ENTITY(smc_nr) (((smc_nr) & 0x3F000000) >> 24)
-+#define SMC_FUNCTION(smc_nr) ((smc_nr) & 0x0000FFFF)
-+
-+#define SMC_NR(entity, fn, fastcall, smc64) ((((fastcall) & 0x1U) << 31) | \
-+ (((smc64) & 0x1U) << 30) | \
-+ (((entity) & 0x3FU) << 24) | \
-+ ((fn) & 0xFFFFU) \
-+ )
-+
-+#define SMC_FASTCALL_NR(entity, fn) SMC_NR((entity), (fn), 1, 0)
-+#define SMC_STDCALL_NR(entity, fn) SMC_NR((entity), (fn), 0, 0)
-+#define SMC_FASTCALL64_NR(entity, fn) SMC_NR((entity), (fn), 1, 1)
-+#define SMC_STDCALL64_NR(entity, fn) SMC_NR((entity), (fn), 0, 1)
-+
-+#define SMC_ENTITY_ARCH 0 /* ARM Architecture calls */
-+#define SMC_ENTITY_CPU 1 /* CPU Service calls */
-+#define SMC_ENTITY_SIP 2 /* SIP Service calls */
-+#define SMC_ENTITY_OEM 3 /* OEM Service calls */
-+#define SMC_ENTITY_STD 4 /* Standard Service calls */
-+#define SMC_ENTITY_RESERVED 5 /* Reserved for future use */
-+#define SMC_ENTITY_TRUSTED_APP 48 /* Trusted Application calls */
-+#define SMC_ENTITY_TRUSTED_OS 50 /* Trusted OS calls */
-+#define SMC_ENTITY_LOGGING 51 /* Used for secure -> nonsecure logging */
-+#define SMC_ENTITY_TEST 52 /* Used for secure -> nonsecure tests */
-+#define SMC_ENTITY_SECURE_MONITOR 60 /* Trusted OS calls internal to secure monitor */
-+
-+/* FC = Fast call, SC = Standard call */
-+#define SMC_SC_RESTART_LAST SMC_STDCALL_NR(SMC_ENTITY_SECURE_MONITOR, 0)
-+#define SMC_SC_LOCKED_NOP SMC_STDCALL_NR(SMC_ENTITY_SECURE_MONITOR, 1)
-+
-+/**
-+ * SMC_SC_RESTART_FIQ - Re-enter trusty after it was interrupted by an fiq
-+ *
-+ * No arguments, no return value.
-+ *
-+ * Re-enter trusty after returning to ns to process an fiq. Must be called iff
-+ * trusty returns SM_ERR_FIQ_INTERRUPTED.
-+ *
-+ * Enable by selecting api version TRUSTY_API_VERSION_RESTART_FIQ (1) or later.
-+ */
-+#define SMC_SC_RESTART_FIQ SMC_STDCALL_NR(SMC_ENTITY_SECURE_MONITOR, 2)
-+
-+/**
-+ * SMC_SC_NOP - Enter trusty to run pending work.
-+ *
-+ * No arguments.
-+ *
-+ * Returns SM_ERR_NOP_INTERRUPTED or SM_ERR_NOP_DONE.
-+ * If SM_ERR_NOP_INTERRUPTED is returned, the call must be repeated.
-+ *
-+ * Enable by selecting api version TRUSTY_API_VERSION_SMP (2) or later.
-+ */
-+#define SMC_SC_NOP SMC_STDCALL_NR(SMC_ENTITY_SECURE_MONITOR, 3)
-+
-+/*
-+ * Return from secure os to non-secure os with return value in r1
-+ */
-+#define SMC_SC_NS_RETURN SMC_STDCALL_NR(SMC_ENTITY_SECURE_MONITOR, 0)
-+
-+#define SMC_FC_RESERVED SMC_FASTCALL_NR(SMC_ENTITY_SECURE_MONITOR, 0)
-+#define SMC_FC_FIQ_EXIT SMC_FASTCALL_NR(SMC_ENTITY_SECURE_MONITOR, 1)
-+#define SMC_FC_REQUEST_FIQ SMC_FASTCALL_NR(SMC_ENTITY_SECURE_MONITOR, 2)
-+
-+#define TRUSTY_IRQ_TYPE_NORMAL (0)
-+#define TRUSTY_IRQ_TYPE_PER_CPU (1)
-+#define TRUSTY_IRQ_TYPE_DOORBELL (2)
-+#define SMC_FC_GET_NEXT_IRQ SMC_FASTCALL_NR(SMC_ENTITY_SECURE_MONITOR, 3)
-+
-+#define SMC_FC_CPU_SUSPEND SMC_FASTCALL_NR(SMC_ENTITY_SECURE_MONITOR, 7)
-+#define SMC_FC_CPU_RESUME SMC_FASTCALL_NR(SMC_ENTITY_SECURE_MONITOR, 8)
-+
-+#define SMC_FC_AARCH_SWITCH SMC_FASTCALL_NR(SMC_ENTITY_SECURE_MONITOR, 9)
-+#define SMC_FC_GET_VERSION_STR SMC_FASTCALL_NR(SMC_ENTITY_SECURE_MONITOR, 10)
-+
-+/**
-+ * SMC_FC_API_VERSION - Find and select supported API version.
-+ *
-+ * @r1: Version supported by client.
-+ *
-+ * Returns version supported by trusty.
-+ *
-+ * If multiple versions are supported, the client should start by calling
-+ * SMC_FC_API_VERSION with the largest version it supports. Trusty will then
-+ * return a version it supports. If the client does not support the version
-+ * returned by trusty and the version returned is less than the version
-+ * requested, repeat the call with the largest supported version less than the
-+ * last returned version.
-+ *
-+ * This call must be made before any calls that are affected by the api version.
-+ */
-+#define TRUSTY_API_VERSION_RESTART_FIQ (1)
-+#define TRUSTY_API_VERSION_SMP (2)
-+#define TRUSTY_API_VERSION_SMP_NOP (3)
-+#define TRUSTY_API_VERSION_PHYS_MEM_OBJ (4)
-+#define TRUSTY_API_VERSION_MEM_OBJ (5)
-+#define TRUSTY_API_VERSION_CURRENT (5)
-+#define SMC_FC_API_VERSION SMC_FASTCALL_NR(SMC_ENTITY_SECURE_MONITOR, 11)
-+
-+/* TRUSTED_OS entity calls */
-+#define SMC_SC_VIRTIO_GET_DESCR SMC_STDCALL_NR(SMC_ENTITY_TRUSTED_OS, 20)
-+#define SMC_SC_VIRTIO_START SMC_STDCALL_NR(SMC_ENTITY_TRUSTED_OS, 21)
-+#define SMC_SC_VIRTIO_STOP SMC_STDCALL_NR(SMC_ENTITY_TRUSTED_OS, 22)
-+
-+#define SMC_SC_VDEV_RESET SMC_STDCALL_NR(SMC_ENTITY_TRUSTED_OS, 23)
-+#define SMC_SC_VDEV_KICK_VQ SMC_STDCALL_NR(SMC_ENTITY_TRUSTED_OS, 24)
-+#define SMC_NC_VDEV_KICK_VQ SMC_STDCALL_NR(SMC_ENTITY_TRUSTED_OS, 25)
-+
-+#endif /* __LINUX_TRUSTY_SMCALL_H */
-diff --git a/include/linux/trusty/trusty.h b/include/linux/trusty/trusty.h
-new file mode 100644
-index 000000000000..efbb36999a8b
---- /dev/null
-+++ b/include/linux/trusty/trusty.h
-@@ -0,0 +1,131 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+/*
-+ * Copyright (C) 2013 Google, Inc.
-+ */
-+#ifndef __LINUX_TRUSTY_TRUSTY_H
-+#define __LINUX_TRUSTY_TRUSTY_H
-+
-+#include <linux/kernel.h>
-+#include <linux/trusty/sm_err.h>
-+#include <linux/types.h>
-+#include <linux/device.h>
-+#include <linux/pagemap.h>
-+
-+
-+#if IS_ENABLED(CONFIG_TRUSTY)
-+s32 trusty_std_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2);
-+s32 trusty_fast_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2);
-+#ifdef CONFIG_64BIT
-+s64 trusty_fast_call64(struct device *dev, u64 smcnr, u64 a0, u64 a1, u64 a2);
-+#endif
-+#else
-+static inline s32 trusty_std_call32(struct device *dev, u32 smcnr,
-+ u32 a0, u32 a1, u32 a2)
-+{
-+ return SM_ERR_UNDEFINED_SMC;
-+}
-+static inline s32 trusty_fast_call32(struct device *dev, u32 smcnr,
-+ u32 a0, u32 a1, u32 a2)
-+{
-+ return SM_ERR_UNDEFINED_SMC;
-+}
-+#ifdef CONFIG_64BIT
-+static inline s64 trusty_fast_call64(struct device *dev,
-+ u64 smcnr, u64 a0, u64 a1, u64 a2)
-+{
-+ return SM_ERR_UNDEFINED_SMC;
-+}
-+#endif
-+#endif
-+
-+struct notifier_block;
-+enum {
-+ TRUSTY_CALL_PREPARE,
-+ TRUSTY_CALL_RETURNED,
-+};
-+int trusty_call_notifier_register(struct device *dev,
-+ struct notifier_block *n);
-+int trusty_call_notifier_unregister(struct device *dev,
-+ struct notifier_block *n);
-+const char *trusty_version_str_get(struct device *dev);
-+u32 trusty_get_api_version(struct device *dev);
-+bool trusty_get_panic_status(struct device *dev);
-+
-+struct ns_mem_page_info {
-+ u64 paddr;
-+ u8 ffa_mem_attr;
-+ u8 ffa_mem_perm;
-+ u64 compat_attr;
-+};
-+
-+int trusty_encode_page_info(struct ns_mem_page_info *inf,
-+ struct page *page, pgprot_t pgprot);
-+
-+struct scatterlist;
-+typedef u64 trusty_shared_mem_id_t;
-+int trusty_share_memory(struct device *dev, trusty_shared_mem_id_t *id,
-+ struct scatterlist *sglist, unsigned int nents,
-+ pgprot_t pgprot);
-+int trusty_share_memory_compat(struct device *dev, trusty_shared_mem_id_t *id,
-+ struct scatterlist *sglist, unsigned int nents,
-+ pgprot_t pgprot);
-+int trusty_transfer_memory(struct device *dev, u64 *id,
-+ struct scatterlist *sglist, unsigned int nents,
-+ pgprot_t pgprot, u64 tag, bool lend);
-+int trusty_reclaim_memory(struct device *dev, trusty_shared_mem_id_t id,
-+ struct scatterlist *sglist, unsigned int nents);
-+
-+struct dma_buf;
-+#ifdef CONFIG_TRUSTY_DMA_BUF_FFA_TAG
-+u64 trusty_dma_buf_get_ffa_tag(struct dma_buf *dma_buf);
-+#else
-+static inline u64 trusty_dma_buf_get_ffa_tag(struct dma_buf *dma_buf)
-+{
-+ return 0;
-+}
-+#endif
-+
-+/* Invalid handle value is defined by FF-A spec */
-+#ifdef CONFIG_TRUSTY_DMA_BUF_SHARED_MEM_ID
-+/**
-+ * trusty_dma_buf_get_shared_mem_id() - Get memory ID corresponding to a dma_buf
-+ * @dma_buf: DMA buffer
-+ * @id: Pointer to output trusty_shared_mem_id_t
-+ *
-+ * Sets @id to trusty_shared_mem_id_t corresponding to the given @dma_buf.
-+ * @dma_buf "owns" the ID, i.e. is responsible for allocating/releasing it.
-+ * @dma_buf with an allocated @id must be in secure memory and should only be
-+ * sent to Trusty using TRUSTY_SEND_SECURE.
-+ *
-+ * Return:
-+ * * 0 - success
-+ * * -ENODATA - @dma_buf does not own a trusty_shared_mem_id_t
-+ * * ... - @dma_buf should not be lent or shared
-+ */
-+int trusty_dma_buf_get_shared_mem_id(struct dma_buf *dma_buf,
-+ trusty_shared_mem_id_t *id);
-+#else
-+static inline int trusty_dma_buf_get_shared_mem_id(struct dma_buf *dma_buf,
-+ trusty_shared_mem_id_t *id)
-+{
-+ return -ENODATA;
-+}
-+#endif
-+
-+struct trusty_nop {
-+ struct list_head node;
-+ u32 args[3];
-+};
-+
-+static inline void trusty_nop_init(struct trusty_nop *nop,
-+ u32 arg0, u32 arg1, u32 arg2) {
-+ INIT_LIST_HEAD(&nop->node);
-+ nop->args[0] = arg0;
-+ nop->args[1] = arg1;
-+ nop->args[2] = arg2;
-+}
-+
-+void trusty_enqueue_nop(struct device *dev, struct trusty_nop *nop);
-+void trusty_dequeue_nop(struct device *dev, struct trusty_nop *nop);
-+
-+#endif
-diff --git a/include/linux/trusty/trusty_ipc.h b/include/linux/trusty/trusty_ipc.h
-new file mode 100644
-index 000000000000..9386392f3a64
---- /dev/null
-+++ b/include/linux/trusty/trusty_ipc.h
-@@ -0,0 +1,89 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+/*
-+ * Copyright (C) 2015 Google, Inc.
-+ */
-+#ifndef __LINUX_TRUSTY_TRUSTY_IPC_H
-+#define __LINUX_TRUSTY_TRUSTY_IPC_H
-+
-+#include <linux/list.h>
-+#include <linux/scatterlist.h>
-+#include <linux/trusty/trusty.h>
-+#include <linux/types.h>
-+
-+struct tipc_chan;
-+
-+struct tipc_msg_buf {
-+ void *buf_va;
-+ struct scatterlist sg;
-+ trusty_shared_mem_id_t buf_id;
-+ size_t buf_sz;
-+ size_t wpos;
-+ size_t rpos;
-+ size_t shm_cnt;
-+ struct list_head node;
-+};
-+
-+enum tipc_chan_event {
-+ TIPC_CHANNEL_CONNECTED = 1,
-+ TIPC_CHANNEL_DISCONNECTED,
-+ TIPC_CHANNEL_SHUTDOWN,
-+};
-+
-+struct tipc_chan_ops {
-+ void (*handle_event)(void *cb_arg, int event);
-+ struct tipc_msg_buf *(*handle_msg)(void *cb_arg,
-+ struct tipc_msg_buf *mb);
-+ void (*handle_release)(void *cb_arg);
-+};
-+
-+struct tipc_chan *tipc_create_channel(struct device *dev,
-+ const struct tipc_chan_ops *ops,
-+ void *cb_arg);
-+
-+int tipc_chan_connect(struct tipc_chan *chan, const char *port);
-+
-+int tipc_chan_queue_msg(struct tipc_chan *chan, struct tipc_msg_buf *mb);
-+
-+int tipc_chan_shutdown(struct tipc_chan *chan);
-+
-+void tipc_chan_destroy(struct tipc_chan *chan);
-+
-+struct tipc_msg_buf *tipc_chan_get_rxbuf(struct tipc_chan *chan);
-+
-+void tipc_chan_put_rxbuf(struct tipc_chan *chan, struct tipc_msg_buf *mb);
-+
-+struct tipc_msg_buf *
-+tipc_chan_get_txbuf_timeout(struct tipc_chan *chan, long timeout);
-+
-+void tipc_chan_put_txbuf(struct tipc_chan *chan, struct tipc_msg_buf *mb);
-+
-+static inline size_t mb_avail_space(struct tipc_msg_buf *mb)
-+{
-+ return mb->buf_sz - mb->wpos;
-+}
-+
-+static inline size_t mb_avail_data(struct tipc_msg_buf *mb)
-+{
-+ return mb->wpos - mb->rpos;
-+}
-+
-+static inline void *mb_put_data(struct tipc_msg_buf *mb, size_t len)
-+{
-+ void *pos = (u8 *)mb->buf_va + mb->wpos;
-+
-+ BUG_ON(mb->wpos + len > mb->buf_sz);
-+ mb->wpos += len;
-+ return pos;
-+}
-+
-+static inline void *mb_get_data(struct tipc_msg_buf *mb, size_t len)
-+{
-+ void *pos = (u8 *)mb->buf_va + mb->rpos;
-+
-+ BUG_ON(mb->rpos + len > mb->wpos);
-+ mb->rpos += len;
-+ return pos;
-+}
-+
-+#endif /* __LINUX_TRUSTY_TRUSTY_IPC_H */
-+
-diff --git a/include/uapi/linux/trusty/ipc.h b/include/uapi/linux/trusty/ipc.h
-new file mode 100644
-index 000000000000..af91035484f1
---- /dev/null
-+++ b/include/uapi/linux/trusty/ipc.h
-@@ -0,0 +1,65 @@
-+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-+
-+#ifndef _UAPI_LINUX_TRUSTY_IPC_H_
-+#define _UAPI_LINUX_TRUSTY_IPC_H_
-+
-+#include <linux/ioctl.h>
-+#include <linux/types.h>
-+#include <linux/uio.h>
-+
-+/**
-+ * enum transfer_kind - How to send an fd to Trusty
-+ * @TRUSTY_SHARE: Memory will be accessible by Linux and Trusty. On ARM it
-+ * will be mapped as nonsecure. Suitable for shared memory.
-+ * The paired fd must be a "dma_buf".
-+ * @TRUSTY_LEND: Memory will be accessible only to Trusty. On ARM it will
-+ * be transitioned to "Secure" memory if Trusty is in
-+ * TrustZone. This transfer kind is suitable for donating
-+ * video buffers or other similar resources. The paired fd
-+ * may need to come from a platform-specific allocator for
-+ * memory that may be transitioned to "Secure".
-+ * @TRUSTY_SEND_SECURE: Send memory that is already "Secure". Memory will be
-+ * accessible only to Trusty. The paired fd may need to
-+ * come from a platform-specific allocator that returns
-+ * "Secure" buffers.
-+ *
-+ * Describes how the user would like the resource in question to be sent to
-+ * Trusty. Options may be valid only for certain kinds of fds.
-+ */
-+enum transfer_kind {
-+ TRUSTY_SHARE = 0,
-+ TRUSTY_LEND = 1,
-+ TRUSTY_SEND_SECURE = 2,
-+};
-+
-+/**
-+ * struct trusty_shm - Describes a transfer of memory to Trusty
-+ * @fd: The fd to transfer
-+ * @transfer: How to transfer it - see &enum transfer_kind
-+ */
-+struct trusty_shm {
-+ __s32 fd;
-+ __u32 transfer;
-+};
-+
-+/**
-+ * struct tipc_send_msg_req - Request struct for @TIPC_IOC_SEND_MSG
-+ * @iov: Pointer to an array of &struct iovec describing data to be sent
-+ * @shm: Pointer to an array of &struct trusty_shm describing any file
-+ * descriptors to be transferred.
-+ * @iov_cnt: Number of elements in the @iov array
-+ * @shm_cnt: Number of elements in the @shm array
-+ */
-+struct tipc_send_msg_req {
-+ __u64 iov;
-+ __u64 shm;
-+ __u64 iov_cnt;
-+ __u64 shm_cnt;
-+};
-+
-+#define TIPC_IOC_MAGIC 'r'
-+#define TIPC_IOC_CONNECT _IOW(TIPC_IOC_MAGIC, 0x80, char *)
-+#define TIPC_IOC_SEND_MSG _IOW(TIPC_IOC_MAGIC, 0x81, \
-+ struct tipc_send_msg_req)
-+
-+#endif
-diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h
-index 80d76b75bccd..909905cd7618 100644
---- a/include/uapi/linux/virtio_ids.h
-+++ b/include/uapi/linux/virtio_ids.h
-@@ -42,6 +42,7 @@
- #define VIRTIO_ID_RPROC_SERIAL 11 /* virtio remoteproc serial link */
- #define VIRTIO_ID_CAIF 12 /* Virtio caif */
- #define VIRTIO_ID_MEMORY_BALLOON 13 /* virtio memory balloon */
-+#define VIRTIO_ID_TRUSTY_IPC 13 /* virtio trusty ipc */
- #define VIRTIO_ID_GPU 16 /* virtio GPU */
- #define VIRTIO_ID_CLOCK 17 /* virtio clock/timer */
- #define VIRTIO_ID_INPUT 18 /* virtio input */
-2.34.1
-
deleted file mode 100644
@@ -1,1077 +0,0 @@
-From 1ecad11415cff1f4a1f098ddb224293fcc8df4a1 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Fri, 14 Jan 2022 13:41:26 +0000
-Subject: [PATCH 28/40] ANDROID: trusty: Remove FFA specific initilization
-
-Remove FFA specific initialization and its arm_ffa.h file from Trusty
-driver. These changes are done so that Trusty can use ARM FFA driver
-and its related header files.
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: Iaad473659de94930cdf78cd7201f016d59cee8d7
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- drivers/trusty/trusty-mem.c | 37 ---
- drivers/trusty/trusty.c | 286 +---------------
- include/linux/trusty/arm_ffa.h | 590 ---------------------------------
- include/linux/trusty/trusty.h | 3 -
- 4 files changed, 3 insertions(+), 913 deletions(-)
- delete mode 100644 include/linux/trusty/arm_ffa.h
-
-diff --git a/drivers/trusty/trusty-mem.c b/drivers/trusty/trusty-mem.c
-index 8a360298e501..7775ff76c38c 100644
---- a/drivers/trusty/trusty-mem.c
-+++ b/drivers/trusty/trusty-mem.c
-@@ -5,7 +5,6 @@
-
- #include <linux/types.h>
- #include <linux/printk.h>
--#include <linux/trusty/arm_ffa.h>
- #include <linux/trusty/trusty.h>
- #include <linux/trusty/smcall.h>
-
-@@ -75,8 +74,6 @@ int trusty_encode_page_info(struct ns_mem_page_info *inf,
- {
- int mem_attr;
- u64 pte;
-- u8 ffa_mem_attr;
-- u8 ffa_mem_perm = 0;
-
- if (!inf || !page)
- return -EINVAL;
-@@ -89,30 +86,6 @@ int trusty_encode_page_info(struct ns_mem_page_info *inf,
- if (mem_attr < 0)
- return mem_attr;
-
-- switch (mem_attr) {
-- case MEM_ATTR_STRONGLY_ORDERED:
-- ffa_mem_attr = FFA_MEM_ATTR_DEVICE_NGNRNE;
-- break;
--
-- case MEM_ATTR_DEVICE:
-- ffa_mem_attr = FFA_MEM_ATTR_DEVICE_NGNRE;
-- break;
--
-- case MEM_ATTR_NORMAL_NON_CACHEABLE:
-- ffa_mem_attr = FFA_MEM_ATTR_NORMAL_MEMORY_UNCACHED;
-- break;
--
-- case MEM_ATTR_NORMAL_WRITE_BACK_READ_ALLOCATE:
-- case MEM_ATTR_NORMAL_WRITE_BACK_WRITE_ALLOCATE:
-- ffa_mem_attr = FFA_MEM_ATTR_NORMAL_MEMORY_CACHED_WB;
-- break;
--
-- default:
-- return -EINVAL;
-- }
--
-- inf->paddr = pte;
--
- /* add other attributes */
- #if defined(CONFIG_ARM64) || defined(CONFIG_ARM_LPAE)
- pte |= pgprot_val(pgprot);
-@@ -123,16 +96,6 @@ int trusty_encode_page_info(struct ns_mem_page_info *inf,
- pte |= ATTR_INNER_SHAREABLE; /* inner sharable */
- #endif
-
-- if (!(pte & ATTR_RDONLY))
-- ffa_mem_perm |= FFA_MEM_PERM_RW;
-- else
-- ffa_mem_perm |= FFA_MEM_PERM_RO;
--
-- if ((pte & ATTR_INNER_SHAREABLE) == ATTR_INNER_SHAREABLE)
-- ffa_mem_attr |= FFA_MEM_ATTR_INNER_SHAREABLE;
--
-- inf->ffa_mem_attr = ffa_mem_attr;
-- inf->ffa_mem_perm = ffa_mem_perm;
- inf->compat_attr = (pte & 0x0000FFFFFFFFFFFFull) |
- ((u64)mem_attr << 48);
- return 0;
-diff --git a/drivers/trusty/trusty.c b/drivers/trusty/trusty.c
-index 265eab52aea0..2dec75398f69 100644
---- a/drivers/trusty/trusty.c
-+++ b/drivers/trusty/trusty.c
-@@ -11,7 +11,6 @@
- #include <linux/slab.h>
- #include <linux/stat.h>
- #include <linux/string.h>
--#include <linux/trusty/arm_ffa.h>
- #include <linux/trusty/smcall.h>
- #include <linux/trusty/sm_err.h>
- #include <linux/trusty/trusty.h>
-@@ -42,11 +41,6 @@ struct trusty_state {
- struct list_head nop_queue;
- spinlock_t nop_lock; /* protects nop_queue */
- struct device_dma_parameters dma_parms;
-- void *ffa_tx;
-- void *ffa_rx;
-- u16 ffa_local_id;
-- u16 ffa_remote_id;
-- struct mutex share_memory_msg_lock; /* protects share_memory_msg */
- };
-
- static inline unsigned long smc(unsigned long r0, unsigned long r1,
-@@ -246,19 +240,6 @@ int trusty_transfer_memory(struct device *dev, u64 *id,
- struct ns_mem_page_info pg_inf;
- struct scatterlist *sg;
- size_t count;
-- size_t i;
-- size_t len;
-- u64 ffa_handle = 0;
-- size_t total_len;
-- size_t endpoint_count = 1;
-- struct ffa_mtd *mtd = s->ffa_tx;
-- size_t comp_mrd_offset = offsetof(struct ffa_mtd, emad[endpoint_count]);
-- struct ffa_comp_mrd *comp_mrd = s->ffa_tx + comp_mrd_offset;
-- struct ffa_cons_mrd *cons_mrd = comp_mrd->address_range_array;
-- size_t cons_mrd_offset = (void *)cons_mrd - s->ffa_tx;
-- struct smc_ret8 smc_ret;
-- u32 cookie_low;
-- u32 cookie_high;
-
- if (WARN_ON(dev->driver != &trusty_driver.driver))
- return -EINVAL;
-@@ -284,126 +265,11 @@ int trusty_transfer_memory(struct device *dev, u64 *id,
- if (ret) {
- dev_err(s->dev, "%s: trusty_encode_page_info failed\n",
- __func__);
-- goto err_encode_page_info;
-- }
--
-- if (s->api_version < TRUSTY_API_VERSION_MEM_OBJ) {
-- *id = pg_inf.compat_attr;
-- return 0;
-- }
--
-- len = 0;
-- for_each_sg(sglist, sg, nents, i)
-- len += sg_dma_len(sg);
--
-- mutex_lock(&s->share_memory_msg_lock);
--
-- mtd->sender_id = s->ffa_local_id;
-- mtd->memory_region_attributes = pg_inf.ffa_mem_attr;
-- mtd->reserved_3 = 0;
-- mtd->flags = 0;
-- mtd->handle = 0;
-- mtd->tag = tag;
-- mtd->reserved_24_27 = 0;
-- mtd->emad_count = endpoint_count;
-- for (i = 0; i < endpoint_count; i++) {
-- struct ffa_emad *emad = &mtd->emad[i];
-- /* TODO: support stream ids */
-- emad->mapd.endpoint_id = s->ffa_remote_id;
-- emad->mapd.memory_access_permissions = pg_inf.ffa_mem_perm;
-- emad->mapd.flags = 0;
-- emad->comp_mrd_offset = comp_mrd_offset;
-- emad->reserved_8_15 = 0;
-- }
-- comp_mrd->total_page_count = len / PAGE_SIZE;
-- comp_mrd->address_range_count = nents;
-- comp_mrd->reserved_8_15 = 0;
--
-- total_len = cons_mrd_offset + nents * sizeof(*cons_mrd);
-- sg = sglist;
-- while (count) {
-- size_t lcount =
-- min_t(size_t, count, (PAGE_SIZE - cons_mrd_offset) /
-- sizeof(*cons_mrd));
-- size_t fragment_len = lcount * sizeof(*cons_mrd) +
-- cons_mrd_offset;
--
-- for (i = 0; i < lcount; i++) {
-- cons_mrd[i].address = sg_dma_address(sg);
-- cons_mrd[i].page_count = sg_dma_len(sg) / PAGE_SIZE;
-- cons_mrd[i].reserved_12_15 = 0;
-- sg = sg_next(sg);
-- }
-- count -= lcount;
-- if (cons_mrd_offset) {
-- u32 smc = lend ? SMC_FC_FFA_MEM_LEND :
-- SMC_FC_FFA_MEM_SHARE;
-- /* First fragment */
-- smc_ret = trusty_smc8(smc, total_len,
-- fragment_len, 0, 0, 0, 0, 0);
-- } else {
-- smc_ret = trusty_smc8(SMC_FC_FFA_MEM_FRAG_TX,
-- cookie_low, cookie_high,
-- fragment_len, 0, 0, 0, 0);
-- }
-- if (smc_ret.r0 == SMC_FC_FFA_MEM_FRAG_RX) {
-- cookie_low = smc_ret.r1;
-- cookie_high = smc_ret.r2;
-- dev_dbg(s->dev, "cookie %x %x", cookie_low,
-- cookie_high);
-- if (!count) {
-- /*
-- * We have sent all our descriptors. Expected
-- * SMC_FC_FFA_SUCCESS, not a request to send
-- * another fragment.
-- */
-- dev_err(s->dev, "%s: fragment_len %zd/%zd, unexpected SMC_FC_FFA_MEM_FRAG_RX\n",
-- __func__, fragment_len, total_len);
-- ret = -EIO;
-- break;
-- }
-- } else if (smc_ret.r0 == SMC_FC_FFA_SUCCESS) {
-- ffa_handle = smc_ret.r2 | (u64)smc_ret.r3 << 32;
-- dev_dbg(s->dev, "%s: fragment_len %zu/%zu, got handle 0x%llx\n",
-- __func__, fragment_len, total_len,
-- ffa_handle);
-- if (count) {
-- /*
-- * We have not sent all our descriptors.
-- * Expected SMC_FC_FFA_MEM_FRAG_RX not
-- * SMC_FC_FFA_SUCCESS.
-- */
-- dev_err(s->dev, "%s: fragment_len %zu/%zu, unexpected SMC_FC_FFA_SUCCESS, count %zu != 0\n",
-- __func__, fragment_len, total_len,
-- count);
-- ret = -EIO;
-- break;
-- }
-- } else {
-- dev_err(s->dev, "%s: fragment_len %zu/%zu, SMC_FC_FFA_MEM_SHARE failed 0x%lx 0x%lx 0x%lx",
-- __func__, fragment_len, total_len,
-- smc_ret.r0, smc_ret.r1, smc_ret.r2);
-- ret = -EIO;
-- break;
-- }
--
-- cons_mrd = s->ffa_tx;
-- cons_mrd_offset = 0;
-- }
--
-- mutex_unlock(&s->share_memory_msg_lock);
--
-- if (!ret) {
-- *id = ffa_handle;
-- dev_dbg(s->dev, "%s: done\n", __func__);
-- return 0;
-+ return ret;
- }
-
-- dev_err(s->dev, "%s: failed %d", __func__, ret);
--
--err_encode_page_info:
-- dma_unmap_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
-- return ret;
-+ *id = pg_inf.compat_attr;
-+ return 0;
- }
- EXPORT_SYMBOL(trusty_transfer_memory);
-
-@@ -433,8 +299,6 @@ int trusty_reclaim_memory(struct device *dev, u64 id,
- struct scatterlist *sglist, unsigned int nents)
- {
- struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-- int ret = 0;
-- struct smc_ret8 smc_ret;
-
- if (WARN_ON(dev->driver != &trusty_driver.driver))
- return -EINVAL;
-@@ -454,28 +318,6 @@ int trusty_reclaim_memory(struct device *dev, u64 id,
- return 0;
- }
-
-- mutex_lock(&s->share_memory_msg_lock);
--
-- smc_ret = trusty_smc8(SMC_FC_FFA_MEM_RECLAIM, (u32)id, id >> 32, 0, 0,
-- 0, 0, 0);
-- if (smc_ret.r0 != SMC_FC_FFA_SUCCESS) {
-- dev_err(s->dev, "%s: SMC_FC_FFA_MEM_RECLAIM failed 0x%lx 0x%lx 0x%lx",
-- __func__, smc_ret.r0, smc_ret.r1, smc_ret.r2);
-- if (smc_ret.r0 == SMC_FC_FFA_ERROR &&
-- smc_ret.r2 == FFA_ERROR_DENIED)
-- ret = -EBUSY;
-- else
-- ret = -EIO;
-- }
--
-- mutex_unlock(&s->share_memory_msg_lock);
--
-- if (ret != 0)
-- return ret;
--
-- dma_unmap_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
--
-- dev_dbg(s->dev, "%s: done\n", __func__);
- return 0;
- }
- EXPORT_SYMBOL(trusty_reclaim_memory);
-@@ -527,118 +369,6 @@ const char *trusty_version_str_get(struct device *dev)
- }
- EXPORT_SYMBOL(trusty_version_str_get);
-
--static int trusty_init_msg_buf(struct trusty_state *s, struct device *dev)
--{
-- phys_addr_t tx_paddr;
-- phys_addr_t rx_paddr;
-- int ret;
-- struct smc_ret8 smc_ret;
--
-- if (s->api_version < TRUSTY_API_VERSION_MEM_OBJ)
-- return 0;
--
-- /* Get supported FF-A version and check if it is compatible */
-- smc_ret = trusty_smc8(SMC_FC_FFA_VERSION, FFA_CURRENT_VERSION, 0, 0,
-- 0, 0, 0, 0);
-- if (FFA_VERSION_TO_MAJOR(smc_ret.r0) != FFA_CURRENT_VERSION_MAJOR) {
-- dev_err(s->dev,
-- "%s: Unsupported FF-A version 0x%lx, expected 0x%x\n",
-- __func__, smc_ret.r0, FFA_CURRENT_VERSION);
-- ret = -EIO;
-- goto err_version;
-- }
--
-- /* Check that SMC_FC_FFA_MEM_SHARE is implemented */
-- smc_ret = trusty_smc8(SMC_FC_FFA_FEATURES, SMC_FC_FFA_MEM_SHARE, 0, 0,
-- 0, 0, 0, 0);
-- if (smc_ret.r0 != SMC_FC_FFA_SUCCESS) {
-- dev_err(s->dev,
-- "%s: SMC_FC_FFA_FEATURES(SMC_FC_FFA_MEM_SHARE) failed 0x%lx 0x%lx 0x%lx\n",
-- __func__, smc_ret.r0, smc_ret.r1, smc_ret.r2);
-- ret = -EIO;
-- goto err_features;
-- }
--
-- /*
-- * Set FF-A endpoint IDs.
-- *
-- * Hardcode 0x8000 for the secure os.
-- * TODO: Use FF-A call or device tree to configure this dynamically
-- */
-- smc_ret = trusty_smc8(SMC_FC_FFA_ID_GET, 0, 0, 0, 0, 0, 0, 0);
-- if (smc_ret.r0 != SMC_FC_FFA_SUCCESS) {
-- dev_err(s->dev,
-- "%s: SMC_FC_FFA_ID_GET failed 0x%lx 0x%lx 0x%lx\n",
-- __func__, smc_ret.r0, smc_ret.r1, smc_ret.r2);
-- ret = -EIO;
-- goto err_id_get;
-- }
--
-- s->ffa_local_id = smc_ret.r2;
-- s->ffa_remote_id = 0x8000;
--
-- s->ffa_tx = kmalloc(PAGE_SIZE, GFP_KERNEL);
-- if (!s->ffa_tx) {
-- ret = -ENOMEM;
-- goto err_alloc_tx;
-- }
-- tx_paddr = virt_to_phys(s->ffa_tx);
-- if (WARN_ON(tx_paddr & (PAGE_SIZE - 1))) {
-- ret = -EINVAL;
-- goto err_unaligned_tx_buf;
-- }
--
-- s->ffa_rx = kmalloc(PAGE_SIZE, GFP_KERNEL);
-- if (!s->ffa_rx) {
-- ret = -ENOMEM;
-- goto err_alloc_rx;
-- }
-- rx_paddr = virt_to_phys(s->ffa_rx);
-- if (WARN_ON(rx_paddr & (PAGE_SIZE - 1))) {
-- ret = -EINVAL;
-- goto err_unaligned_rx_buf;
-- }
--
-- smc_ret = trusty_smc8(SMC_FCZ_FFA_RXTX_MAP, tx_paddr, rx_paddr, 1, 0,
-- 0, 0, 0);
-- if (smc_ret.r0 != SMC_FC_FFA_SUCCESS) {
-- dev_err(s->dev, "%s: SMC_FCZ_FFA_RXTX_MAP failed 0x%lx 0x%lx 0x%lx\n",
-- __func__, smc_ret.r0, smc_ret.r1, smc_ret.r2);
-- ret = -EIO;
-- goto err_rxtx_map;
-- }
--
-- return 0;
--
--err_rxtx_map:
--err_unaligned_rx_buf:
-- kfree(s->ffa_rx);
-- s->ffa_rx = NULL;
--err_alloc_rx:
--err_unaligned_tx_buf:
-- kfree(s->ffa_tx);
-- s->ffa_tx = NULL;
--err_alloc_tx:
--err_id_get:
--err_features:
--err_version:
-- return ret;
--}
--
--static void trusty_free_msg_buf(struct trusty_state *s, struct device *dev)
--{
-- struct smc_ret8 smc_ret;
--
-- smc_ret = trusty_smc8(SMC_FC_FFA_RXTX_UNMAP, 0, 0, 0, 0, 0, 0, 0);
-- if (smc_ret.r0 != SMC_FC_FFA_SUCCESS) {
-- dev_err(s->dev, "%s: SMC_FC_FFA_RXTX_UNMAP failed 0x%lx 0x%lx 0x%lx\n",
-- __func__, smc_ret.r0, smc_ret.r1, smc_ret.r2);
-- } else {
-- kfree(s->ffa_rx);
-- kfree(s->ffa_tx);
-- }
--}
--
- static void trusty_init_version(struct trusty_state *s, struct device *dev)
- {
- int ret;
-@@ -842,7 +572,6 @@ static int trusty_probe(struct platform_device *pdev)
- spin_lock_init(&s->nop_lock);
- INIT_LIST_HEAD(&s->nop_queue);
- mutex_init(&s->smc_lock);
-- mutex_init(&s->share_memory_msg_lock);
- ATOMIC_INIT_NOTIFIER_HEAD(&s->notifier);
- init_completion(&s->cpu_idle_completion);
-
-@@ -862,10 +591,6 @@ static int trusty_probe(struct platform_device *pdev)
- if (ret < 0)
- goto err_api_version;
-
-- ret = trusty_init_msg_buf(s, &pdev->dev);
-- if (ret < 0)
-- goto err_init_msg_buf;
--
- s->nop_wq = alloc_workqueue("trusty-nop-wq", WQ_CPU_INTENSIVE, 0);
- if (!s->nop_wq) {
- ret = -ENODEV;
-@@ -910,13 +635,10 @@ static int trusty_probe(struct platform_device *pdev)
- err_alloc_works:
- destroy_workqueue(s->nop_wq);
- err_create_nop_wq:
-- trusty_free_msg_buf(s, &pdev->dev);
--err_init_msg_buf:
- err_api_version:
- s->dev->dma_parms = NULL;
- kfree(s->version_str);
- device_for_each_child(&pdev->dev, NULL, trusty_remove_child);
-- mutex_destroy(&s->share_memory_msg_lock);
- mutex_destroy(&s->smc_lock);
- kfree(s);
- err_allocate_state:
-@@ -938,9 +660,7 @@ static int trusty_remove(struct platform_device *pdev)
- free_percpu(s->nop_works);
- destroy_workqueue(s->nop_wq);
-
-- mutex_destroy(&s->share_memory_msg_lock);
- mutex_destroy(&s->smc_lock);
-- trusty_free_msg_buf(s, &pdev->dev);
- s->dev->dma_parms = NULL;
- kfree(s->version_str);
- kfree(s);
-diff --git a/include/linux/trusty/arm_ffa.h b/include/linux/trusty/arm_ffa.h
-deleted file mode 100644
-index ab7b2afb794c..000000000000
---- a/include/linux/trusty/arm_ffa.h
-+++ /dev/null
-@@ -1,590 +0,0 @@
--/* SPDX-License-Identifier: MIT */
--/*
-- * Copyright (C) 2020 Google, Inc.
-- *
-- * Trusty and TF-A also have a copy of this header.
-- * Please keep the copies in sync.
-- */
--#ifndef __LINUX_TRUSTY_ARM_FFA_H
--#define __LINUX_TRUSTY_ARM_FFA_H
--
--/*
-- * Subset of Arm PSA Firmware Framework for Arm v8-A 1.0 EAC 1_0
-- * (https://developer.arm.com/docs/den0077/a) needed for shared memory.
-- */
--
--#include "smcall.h"
--
--#ifndef STATIC_ASSERT
--#define STATIC_ASSERT(e) _Static_assert(e, #e)
--#endif
--
--#define FFA_CURRENT_VERSION_MAJOR (1U)
--#define FFA_CURRENT_VERSION_MINOR (0U)
--
--#define FFA_VERSION_TO_MAJOR(version) ((version) >> 16)
--#define FFA_VERSION_TO_MINOR(version) ((version) & (0xffff))
--#define FFA_VERSION(major, minor) (((major) << 16) | (minor))
--#define FFA_CURRENT_VERSION \
-- FFA_VERSION(FFA_CURRENT_VERSION_MAJOR, FFA_CURRENT_VERSION_MINOR)
--
--#define SMC_ENTITY_SHARED_MEMORY 4
--
--#define SMC_FASTCALL_NR_SHARED_MEMORY(nr) \
-- SMC_FASTCALL_NR(SMC_ENTITY_SHARED_MEMORY, nr)
--#define SMC_FASTCALL64_NR_SHARED_MEMORY(nr) \
-- SMC_FASTCALL64_NR(SMC_ENTITY_SHARED_MEMORY, nr)
--
--/**
-- * typedef ffa_endpoint_id16_t - Endpoint ID
-- *
-- * Current implementation only supports VMIDs. FFA spec also support stream
-- * endpoint ids.
-- */
--typedef uint16_t ffa_endpoint_id16_t;
--
--/**
-- * struct ffa_cons_mrd - Constituent memory region descriptor
-- * @address:
-- * Start address of contiguous memory region. Must be 4K page aligned.
-- * @page_count:
-- * Number of 4K pages in region.
-- * @reserved_12_15:
-- * Reserve bytes 12-15 to pad struct size to 16 bytes.
-- */
--struct ffa_cons_mrd {
-- uint64_t address;
-- uint32_t page_count;
-- uint32_t reserved_12_15;
--};
--STATIC_ASSERT(sizeof(struct ffa_cons_mrd) == 16);
--
--/**
-- * struct ffa_comp_mrd - Composite memory region descriptor
-- * @total_page_count:
-- * Number of 4k pages in memory region. Must match sum of
-- * @address_range_array[].page_count.
-- * @address_range_count:
-- * Number of entries in @address_range_array.
-- * @reserved_8_15:
-- * Reserve bytes 8-15 to pad struct size to 16 byte alignment and
-- * make @address_range_array 16 byte aligned.
-- * @address_range_array:
-- * Array of &struct ffa_cons_mrd entries.
-- */
--struct ffa_comp_mrd {
-- uint32_t total_page_count;
-- uint32_t address_range_count;
-- uint64_t reserved_8_15;
-- struct ffa_cons_mrd address_range_array[];
--};
--STATIC_ASSERT(sizeof(struct ffa_comp_mrd) == 16);
--
--/**
-- * typedef ffa_mem_attr8_t - Memory region attributes
-- *
-- * * @FFA_MEM_ATTR_DEVICE_NGNRNE:
-- * Device-nGnRnE.
-- * * @FFA_MEM_ATTR_DEVICE_NGNRE:
-- * Device-nGnRE.
-- * * @FFA_MEM_ATTR_DEVICE_NGRE:
-- * Device-nGRE.
-- * * @FFA_MEM_ATTR_DEVICE_GRE:
-- * Device-GRE.
-- * * @FFA_MEM_ATTR_NORMAL_MEMORY_UNCACHED
-- * Normal memory. Non-cacheable.
-- * * @FFA_MEM_ATTR_NORMAL_MEMORY_CACHED_WB
-- * Normal memory. Write-back cached.
-- * * @FFA_MEM_ATTR_NON_SHAREABLE
-- * Non-shareable. Combine with FFA_MEM_ATTR_NORMAL_MEMORY_*.
-- * * @FFA_MEM_ATTR_OUTER_SHAREABLE
-- * Outer Shareable. Combine with FFA_MEM_ATTR_NORMAL_MEMORY_*.
-- * * @FFA_MEM_ATTR_INNER_SHAREABLE
-- * Inner Shareable. Combine with FFA_MEM_ATTR_NORMAL_MEMORY_*.
-- */
--typedef uint8_t ffa_mem_attr8_t;
--#define FFA_MEM_ATTR_DEVICE_NGNRNE ((1U << 4) | (0x0U << 2))
--#define FFA_MEM_ATTR_DEVICE_NGNRE ((1U << 4) | (0x1U << 2))
--#define FFA_MEM_ATTR_DEVICE_NGRE ((1U << 4) | (0x2U << 2))
--#define FFA_MEM_ATTR_DEVICE_GRE ((1U << 4) | (0x3U << 2))
--#define FFA_MEM_ATTR_NORMAL_MEMORY_UNCACHED ((2U << 4) | (0x1U << 2))
--#define FFA_MEM_ATTR_NORMAL_MEMORY_CACHED_WB ((2U << 4) | (0x3U << 2))
--#define FFA_MEM_ATTR_NON_SHAREABLE (0x0U << 0)
--#define FFA_MEM_ATTR_OUTER_SHAREABLE (0x2U << 0)
--#define FFA_MEM_ATTR_INNER_SHAREABLE (0x3U << 0)
--
--/**
-- * typedef ffa_mem_perm8_t - Memory access permissions
-- *
-- * * @FFA_MEM_ATTR_RO
-- * Request or specify read-only mapping.
-- * * @FFA_MEM_ATTR_RW
-- * Request or allow read-write mapping.
-- * * @FFA_MEM_PERM_NX
-- * Deny executable mapping.
-- * * @FFA_MEM_PERM_X
-- * Request executable mapping.
-- */
--typedef uint8_t ffa_mem_perm8_t;
--#define FFA_MEM_PERM_RO (1U << 0)
--#define FFA_MEM_PERM_RW (1U << 1)
--#define FFA_MEM_PERM_NX (1U << 2)
--#define FFA_MEM_PERM_X (1U << 3)
--
--/**
-- * typedef ffa_mem_flag8_t - Endpoint memory flags
-- *
-- * * @FFA_MEM_FLAG_OTHER
-- * Other borrower. Memory region must not be or was not retrieved on behalf
-- * of this endpoint.
-- */
--typedef uint8_t ffa_mem_flag8_t;
--#define FFA_MEM_FLAG_OTHER (1U << 0)
--
--/**
-- * typedef ffa_mtd_flag32_t - Memory transaction descriptor flags
-- *
-- * * @FFA_MTD_FLAG_ZERO_MEMORY
-- * Zero memory after unmapping from sender (must be 0 for share).
-- * * @FFA_MTD_FLAG_TIME_SLICING
-- * Not supported by this implementation.
-- * * @FFA_MTD_FLAG_ZERO_MEMORY_AFTER_RELINQUISH
-- * Zero memory after unmapping from borrowers (must be 0 for share).
-- * * @FFA_MTD_FLAG_TYPE_MASK
-- * Bit-mask to extract memory management transaction type from flags.
-- * * @FFA_MTD_FLAG_TYPE_SHARE_MEMORY
-- * Share memory transaction flag.
-- * Used by @SMC_FC_FFA_MEM_RETRIEVE_RESP to indicate that memory came from
-- * @SMC_FC_FFA_MEM_SHARE and by @SMC_FC_FFA_MEM_RETRIEVE_REQ to specify that
-- * it must have.
-- * * @FFA_MTD_FLAG_ADDRESS_RANGE_ALIGNMENT_HINT_MASK
-- * Not supported by this implementation.
-- */
--typedef uint32_t ffa_mtd_flag32_t;
--#define FFA_MTD_FLAG_ZERO_MEMORY (1U << 0)
--#define FFA_MTD_FLAG_TIME_SLICING (1U << 1)
--#define FFA_MTD_FLAG_ZERO_MEMORY_AFTER_RELINQUISH (1U << 2)
--#define FFA_MTD_FLAG_TYPE_MASK (3U << 3)
--#define FFA_MTD_FLAG_TYPE_SHARE_MEMORY (1U << 3)
--#define FFA_MTD_FLAG_ADDRESS_RANGE_ALIGNMENT_HINT_MASK (0x1FU << 5)
--
--/**
-- * struct ffa_mapd - Memory access permissions descriptor
-- * @endpoint_id:
-- * Endpoint id that @memory_access_permissions and @flags apply to.
-- * (&typedef ffa_endpoint_id16_t).
-- * @memory_access_permissions:
-- * FFA_MEM_PERM_* values or'ed together (&typedef ffa_mem_perm8_t).
-- * @flags:
-- * FFA_MEM_FLAG_* values or'ed together (&typedef ffa_mem_flag8_t).
-- */
--struct ffa_mapd {
-- ffa_endpoint_id16_t endpoint_id;
-- ffa_mem_perm8_t memory_access_permissions;
-- ffa_mem_flag8_t flags;
--};
--STATIC_ASSERT(sizeof(struct ffa_mapd) == 4);
--
--/**
-- * struct ffa_emad - Endpoint memory access descriptor.
-- * @mapd: &struct ffa_mapd.
-- * @comp_mrd_offset:
-- * Offset of &struct ffa_comp_mrd form start of &struct ffa_mtd.
-- * @reserved_8_15:
-- * Reserved bytes 8-15. Must be 0.
-- */
--struct ffa_emad {
-- struct ffa_mapd mapd;
-- uint32_t comp_mrd_offset;
-- uint64_t reserved_8_15;
--};
--STATIC_ASSERT(sizeof(struct ffa_emad) == 16);
--
--/**
-- * struct ffa_mtd - Memory transaction descriptor.
-- * @sender_id:
-- * Sender endpoint id.
-- * @memory_region_attributes:
-- * FFA_MEM_ATTR_* values or'ed together (&typedef ffa_mem_attr8_t).
-- * @reserved_3:
-- * Reserved bytes 3. Must be 0.
-- * @flags:
-- * FFA_MTD_FLAG_* values or'ed together (&typedef ffa_mtd_flag32_t).
-- * @handle:
-- * Id of shared memory object. Most be 0 for MEM_SHARE.
-- * @tag: Client allocated tag. Must match original value.
-- * @reserved_24_27:
-- * Reserved bytes 24-27. Must be 0.
-- * @emad_count:
-- * Number of entries in @emad. Must be 1 in current implementation.
-- * FFA spec allows more entries.
-- * @emad:
-- * Endpoint memory access descriptor array (see @struct ffa_emad).
-- */
--struct ffa_mtd {
-- ffa_endpoint_id16_t sender_id;
-- ffa_mem_attr8_t memory_region_attributes;
-- uint8_t reserved_3;
-- ffa_mtd_flag32_t flags;
-- uint64_t handle;
-- uint64_t tag;
-- uint32_t reserved_24_27;
-- uint32_t emad_count;
-- struct ffa_emad emad[];
--};
--STATIC_ASSERT(sizeof(struct ffa_mtd) == 32);
--
--/**
-- * struct ffa_mem_relinquish_descriptor - Relinquish request descriptor.
-- * @handle:
-- * Id of shared memory object to relinquish.
-- * @flags:
-- * If bit 0 is set clear memory after unmapping from borrower. Must be 0
-- * for share. Bit[1]: Time slicing. Not supported, must be 0. All other
-- * bits are reserved 0.
-- * @endpoint_count:
-- * Number of entries in @endpoint_array.
-- * @endpoint_array:
-- * Array of endpoint ids.
-- */
--struct ffa_mem_relinquish_descriptor {
-- uint64_t handle;
-- uint32_t flags;
-- uint32_t endpoint_count;
-- ffa_endpoint_id16_t endpoint_array[];
--};
--STATIC_ASSERT(sizeof(struct ffa_mem_relinquish_descriptor) == 16);
--
--/**
-- * enum ffa_error - FF-A error code
-- * @FFA_ERROR_NOT_SUPPORTED:
-- * Operation contained possibly valid parameters not supported by the
-- * current implementation. Does not match FF-A 1.0 EAC 1_0 definition.
-- * @FFA_ERROR_INVALID_PARAMETERS:
-- * Invalid parameters. Conditions function specific.
-- * @FFA_ERROR_NO_MEMORY:
-- * Not enough memory.
-- * @FFA_ERROR_DENIED:
-- * Operation not allowed. Conditions function specific.
-- *
-- * FF-A 1.0 EAC 1_0 defines other error codes as well but the current
-- * implementation does not use them.
-- */
--enum ffa_error {
-- FFA_ERROR_NOT_SUPPORTED = -1,
-- FFA_ERROR_INVALID_PARAMETERS = -2,
-- FFA_ERROR_NO_MEMORY = -3,
-- FFA_ERROR_DENIED = -6,
--};
--
--/**
-- * SMC_FC32_FFA_MIN - First 32 bit SMC opcode reserved for FFA
-- */
--#define SMC_FC32_FFA_MIN SMC_FASTCALL_NR_SHARED_MEMORY(0x60)
--
--/**
-- * SMC_FC32_FFA_MAX - Last 32 bit SMC opcode reserved for FFA
-- */
--#define SMC_FC32_FFA_MAX SMC_FASTCALL_NR_SHARED_MEMORY(0x7F)
--
--/**
-- * SMC_FC64_FFA_MIN - First 64 bit SMC opcode reserved for FFA
-- */
--#define SMC_FC64_FFA_MIN SMC_FASTCALL64_NR_SHARED_MEMORY(0x60)
--
--/**
-- * SMC_FC64_FFA_MAX - Last 64 bit SMC opcode reserved for FFA
-- */
--#define SMC_FC64_FFA_MAX SMC_FASTCALL64_NR_SHARED_MEMORY(0x7F)
--
--/**
-- * SMC_FC_FFA_ERROR - SMC error return opcode
-- *
-- * Register arguments:
-- *
-- * * w1: VMID in [31:16], vCPU in [15:0]
-- * * w2: Error code (&enum ffa_error)
-- */
--#define SMC_FC_FFA_ERROR SMC_FASTCALL_NR_SHARED_MEMORY(0x60)
--
--/**
-- * SMC_FC_FFA_SUCCESS - 32 bit SMC success return opcode
-- *
-- * Register arguments:
-- *
-- * * w1: VMID in [31:16], vCPU in [15:0]
-- * * w2-w7: Function specific
-- */
--#define SMC_FC_FFA_SUCCESS SMC_FASTCALL_NR_SHARED_MEMORY(0x61)
--
--/**
-- * SMC_FC64_FFA_SUCCESS - 64 bit SMC success return opcode
-- *
-- * Register arguments:
-- *
-- * * w1: VMID in [31:16], vCPU in [15:0]
-- * * w2/x2-w7/x7: Function specific
-- */
--#define SMC_FC64_FFA_SUCCESS SMC_FASTCALL64_NR_SHARED_MEMORY(0x61)
--
--/**
-- * SMC_FC_FFA_VERSION - SMC opcode to return supported FF-A version
-- *
-- * Register arguments:
-- *
-- * * w1: Major version bit[30:16] and minor version in bit[15:0] supported
-- * by caller. Bit[31] must be 0.
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_SUCCESS
-- * * w2: Major version bit[30:16], minor version in bit[15:0], bit[31] must
-- * be 0.
-- *
-- * or
-- *
-- * * w0: SMC_FC_FFA_ERROR
-- * * w2: FFA_ERROR_NOT_SUPPORTED if major version passed in is less than the
-- * minimum major version supported.
-- */
--#define SMC_FC_FFA_VERSION SMC_FASTCALL_NR_SHARED_MEMORY(0x63)
--
--/**
-- * SMC_FC_FFA_FEATURES - SMC opcode to check optional feature support
-- *
-- * Register arguments:
-- *
-- * * w1: FF-A function ID
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_SUCCESS
-- * * w2: Bit[0]: Supports custom buffers for memory transactions.
-- * Bit[1:0]: For RXTX_MAP min buffer size and alignment boundary.
-- * Other bits must be 0.
-- * * w3: For FFA_MEM_RETRIEVE_REQ, bit[7-0]: Number of times receiver can
-- * retrieve each memory region before relinquishing it specified as
-- * ((1U << (value + 1)) - 1 (or value = bits in reference count - 1).
-- * For all other bits and commands: must be 0.
-- * or
-- *
-- * * w0: SMC_FC_FFA_ERROR
-- * * w2: FFA_ERROR_NOT_SUPPORTED if function is not implemented, or
-- * FFA_ERROR_INVALID_PARAMETERS if function id is not valid.
-- */
--#define SMC_FC_FFA_FEATURES SMC_FASTCALL_NR_SHARED_MEMORY(0x64)
--
--/**
-- * SMC_FC_FFA_RXTX_MAP - 32 bit SMC opcode to map message buffers
-- *
-- * Register arguments:
-- *
-- * * w1: TX address
-- * * w2: RX address
-- * * w3: RX/TX page count in bit[5:0]
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_SUCCESS
-- */
--#define SMC_FC_FFA_RXTX_MAP SMC_FASTCALL_NR_SHARED_MEMORY(0x66)
--
--/**
-- * SMC_FC64_FFA_RXTX_MAP - 64 bit SMC opcode to map message buffers
-- *
-- * Register arguments:
-- *
-- * * x1: TX address
-- * * x2: RX address
-- * * x3: RX/TX page count in bit[5:0]
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_SUCCESS
-- */
--#define SMC_FC64_FFA_RXTX_MAP SMC_FASTCALL64_NR_SHARED_MEMORY(0x66)
--#ifdef CONFIG_64BIT
--#define SMC_FCZ_FFA_RXTX_MAP SMC_FC64_FFA_RXTX_MAP
--#else
--#define SMC_FCZ_FFA_RXTX_MAP SMC_FC_FFA_RXTX_MAP
--#endif
--
--/**
-- * SMC_FC_FFA_RXTX_UNMAP - SMC opcode to unmap message buffers
-- *
-- * Register arguments:
-- *
-- * * w1: ID in [31:16]
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_SUCCESS
-- */
--#define SMC_FC_FFA_RXTX_UNMAP SMC_FASTCALL_NR_SHARED_MEMORY(0x67)
--
--/**
-- * SMC_FC_FFA_ID_GET - SMC opcode to get endpoint id of caller
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_SUCCESS
-- * * w2: ID in bit[15:0], bit[31:16] must be 0.
-- */
--#define SMC_FC_FFA_ID_GET SMC_FASTCALL_NR_SHARED_MEMORY(0x69)
--
--/**
-- * SMC_FC_FFA_MEM_DONATE - 32 bit SMC opcode to donate memory
-- *
-- * Not supported.
-- */
--#define SMC_FC_FFA_MEM_DONATE SMC_FASTCALL_NR_SHARED_MEMORY(0x71)
--
--/**
-- * SMC_FC_FFA_MEM_LEND - 32 bit SMC opcode to lend memory
-- *
-- * Not currently supported.
-- */
--#define SMC_FC_FFA_MEM_LEND SMC_FASTCALL_NR_SHARED_MEMORY(0x72)
--
--/**
-- * SMC_FC_FFA_MEM_SHARE - 32 bit SMC opcode to share memory
-- *
-- * Register arguments:
-- *
-- * * w1: Total length
-- * * w2: Fragment length
-- * * w3: Address
-- * * w4: Page count
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_SUCCESS
-- * * w2/w3: Handle
-- *
-- * or
-- *
-- * * w0: &SMC_FC_FFA_MEM_FRAG_RX
-- * * w1-: See &SMC_FC_FFA_MEM_FRAG_RX
-- *
-- * or
-- *
-- * * w0: SMC_FC_FFA_ERROR
-- * * w2: Error code (&enum ffa_error)
-- */
--#define SMC_FC_FFA_MEM_SHARE SMC_FASTCALL_NR_SHARED_MEMORY(0x73)
--
--/**
-- * SMC_FC64_FFA_MEM_SHARE - 64 bit SMC opcode to share memory
-- *
-- * Register arguments:
-- *
-- * * w1: Total length
-- * * w2: Fragment length
-- * * x3: Address
-- * * w4: Page count
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_SUCCESS
-- * * w2/w3: Handle
-- *
-- * or
-- *
-- * * w0: &SMC_FC_FFA_MEM_FRAG_RX
-- * * w1-: See &SMC_FC_FFA_MEM_FRAG_RX
-- *
-- * or
-- *
-- * * w0: SMC_FC_FFA_ERROR
-- * * w2: Error code (&enum ffa_error)
-- */
--#define SMC_FC64_FFA_MEM_SHARE SMC_FASTCALL64_NR_SHARED_MEMORY(0x73)
--
--/**
-- * SMC_FC_FFA_MEM_RETRIEVE_REQ - 32 bit SMC opcode to retrieve shared memory
-- *
-- * Register arguments:
-- *
-- * * w1: Total length
-- * * w2: Fragment length
-- * * w3: Address
-- * * w4: Page count
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_MEM_RETRIEVE_RESP
-- * * w1/x1-w5/x5: See &SMC_FC_FFA_MEM_RETRIEVE_RESP
-- */
--#define SMC_FC_FFA_MEM_RETRIEVE_REQ SMC_FASTCALL_NR_SHARED_MEMORY(0x74)
--
--/**
-- * SMC_FC64_FFA_MEM_RETRIEVE_REQ - 64 bit SMC opcode to retrieve shared memory
-- *
-- * Register arguments:
-- *
-- * * w1: Total length
-- * * w2: Fragment length
-- * * x3: Address
-- * * w4: Page count
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_MEM_RETRIEVE_RESP
-- * * w1/x1-w5/x5: See &SMC_FC_FFA_MEM_RETRIEVE_RESP
-- */
--#define SMC_FC64_FFA_MEM_RETRIEVE_REQ SMC_FASTCALL64_NR_SHARED_MEMORY(0x74)
--
--/**
-- * SMC_FC_FFA_MEM_RETRIEVE_RESP - Retrieve 32 bit SMC return opcode
-- *
-- * Register arguments:
-- *
-- * * w1: Total length
-- * * w2: Fragment length
-- */
--#define SMC_FC_FFA_MEM_RETRIEVE_RESP SMC_FASTCALL_NR_SHARED_MEMORY(0x75)
--
--/**
-- * SMC_FC_FFA_MEM_RELINQUISH - SMC opcode to relinquish shared memory
-- *
-- * Input in &struct ffa_mem_relinquish_descriptor format in message buffer.
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_SUCCESS
-- */
--#define SMC_FC_FFA_MEM_RELINQUISH SMC_FASTCALL_NR_SHARED_MEMORY(0x76)
--
--/**
-- * SMC_FC_FFA_MEM_RECLAIM - SMC opcode to reclaim shared memory
-- *
-- * Register arguments:
-- *
-- * * w1/w2: Handle
-- * * w3: Flags
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_SUCCESS
-- */
--#define SMC_FC_FFA_MEM_RECLAIM SMC_FASTCALL_NR_SHARED_MEMORY(0x77)
--
--/**
-- * SMC_FC_FFA_MEM_FRAG_RX - SMC opcode to request next fragment.
-- *
-- * Register arguments:
-- *
-- * * w1/w2: Cookie
-- * * w3: Fragment offset.
-- * * w4: Endpoint id ID in [31:16], if client is hypervisor.
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_MEM_FRAG_TX
-- * * w1/x1-w5/x5: See &SMC_FC_FFA_MEM_FRAG_TX
-- */
--#define SMC_FC_FFA_MEM_FRAG_RX SMC_FASTCALL_NR_SHARED_MEMORY(0x7A)
--
--/**
-- * SMC_FC_FFA_MEM_FRAG_TX - SMC opcode to transmit next fragment
-- *
-- * Register arguments:
-- *
-- * * w1/w2: Cookie
-- * * w3: Fragment length.
-- * * w4: Sender endpoint id ID in [31:16], if client is hypervisor.
-- *
-- * Return:
-- * * w0: &SMC_FC_FFA_MEM_FRAG_RX or &SMC_FC_FFA_SUCCESS.
-- * * w1/x1-w5/x5: See opcode in w0.
-- */
--#define SMC_FC_FFA_MEM_FRAG_TX SMC_FASTCALL_NR_SHARED_MEMORY(0x7B)
--
--#endif /* __LINUX_TRUSTY_ARM_FFA_H */
-diff --git a/include/linux/trusty/trusty.h b/include/linux/trusty/trusty.h
-index efbb36999a8b..272d96c1c696 100644
---- a/include/linux/trusty/trusty.h
-+++ b/include/linux/trusty/trusty.h
-@@ -52,9 +52,6 @@ u32 trusty_get_api_version(struct device *dev);
- bool trusty_get_panic_status(struct device *dev);
-
- struct ns_mem_page_info {
-- u64 paddr;
-- u8 ffa_mem_attr;
-- u8 ffa_mem_perm;
- u64 compat_attr;
- };
-
-2.34.1
-
deleted file mode 100644
@@ -1,192 +0,0 @@
-From 162daf58abe2d00b9279fce143595b6ff546f803 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Tue, 18 Jan 2022 18:27:09 +0000
-Subject: [PATCH 29/40] ANDROID: trusty: Rename transfer memory function to
- lend memory
-
-Renaming trusty_transfer_memory to trusty_lend_memory allows Trusty
-to export memory operation like share, lend, reclaim and use common
-code for memory share and lend operations.
-
-Define TRUSTY_DEFAULT_MEM_OBJ_TAG as 0 and use that in existing calls.
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: Ie165a609cc4398bb916967595d0b748d54d75faf
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- drivers/trusty/trusty-ipc.c | 14 ++++++++----
- drivers/trusty/trusty-test.c | 3 ++-
- drivers/trusty/trusty-virtio.c | 3 ++-
- drivers/trusty/trusty.c | 41 ++++++++++++++++++++++------------
- include/linux/trusty/trusty.h | 11 ++++-----
- 5 files changed, 47 insertions(+), 25 deletions(-)
-
-diff --git a/drivers/trusty/trusty-ipc.c b/drivers/trusty/trusty-ipc.c
-index 82d6ddeb41f4..0a27af2063a7 100644
---- a/drivers/trusty/trusty-ipc.c
-+++ b/drivers/trusty/trusty-ipc.c
-@@ -1233,10 +1233,16 @@ static int dn_share_fd(struct tipc_dn_chan *dn, int fd,
- goto cleanup_handle;
- }
-
-- ret = trusty_transfer_memory(tipc_shared_handle_dev(shared_handle),
-- &mem_id, shared_handle->sgt->sgl,
-- shared_handle->sgt->orig_nents, prot, tag,
-- lend);
-+ if (lend)
-+ ret = trusty_lend_memory(tipc_shared_handle_dev(shared_handle),
-+ &mem_id, shared_handle->sgt->sgl,
-+ shared_handle->sgt->orig_nents, prot,
-+ tag);
-+ else
-+ ret = trusty_share_memory(tipc_shared_handle_dev(shared_handle),
-+ &mem_id, shared_handle->sgt->sgl,
-+ shared_handle->sgt->orig_nents, prot,
-+ tag);
-
- if (ret < 0) {
- dev_dbg(dev, "Transferring memory failed: %d\n", ret);
-diff --git a/drivers/trusty/trusty-test.c b/drivers/trusty/trusty-test.c
-index 844868981fa5..c25fc0f2fcf0 100644
---- a/drivers/trusty/trusty-test.c
-+++ b/drivers/trusty/trusty-test.c
-@@ -138,7 +138,8 @@ static int trusty_test_share_objs(struct trusty_test_state *s,
- t1 = ktime_get();
- tmpret = trusty_share_memory(s->trusty_dev, &obj->mem_id,
- obj->sgt.sgl, obj->sgt.nents,
-- PAGE_KERNEL);
-+ PAGE_KERNEL,
-+ TRUSTY_DEFAULT_MEM_OBJ_TAG);
- t2 = ktime_get();
- if (tmpret) {
- ret = tmpret;
-diff --git a/drivers/trusty/trusty-virtio.c b/drivers/trusty/trusty-virtio.c
-index fea59cd2e218..365e7c04bcf4 100644
---- a/drivers/trusty/trusty-virtio.c
-+++ b/drivers/trusty/trusty-virtio.c
-@@ -626,7 +626,8 @@ static int trusty_virtio_add_devices(struct trusty_ctx *tctx)
-
- sg_init_one(&tctx->shared_sg, descr_va, descr_buf_sz);
- ret = trusty_share_memory(tctx->dev->parent, &descr_id,
-- &tctx->shared_sg, 1, PAGE_KERNEL);
-+ &tctx->shared_sg, 1, PAGE_KERNEL,
-+ TRUSTY_DEFAULT_MEM_OBJ_TAG);
- if (ret) {
- dev_err(tctx->dev, "trusty_share_memory failed: %d\n", ret);
- goto err_share_memory;
-diff --git a/drivers/trusty/trusty.c b/drivers/trusty/trusty.c
-index 2dec75398f69..6bd30bc1bbc9 100644
---- a/drivers/trusty/trusty.c
-+++ b/drivers/trusty/trusty.c
-@@ -222,18 +222,9 @@ s32 trusty_std_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2)
- }
- EXPORT_SYMBOL(trusty_std_call32);
-
--int trusty_share_memory(struct device *dev, u64 *id,
-- struct scatterlist *sglist, unsigned int nents,
-- pgprot_t pgprot)
--{
-- return trusty_transfer_memory(dev, id, sglist, nents, pgprot, 0,
-- false);
--}
--EXPORT_SYMBOL(trusty_share_memory);
--
--int trusty_transfer_memory(struct device *dev, u64 *id,
-- struct scatterlist *sglist, unsigned int nents,
-- pgprot_t pgprot, u64 tag, bool lend)
-+static int __trusty_share_memory(struct device *dev, u64 *id,
-+ struct scatterlist *sglist, unsigned int nents,
-+ pgprot_t pgprot, u64 tag, bool mem_share)
- {
- struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
- int ret;
-@@ -253,6 +244,12 @@ int trusty_transfer_memory(struct device *dev, u64 *id,
- return -EOPNOTSUPP;
- }
-
-+ if (mem_share == false && s->api_version < TRUSTY_API_VERSION_MEM_OBJ) {
-+ dev_err(s->dev, "%s: old trusty version does not support lending memory objects\n",
-+ __func__);
-+ return -EOPNOTSUPP;
-+ }
-+
- count = dma_map_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
- if (count != nents) {
- dev_err(s->dev, "failed to dma map sg_table\n");
-@@ -271,7 +268,22 @@ int trusty_transfer_memory(struct device *dev, u64 *id,
- *id = pg_inf.compat_attr;
- return 0;
- }
--EXPORT_SYMBOL(trusty_transfer_memory);
-+
-+int trusty_share_memory(struct device *dev, u64 *id,
-+ struct scatterlist *sglist, unsigned int nents,
-+ pgprot_t pgprot, u64 tag)
-+{
-+ return __trusty_share_memory(dev, id, sglist, nents, pgprot, tag, true);
-+}
-+EXPORT_SYMBOL(trusty_share_memory);
-+
-+int trusty_lend_memory(struct device *dev, u64 *id,
-+ struct scatterlist *sglist, unsigned int nents,
-+ pgprot_t pgprot, u64 tag)
-+{
-+ return __trusty_share_memory(dev, id, sglist, nents, pgprot, tag, false);
-+}
-+EXPORT_SYMBOL(trusty_lend_memory);
-
- /*
- * trusty_share_memory_compat - trusty_share_memory wrapper for old apis
-@@ -287,7 +299,8 @@ int trusty_share_memory_compat(struct device *dev, u64 *id,
- int ret;
- struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-
-- ret = trusty_share_memory(dev, id, sglist, nents, pgprot);
-+ ret = trusty_share_memory(dev, id, sglist, nents, pgprot,
-+ TRUSTY_DEFAULT_MEM_OBJ_TAG);
- if (!ret && s->api_version < TRUSTY_API_VERSION_PHYS_MEM_OBJ)
- *id &= 0x0000FFFFFFFFF000ull;
-
-diff --git a/include/linux/trusty/trusty.h b/include/linux/trusty/trusty.h
-index 272d96c1c696..27f635f2d12d 100644
---- a/include/linux/trusty/trusty.h
-+++ b/include/linux/trusty/trusty.h
-@@ -11,6 +11,7 @@
- #include <linux/device.h>
- #include <linux/pagemap.h>
-
-+#define TRUSTY_DEFAULT_MEM_OBJ_TAG (0)
-
- #if IS_ENABLED(CONFIG_TRUSTY)
- s32 trusty_std_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2);
-@@ -62,13 +63,13 @@ struct scatterlist;
- typedef u64 trusty_shared_mem_id_t;
- int trusty_share_memory(struct device *dev, trusty_shared_mem_id_t *id,
- struct scatterlist *sglist, unsigned int nents,
-- pgprot_t pgprot);
-+ pgprot_t pgprot, u64 tag);
- int trusty_share_memory_compat(struct device *dev, trusty_shared_mem_id_t *id,
- struct scatterlist *sglist, unsigned int nents,
- pgprot_t pgprot);
--int trusty_transfer_memory(struct device *dev, u64 *id,
-- struct scatterlist *sglist, unsigned int nents,
-- pgprot_t pgprot, u64 tag, bool lend);
-+int trusty_lend_memory(struct device *dev, u64 *id,
-+ struct scatterlist *sglist, unsigned int nents,
-+ pgprot_t pgprot, u64 tag);
- int trusty_reclaim_memory(struct device *dev, trusty_shared_mem_id_t id,
- struct scatterlist *sglist, unsigned int nents);
-
-@@ -78,7 +79,7 @@ u64 trusty_dma_buf_get_ffa_tag(struct dma_buf *dma_buf);
- #else
- static inline u64 trusty_dma_buf_get_ffa_tag(struct dma_buf *dma_buf)
- {
-- return 0;
-+ return TRUSTY_DEFAULT_MEM_OBJ_TAG;
- }
- #endif
-
-2.34.1
-
deleted file mode 100644
@@ -1,496 +0,0 @@
-From 41cab33091954ec655e7fe567c345f5a44fea122 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Fri, 14 Jan 2022 14:02:39 +0000
-Subject: [PATCH 30/40] ANDROID: trusty: Separate out SMC based transport
-
-This commit refactors SMC based transport operation like
-smc_fastcalls, smc memory operations in a separate file.
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: Iebee505b7172f6247186e3bf1e0b50740b2e4dfa
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- drivers/trusty/Makefile | 1 +
- drivers/trusty/trusty-private.h | 61 ++++++++++++++
- drivers/trusty/trusty-smc.c | 136 ++++++++++++++++++++++++++++++
- drivers/trusty/trusty.c | 144 +++++++++-----------------------
- 4 files changed, 237 insertions(+), 105 deletions(-)
- create mode 100644 drivers/trusty/trusty-private.h
- create mode 100644 drivers/trusty/trusty-smc.c
-
-diff --git a/drivers/trusty/Makefile b/drivers/trusty/Makefile
-index 2cf1cfccf97b..fbb53ee93003 100644
---- a/drivers/trusty/Makefile
-+++ b/drivers/trusty/Makefile
-@@ -5,6 +5,7 @@
-
- obj-$(CONFIG_TRUSTY) += trusty-core.o
- trusty-core-objs += trusty.o trusty-mem.o
-+trusty-core-objs += trusty-smc.o
- trusty-core-$(CONFIG_ARM) += trusty-smc-arm.o
- trusty-core-$(CONFIG_ARM64) += trusty-smc-arm64.o
- obj-$(CONFIG_TRUSTY_IRQ) += trusty-irq.o
-diff --git a/drivers/trusty/trusty-private.h b/drivers/trusty/trusty-private.h
-new file mode 100644
-index 000000000000..4d73c6ae35d4
---- /dev/null
-+++ b/drivers/trusty/trusty-private.h
-@@ -0,0 +1,61 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+/*
-+ * Copyright (C) 2022 ARM Ltd.
-+ */
-+
-+#ifndef _TRUSTY_PRIVATE_H
-+#define _TRUSTY_PRIVATE_H
-+
-+#include <linux/types.h>
-+
-+struct trusty_work {
-+ struct trusty_state *ts;
-+ struct work_struct work;
-+};
-+
-+struct trusty_msg_ops {
-+ u32 (*send_direct_msg)(struct device *dev, unsigned long fid,
-+ unsigned long a0, unsigned long a1,
-+ unsigned long a2);
-+};
-+
-+struct trusty_mem_ops {
-+ int (*trusty_share_memory)(struct device *dev, u64 *id,
-+ struct scatterlist *sglist,
-+ unsigned int nents, pgprot_t pgprot, u64 tag);
-+ int (*trusty_lend_memory)(struct device *dev, u64 *id,
-+ struct scatterlist *sglist,
-+ unsigned int nents, pgprot_t pgprot, u64 tag);
-+ int (*trusty_reclaim_memory)(struct device *dev, u64 id,
-+ struct scatterlist *sglist,
-+ unsigned int nents);
-+};
-+
-+struct trusty_state {
-+ struct mutex smc_lock;
-+ struct atomic_notifier_head notifier;
-+ struct completion cpu_idle_completion;
-+ char *version_str;
-+ u32 api_version;
-+ bool trusty_panicked;
-+ struct device *dev;
-+ struct workqueue_struct *nop_wq;
-+ struct trusty_work __percpu *nop_works;
-+ struct list_head nop_queue;
-+ spinlock_t nop_lock; /* protects nop_queue */
-+ struct device_dma_parameters dma_parms;
-+ const struct trusty_msg_ops *msg_ops;
-+ const struct trusty_mem_ops *mem_ops;
-+};
-+
-+int trusty_init_api_version(struct trusty_state *s, struct device *dev,
-+ u32 (*send_direct_msg)(struct device *dev,
-+ unsigned long fid,
-+ unsigned long a0,
-+ unsigned long a1,
-+ unsigned long a2));
-+
-+int trusty_smc_transport_setup(struct device *dev);
-+void trusty_smc_transport_cleanup(struct device *dev);
-+
-+#endif /* _TRUSTY_PRIVATE_H */
-diff --git a/drivers/trusty/trusty-smc.c b/drivers/trusty/trusty-smc.c
-new file mode 100644
-index 000000000000..8fa841e0e253
---- /dev/null
-+++ b/drivers/trusty/trusty-smc.c
-@@ -0,0 +1,136 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Copyright (C) 2013 Google, Inc.
-+ */
-+
-+#include <linux/platform_device.h>
-+#include <linux/trusty/smcall.h>
-+#include <linux/trusty/trusty.h>
-+
-+#include <linux/scatterlist.h>
-+#include <linux/dma-mapping.h>
-+
-+#include "trusty-smc.h"
-+#include "trusty-private.h"
-+
-+static u32 trusty_smc_send_direct_msg(struct device *dev, unsigned long fid,
-+ unsigned long a0, unsigned long a1,
-+ unsigned long a2)
-+{
-+ return trusty_smc8(fid, a0, a1, a2, 0, 0, 0, 0).r0;
-+}
-+
-+static int trusty_smc_share_memory(struct device *dev, u64 *id,
-+ struct scatterlist *sglist,
-+ unsigned int nents, pgprot_t pgprot, u64 tag)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+ int ret;
-+ struct ns_mem_page_info pg_inf;
-+ struct scatterlist *sg;
-+ size_t count;
-+
-+ if (WARN_ON(nents < 1))
-+ return -EINVAL;
-+
-+ if (nents != 1) {
-+ dev_err(s->dev, "%s: old trusty version does not support "
-+ "non-contiguous memory objects\n", __func__);
-+ return -EOPNOTSUPP;
-+ }
-+
-+ count = dma_map_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
-+ if (count != nents) {
-+ dev_err(s->dev, "failed to dma map sg_table\n");
-+ return -EINVAL;
-+ }
-+
-+ sg = sglist;
-+ ret = trusty_encode_page_info(&pg_inf, phys_to_page(sg_dma_address(sg)),
-+ pgprot);
-+ if (ret) {
-+ dev_err(s->dev, "%s: trusty_encode_page_info failed\n",
-+ __func__);
-+ dma_unmap_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
-+ return ret;
-+ }
-+
-+ *id = pg_inf.compat_attr;
-+ return 0;
-+}
-+
-+static int trusty_smc_lend_memory(struct device *dev, u64 *id,
-+ struct scatterlist *sglist,
-+ unsigned int nents, pgprot_t pgprot, u64 tag)
-+{
-+ return -EOPNOTSUPP;
-+}
-+
-+static int trusty_smc_reclaim_memory(struct device *dev, u64 id,
-+ struct scatterlist *sglist,
-+ unsigned int nents)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ if (WARN_ON(nents < 1))
-+ return -EINVAL;
-+
-+ if (WARN_ON(s->api_version >= TRUSTY_API_VERSION_MEM_OBJ))
-+ return -EINVAL;
-+
-+ if (nents != 1) {
-+ dev_err(s->dev, "%s: not supported\n", __func__);
-+ return -EOPNOTSUPP;
-+ }
-+
-+ dma_unmap_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
-+
-+ dev_dbg(s->dev, "%s: done\n", __func__);
-+ return 0;
-+}
-+
-+static const struct trusty_msg_ops trusty_smc_msg_ops = {
-+ .send_direct_msg = &trusty_smc_send_direct_msg,
-+};
-+
-+static const struct trusty_mem_ops trusty_smc_mem_ops = {
-+ .trusty_share_memory = &trusty_smc_share_memory,
-+ .trusty_lend_memory = &trusty_smc_lend_memory,
-+ .trusty_reclaim_memory = &trusty_smc_reclaim_memory,
-+};
-+
-+int trusty_smc_transport_setup(struct device *dev)
-+{
-+ int rc;
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ rc = trusty_init_api_version(s, dev, &trusty_smc_send_direct_msg);
-+ if (rc != 0) {
-+ return rc;
-+ }
-+
-+ /*
-+ * Initialize Trusty msg calls with Trusty SMC ABI
-+ */
-+ s->msg_ops = &trusty_smc_msg_ops;
-+
-+ /*
-+ * Initialize Trusty memory operations with Trusty SMC ABI only when
-+ * Trusty API version is below TRUSTY_API_VERSION_MEM_OBJ.
-+ */
-+ if (s->api_version < TRUSTY_API_VERSION_MEM_OBJ)
-+ s->mem_ops = &trusty_smc_mem_ops;
-+
-+ return 0;
-+}
-+
-+void trusty_smc_transport_cleanup(struct device *dev)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ if (s->msg_ops == &trusty_smc_msg_ops)
-+ s->msg_ops = NULL;
-+
-+ if (s->mem_ops == &trusty_smc_mem_ops)
-+ s->mem_ops = NULL;
-+}
-diff --git a/drivers/trusty/trusty.c b/drivers/trusty/trusty.c
-index 6bd30bc1bbc9..0486827a45ca 100644
---- a/drivers/trusty/trusty.c
-+++ b/drivers/trusty/trusty.c
-@@ -18,37 +18,10 @@
- #include <linux/scatterlist.h>
- #include <linux/dma-mapping.h>
-
--#include "trusty-smc.h"
-+#include "trusty-private.h"
-
--struct trusty_state;
- static struct platform_driver trusty_driver;
-
--struct trusty_work {
-- struct trusty_state *ts;
-- struct work_struct work;
--};
--
--struct trusty_state {
-- struct mutex smc_lock;
-- struct atomic_notifier_head notifier;
-- struct completion cpu_idle_completion;
-- char *version_str;
-- u32 api_version;
-- bool trusty_panicked;
-- struct device *dev;
-- struct workqueue_struct *nop_wq;
-- struct trusty_work __percpu *nop_works;
-- struct list_head nop_queue;
-- spinlock_t nop_lock; /* protects nop_queue */
-- struct device_dma_parameters dma_parms;
--};
--
--static inline unsigned long smc(unsigned long r0, unsigned long r1,
-- unsigned long r2, unsigned long r3)
--{
-- return trusty_smc8(r0, r1, r2, r3, 0, 0, 0, 0).r0;
--}
--
- s32 trusty_fast_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2)
- {
- struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-@@ -60,7 +33,7 @@ s32 trusty_fast_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2)
- if (WARN_ON(SMC_IS_SMC64(smcnr)))
- return SM_ERR_INVALID_PARAMETERS;
-
-- return smc(smcnr, a0, a1, a2);
-+ return s->msg_ops->send_direct_msg(dev, smcnr, a0, a1, a2);
- }
- EXPORT_SYMBOL(trusty_fast_call32);
-
-@@ -76,7 +49,7 @@ s64 trusty_fast_call64(struct device *dev, u64 smcnr, u64 a0, u64 a1, u64 a2)
- if (WARN_ON(!SMC_IS_SMC64(smcnr)))
- return SM_ERR_INVALID_PARAMETERS;
-
-- return smc(smcnr, a0, a1, a2);
-+ return s->msg_ops->send_direct_msg(dev, smcnr, a0, a1, a2);
- }
- EXPORT_SYMBOL(trusty_fast_call64);
- #endif
-@@ -88,13 +61,16 @@ static unsigned long trusty_std_call_inner(struct device *dev,
- {
- unsigned long ret;
- int retry = 5;
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-
- dev_dbg(dev, "%s(0x%lx 0x%lx 0x%lx 0x%lx)\n",
- __func__, smcnr, a0, a1, a2);
- while (true) {
-- ret = smc(smcnr, a0, a1, a2);
-+ ret = s->msg_ops->send_direct_msg(dev, smcnr, a0, a1, a2);
- while ((s32)ret == SM_ERR_FIQ_INTERRUPTED)
-- ret = smc(SMC_SC_RESTART_FIQ, 0, 0, 0);
-+ ret = s->msg_ops->send_direct_msg(dev,
-+ SMC_SC_RESTART_FIQ,
-+ 0, 0, 0);
- if ((int)ret != SM_ERR_BUSY || !retry)
- break;
-
-@@ -222,58 +198,17 @@ s32 trusty_std_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2)
- }
- EXPORT_SYMBOL(trusty_std_call32);
-
--static int __trusty_share_memory(struct device *dev, u64 *id,
-- struct scatterlist *sglist, unsigned int nents,
-- pgprot_t pgprot, u64 tag, bool mem_share)
-+int trusty_share_memory(struct device *dev, u64 *id,
-+ struct scatterlist *sglist, unsigned int nents,
-+ pgprot_t pgprot, u64 tag)
- {
- struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-- int ret;
-- struct ns_mem_page_info pg_inf;
-- struct scatterlist *sg;
-- size_t count;
-
- if (WARN_ON(dev->driver != &trusty_driver.driver))
- return -EINVAL;
-
-- if (WARN_ON(nents < 1))
-- return -EINVAL;
--
-- if (nents != 1 && s->api_version < TRUSTY_API_VERSION_MEM_OBJ) {
-- dev_err(s->dev, "%s: old trusty version does not support non-contiguous memory objects\n",
-- __func__);
-- return -EOPNOTSUPP;
-- }
--
-- if (mem_share == false && s->api_version < TRUSTY_API_VERSION_MEM_OBJ) {
-- dev_err(s->dev, "%s: old trusty version does not support lending memory objects\n",
-- __func__);
-- return -EOPNOTSUPP;
-- }
--
-- count = dma_map_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
-- if (count != nents) {
-- dev_err(s->dev, "failed to dma map sg_table\n");
-- return -EINVAL;
-- }
--
-- sg = sglist;
-- ret = trusty_encode_page_info(&pg_inf, phys_to_page(sg_dma_address(sg)),
-- pgprot);
-- if (ret) {
-- dev_err(s->dev, "%s: trusty_encode_page_info failed\n",
-- __func__);
-- return ret;
-- }
--
-- *id = pg_inf.compat_attr;
-- return 0;
--}
--
--int trusty_share_memory(struct device *dev, u64 *id,
-- struct scatterlist *sglist, unsigned int nents,
-- pgprot_t pgprot, u64 tag)
--{
-- return __trusty_share_memory(dev, id, sglist, nents, pgprot, tag, true);
-+ return s->mem_ops->trusty_share_memory(dev, id, sglist, nents, pgprot,
-+ tag);
- }
- EXPORT_SYMBOL(trusty_share_memory);
-
-@@ -281,7 +216,13 @@ int trusty_lend_memory(struct device *dev, u64 *id,
- struct scatterlist *sglist, unsigned int nents,
- pgprot_t pgprot, u64 tag)
- {
-- return __trusty_share_memory(dev, id, sglist, nents, pgprot, tag, false);
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ if (WARN_ON(dev->driver != &trusty_driver.driver))
-+ return -EINVAL;
-+
-+ return s->mem_ops->trusty_lend_memory(dev, id, sglist, nents, pgprot,
-+ tag);
- }
- EXPORT_SYMBOL(trusty_lend_memory);
-
-@@ -316,22 +257,7 @@ int trusty_reclaim_memory(struct device *dev, u64 id,
- if (WARN_ON(dev->driver != &trusty_driver.driver))
- return -EINVAL;
-
-- if (WARN_ON(nents < 1))
-- return -EINVAL;
--
-- if (s->api_version < TRUSTY_API_VERSION_MEM_OBJ) {
-- if (nents != 1) {
-- dev_err(s->dev, "%s: not supported\n", __func__);
-- return -EOPNOTSUPP;
-- }
--
-- dma_unmap_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
--
-- dev_dbg(s->dev, "%s: done\n", __func__);
-- return 0;
-- }
--
-- return 0;
-+ return s->mem_ops->trusty_reclaim_memory(dev, id, sglist, nents);
- }
- EXPORT_SYMBOL(trusty_reclaim_memory);
-
-@@ -382,7 +308,7 @@ const char *trusty_version_str_get(struct device *dev)
- }
- EXPORT_SYMBOL(trusty_version_str_get);
-
--static void trusty_init_version(struct trusty_state *s, struct device *dev)
-+static void trusty_init_version_str(struct trusty_state *s, struct device *dev)
- {
- int ret;
- int i;
-@@ -430,12 +356,17 @@ bool trusty_get_panic_status(struct device *dev)
- }
- EXPORT_SYMBOL(trusty_get_panic_status);
-
--static int trusty_init_api_version(struct trusty_state *s, struct device *dev)
-+int trusty_init_api_version(struct trusty_state *s, struct device *dev,
-+ u32 (*send_direct_msg)(struct device *dev,
-+ unsigned long fid,
-+ unsigned long a0,
-+ unsigned long a1,
-+ unsigned long a2))
- {
- u32 api_version;
-
-- api_version = trusty_fast_call32(dev, SMC_FC_API_VERSION,
-- TRUSTY_API_VERSION_CURRENT, 0, 0);
-+ api_version = send_direct_msg(dev, SMC_FC_API_VERSION,
-+ TRUSTY_API_VERSION_CURRENT, 0, 0);
- if (api_version == SM_ERR_UNDEFINED_SMC)
- api_version = 0;
-
-@@ -598,11 +529,12 @@ static int trusty_probe(struct platform_device *pdev)
-
- platform_set_drvdata(pdev, s);
-
-- trusty_init_version(s, &pdev->dev);
-+ /* Initialize SMC transport */
-+ ret = trusty_smc_transport_setup(s->dev);
-+ if (ret != 0 || s->msg_ops == NULL || s->mem_ops == NULL)
-+ goto err_transport_setup;
-
-- ret = trusty_init_api_version(s, &pdev->dev);
-- if (ret < 0)
-- goto err_api_version;
-+ trusty_init_version_str(s, &pdev->dev);
-
- s->nop_wq = alloc_workqueue("trusty-nop-wq", WQ_CPU_INTENSIVE, 0);
- if (!s->nop_wq) {
-@@ -648,9 +580,10 @@ static int trusty_probe(struct platform_device *pdev)
- err_alloc_works:
- destroy_workqueue(s->nop_wq);
- err_create_nop_wq:
--err_api_version:
-- s->dev->dma_parms = NULL;
- kfree(s->version_str);
-+ trusty_smc_transport_cleanup(s->dev);
-+err_transport_setup:
-+ s->dev->dma_parms = NULL;
- device_for_each_child(&pdev->dev, NULL, trusty_remove_child);
- mutex_destroy(&s->smc_lock);
- kfree(s);
-@@ -673,6 +606,7 @@ static int trusty_remove(struct platform_device *pdev)
- free_percpu(s->nop_works);
- destroy_workqueue(s->nop_wq);
-
-+ trusty_smc_transport_cleanup(s->dev);
- mutex_destroy(&s->smc_lock);
- s->dev->dma_parms = NULL;
- kfree(s->version_str);
-2.34.1
-
deleted file mode 100644
@@ -1,57 +0,0 @@
-From d022d0c3c6cadacf8a3a5fd2bb42c465834eef26 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Fri, 14 Jan 2022 14:22:42 +0000
-Subject: [PATCH 31/40] ANDROID: trusty: Modify device compatible string
-
-Drop smc keyword from device tree node as Trusty can use SMC or FFA
-based transport.
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: Id99b52f32a2122434a22f1991c0b4cd52b0676ed
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- Documentation/devicetree/bindings/trusty/trusty-irq.txt | 2 +-
- Documentation/devicetree/bindings/trusty/trusty-smc.txt | 2 +-
- drivers/trusty/trusty.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Documentation/devicetree/bindings/trusty/trusty-irq.txt b/Documentation/devicetree/bindings/trusty/trusty-irq.txt
-index cbb545ad452b..ae02030be4e7 100644
---- a/Documentation/devicetree/bindings/trusty/trusty-irq.txt
-+++ b/Documentation/devicetree/bindings/trusty/trusty-irq.txt
-@@ -48,7 +48,7 @@ Example:
- };
- ...
- trusty {
-- compatible = "android,trusty-smc-v1";
-+ compatible = "android,trusty-v1";
- ranges;
- #address-cells = <2>;
- #size-cells = <2>;
-diff --git a/Documentation/devicetree/bindings/trusty/trusty-smc.txt b/Documentation/devicetree/bindings/trusty/trusty-smc.txt
-index 1b39ad317c67..8d02a31ba814 100644
---- a/Documentation/devicetree/bindings/trusty/trusty-smc.txt
-+++ b/Documentation/devicetree/bindings/trusty/trusty-smc.txt
-@@ -3,4 +3,4 @@ Trusty smc interface
- Trusty is running in secure mode on the same (arm) cpu(s) as the current os.
-
- Required properties:
-+- compatible: "android,trusty-v1"
-diff --git a/drivers/trusty/trusty.c b/drivers/trusty/trusty.c
-index 0486827a45ca..757dd7b2c527 100644
---- a/drivers/trusty/trusty.c
-+++ b/drivers/trusty/trusty.c
-@@ -615,7 +615,7 @@ static int trusty_remove(struct platform_device *pdev)
- }
-
- static const struct of_device_id trusty_of_match[] = {
-- { .compatible = "android,trusty-smc-v1", },
-+ { .compatible = "android,trusty-v1", },
- {},
- };
-
-2.34.1
-
deleted file mode 100644
@@ -1,210 +0,0 @@
-From e7fe12a5a7e3eac7a7d549ef9a7d88e9baba1832 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Fri, 14 Jan 2022 17:52:33 +0000
-Subject: [PATCH 32/40] ANDROID: trusty: Add transport descriptor
-
-Use transport descriptor to hold transport specific operations. This
-helps to add new transport to Trusty core.
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: Ibbde50de0302f6d259a7d572f0910067ce712b37
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- drivers/trusty/trusty-private.h | 20 +++++++++-
- drivers/trusty/trusty-smc.c | 6 +++
- drivers/trusty/trusty.c | 71 ++++++++++++++++++++++++++++++---
- 3 files changed, 90 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/trusty/trusty-private.h b/drivers/trusty/trusty-private.h
-index 4d73c6ae35d4..74b88bb8f83b 100644
---- a/drivers/trusty/trusty-private.h
-+++ b/drivers/trusty/trusty-private.h
-@@ -14,12 +14,14 @@ struct trusty_work {
- };
-
- struct trusty_msg_ops {
-+ const struct trusty_transport_desc *desc;
- u32 (*send_direct_msg)(struct device *dev, unsigned long fid,
- unsigned long a0, unsigned long a1,
- unsigned long a2);
- };
-
- struct trusty_mem_ops {
-+ const struct trusty_transport_desc *desc;
- int (*trusty_share_memory)(struct device *dev, u64 *id,
- struct scatterlist *sglist,
- unsigned int nents, pgprot_t pgprot, u64 tag);
-@@ -46,6 +48,19 @@ struct trusty_state {
- struct device_dma_parameters dma_parms;
- const struct trusty_msg_ops *msg_ops;
- const struct trusty_mem_ops *mem_ops;
-+ struct trusty_ffa_state *ffa;
-+};
-+
-+struct trusty_ffa_state {
-+ struct device *dev; /* ffa device */
-+ const struct ffa_dev_ops *ops;
-+ struct mutex share_memory_msg_lock; /* protects share_memory_msg */
-+};
-+
-+struct trusty_transport_desc {
-+ const char *name;
-+ int (*setup)(struct device *dev);
-+ void (*cleanup)(struct device *dev);
- };
-
- int trusty_init_api_version(struct trusty_state *s, struct device *dev,
-@@ -55,7 +70,8 @@ int trusty_init_api_version(struct trusty_state *s, struct device *dev,
- unsigned long a1,
- unsigned long a2));
-
--int trusty_smc_transport_setup(struct device *dev);
--void trusty_smc_transport_cleanup(struct device *dev);
-+typedef const struct trusty_transport_desc *trusty_transports_t;
-+
-+extern const struct trusty_transport_desc trusty_smc_transport;
-
- #endif /* _TRUSTY_PRIVATE_H */
-diff --git a/drivers/trusty/trusty-smc.c b/drivers/trusty/trusty-smc.c
-index 8fa841e0e253..62d1d7060744 100644
---- a/drivers/trusty/trusty-smc.c
-+++ b/drivers/trusty/trusty-smc.c
-@@ -134,3 +134,9 @@ void trusty_smc_transport_cleanup(struct device *dev)
- if (s->mem_ops == &trusty_smc_mem_ops)
- s->mem_ops = NULL;
- }
-+
-+const struct trusty_transport_desc trusty_smc_transport = {
-+ .name = "smc",
-+ .setup = trusty_smc_transport_setup,
-+ .cleanup = trusty_smc_transport_cleanup,
-+};
-diff --git a/drivers/trusty/trusty.c b/drivers/trusty/trusty.c
-index 757dd7b2c527..ec0fccfaa24c 100644
---- a/drivers/trusty/trusty.c
-+++ b/drivers/trusty/trusty.c
-@@ -493,6 +493,46 @@ void trusty_dequeue_nop(struct device *dev, struct trusty_nop *nop)
- }
- EXPORT_SYMBOL(trusty_dequeue_nop);
-
-+static int
-+trusty_transports_setup(const trusty_transports_t *transports,
-+ struct device *dev)
-+{
-+ const struct trusty_transport_desc *transport;
-+ int ret;
-+ int transports_ret = -ENODEV;
-+
-+ if (!transports)
-+ return -EINVAL;
-+
-+ for (; (transport = *transports); transports++) {
-+ if (!transport->setup)
-+ return -EINVAL;
-+
-+ ret = transport->setup(dev);
-+ transports_ret &= ret;
-+ }
-+
-+ /* One transport needs to complete setup without error. */
-+ if (transports_ret < 0)
-+ return -ENODEV;
-+
-+ return 0;
-+}
-+
-+static void
-+trusty_transports_cleanup(const trusty_transports_t *transports,
-+ struct device *dev)
-+{
-+ const struct trusty_transport_desc *transport;
-+
-+ for (; (transport = *transports); transports++) {
-+ if (!transport->cleanup)
-+ continue;
-+
-+ transport->cleanup(dev);
-+ }
-+}
-+
- static int trusty_probe(struct platform_device *pdev)
- {
- int ret;
-@@ -500,6 +540,7 @@ static int trusty_probe(struct platform_device *pdev)
- work_func_t work_func;
- struct trusty_state *s;
- struct device_node *node = pdev->dev.of_node;
-+ const trusty_transports_t *descs;
-
- if (!node) {
- dev_err(&pdev->dev, "of_node required\n");
-@@ -529,8 +570,12 @@ static int trusty_probe(struct platform_device *pdev)
-
- platform_set_drvdata(pdev, s);
-
-- /* Initialize SMC transport */
-- ret = trusty_smc_transport_setup(s->dev);
-+ /*
-+ * Initialize Trusty transport. Trusty msg and mem ops has to be
-+ * initialized as part of transport setup.
-+ */
-+ descs = of_device_get_match_data(&pdev->dev);
-+ ret = trusty_transports_setup(descs, s->dev);
- if (ret != 0 || s->msg_ops == NULL || s->mem_ops == NULL)
- goto err_transport_setup;
-
-@@ -581,7 +626,7 @@ static int trusty_probe(struct platform_device *pdev)
- destroy_workqueue(s->nop_wq);
- err_create_nop_wq:
- kfree(s->version_str);
-- trusty_smc_transport_cleanup(s->dev);
-+ trusty_transports_cleanup(descs, s->dev);
- err_transport_setup:
- s->dev->dma_parms = NULL;
- device_for_each_child(&pdev->dev, NULL, trusty_remove_child);
-@@ -595,6 +640,7 @@ static int trusty_remove(struct platform_device *pdev)
- {
- unsigned int cpu;
- struct trusty_state *s = platform_get_drvdata(pdev);
-+ const trusty_transports_t *descs;
-
- device_for_each_child(&pdev->dev, NULL, trusty_remove_child);
-
-@@ -606,7 +652,10 @@ static int trusty_remove(struct platform_device *pdev)
- free_percpu(s->nop_works);
- destroy_workqueue(s->nop_wq);
-
-- trusty_smc_transport_cleanup(s->dev);
-+ /* call transport cleanup */
-+ descs = of_device_get_match_data(&pdev->dev);
-+ trusty_transports_cleanup(descs, s->dev);
-+
- mutex_destroy(&s->smc_lock);
- s->dev->dma_parms = NULL;
- kfree(s->version_str);
-@@ -614,8 +663,20 @@ static int trusty_remove(struct platform_device *pdev)
- return 0;
- }
-
-+/*
-+ * Trusty probe will try all compiled in transports and will use the transport
-+ * supported by the Trusty kernel.
-+ *
-+ * For Trusty API version < TRUSTY_API_VERSION_MEM_OBJ:
-+ * trusty_smc_transport used for messaging.
-+ */
-+static const trusty_transports_t trusty_transports[] = {
-+ &trusty_smc_transport,
-+ NULL,
-+};
-+
- static const struct of_device_id trusty_of_match[] = {
-- { .compatible = "android,trusty-v1", },
-+ { .compatible = "android,trusty-v1", .data = trusty_transports },
- {},
- };
-
-2.34.1
-
deleted file mode 100644
@@ -1,313 +0,0 @@
-From 34236d8df51d00d1167481760fda5abb56850765 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Fri, 14 Jan 2022 18:47:08 +0000
-Subject: [PATCH 33/40] ANDROID: trusty: Add trusty-ffa driver
-
-Initial changes related to FFA transport support
- - Adds FFA transport descriptor
- - Defines Trusty UUID
- - Initializes FFA transport does probe, sets ffa_ops
- - Defers Trusty probe if ARM FF-A driver is not initialized or
- Trusty SP not found.
- - Link FF-A device as the supplier for Trusty platform device.
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: I78f72b85c20e4bad4c24cf0826e96f27dcf2ee1d
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- drivers/trusty/Makefile | 1 +
- drivers/trusty/trusty-ffa.c | 196 ++++++++++++++++++++++++++++++++
- drivers/trusty/trusty-ffa.h | 28 +++++
- drivers/trusty/trusty-private.h | 1 +
- drivers/trusty/trusty.c | 6 +
- 5 files changed, 232 insertions(+)
- create mode 100644 drivers/trusty/trusty-ffa.c
- create mode 100644 drivers/trusty/trusty-ffa.h
-
-diff --git a/drivers/trusty/Makefile b/drivers/trusty/Makefile
-index fbb53ee93003..797d61bf68ef 100644
---- a/drivers/trusty/Makefile
-+++ b/drivers/trusty/Makefile
-@@ -6,6 +6,7 @@
- obj-$(CONFIG_TRUSTY) += trusty-core.o
- trusty-core-objs += trusty.o trusty-mem.o
- trusty-core-objs += trusty-smc.o
-+trusty-core-objs += trusty-ffa.o
- trusty-core-$(CONFIG_ARM) += trusty-smc-arm.o
- trusty-core-$(CONFIG_ARM64) += trusty-smc-arm64.o
- obj-$(CONFIG_TRUSTY_IRQ) += trusty-irq.o
-diff --git a/drivers/trusty/trusty-ffa.c b/drivers/trusty/trusty-ffa.c
-new file mode 100644
-index 000000000000..c8c16a1fc700
---- /dev/null
-+++ b/drivers/trusty/trusty-ffa.c
-@@ -0,0 +1,196 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+/*
-+ * Copyright (C) 2022 ARM Ltd.
-+ */
-+
-+#include <linux/platform_device.h>
-+#include <linux/slab.h>
-+#include <linux/trusty/smcall.h>
-+#include <linux/arm_ffa.h>
-+#include <linux/trusty/trusty.h>
-+
-+#include <linux/scatterlist.h>
-+#include <linux/dma-mapping.h>
-+
-+#include "trusty-ffa.h"
-+#include "trusty-private.h"
-+
-+static const struct trusty_mem_ops trusty_ffa_mem_ops = {
-+ .desc = &trusty_ffa_transport,
-+};
-+
-+static const struct ffa_device_id trusty_ffa_device_id[] = {
-+ /*
-+ * Trusty UID: RFC-4122 compliant UUID version 4
-+ * 40ee25f0-a2bc-304c-8c4ca173c57d8af1
-+ */
-+ { UUID_INIT(0x40ee25f0, 0xa2bc, 0x304c,
-+ 0x8c, 0x4c, 0xa1, 0x73, 0xc5, 0x7d, 0x8a, 0xf1) },
-+ {}
-+};
-+
-+static int trusty_ffa_dev_match(struct device *dev, const void *uuid)
-+{
-+ struct ffa_device *ffa_dev;
-+
-+ ffa_dev = to_ffa_dev(dev);
-+ if (uuid_equal(&ffa_dev->uuid, uuid))
-+ return 1;
-+
-+ return 0;
-+}
-+
-+static struct ffa_device *trusty_ffa_dev_find(void)
-+{
-+ const void *data;
-+ struct device *dev;
-+
-+ /* currently only one trusty instance is probed */
-+ data = &trusty_ffa_device_id[0].uuid;
-+
-+ dev = bus_find_device(&ffa_bus_type, NULL, data, trusty_ffa_dev_match);
-+ if (dev) {
-+ /* drop reference count */
-+ put_device(dev);
-+ return to_ffa_dev(dev);
-+ }
-+
-+ return NULL;
-+}
-+
-+static int trusty_ffa_link_supplier(struct device *c_dev, struct device *s_dev)
-+{
-+ if (!c_dev || !s_dev)
-+ return -EINVAL;
-+
-+ if (!device_link_add(c_dev, s_dev, DL_FLAG_AUTOREMOVE_CONSUMER)) {
-+ return -ENODEV;
-+ }
-+
-+ return 0;
-+}
-+
-+/*
-+ * called from trusty probe
-+ */
-+static int trusty_ffa_transport_setup(struct device *dev)
-+{
-+ int rc;
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+ struct trusty_ffa_state *ffa_state;
-+ struct ffa_device *ffa_dev;
-+
-+ /* ffa transport not required for lower api versions */
-+ if (s->api_version != 0 && s->api_version < TRUSTY_API_VERSION_MEM_OBJ) {
-+ return -EINVAL;
-+ }
-+
-+ ffa_dev = trusty_ffa_dev_find();
-+ if (!ffa_dev) {
-+ dev_dbg(dev, "FFA: Trusty device not found defer probe\n");
-+ return -EPROBE_DEFER;
-+ }
-+
-+ ffa_state = ffa_dev_get_drvdata(ffa_dev);
-+ if (!ffa_state)
-+ return -EINVAL;
-+
-+ rc = trusty_ffa_link_supplier(dev, &ffa_dev->dev);
-+ if (rc != 0)
-+ return rc;
-+
-+ /* FFA used only for memory sharing operations */
-+ if (s->api_version == TRUSTY_API_VERSION_MEM_OBJ) {
-+ s->ffa = ffa_state;
-+ s->mem_ops = &trusty_ffa_mem_ops;
-+ return 0;
-+ }
-+
-+ return -EINVAL;
-+}
-+
-+static void trusty_ffa_transport_cleanup(struct device *dev)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+
-+ /* ffa transport not setup for lower api versions */
-+ if (s->api_version < TRUSTY_API_VERSION_MEM_OBJ) {
-+ return;
-+ }
-+
-+ s->ffa = NULL;
-+ s->mem_ops = NULL;
-+}
-+
-+static int trusty_ffa_probe(struct ffa_device *ffa_dev)
-+{
-+ const struct ffa_dev_ops *ffa_ops;
-+ struct trusty_ffa_state *s;
-+ u32 ffa_drv_version;
-+
-+ ffa_ops = ffa_dev_ops_get(ffa_dev);
-+ if (!ffa_ops) {
-+ dev_dbg(&ffa_dev->dev, "ffa_dev_ops_get: failed\n");
-+ return -ENOENT;
-+ }
-+
-+ /* check ffa driver version compatibility */
-+ ffa_drv_version = ffa_ops->api_version_get();
-+ if (TO_TRUSTY_FFA_MAJOR(ffa_drv_version) != TRUSTY_FFA_VERSION_MAJOR ||
-+ TO_TRUSTY_FFA_MINOR(ffa_drv_version) < TRUSTY_FFA_VERSION_MINOR)
-+ return -EINVAL;
-+
-+ s = kzalloc(sizeof(*s), GFP_KERNEL);
-+ if (!s)
-+ return -ENOMEM;
-+
-+ s->dev = &ffa_dev->dev;
-+ s->ops = ffa_ops;
-+ mutex_init(&s->share_memory_msg_lock);
-+ ffa_dev_set_drvdata(ffa_dev, s);
-+
-+ ffa_ops->mode_32bit_set(ffa_dev);
-+
-+ return 0;
-+}
-+
-+static void trusty_ffa_remove(struct ffa_device *ffa_dev)
-+{
-+ struct trusty_ffa_state *s;
-+
-+ s = ffa_dev_get_drvdata(ffa_dev);
-+
-+ mutex_destroy(&s->share_memory_msg_lock);
-+ memset(s, 0, sizeof(struct trusty_ffa_state));
-+ kfree(s);
-+}
-+
-+static struct ffa_driver trusty_ffa_driver = {
-+ .name = "trusty-ffa",
-+ .probe = trusty_ffa_probe,
-+ .remove = trusty_ffa_remove,
-+ .id_table = trusty_ffa_device_id,
-+};
-+
-+static int __init trusty_ffa_transport_init(void)
-+{
-+ if (IS_REACHABLE(CONFIG_ARM_FFA_TRANSPORT)) {
-+ return ffa_register(&trusty_ffa_driver);
-+ } else
-+ return -ENODEV;
-+}
-+
-+static void __exit trusty_ffa_transport_exit(void)
-+{
-+ if (IS_REACHABLE(CONFIG_ARM_FFA_TRANSPORT))
-+ ffa_unregister(&trusty_ffa_driver);
-+}
-+
-+const struct trusty_transport_desc trusty_ffa_transport = {
-+ .name = "ffa",
-+ .setup = trusty_ffa_transport_setup,
-+ .cleanup = trusty_ffa_transport_cleanup,
-+};
-+
-+module_init(trusty_ffa_transport_init);
-+module_exit(trusty_ffa_transport_exit);
-diff --git a/drivers/trusty/trusty-ffa.h b/drivers/trusty/trusty-ffa.h
-new file mode 100644
-index 000000000000..267ca2c5db29
---- /dev/null
-+++ b/drivers/trusty/trusty-ffa.h
-@@ -0,0 +1,28 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+/*
-+ * Copyright (C) 2022 ARM Ltd.
-+ */
-+
-+#ifndef __LINUX_TRUSTY_FFA_H
-+#define __LINUX_TRUSTY_FFA_H
-+
-+#include <linux/types.h>
-+#include <linux/uuid.h>
-+#include <linux/arm_ffa.h>
-+
-+#define TRUSTY_FFA_VERSION_MAJOR (1U)
-+#define TRUSTY_FFA_VERSION_MINOR (0U)
-+#define TRUSTY_FFA_VERSION_MAJOR_SHIFT (16U)
-+#define TRUSTY_FFA_VERSION_MAJOR_MASK (0x7fffU)
-+#define TRUSTY_FFA_VERSION_MINOR_SHIFT (0U)
-+#define TRUSTY_FFA_VERSION_MINOR_MASK (0U)
-+
-+#define TO_TRUSTY_FFA_MAJOR(v) \
-+ ((u16)((v >> TRUSTY_FFA_VERSION_MAJOR_SHIFT) & \
-+ TRUSTY_FFA_VERSION_MAJOR_MASK))
-+
-+#define TO_TRUSTY_FFA_MINOR(v) \
-+ ((u16)((v >> TRUSTY_FFA_VERSION_MINOR_SHIFT) & \
-+ TRUSTY_FFA_VERSION_MINOR_MASK))
-+
-+#endif /* __LINUX_TRUSTY_FFA_H */
-diff --git a/drivers/trusty/trusty-private.h b/drivers/trusty/trusty-private.h
-index 74b88bb8f83b..2496f397e5d2 100644
---- a/drivers/trusty/trusty-private.h
-+++ b/drivers/trusty/trusty-private.h
-@@ -73,5 +73,6 @@ int trusty_init_api_version(struct trusty_state *s, struct device *dev,
- typedef const struct trusty_transport_desc *trusty_transports_t;
-
- extern const struct trusty_transport_desc trusty_smc_transport;
-+extern const struct trusty_transport_desc trusty_ffa_transport;
-
- #endif /* _TRUSTY_PRIVATE_H */
-diff --git a/drivers/trusty/trusty.c b/drivers/trusty/trusty.c
-index ec0fccfaa24c..4686b0d34f61 100644
---- a/drivers/trusty/trusty.c
-+++ b/drivers/trusty/trusty.c
-@@ -509,6 +509,11 @@ trusty_transports_setup(const trusty_transports_t *transports,
- return -EINVAL;
-
- ret = transport->setup(dev);
-+ if (ret == -EPROBE_DEFER) {
-+ dev_notice(dev, "transport %s: defer probe\n",
-+ transport->name);
-+ return ret;
-+ }
- transports_ret &= ret;
- }
-
-@@ -672,6 +677,7 @@ static int trusty_remove(struct platform_device *pdev)
- */
- static const trusty_transports_t trusty_transports[] = {
- &trusty_smc_transport,
-+ &trusty_ffa_transport,
- NULL,
- };
-
-2.34.1
-
deleted file mode 100644
@@ -1,152 +0,0 @@
-From 996e6bae70ec2ce04061daab23f20e9c353c4227 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Tue, 18 Jan 2022 15:11:46 +0000
-Subject: [PATCH 34/40] ANDROID: trusty-ffa: Add support for FFA memory
- operations
-
-Initializes Trusty mem_ops with FFA memory operations for share,
-lend, reclaim.
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: Id3a1eb5ae8e4721cb983c624773d39bafe25a77d
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- drivers/trusty/trusty-ffa.c | 102 ++++++++++++++++++++++++++++++++++++
- drivers/trusty/trusty.c | 5 ++
- 2 files changed, 107 insertions(+)
-
-diff --git a/drivers/trusty/trusty-ffa.c b/drivers/trusty/trusty-ffa.c
-index c8c16a1fc700..0655b3887b52 100644
---- a/drivers/trusty/trusty-ffa.c
-+++ b/drivers/trusty/trusty-ffa.c
-@@ -15,8 +15,110 @@
- #include "trusty-ffa.h"
- #include "trusty-private.h"
-
-+static int __trusty_ffa_share_memory(struct device *dev, u64 *id,
-+ struct scatterlist *sglist,
-+ unsigned int nents, pgprot_t pgprot,
-+ u64 tag, bool share)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+ int ret;
-+ struct scatterlist *sg;
-+ size_t count;
-+ struct ffa_device *ffa_dev = to_ffa_dev(s->ffa->dev);
-+ const struct ffa_dev_ops *ffa_ops = s->ffa->ops;
-+ struct ffa_mem_region_attributes ffa_mem_attr;
-+ struct ffa_mem_ops_args ffa_mem_args;
-+
-+ if (WARN_ON(nents < 1))
-+ return -EINVAL;
-+
-+ count = dma_map_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
-+ if (count != nents) {
-+ dev_err(s->dev, "failed to dma map sg_table\n");
-+ return -EINVAL;
-+ }
-+
-+ sg = sglist;
-+
-+ mutex_lock(&s->ffa->share_memory_msg_lock);
-+
-+ ffa_mem_attr.receiver = ffa_dev->vm_id;
-+ ffa_mem_attr.attrs = FFA_MEM_RW;
-+
-+ ffa_mem_args.use_txbuf = 1;
-+ ffa_mem_args.tag = tag;
-+ ffa_mem_args.attrs = &ffa_mem_attr;
-+ ffa_mem_args.nattrs = 1;
-+ ffa_mem_args.sg = sg;
-+ ffa_mem_args.flags = 0;
-+
-+ if (share) {
-+ ret = ffa_ops->memory_share(ffa_dev, &ffa_mem_args);
-+ } else {
-+ ret = ffa_ops->memory_lend(ffa_dev, &ffa_mem_args);
-+ }
-+
-+ mutex_unlock(&s->ffa->share_memory_msg_lock);
-+
-+ if (!ret) {
-+ *id = ffa_mem_args.g_handle;
-+ dev_dbg(s->dev, "%s: done\n", __func__);
-+ return 0;
-+ }
-+
-+ dev_err(s->dev, "%s: failed %d", __func__, ret);
-+
-+ dma_unmap_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
-+ return ret;
-+}
-+
-+static int trusty_ffa_share_memory(struct device *dev, u64 *id,
-+ struct scatterlist *sglist,
-+ unsigned int nents, pgprot_t pgprot, u64 tag)
-+{
-+ return __trusty_ffa_share_memory(dev, id, sglist, nents, pgprot, tag,
-+ true);
-+}
-+
-+static int trusty_ffa_lend_memory(struct device *dev, u64 *id,
-+ struct scatterlist *sglist,
-+ unsigned int nents, pgprot_t pgprot, u64 tag)
-+{
-+ return __trusty_ffa_share_memory(dev, id, sglist, nents, pgprot, tag,
-+ false);
-+}
-+
-+static int trusty_ffa_reclaim_memory(struct device *dev, u64 id,
-+ struct scatterlist *sglist,
-+ unsigned int nents)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+ int ret = 0;
-+ const struct ffa_dev_ops *ffa_ops = s->ffa->ops;
-+
-+ if (WARN_ON(nents < 1))
-+ return -EINVAL;
-+
-+ mutex_lock(&s->ffa->share_memory_msg_lock);
-+
-+ ret = ffa_ops->memory_reclaim(id, 0);
-+
-+ mutex_unlock(&s->ffa->share_memory_msg_lock);
-+
-+ if (ret != 0)
-+ return ret;
-+
-+ dma_unmap_sg(dev, sglist, nents, DMA_BIDIRECTIONAL);
-+
-+ dev_dbg(s->dev, "%s: done\n", __func__);
-+ return 0;
-+}
-+
- static const struct trusty_mem_ops trusty_ffa_mem_ops = {
- .desc = &trusty_ffa_transport,
-+ .trusty_share_memory = &trusty_ffa_share_memory,
-+ .trusty_lend_memory = &trusty_ffa_lend_memory,
-+ .trusty_reclaim_memory = &trusty_ffa_reclaim_memory,
- };
-
- static const struct ffa_device_id trusty_ffa_device_id[] = {
-diff --git a/drivers/trusty/trusty.c b/drivers/trusty/trusty.c
-index 4686b0d34f61..f91c255c9897 100644
---- a/drivers/trusty/trusty.c
-+++ b/drivers/trusty/trusty.c
-@@ -674,6 +674,11 @@ static int trusty_remove(struct platform_device *pdev)
- *
- * For Trusty API version < TRUSTY_API_VERSION_MEM_OBJ:
- * trusty_smc_transport used for messaging.
-+ *
-+ * For Trusty API version == TRUSTY_API_VERSION_MEM_OBJ:
-+ * trusty_smc_transport used for messaging.
-+ * trusty_ffa_transport used for memory sharing.
-+ *
- */
- static const trusty_transports_t trusty_transports[] = {
- &trusty_smc_transport,
-2.34.1
-
deleted file mode 100644
@@ -1,143 +0,0 @@
-From 8612a35bb376a3d104fe81f07c7109a252dcd9bf Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Thu, 3 Feb 2022 11:19:38 +0000
-Subject: [PATCH 35/40] ANDROID: trusty-ffa: Enable FFA transport for both
- memory and message ops
-
-Adds new API version TRUSTY_API_VERSION_FFA and sets this as current
-API version.
-
-If Trusty on the secure side supports receipt of FFA direct request,
-then trusty core uses FFA calls for messages and memory operations.
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: I4a8b060f906a96935a7df10713026fb543e2b9a7
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- drivers/trusty/trusty-ffa.c | 58 +++++++++++++++++++++++++++++++++++
- drivers/trusty/trusty.c | 3 ++
- include/linux/trusty/smcall.h | 3 +-
- 3 files changed, 63 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/trusty/trusty-ffa.c b/drivers/trusty/trusty-ffa.c
-index 0655b3887b52..543f5a0d31cb 100644
---- a/drivers/trusty/trusty-ffa.c
-+++ b/drivers/trusty/trusty-ffa.c
-@@ -15,6 +15,36 @@
- #include "trusty-ffa.h"
- #include "trusty-private.h"
-
-+/* partition property: Supports receipt of direct requests */
-+#define FFA_PARTITION_DIRECT_REQ_RECV BIT(0)
-+
-+/* string representation of trusty UUID used for partition info get call */
-+static const char *trusty_uuid = "40ee25f0-a2bc-304c-8c4c-a173c57d8af1";
-+
-+static u32 trusty_ffa_send_direct_msg(struct device *dev, unsigned long fid,
-+ unsigned long a0, unsigned long a1,
-+ unsigned long a2)
-+{
-+ struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
-+ struct ffa_send_direct_data ffa_msg;
-+ struct ffa_device *ffa_dev;
-+ int ret;
-+
-+ ffa_dev = to_ffa_dev(s->ffa->dev);
-+
-+ ffa_msg.data0 = fid;
-+ ffa_msg.data1 = a0;
-+ ffa_msg.data2 = a1;
-+ ffa_msg.data3 = a2;
-+ ffa_msg.data4 = 0;
-+
-+ ret = s->ffa->ops->sync_send_receive(ffa_dev, &ffa_msg);
-+ if (!ret)
-+ return ffa_msg.data0;
-+
-+ return ret;
-+}
-+
- static int __trusty_ffa_share_memory(struct device *dev, u64 *id,
- struct scatterlist *sglist,
- unsigned int nents, pgprot_t pgprot,
-@@ -114,6 +144,11 @@ static int trusty_ffa_reclaim_memory(struct device *dev, u64 id,
- return 0;
- }
-
-+static const struct trusty_msg_ops trusty_ffa_msg_ops = {
-+ .desc = &trusty_ffa_transport,
-+ .send_direct_msg = &trusty_ffa_send_direct_msg,
-+};
-+
- static const struct trusty_mem_ops trusty_ffa_mem_ops = {
- .desc = &trusty_ffa_transport,
- .trusty_share_memory = &trusty_ffa_share_memory,
-@@ -181,6 +216,7 @@ static int trusty_ffa_transport_setup(struct device *dev)
- struct trusty_state *s = platform_get_drvdata(to_platform_device(dev));
- struct trusty_ffa_state *ffa_state;
- struct ffa_device *ffa_dev;
-+ struct ffa_partition_info pinfo = { 0 };
-
- /* ffa transport not required for lower api versions */
- if (s->api_version != 0 && s->api_version < TRUSTY_API_VERSION_MEM_OBJ) {
-@@ -208,6 +244,28 @@ static int trusty_ffa_transport_setup(struct device *dev)
- return 0;
- }
-
-+ /* check if Trusty partition can support receipt of direct requests. */
-+ rc = ffa_state->ops->partition_info_get(trusty_uuid, &pinfo);
-+ if (rc || !(pinfo.properties & FFA_PARTITION_DIRECT_REQ_RECV)) {
-+ dev_err(ffa_state->dev, "trusty_ffa_pinfo: ret: 0x%x, prop: 0x%x\n",
-+ rc, pinfo.properties);
-+ return -EINVAL;
-+ }
-+
-+ /* query and check Trusty API version */
-+ s->ffa = ffa_state;
-+ rc = trusty_init_api_version(s, dev, trusty_ffa_send_direct_msg);
-+ if (rc) {
-+ s->ffa = NULL;
-+ return -EINVAL;
-+ }
-+
-+ if (s->api_version == TRUSTY_API_VERSION_FFA) {
-+ s->msg_ops = &trusty_ffa_msg_ops;
-+ s->mem_ops = &trusty_ffa_mem_ops;
-+ return 0;
-+ }
-+
- return -EINVAL;
- }
-
-diff --git a/drivers/trusty/trusty.c b/drivers/trusty/trusty.c
-index f91c255c9897..66273873f169 100644
---- a/drivers/trusty/trusty.c
-+++ b/drivers/trusty/trusty.c
-@@ -679,6 +679,9 @@ static int trusty_remove(struct platform_device *pdev)
- * trusty_smc_transport used for messaging.
- * trusty_ffa_transport used for memory sharing.
- *
-+ * For Trusty API version > TRUSTY_API_VERSION_MEM_OBJ:
-+ * trusty_ffa_transport used for messaging and memory sharing operations.
-+ *
- */
- static const trusty_transports_t trusty_transports[] = {
- &trusty_smc_transport,
-diff --git a/include/linux/trusty/smcall.h b/include/linux/trusty/smcall.h
-index aea3f6068593..17b3d1c2c4f6 100644
---- a/include/linux/trusty/smcall.h
-+++ b/include/linux/trusty/smcall.h
-@@ -109,7 +109,8 @@
- #define TRUSTY_API_VERSION_SMP_NOP (3)
- #define TRUSTY_API_VERSION_PHYS_MEM_OBJ (4)
- #define TRUSTY_API_VERSION_MEM_OBJ (5)
--#define TRUSTY_API_VERSION_CURRENT (5)
-+#define TRUSTY_API_VERSION_FFA (6)
-+#define TRUSTY_API_VERSION_CURRENT (6)
- #define SMC_FC_API_VERSION SMC_FASTCALL_NR(SMC_ENTITY_SECURE_MONITOR, 11)
-
- /* TRUSTED_OS entity calls */
-2.34.1
-
deleted file mode 100644
@@ -1,147 +0,0 @@
-From f6ffd3bf7b561d603b350dc0274121886193fef0 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Wed, 16 Mar 2022 11:14:09 +0000
-Subject: [PATCH 36/40] ANDROID: trusty: Make trusty transports configurable
-
-With TRUSTY_SMC_TRANSPORT set to 'y', SMC based message passing and
-memory sharing support will be compiled in to trusty core.
-
-With TRUSTY_FFA_TRANSPORT set to 'y', FFA based message passing and
-memory sharing support will be compiled in to trusty core. This
-depends on ARM FF-A driver (ARM_FFA_TRANSPORT).
-
-Enabling any of the transport sets config TRUSTY_HAVE_TRANSPORT to 'y'.
-Not enabling any of the transport causes the build to break.
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: Ib5bbf0d39202e6897700264d14371ae33101c1d1
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- drivers/trusty/Kconfig | 30 ++++++++++++++++++++++++++++++
- drivers/trusty/Makefile | 26 +++++++++++++++-----------
- drivers/trusty/trusty-private.h | 4 ++++
- drivers/trusty/trusty.c | 7 +++++++
- 4 files changed, 56 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/trusty/Kconfig b/drivers/trusty/Kconfig
-index fcde7f097acf..260022e4595b 100644
---- a/drivers/trusty/Kconfig
-+++ b/drivers/trusty/Kconfig
-@@ -21,6 +21,36 @@ config TRUSTY
-
- if TRUSTY
-
-+config TRUSTY_HAVE_TRANSPORT
-+ bool
-+ help
-+ If any of the Trusty transport is enabled then it sets this config
-+ option. This variable is used to break the build when none of the
-+ Trusty transports are enabled.
-+
-+config TRUSTY_SMC_TRANSPORT
-+ bool "Trusty transport based on SMC"
-+ select TRUSTY_HAVE_TRANSPORT
-+ default n
-+ help
-+ Enable SMC based transport for Trusty. This transport is required for
-+ Trusty API version <= TRUSTY_API_VERSION_MEM_OBJ.
-+
-+ If you want to use legacy SMC based transport for sending Trusty
-+ messages to secure world, answer Y.
-+
-+config TRUSTY_FFA_TRANSPORT
-+ bool "Trusty transport based on FFA"
-+ select TRUSTY_HAVE_TRANSPORT
-+ depends on ARM_FFA_TRANSPORT
-+ default y
-+ help
-+ Enable ARM FF-A based transport for Trusty. This transport is required
-+ for Trusty API version >= TRUSTY_API_VERSION_MEM_OBJ.
-+
-+ If you want to use ARM FF-A based transport for sending Trusty messages
-+ to secure world, answer Y.
-+
- config TRUSTY_IRQ
- tristate "Trusty IRQ support"
- default y
-diff --git a/drivers/trusty/Makefile b/drivers/trusty/Makefile
-index 797d61bf68ef..104a4d0ed35c 100644
---- a/drivers/trusty/Makefile
-+++ b/drivers/trusty/Makefile
-@@ -3,14 +3,18 @@
- # Makefile for trusty components
- #
-
--obj-$(CONFIG_TRUSTY) += trusty-core.o
--trusty-core-objs += trusty.o trusty-mem.o
--trusty-core-objs += trusty-smc.o
--trusty-core-objs += trusty-ffa.o
--trusty-core-$(CONFIG_ARM) += trusty-smc-arm.o
--trusty-core-$(CONFIG_ARM64) += trusty-smc-arm64.o
--obj-$(CONFIG_TRUSTY_IRQ) += trusty-irq.o
--obj-$(CONFIG_TRUSTY_LOG) += trusty-log.o
--obj-$(CONFIG_TRUSTY_TEST) += trusty-test.o
--obj-$(CONFIG_TRUSTY_VIRTIO) += trusty-virtio.o
--obj-$(CONFIG_TRUSTY_VIRTIO_IPC) += trusty-ipc.o
-+obj-$(CONFIG_TRUSTY) += trusty-core.o
-+trusty-core-objs += trusty.o
-+trusty-arm-smc-$(CONFIG_ARM) += trusty-smc-arm.o
-+trusty-arm-smc64-$(CONFIG_ARM64) += trusty-smc-arm64.o
-+trusty-transport-$(CONFIG_TRUSTY_SMC_TRANSPORT) += trusty-smc.o
-+trusty-transport-$(CONFIG_TRUSTY_SMC_TRANSPORT) += trusty-mem.o
-+trusty-transport-$(CONFIG_TRUSTY_SMC_TRANSPORT) += $(trusty-arm-smc-y)
-+trusty-transport-$(CONFIG_TRUSTY_SMC_TRANSPORT) += $(trusty-arm-smc64-y)
-+trusty-transport-$(CONFIG_TRUSTY_FFA_TRANSPORT) += trusty-ffa.o
-+trusty-core-objs += $(trusty-transport-y)
-+obj-$(CONFIG_TRUSTY_IRQ) += trusty-irq.o
-+obj-$(CONFIG_TRUSTY_LOG) += trusty-log.o
-+obj-$(CONFIG_TRUSTY_TEST) += trusty-test.o
-+obj-$(CONFIG_TRUSTY_VIRTIO) += trusty-virtio.o
-+obj-$(CONFIG_TRUSTY_VIRTIO_IPC) += trusty-ipc.o
-diff --git a/drivers/trusty/trusty-private.h b/drivers/trusty/trusty-private.h
-index 2496f397e5d2..386ca9ae5af3 100644
---- a/drivers/trusty/trusty-private.h
-+++ b/drivers/trusty/trusty-private.h
-@@ -72,7 +72,11 @@ int trusty_init_api_version(struct trusty_state *s, struct device *dev,
-
- typedef const struct trusty_transport_desc *trusty_transports_t;
-
-+#ifdef CONFIG_TRUSTY_SMC_TRANSPORT
- extern const struct trusty_transport_desc trusty_smc_transport;
-+#endif
-+#ifdef CONFIG_TRUSTY_FFA_TRANSPORT
- extern const struct trusty_transport_desc trusty_ffa_transport;
-+#endif
-
- #endif /* _TRUSTY_PRIVATE_H */
-diff --git a/drivers/trusty/trusty.c b/drivers/trusty/trusty.c
-index 66273873f169..06698f3c67f9 100644
---- a/drivers/trusty/trusty.c
-+++ b/drivers/trusty/trusty.c
-@@ -684,8 +684,12 @@ static int trusty_remove(struct platform_device *pdev)
- *
- */
- static const trusty_transports_t trusty_transports[] = {
-+#ifdef CONFIG_TRUSTY_SMC_TRANSPORT
- &trusty_smc_transport,
-+#endif
-+#ifdef CONFIG_TRUSTY_FFA_TRANSPORT
- &trusty_ffa_transport,
-+#endif
- NULL,
- };
-
-@@ -708,6 +712,9 @@ static struct platform_driver trusty_driver = {
-
- static int __init trusty_driver_init(void)
- {
-+ BUILD_BUG_ON_MSG(!IS_ENABLED(CONFIG_TRUSTY_HAVE_TRANSPORT),
-+ "Trusty transport not configured");
-+
- return platform_driver_register(&trusty_driver);
- }
-
-2.34.1
-
deleted file mode 100644
@@ -1,27 +0,0 @@
-From 71a99394b657019d234b43d9abacf9f86a3c4e4f Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Thu, 19 May 2022 09:56:04 +0100
-Subject: [PATCH 37/40] ANDROID: trusty-log: include panic_notifier.h
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- drivers/trusty/trusty-log.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/trusty/trusty-log.c b/drivers/trusty/trusty-log.c
-index 7b279fe63766..1bd68278d0be 100644
---- a/drivers/trusty/trusty-log.c
-+++ b/drivers/trusty/trusty-log.c
-@@ -6,6 +6,7 @@
- #include <linux/trusty/smcall.h>
- #include <linux/trusty/trusty.h>
- #include <linux/notifier.h>
-+#include <linux/panic_notifier.h>
- #include <linux/scatterlist.h>
- #include <linux/slab.h>
- #include <linux/mm.h>
-2.34.1
-
deleted file mode 100644
@@ -1,30 +0,0 @@
-From dfa152d399d7e6a285ab31bcc2172f61d5db907d Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Thu, 19 May 2022 09:59:06 +0100
-Subject: [PATCH 38/40] ANDROID: trusty-ipc: fix VIRTIO_ID_TRUSTY_IPC ID
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- include/uapi/linux/virtio_ids.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h
-index 909905cd7618..06ccbf2db5fa 100644
---- a/include/uapi/linux/virtio_ids.h
-+++ b/include/uapi/linux/virtio_ids.h
-@@ -42,6 +42,10 @@
- #define VIRTIO_ID_RPROC_SERIAL 11 /* virtio remoteproc serial link */
- #define VIRTIO_ID_CAIF 12 /* Virtio caif */
- #define VIRTIO_ID_MEMORY_BALLOON 13 /* virtio memory balloon */
-+/*
-+ * todo: VIRTIO_ID_TRUSTY_IPC conflicts with VIRTIO_ID_MEMORY_BALLOON
-+ * replace with unused ID and update trusty kernel header tipc_virtio_dev.h
-+ */
- #define VIRTIO_ID_TRUSTY_IPC 13 /* virtio trusty ipc */
- #define VIRTIO_ID_GPU 16 /* virtio GPU */
- #define VIRTIO_ID_CLOCK 17 /* virtio clock/timer */
-2.34.1
-
deleted file mode 100644
@@ -1,27 +0,0 @@
-From 6de0622bb6880b5a8e8422f6e6e847cc43231a89 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Wed, 18 May 2022 18:47:55 +0100
-Subject: [PATCH 39/40] gki_config: add tc/disable_mpam
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- arch/arm64/configs/gki_defconfig | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
-index 31d836eef904..0536759d1baa 100644
---- a/arch/arm64/configs/gki_defconfig
-+++ b/arch/arm64/configs/gki_defconfig
-@@ -60,7 +60,6 @@ CONFIG_ARMV8_DEPRECATED=y
- CONFIG_SWP_EMULATION=y
- CONFIG_CP15_BARRIER_EMULATION=y
- CONFIG_SETEND_EMULATION=y
--CONFIG_ARM64_MPAM=y
- CONFIG_RANDOMIZE_BASE=y
- # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set
- CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off kvm-arm.mode=protected cgroup_disable=pressure"
-2.34.1
-
deleted file mode 100644
@@ -1,52 +0,0 @@
-From 2cdf0de8f42c4825f52618b9bbd2ec2084749de0 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Thu, 19 May 2022 16:44:13 +0100
-Subject: [PATCH 40/40] ANDROID: KVM: arm64: disable FFA driver at EL2
-
-Do not handle FFA calls
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com
----
- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 3 +++
- arch/arm64/kvm/hyp/nvhe/setup.c | 4 +++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
-index 49345929af0d..463cf27712c3 100644
---- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c
-+++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
-@@ -1134,8 +1134,11 @@ static void handle_host_smc(struct kvm_cpu_context *host_ctxt)
- bool handled;
-
- handled = kvm_host_psci_handler(host_ctxt);
-+ /* do not handle ffa calls as EL2 FFA driver is not yet complete */
-+#if 0
- if (!handled)
- handled = kvm_host_ffa_handler(host_ctxt);
-+#endif
- if (!handled)
- default_host_smc_handler(host_ctxt);
-
-diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setup.c
-index 1a6f3eba5035..ce84030426d0 100644
---- a/arch/arm64/kvm/hyp/nvhe/setup.c
-+++ b/arch/arm64/kvm/hyp/nvhe/setup.c
-@@ -317,10 +317,12 @@ void __noreturn __pkvm_init_finalise(void)
- if (ret)
- goto out;
-
-+ /* skip ffa init at EL2, use EL1 driver instead */
-+#if 0
- ret = hyp_ffa_init(ffa_proxy_pages);
- if (ret)
- goto out;
--
-+#endif
- hyp_shadow_table_init(shadow_table_base);
- out:
- /*
-2.34.1
-
deleted file mode 100644
@@ -1,66 +0,0 @@
-From 37948a54f3e49fc2fef157f89d5bb52cefcfe68e Mon Sep 17 00:00:00 2001
-From: Kees Cook <keescook@chromium.org>
-Date: Sat, 12 Feb 2022 09:14:49 -0800
-Subject: [PATCH] etherdevice: Adjust ether_addr* prototypes to silence
- -Wstringop-overead
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With GCC 12, -Wstringop-overread was warning about an implicit cast from
-char[6] to char[8]. However, the extra 2 bytes are always thrown away,
-alignment doesn't matter, and the risk of hitting the edge of unallocated
-memory has been accepted, so this prototype can just be converted to a
-regular char *. Silences:
-
-net/core/dev.c: In function ‘bpf_prog_run_generic_xdp’: net/core/dev.c:4618:21: warning: ‘ether_addr_equal_64bits’ reading 8 bytes from a region of size 6 [-Wstringop-overread]
- 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr);
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-net/core/dev.c:4618:21: note: referencing argument 1 of type ‘const u8[8]’ {aka ‘const unsigned char[8]’}
-net/core/dev.c:4618:21: note: referencing argument 2 of type ‘const u8[8]’ {aka ‘const unsigned char[8]’}
-In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ‘ether_addr_equal_64bits’
- 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2],
- | ^~~~~~~~~~~~~~~~~~~~~~~
-
-Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
-Tested-by: Marc Kleine-Budde <mkl@pengutronix.de>
-Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73@pengutronix.de
-Cc: Jakub Kicinski <kuba@kernel.org>
-Cc: "David S. Miller" <davem@davemloft.net>
-Cc: netdev@vger.kernel.org
-Signed-off-by: Kees Cook <keescook@chromium.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd]
-Change-Id: I41ed4ace65094964eacddf0c56f9fc779f7d4e0c
-Signed-off-by: Davidson K <davidson.kumaresan@arm.com>
----
- include/linux/etherdevice.h | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
-index c58d50451485..7f28fa702bb7 100644
---- a/include/linux/etherdevice.h
-+++ b/include/linux/etherdevice.h
-@@ -127,7 +127,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr)
- #endif
- }
-
--static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2])
-+static inline bool is_multicast_ether_addr_64bits(const u8 *addr)
- {
- #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
- #ifdef __BIG_ENDIAN
-@@ -364,8 +364,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2)
- * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits.
- */
-
--static inline bool ether_addr_equal_64bits(const u8 addr1[6+2],
-- const u8 addr2[6+2])
-+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2)
- {
- #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
- u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2);
-2.34.1
-
deleted file mode 100644
@@ -1,45 +0,0 @@
-From 74979dd6327bbaa96ecb8525f8ea6025715d5ba7 Mon Sep 17 00:00:00 2001
-From: Xiongwei Song <sxwjean@gmail.com>
-Date: Fri, 14 Jan 2022 14:07:24 -0800
-Subject: [PATCH] mm: page_alloc: fix building error on -Werror=array-compare
-
-Arthur Marsh reported we would hit the error below when building kernel
-with gcc-12:
-
- CC mm/page_alloc.o
- mm/page_alloc.c: In function `mem_init_print_info':
- mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare]
- 8173 | if (start <= pos && pos < end && size > adj) \
- |
-
-In C++20, the comparision between arrays should be warned.
-
-Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean@me.com
-Signed-off-by: Xiongwei Song <sxwjean@gmail.com>
-Reported-by: Arthur Marsh <arthur.marsh@internode.on.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f]
-Signed-off-by: Davidson K <davidson.kumaresan@arm.com>
-Change-Id: I11931013f1fd42f0f2a75375cdfb129cb3a9d5aa
----
- mm/page_alloc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 185fbddecc83..3affeeb194d4 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -8282,7 +8282,7 @@ void __init mem_init_print_info(void)
- */
- #define adj_init_size(start, end, size, pos, adj) \
- do { \
-- if (start <= pos && pos < end && size > adj) \
-+ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \
- size -= adj; \
- } while (0)
-
-2.34.1
-
deleted file mode 100644
@@ -1,693 +0,0 @@
-CONFIG_UAPI_HEADER_TEST=y
-CONFIG_AUDIT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BPF_JIT=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_PREEMPT=y
-CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
-CONFIG_RCU_EXPERT=y
-CONFIG_RCU_FAST_NO_HZ=y
-CONFIG_RCU_NOCB_CPU=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKHEADERS=y
-CONFIG_UCLAMP_TASK=y
-CONFIG_UCLAMP_BUCKETS_COUNT=20
-CONFIG_CGROUPS=y
-CONFIG_MEMCG=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_UCLAMP_TASK_GROUP=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CPUSETS=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_BPF=y
-CONFIG_NAMESPACES=y
-# CONFIG_PID_NS is not set
-CONFIG_RT_SOFTINT_OPTIMIZATION=y
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_XZ is not set
-# CONFIG_RD_LZO is not set
-CONFIG_BOOT_CONFIG=y
-# CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_FHANDLE is not set
-CONFIG_KALLSYMS_ALL=y
-CONFIG_USERFAULTFD=y
-# CONFIG_RSEQ is not set
-CONFIG_EMBEDDED=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB_MERGE_DEFAULT is not set
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
-CONFIG_PROFILING=y
-CONFIG_ARCH_SUNXI=y
-CONFIG_ARCH_HISI=y
-CONFIG_ARCH_QCOM=y
-CONFIG_SCHED_MC=y
-CONFIG_NR_CPUS=32
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-CONFIG_ARM64_SW_TTBR0_PAN=y
-CONFIG_COMPAT=y
-CONFIG_ARMV8_DEPRECATED=y
-CONFIG_SWP_EMULATION=y
-CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_SETEND_EMULATION=y
-CONFIG_ARM64_MPAM=y
-CONFIG_RANDOMIZE_BASE=y
-# CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set
-CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off kvm-arm.mode=protected cgroup_disable=pressure"
-CONFIG_CMDLINE_EXTEND=y
-# CONFIG_DMI is not set
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=0
-# CONFIG_PM_WAKELOCKS_GC is not set
-CONFIG_ENERGY_MODEL=y
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_IDLE_GOV_TEO=y
-CONFIG_ARM_CPUIDLE=y
-CONFIG_ARM_PSCI_CPUIDLE=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_TIMES=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_ARM_SCPI_CPUFREQ=y
-CONFIG_ARM_SCMI_CPUFREQ=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_KVM_S2MPU=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-CONFIG_SHADOW_CALL_STACK=y
-CONFIG_LTO_CLANG_FULL=y
-CONFIG_CFI_CLANG=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SCMVERSION=y
-CONFIG_MODULE_SIG=y
-CONFIG_MODULE_SIG_PROTECT=y
-CONFIG_BLK_INLINE_ENCRYPTION=y
-CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
-CONFIG_IOSCHED_BFQ=y
-CONFIG_BFQ_GROUP_IOSCHED=y
-CONFIG_GKI_HACKS_TO_FIX=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_MISC=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
-CONFIG_CLEANCACHE=y
-CONFIG_CMA=y
-CONFIG_CMA_DEBUGFS=y
-CONFIG_CMA_AREAS=16
-# CONFIG_ZONE_DMA is not set
-CONFIG_ANON_VMA_NAME=y
-CONFIG_LRU_GEN=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_XFRM_INTERFACE=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_NET_KEY=y
-CONFIG_XDP_SOCKETS=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_NET_IPIP=y
-CONFIG_NET_IPGRE_DEMUX=y
-CONFIG_NET_IPGRE=y
-CONFIG_NET_IPVTI=y
-CONFIG_INET_ESP=y
-CONFIG_INET_UDP_DIAG=y
-CONFIG_INET_DIAG_DESTROY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_IPV6_MIP6=y
-CONFIG_IPV6_VTI=y
-CONFIG_IPV6_GRE=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_NETFILTER=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_AMANDA=y
-CONFIG_NF_CONNTRACK_FTP=y
-CONFIG_NF_CONNTRACK_H323=y
-CONFIG_NF_CONNTRACK_IRC=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=y
-CONFIG_NF_CONNTRACK_PPTP=y
-CONFIG_NF_CONNTRACK_SANE=y
-CONFIG_NF_CONNTRACK_TFTP=y
-CONFIG_NF_CT_NETLINK=y
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
-CONFIG_NETFILTER_XT_TARGET_DSCP=y
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
-CONFIG_NETFILTER_XT_TARGET_MARK=y
-CONFIG_NETFILTER_XT_TARGET_NFLOG=y
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
-CONFIG_NETFILTER_XT_TARGET_TEE=y
-CONFIG_NETFILTER_XT_TARGET_TPROXY=y
-CONFIG_NETFILTER_XT_TARGET_TRACE=y
-CONFIG_NETFILTER_XT_TARGET_SECMARK=y
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
-CONFIG_NETFILTER_XT_MATCH_BPF=y
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_DSCP=y
-CONFIG_NETFILTER_XT_MATCH_ESP=y
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_HELPER=y
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
-CONFIG_NETFILTER_XT_MATCH_LENGTH=y
-CONFIG_NETFILTER_XT_MATCH_LIMIT=y
-CONFIG_NETFILTER_XT_MATCH_MAC=y
-CONFIG_NETFILTER_XT_MATCH_MARK=y
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
-CONFIG_NETFILTER_XT_MATCH_POLICY=y
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
-CONFIG_NETFILTER_XT_MATCH_SOCKET=y
-CONFIG_NETFILTER_XT_MATCH_STATE=y
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
-CONFIG_NETFILTER_XT_MATCH_STRING=y
-CONFIG_NETFILTER_XT_MATCH_TIME=y
-CONFIG_NETFILTER_XT_MATCH_U32=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_MATCH_ECN=y
-CONFIG_IP_NF_MATCH_TTL=y
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_IP_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_NETMAP=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
-CONFIG_IP_NF_MANGLE=y
-CONFIG_IP_NF_RAW=y
-CONFIG_IP_NF_SECURITY=y
-CONFIG_IP_NF_ARPTABLES=y
-CONFIG_IP_NF_ARPFILTER=y
-CONFIG_IP_NF_ARP_MANGLE=y
-CONFIG_IP6_NF_IPTABLES=y
-CONFIG_IP6_NF_MATCH_RPFILTER=y
-CONFIG_IP6_NF_FILTER=y
-CONFIG_IP6_NF_TARGET_REJECT=y
-CONFIG_IP6_NF_MANGLE=y
-CONFIG_IP6_NF_RAW=y
-CONFIG_TIPC=y
-CONFIG_L2TP=y
-CONFIG_BRIDGE=y
-CONFIG_VLAN_8021Q=y
-CONFIG_6LOWPAN=y
-CONFIG_IEEE802154=y
-CONFIG_IEEE802154_6LOWPAN=y
-CONFIG_MAC802154=y
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_HTB=y
-CONFIG_NET_SCH_PRIO=y
-CONFIG_NET_SCH_MULTIQ=y
-CONFIG_NET_SCH_SFQ=y
-CONFIG_NET_SCH_TBF=y
-CONFIG_NET_SCH_NETEM=y
-CONFIG_NET_SCH_CODEL=y
-CONFIG_NET_SCH_FQ_CODEL=y
-CONFIG_NET_SCH_FQ=y
-CONFIG_NET_SCH_INGRESS=y
-CONFIG_NET_CLS_BASIC=y
-CONFIG_NET_CLS_TCINDEX=y
-CONFIG_NET_CLS_FW=y
-CONFIG_NET_CLS_U32=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_FLOW=y
-CONFIG_NET_CLS_BPF=y
-CONFIG_NET_CLS_MATCHALL=y
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_CMP=y
-CONFIG_NET_EMATCH_NBYTE=y
-CONFIG_NET_EMATCH_U32=y
-CONFIG_NET_EMATCH_META=y
-CONFIG_NET_EMATCH_TEXT=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_ACT_GACT=y
-CONFIG_NET_ACT_MIRRED=y
-CONFIG_NET_ACT_SKBEDIT=y
-CONFIG_NET_ACT_BPF=y
-CONFIG_VSOCKETS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CAN=y
-CONFIG_BT=y
-CONFIG_BT_RFCOMM=y
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_HIDP=y
-CONFIG_BT_HCIBTSDIO=y
-CONFIG_BT_HCIUART=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_CFG80211=y
-CONFIG_NL80211_TESTMODE=y
-# CONFIG_CFG80211_DEFAULT_PS is not set
-# CONFIG_CFG80211_CRDA_SUPPORT is not set
-CONFIG_MAC80211=y
-CONFIG_RFKILL=y
-CONFIG_NFC=y
-CONFIG_PCI=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIEAER=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_HOST_GENERIC=y
-CONFIG_PCIE_DW_PLAT_EP=y
-CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_KIRIN=y
-CONFIG_PCI_ENDPOINT=y
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_CACHE is not set
-# CONFIG_SUN50I_DE2_BUS is not set
-# CONFIG_SUNXI_RSB is not set
-CONFIG_ARM_SCMI_PROTOCOL=y
-# CONFIG_ARM_SCMI_POWER_DOMAIN is not set
-CONFIG_ARM_SCPI_PROTOCOL=y
-# CONFIG_ARM_SCPI_POWER_DOMAIN is not set
-# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
-CONFIG_GNSS=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_SRAM=y
-CONFIG_UID_SYS_STATS=y
-CONFIG_SCSI=y
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_UFSHCD=y
-CONFIG_SCSI_UFSHCD_PCI=y
-CONFIG_SCSI_UFSHCD_PLATFORM=y
-CONFIG_SCSI_UFS_DWC_TC_PLATFORM=y
-CONFIG_SCSI_UFS_HISI=y
-CONFIG_SCSI_UFS_BSG=y
-CONFIG_SCSI_UFS_CRYPTO=y
-CONFIG_MD=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_DEFAULT_KEY=y
-CONFIG_DM_SNAPSHOT=y
-CONFIG_DM_UEVENT=y
-CONFIG_DM_VERITY=y
-CONFIG_DM_VERITY_FEC=y
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=y
-CONFIG_WIREGUARD=y
-CONFIG_IFB=y
-CONFIG_MACSEC=y
-CONFIG_TUN=y
-CONFIG_VETH=y
-CONFIG_PPP=y
-CONFIG_PPP_BSDCOMP=y
-CONFIG_PPP_DEFLATE=y
-CONFIG_PPP_MPPE=y
-CONFIG_PPTP=y
-CONFIG_PPPOL2TP=y
-CONFIG_USB_RTL8150=y
-CONFIG_USB_RTL8152=y
-CONFIG_USB_USBNET=y
-CONFIG_USB_NET_CDC_EEM=y
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_ZAURUS is not set
-CONFIG_USB_NET_AQC111=y
-# CONFIG_WLAN_VENDOR_ADMTEK is not set
-# CONFIG_WLAN_VENDOR_ATH is not set
-# CONFIG_WLAN_VENDOR_ATMEL is not set
-# CONFIG_WLAN_VENDOR_BROADCOM is not set
-# CONFIG_WLAN_VENDOR_CISCO is not set
-# CONFIG_WLAN_VENDOR_INTEL is not set
-# CONFIG_WLAN_VENDOR_INTERSIL is not set
-# CONFIG_WLAN_VENDOR_MARVELL is not set
-# CONFIG_WLAN_VENDOR_MEDIATEK is not set
-# CONFIG_WLAN_VENDOR_RALINK is not set
-# CONFIG_WLAN_VENDOR_REALTEK is not set
-# CONFIG_WLAN_VENDOR_RSI is not set
-# CONFIG_WLAN_VENDOR_ST is not set
-# CONFIG_WLAN_VENDOR_TI is not set
-# CONFIG_WLAN_VENDOR_ZYDAS is not set
-# CONFIG_WLAN_VENDOR_QUANTENNA is not set
-CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_MOUSE_PS2 is not set
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_XPAD=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=y
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_EXAR is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=0
-CONFIG_SERIAL_8250_DW=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_SERIAL_QCOM_GENI=y
-# CONFIG_SERIAL_QCOM_GENI_CONSOLE_DEFAULT_ENABLED is not set
-CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
-CONFIG_SERIAL_SPRD=y
-CONFIG_SERIAL_SPRD_CONSOLE=y
-CONFIG_HVC_DCC=y
-CONFIG_SERIAL_DEV_BUS=y
-CONFIG_HW_RANDOM=y
-# CONFIG_DEVMEM is not set
-# CONFIG_DEVPORT is not set
-CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_I2C_COMPAT is not set
-# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I3C=y
-CONFIG_SPI=y
-CONFIG_SPI_MEM=y
-CONFIG_SPMI=y
-# CONFIG_SPMI_MSM_PMIC_ARB is not set
-# CONFIG_PINCTRL_SUN8I_H3_R is not set
-# CONFIG_PINCTRL_SUN50I_A64 is not set
-# CONFIG_PINCTRL_SUN50I_A64_R is not set
-# CONFIG_PINCTRL_SUN50I_H5 is not set
-# CONFIG_PINCTRL_SUN50I_H6 is not set
-# CONFIG_PINCTRL_SUN50I_H6_R is not set
-CONFIG_GPIO_GENERIC_PLATFORM=y
-CONFIG_POWER_RESET_HISI=y
-CONFIG_POWER_RESET_SYSCON=y
-# CONFIG_HWMON is not set
-CONFIG_THERMAL=y
-CONFIG_THERMAL_NETLINK=y
-CONFIG_THERMAL_STATISTICS=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=100
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_CPU_THERMAL=y
-CONFIG_DEVFREQ_THERMAL=y
-CONFIG_THERMAL_EMULATION=y
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-CONFIG_MFD_ACT8945A=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_RC_CORE=y
-# CONFIG_RC_MAP is not set
-CONFIG_LIRC=y
-CONFIG_BPF_LIRC_MODE2=y
-CONFIG_RC_DECODERS=y
-CONFIG_RC_DEVICES=y
-CONFIG_MEDIA_CEC_RC=y
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_TEST_SUPPORT is not set
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=y
-CONFIG_USB_GSPCA=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_VGA_ARB is not set
-CONFIG_DRM=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_HRTIMER=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_DRIVERS is not set
-CONFIG_SND_USB_AUDIO=y
-CONFIG_SND_SOC=y
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=y
-CONFIG_HID_APPLE=y
-CONFIG_HID_PRODIKEYS=y
-CONFIG_HID_ELECOM=y
-CONFIG_HID_UCLOGIC=y
-CONFIG_HID_LOGITECH=y
-CONFIG_HID_LOGITECH_DJ=y
-CONFIG_HID_MAGICMOUSE=y
-CONFIG_HID_MICROSOFT=y
-CONFIG_HID_MULTITOUCH=y
-CONFIG_HID_NINTENDO=y
-CONFIG_HID_PICOLCD=y
-CONFIG_HID_PLANTRONICS=y
-CONFIG_HID_PLAYSTATION=y
-CONFIG_PLAYSTATION_FF=y
-CONFIG_HID_ROCCAT=y
-CONFIG_HID_SONY=y
-CONFIG_SONY_FF=y
-CONFIG_HID_STEAM=y
-CONFIG_HID_WACOM=y
-CONFIG_HID_WIIMOTE=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_OTG=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_ACM=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_UAS=y
-CONFIG_USB_DWC3=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_CONFIGFS=y
-CONFIG_USB_CONFIGFS_UEVENT=y
-CONFIG_USB_CONFIGFS_SERIAL=y
-CONFIG_USB_CONFIGFS_ACM=y
-CONFIG_USB_CONFIGFS_NCM=y
-CONFIG_USB_CONFIGFS_ECM=y
-CONFIG_USB_CONFIGFS_EEM=y
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_USB_CONFIGFS_F_ACC=y
-CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
-CONFIG_USB_CONFIGFS_F_UAC2=y
-CONFIG_USB_CONFIGFS_F_MIDI=y
-CONFIG_USB_CONFIGFS_F_HID=y
-CONFIG_TYPEC=y
-CONFIG_TYPEC_TCPM=y
-CONFIG_TYPEC_TCPCI=y
-CONFIG_TYPEC_UCSI=y
-CONFIG_MMC=y
-# CONFIG_PWRSEQ_EMMC is not set
-# CONFIG_PWRSEQ_SIMPLE is not set
-CONFIG_MMC_CRYPTO=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_LEDS_CLASS_FLASH=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_TRANSIENT=y
-CONFIG_EDAC=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_PL030=y
-CONFIG_RTC_DRV_PL031=y
-CONFIG_DMABUF_HEAPS=y
-CONFIG_DMABUF_SYSFS_STATS=y
-CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y
-CONFIG_DMABUF_HEAPS_PAGE_POOL=y
-CONFIG_UIO=y
-CONFIG_VHOST_VSOCK=y
-CONFIG_STAGING=y
-CONFIG_ASHMEM=y
-CONFIG_DEBUG_KINFO=y
-CONFIG_COMMON_CLK_SCPI=y
-# CONFIG_CLK_SUNXI is not set
-# CONFIG_SUNXI_CCU is not set
-CONFIG_HWSPINLOCK=y
-# CONFIG_SUN50I_ERRATUM_UNKNOWN1 is not set
-CONFIG_MAILBOX=y
-CONFIG_REMOTEPROC=y
-CONFIG_REMOTEPROC_CDEV=y
-CONFIG_RPMSG_CHAR=y
-CONFIG_QCOM_GENI_SE=y
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
-CONFIG_DEVFREQ_GOV_PASSIVE=y
-CONFIG_PM_DEVFREQ_EVENT=y
-CONFIG_IIO=y
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_TRIGGER=y
-CONFIG_PWM=y
-CONFIG_GENERIC_PHY=y
-CONFIG_POWERCAP=y
-CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDERFS=y
-CONFIG_ANDROID_DEBUG_SYMBOLS=y
-CONFIG_ANDROID_VENDOR_HOOKS=y
-CONFIG_LIBNVDIMM=y
-# CONFIG_ND_BLK is not set
-CONFIG_INTERCONNECT=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_F2FS_FS=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_FS_COMPRESSION=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
-CONFIG_FS_VERITY=y
-CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
-# CONFIG_DNOTIFY is not set
-CONFIG_QUOTA=y
-CONFIG_QFMT_V2=y
-CONFIG_FUSE_FS=y
-CONFIG_VIRTIO_FS=y
-CONFIG_OVERLAY_FS=y
-CONFIG_INCREMENTAL_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_EXFAT_FS=y
-CONFIG_TMPFS=y
-# CONFIG_EFIVAR_FS is not set
-CONFIG_PSTORE=y
-CONFIG_PSTORE_CONSOLE=y
-CONFIG_PSTORE_PMSG=y
-CONFIG_PSTORE_RAM=y
-CONFIG_EROFS_FS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_737=y
-CONFIG_NLS_CODEPAGE_775=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=y
-CONFIG_NLS_CODEPAGE_855=y
-CONFIG_NLS_CODEPAGE_857=y
-CONFIG_NLS_CODEPAGE_860=y
-CONFIG_NLS_CODEPAGE_861=y
-CONFIG_NLS_CODEPAGE_862=y
-CONFIG_NLS_CODEPAGE_863=y
-CONFIG_NLS_CODEPAGE_864=y
-CONFIG_NLS_CODEPAGE_865=y
-CONFIG_NLS_CODEPAGE_866=y
-CONFIG_NLS_CODEPAGE_869=y
-CONFIG_NLS_CODEPAGE_936=y
-CONFIG_NLS_CODEPAGE_950=y
-CONFIG_NLS_CODEPAGE_932=y
-CONFIG_NLS_CODEPAGE_949=y
-CONFIG_NLS_CODEPAGE_874=y
-CONFIG_NLS_ISO8859_8=y
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_CODEPAGE_1251=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=y
-CONFIG_NLS_ISO8859_3=y
-CONFIG_NLS_ISO8859_4=y
-CONFIG_NLS_ISO8859_5=y
-CONFIG_NLS_ISO8859_6=y
-CONFIG_NLS_ISO8859_7=y
-CONFIG_NLS_ISO8859_9=y
-CONFIG_NLS_ISO8859_13=y
-CONFIG_NLS_ISO8859_14=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_KOI8_R=y
-CONFIG_NLS_KOI8_U=y
-CONFIG_NLS_MAC_ROMAN=y
-CONFIG_NLS_MAC_CELTIC=y
-CONFIG_NLS_MAC_CENTEURO=y
-CONFIG_NLS_MAC_CROATIAN=y
-CONFIG_NLS_MAC_CYRILLIC=y
-CONFIG_NLS_MAC_GAELIC=y
-CONFIG_NLS_MAC_GREEK=y
-CONFIG_NLS_MAC_ICELAND=y
-CONFIG_NLS_MAC_INUIT=y
-CONFIG_NLS_MAC_ROMANIAN=y
-CONFIG_NLS_MAC_TURKISH=y
-CONFIG_NLS_UTF8=y
-CONFIG_UNICODE=y
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
-CONFIG_STATIC_USERMODEHELPER=y
-CONFIG_STATIC_USERMODEHELPER_PATH=""
-CONFIG_SECURITY_SELINUX=y
-CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-CONFIG_CRYPTO_CHACHA20POLY1305=y
-CONFIG_CRYPTO_ADIANTUM=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_CRYPTO_BLAKE2B=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_ZSTD=y
-CONFIG_CRYPTO_ANSI_CPRNG=y
-CONFIG_XZ_DEC=y
-CONFIG_DMA_CMA=y
-CONFIG_STACK_HASH_ORDER=12
-CONFIG_PRINTK_TIME=y
-CONFIG_PRINTK_CALLER=y
-CONFIG_DYNAMIC_DEBUG_CORE=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_INFO_DWARF4=y
-CONFIG_DEBUG_INFO_BTF=y
-CONFIG_MODULE_ALLOW_BTF_MISMATCH=y
-CONFIG_HEADERS_INSTALL=y
-# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_UBSAN=y
-CONFIG_UBSAN_TRAP=y
-CONFIG_UBSAN_LOCAL_BOUNDS=y
-# CONFIG_UBSAN_SHIFT is not set
-# CONFIG_UBSAN_BOOL is not set
-# CONFIG_UBSAN_ENUM is not set
-CONFIG_PAGE_OWNER=y
-CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_KASAN=y
-CONFIG_KASAN_HW_TAGS=y
-CONFIG_KFENCE=y
-CONFIG_KFENCE_SAMPLE_INTERVAL=500
-CONFIG_KFENCE_NUM_OBJECTS=63
-CONFIG_PANIC_ON_OOPS=y
-CONFIG_PANIC_TIMEOUT=-1
-CONFIG_SOFTLOCKUP_DETECTOR=y
-CONFIG_WQ_WATCHDOG=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_DEBUG_PREEMPT is not set
-CONFIG_BUG_ON_DATA_CORRUPTION=y
-CONFIG_TRACE_MMIO_ACCESS=y
-CONFIG_HIST_TRIGGERS=y
-CONFIG_PID_IN_CONTEXTIDR=y
-# CONFIG_RUNTIME_TESTING_MENU is not set
deleted file mode 100644
@@ -1,99 +0,0 @@
-From 1b2013986271de39360cf79e62ed9b7d2cc59f9b Mon Sep 17 00:00:00 2001
-From: Andres Freund <andres@anarazel.de>
-Date: Wed, 22 Jun 2022 11:19:18 -0700
-Subject: [PATCH] init_disassemble_info() signature changes causes compile
- failures
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Hi,
-
-binutils changed the signature of init_disassemble_info(), which now causes
-perf and bpftool to fail to compile (e.g. on debian unstable).
-
-Relevant binutils commit: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=60a3da00bd5407f07d64dff82a4dae98230dfaac
-
-util/annotate.c: In function ‘symbol__disassemble_bpf’:
-util/annotate.c:1765:9: error: too few arguments to function ‘init_disassemble_info’
- 1765 | init_disassemble_info(&info, s,
- | ^~~~~~~~~~~~~~~~~~~~~
-In file included from util/annotate.c:1718:
-/usr/include/dis-asm.h:472:13: note: declared here
- 472 | extern void init_disassemble_info (struct disassemble_info *dinfo, void *stream,
- | ^~~~~~~~~~~~~~~~~~~~~
-
-with equivalent failures in
-
-tools/bpf/bpf_jit_disasm.c
-tools/bpf/bpftool/jit_disasm.c
-
-The fix is easy enough, add a wrapper around fprintf() that conforms to the
-new signature.
-
-However I assume the necessary feature test and wrapper should only be added
-once? I don't know the kernel stuff well enough to choose the right structure
-here.
-
-Attached is my local fix for perf. Obviously would need work to be a real
-solution.
-
-Greetings,
-
-Andres Freund
----
-
-binutils 2.39 changed the signature of init_disassemble_info(),
-which now causes perf and bpftool to fail to compile.
-
-Relevant binutils commit: [1]
-
-There is a proper fix in development upstream[2].
-This is a work-around for older kernels.
-
-[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=60a3da00bd5407f07d64dff82a4dae98230dfaac
-[2] https://patchwork.kernel.org/project/netdevbpf/cover/20220801013834.156015-1-andres@anarazel.de/
-
-Upstream-Status: Pending
-Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
-
-
- tools/perf/util/annotate.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
-index 6c8575e182ed..466a3a68f5cd 100644
---- a/tools/perf/util/annotate.c
-+++ b/tools/perf/util/annotate.c
-@@ -1677,6 +1677,18 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil
- #include <bfd.h>
- #include <dis-asm.h>
-
-+static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...)
-+{
-+ va_list args;
-+ int r;
-+
-+ va_start(args, fmt);
-+ r = vprintf(fmt, args);
-+ va_end(args);
-+
-+ return r;
-+}
-+
- static int symbol__disassemble_bpf(struct symbol *sym,
- struct annotate_args *args)
- {
-@@ -1719,7 +1731,8 @@ static int symbol__disassemble_bpf(struct symbol *sym,
- goto out;
- }
- init_disassemble_info(&info, s,
-- (fprintf_ftype) fprintf);
-+ (fprintf_ftype) fprintf,
-+ fprintf_styled);
-
- info.arch = bfd_get_arch(bfdf);
- info.mach = bfd_get_mach(bfdf);
-2.30.2
-
deleted file mode 100644
@@ -1,8 +0,0 @@
-# Clang-specific configuration of kernel build
-
-# We need to add this dependency as the kernel configuration depends on the compiler
-do_kernel_configme[depends] += "androidclang-native:do_populate_sysroot"
-
-DEPENDS:append = " androidclang-native"
-
-KERNEL_CC = "${CCACHE}clang ${HOST_CC_KERNEL_ARCH}"
deleted file mode 100644
@@ -1,3 +0,0 @@
-LINUX_ARM64_ACK_TOOLCHAIN_REQUIRE = "${@oe.utils.ifelse(d.getVar('LINUX_ACK_TOOLCHAIN_CLANG'), 'linux-arm64-ack-clang.inc', '')}"
-
-require ${LINUX_ARM64_ACK_TOOLCHAIN_REQUIRE}
deleted file mode 100644
@@ -1,5 +0,0 @@
-# Machine specific configurations
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BP}:"
-
-require linux-arm-platforms.inc
deleted file mode 100644
@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (c) 2021 Arm Limited
-#
-
-DESCRIPTION = "Linux Android Common Kernel"
-SECTION = "kernel"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-require recipes-kernel/linux/linux-yocto.inc
-
-COMPATIBLE_MACHINE ?= "invalid"
-
-ARCH = "arm64"
-
-S = "${WORKDIR}/git"
-
-LINUX_VERSION ?= "${PV}"
-KERNEL_VERSION_SANITY_SKIP = "1"
-KBRANCH = ""
deleted file mode 100644
@@ -1,46 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-From af8dffeef974b488fd0f12723080a72b1b5f5822 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Sun, 10 Jul 2022 22:56:53 -0400
-Subject: [PATCH 1/2] lib/build_OID_registry: fix reproducibility issues
-
-The script build_OID_registry captures the full path of itself
-in the generated data. This causes reproduciblity issues as the
-path is captured and packaged.
-
-We use the basename of the script instead, and that allows us
-to be reprodicible, with slightly less information captured in
-the output data (but the generating script can still easily
-be found).
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
----
- lib/build_OID_registry | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/build_OID_registry b/lib/build_OID_registry
-index d7fc32ea8ac2..f6de0a7f7457 100755
---- a/lib/build_OID_registry
-+++ b/lib/build_OID_registry
-@@ -8,6 +8,7 @@
- #
-
- use strict;
-+use File::Basename;
-
- my @names = ();
- my @oids = ();
-@@ -35,7 +36,7 @@ close IN_FILE || die;
- #
- open C_FILE, ">$ARGV[1]" or die;
- print C_FILE "/*\n";
--print C_FILE " * Automatically generated by ", $0, ". Do not edit\n";
-+print C_FILE " * Automatically generated by ", basename $0, ". Do not edit\n";
- print C_FILE " */\n";
-
- #
-2.34.1
-
deleted file mode 100644
@@ -1,34 +0,0 @@
-Take a patch from linux-yocto to fix buildpaths in perf's python module.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-From b8cd0e429bf75b673c438a8277d4bc74327df992 Mon Sep 17 00:00:00 2001
-From: Tom Zanussi <tom.zanussi@intel.com>
-Date: Tue, 3 Jul 2012 13:07:23 -0500
-Subject: [PATCH] perf: change --root to --prefix for python install
-
-Otherwise we get the sysroot path appended to the build path, not what
-we want.
-
-Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
----
- tools/perf/Makefile.perf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
-index 8f738e11356d..ee945d8e3996 100644
---- a/tools/perf/Makefile.perf
-+++ b/tools/perf/Makefile.perf
-@@ -1022,7 +1022,7 @@ install-bin: install-tools install-tests install-traceevent-plugins
- install: install-bin try-install-man
-
- install-python_ext:
-- $(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)'
-+ $(PYTHON_WORD) util/setup.py --quiet install --prefix='$(DESTDIR_SQ)/usr'
-
- # 'make install-doc' should call 'make -C Documentation install'
- $(INSTALL_DOC_TARGETS):
-2.34.1
-
deleted file mode 100644
@@ -1,56 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-From 94b28f266f72c244051a2ec30ff4526a44b2ce85 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Sun, 10 Jul 2022 21:37:07 -0400
-Subject: [PATCH 2/2] vt/conmakehash: improve reproducibility
-
-The file generated by conmakehash capture the application
-path used to generate the file. While that can be informative,
-it varies based on where the kernel was built, as the full
-path is captured.
-
-We tweak the application to use a second input as the "capture
-name", and then modify the Makefile to pass the basename of
-the source, making it reproducible.
-
-This could be improved by using some sort of path mapping,
-or the application manipualing argv[1] itself, but for now
-this solves the reprodicibility issue.
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
----
- drivers/tty/vt/Makefile | 2 +-
- drivers/tty/vt/conmakehash.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
-index fe30ce512819..cb51c21b58f9 100644
---- a/drivers/tty/vt/Makefile
-+++ b/drivers/tty/vt/Makefile
-@@ -15,7 +15,7 @@ clean-files := consolemap_deftbl.c defkeymap.c
- hostprogs += conmakehash
-
- quiet_cmd_conmk = CONMK $@
-- cmd_conmk = $(obj)/conmakehash $< > $@
-+ cmd_conmk = $(obj)/conmakehash $< $(shell basename $<) > $@
-
- $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
- $(call cmd,conmk)
-diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
-index cddd789fe46e..d62510b280e9 100644
---- a/drivers/tty/vt/conmakehash.c
-+++ b/drivers/tty/vt/conmakehash.c
-@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
- #include <linux/types.h>\n\
- \n\
- u8 dfont_unicount[%d] = \n\
--{\n\t", argv[1], fontlen);
-+{\n\t", argv[2], fontlen);
-
- for ( i = 0 ; i < fontlen ; i++ )
- {
-2.34.1
-
deleted file mode 100644
@@ -1,15 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (c) 2022 Arm Limited
-#
-require linux-arm64-ack.inc
-
-SRC_URI = " \
- git://android.googlesource.com/kernel/common.git;protocol=https;branch=android13-5.15-lts \
- file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
- file://0002-vt-conmakehash-improve-reproducibility.patch \
- file://0001-perf-change-root-to-prefix-for-python-install.patch \
- "
-
-# tag: ASB-2022-05-05_13-5.15-93-ge8b3f31d7a60
-SRCREV = "e8b3f31d7a60648343ecbd45ab58dbcfc425b22c"
Drop usage of the Android kernel and legacy u-boot in favor of the latest of both Signed-off-by: Jon Mason <jon.mason@arm.com> --- meta-arm-bsp/conf/machine/include/tc.inc | 3 +- ...otal_compute-update-secure-dram-size.patch | 33 - ...ntroducing-Arm-FF-A-low-level-driver.patch | 2611 ------ .../0003-arm-total_compute-enable-psci.patch | 30 - ...ffa-rxtx_map-should-use-64-bit-calls.patch | 37 - ...-new-fmp-driver-that-supports-arm-fw.patch | 993 -- ...-total_compute-enable-capsule-update.patch | 70 - ...ap-rxtx-buffer-before-exiting-u-boot.patch | 51 - .../recipes-bsp/u-boot/u-boot/tc/bootargs.cfg | 2 +- .../recipes-bsp/u-boot/u-boot_%.bbappend | 7 - .../recipes-bsp/u-boot/u-boot_2022.04.bb | 26 - .../bsp/arm-platforms/tc-autofdo.scc | 1 - .../bsp/arm-platforms/tc.scc | 13 - .../bsp/arm-platforms/tc/autofdo.cfg | 3 - .../bsp/arm-platforms/tc/base.cfg | 12 - .../bsp/arm-platforms/tc/ci700.cfg | 1 - .../bsp/arm-platforms/tc/devtmpfs.cfg | 3 - .../bsp/arm-platforms/tc/dhcp.cfg | 2 - .../bsp/arm-platforms/tc/disable_btf.cfg | 1 - .../bsp/arm-platforms/tc/disable_mpam.cfg | 1 - .../bsp/arm-platforms/tc/ffa.cfg | 1 - .../bsp/arm-platforms/tc/gralloc.cfg | 2 - .../bsp/arm-platforms/tc/mali.cfg | 1 - .../bsp/arm-platforms/tc/optee.cfg | 2 - .../bsp/arm-platforms/tc/trusty.cfg | 1 - .../bsp/arm-platforms/tc/virtio.cfg | 2 - .../linux/linux-arm-platforms.inc | 52 +- ...m-Add-component-aware-simple-encoder.patch | 367 - ...andling-of-atomic-commits-in-the-ato.patch | 115 - ...dd-RENDER-capability-to-the-device-n.patch | 33 - ...-Fix-uuid-argument-passed-to-ffa_par.patch | 30 - ...ware-arm_ffa-Add-ffa_dev_get_drvdata.patch | 34 - ...firmware-arm_ffa-extern-ffa_bus_type.patch | 31 - ...-Fix-FFA_MEM_SHARE-and-FFA_MEM_FRAG_.patch | 55 - ...-driver-internal-tee_context-for-som.patch | 111 - ...e-add-sec_world_id-to-struct-tee_shm.patch | 45 - .../0009-optee-simplify-optee_release.patch | 181 - ...actor-driver-with-internal-callbacks.patch | 722 -- .../tc/0011-optee-isolate-smc-abi.patch | 3168 ------- .../tc/0012-optee-add-FF-A-support.patch | 1356 --- ...abi.c-add-missing-include-linux-mm.h.patch | 63 - ...Fix-spelling-mistake-reclain-reclaim.patch | 43 - .../0015-optee-fix-kfree-NULL-pointer.patch | 44 - ...rf-arm-cmn-Account-for-NUMA-affinity.patch | 107 - ...rm-cmn-Drop-compile-test-restriction.patch | 89 - ...rf-arm-cmn-Refactor-node-ID-handling.patch | 155 - ...rf-arm-cmn-Streamline-node-iteration.patch | 118 - ...0-perf-arm-cmn-Refactor-DTM-handling.patch | 406 - ...f-arm-cmn-Optimise-DTM-counter-reads.patch | 56 - ...rm-cmn-Optimise-DTC-counter-accesses.patch | 111 - ...Move-group-validation-data-off-stack.patch | 108 - ...-arm-cmn-Demarcate-CMN-600-specifics.patch | 466 - ...perf-arm-cmn-Support-new-IP-features.patch | 548 -- ...0026-perf-arm-cmn-Add-CI-700-Support.patch | 150 - ...OID-trusty-Backport-of-trusty-driver.patch | 8100 ----------------- ...ty-Remove-FFA-specific-initilization.patch | 1077 --- ...ename-transfer-memory-function-to-le.patch | 192 - ...sty-Separate-out-SMC-based-transport.patch | 496 - ...usty-Modify-device-compatible-string.patch | 57 - ...ROID-trusty-Add-transport-descriptor.patch | 210 - ...ANDROID-trusty-Add-trusty-ffa-driver.patch | 313 - ...fa-Add-support-for-FFA-memory-operat.patch | 152 - ...fa-Enable-FFA-transport-for-both-mem.patch | 143 - ...-Make-trusty-transports-configurable.patch | 147 - ...-trusty-log-include-panic_notifier.h.patch | 27 - ...usty-ipc-fix-VIRTIO_ID_TRUSTY_IPC-ID.patch | 30 - .../0039-gki_config-add-tc-disable_mpam.patch | 27 - ...-KVM-arm64-disable-FFA-driver-at-EL2.patch | 52 - ...st-ether_addr-prototypes-to-silence-.patch | 66 - ...x-building-error-on-Werror-array-com.patch | 45 - .../linux-arm64-ack-5.15/tc/gki_defconfig | 693 -- ...ture-changes-causes-compile-failures.patch | 99 - .../linux/linux-arm64-ack-clang.inc | 8 - .../linux/linux-arm64-ack_%.bbappend | 3 - .../linux/linux-arm64-ack_5.15.bbappend | 5 - .../recipes-kernel/linux/linux-arm64-ack.inc | 21 - ..._registry-fix-reproducibility-issues.patch | 46 - ...ge-root-to-prefix-for-python-install.patch | 34 - ...-conmakehash-improve-reproducibility.patch | 56 - .../linux/linux-arm64-ack_5.15.bb | 15 - 80 files changed, 3 insertions(+), 24784 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0001-arm-total_compute-update-secure-dram-size.patch delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0002-arm_ffa-introducing-Arm-FF-A-low-level-driver.patch delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0003-arm-total_compute-enable-psci.patch delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0004-arm_ffa-rxtx_map-should-use-64-bit-calls.patch delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0005-efi_firmware-add-new-fmp-driver-that-supports-arm-fw.patch delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0006-arm-total_compute-enable-capsule-update.patch delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0007-arm_ffa-unmap-rxtx-buffer-before-exiting-u-boot.patch delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2022.04.bb delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc-autofdo.scc delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc.scc delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/autofdo.cfg delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/base.cfg delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/ci700.cfg delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/devtmpfs.cfg delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/dhcp.cfg delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/disable_btf.cfg delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/disable_mpam.cfg delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/ffa.cfg delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/gralloc.cfg delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/mali.cfg delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/optee.cfg delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/trusty.cfg delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/virtio.cfg delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0001-drm-Add-component-aware-simple-encoder.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0001-drm-komeda-Fix-handling-of-atomic-commits-in-the-ato.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0002-drm-arm-komeda-add-RENDER-capability-to-the-device-n.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0003-firmware-arm_ffa-Fix-uuid-argument-passed-to-ffa_par.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0004-firmware-arm_ffa-Add-ffa_dev_get_drvdata.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0005-firmware-arm_ffa-extern-ffa_bus_type.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0006-firmware-arm_ffa-Fix-FFA_MEM_SHARE-and-FFA_MEM_FRAG_.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0007-Revert-optee-use-driver-internal-tee_context-for-som.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0008-tee-add-sec_world_id-to-struct-tee_shm.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0009-optee-simplify-optee_release.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0010-optee-refactor-driver-with-internal-callbacks.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0011-optee-isolate-smc-abi.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0012-optee-add-FF-A-support.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0013-optee-smc_abi.c-add-missing-include-linux-mm.h.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0014-optee-Fix-spelling-mistake-reclain-reclaim.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0015-optee-fix-kfree-NULL-pointer.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0016-perf-arm-cmn-Account-for-NUMA-affinity.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0017-perf-arm-cmn-Drop-compile-test-restriction.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0018-perf-arm-cmn-Refactor-node-ID-handling.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0019-perf-arm-cmn-Streamline-node-iteration.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0020-perf-arm-cmn-Refactor-DTM-handling.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0021-perf-arm-cmn-Optimise-DTM-counter-reads.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0022-perf-arm-cmn-Optimise-DTC-counter-accesses.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0023-perf-arm-cmn-Move-group-validation-data-off-stack.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0024-perf-arm-cmn-Demarcate-CMN-600-specifics.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0025-perf-arm-cmn-Support-new-IP-features.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0026-perf-arm-cmn-Add-CI-700-Support.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0027-ANDROID-trusty-Backport-of-trusty-driver.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0028-ANDROID-trusty-Remove-FFA-specific-initilization.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0029-ANDROID-trusty-Rename-transfer-memory-function-to-le.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0030-ANDROID-trusty-Separate-out-SMC-based-transport.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0031-ANDROID-trusty-Modify-device-compatible-string.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0032-ANDROID-trusty-Add-transport-descriptor.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0033-ANDROID-trusty-Add-trusty-ffa-driver.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0034-ANDROID-trusty-ffa-Add-support-for-FFA-memory-operat.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0035-ANDROID-trusty-ffa-Enable-FFA-transport-for-both-mem.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0036-ANDROID-trusty-Make-trusty-transports-configurable.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0037-ANDROID-trusty-log-include-panic_notifier.h.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0038-ANDROID-trusty-ipc-fix-VIRTIO_ID_TRUSTY_IPC-ID.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0039-gki_config-add-tc-disable_mpam.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0040-ANDROID-KVM-arm64-disable-FFA-driver-at-EL2.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0041-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/0042-mm-page_alloc-fix-building-error-on-Werror-array-com.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/gki_defconfig delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.15/tc/init_disassemble_info-signature-changes-causes-compile-failures.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-clang.inc delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_%.bbappend delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_5.15.bbappend delete mode 100644 meta-arm/recipes-kernel/linux/linux-arm64-ack.inc delete mode 100644 meta-arm/recipes-kernel/linux/linux-arm64-ack/0001-lib-build_OID_registry-fix-reproducibility-issues.patch delete mode 100644 meta-arm/recipes-kernel/linux/linux-arm64-ack/0001-perf-change-root-to-prefix-for-python-install.patch delete mode 100644 meta-arm/recipes-kernel/linux/linux-arm64-ack/0002-vt-conmakehash-improve-reproducibility.patch delete mode 100644 meta-arm/recipes-kernel/linux/linux-arm64-ack_5.15.bb