Skip to contentSkip to conversation

arm-toolchain: Fetch prebuilt Android Clang, version r416183b

PATCH Applied Anders Dellien 4 participants 7 messages Jan 17, 2022 – Jan 18, 2022

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 arm-toolchain: Fetch prebuilt Android Clang, version r416183b

From: Usama Arif <[email protected]>

This Clang version is present in Android master
(as of October 8, 2021)

Change-Id I957742ee943ef68119fd7c7e2bd8ee62b717b31c
---
 .../androidclang_r416183b.bb                  | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/androidclang_r416183b.bb
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/androidclang_r416183b.bb new file +50 -0
new file mode 100644
index 00000000..316cbb93
@@ -0,0 +1,50 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2021 Arm Limited
+#
+
+SUMMARY = "Android Clang compiler"
+DESCRIPTION = "Android Clang compiler, version r416183b. This is based on Clang 12.0.5 \
+Intended usage is to build kernel images that match the output of the Android (hermetic) \
+build system"
+
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://MODULE_LICENSE_MIT;md5=d41d8cd98f00b204e9800998ecf8427e"
+
+ANDROID_CLANG_VERSION = "clang-r416183b"
+ANDROID_CLANG_HASH = "bd96dfe349c962681f0e5388af874c771ef96670"
+
+COMPATIBLE_HOST = "x86_64.*-linux"
+
+SRC_URI = "https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+archive/${ANDROID_CLANG_HASH}/${ANDROID_CLANG_VERSION}.tar.gz;subdir=${ANDROID_CLANG_VERSION}"
+
+# We need to set the checksum to "ignore" because the tarball is dynamically generated and has a new checksum every time
+# (the contents are the same, but the time stamp differs)
+BB_STRICT_CHECKSUM = "ignore"
+
+S = "${WORKDIR}/${ANDROID_CLANG_VERSION}"
+
+do_install() {
+    # We should really use ${libexecdir} here, but that as some files have invalid RPATH
+    # this results in lots of warning. So using ${datadir} for now
+    install -d ${D}${datadir}/${ANDROID_CLANG_VERSION}/
+
+    cp --no-preserve=ownership -r ${S}/. ${D}${datadir}/${ANDROID_CLANG_VERSION}/
+
+    install -d ${D}${bindir}
+    # Symlink all executables into bindir
+    for f in ${D}${datadir}/${ANDROID_CLANG_VERSION}/bin/*; do
+        ln -rs $f ${D}${bindir}/$(basename $f)
+    done
+}
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+INSANE_SKIP:${PN} = "already-stripped libdir staticdev file-rdeps arch dev-so"
+
+INHIBIT_SYSROOT_STRIP = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/3 arm-toolchain: Support linux-arm64-ack build with Android Clang

This commit introduces a configuration variable, LINUX_ACK_TOOLCHAIN_CLANG, that (if set) switches the kernel build to use the Android Clang compiler

Change-Id: Iab362916159bf6e8096061f1b7281a7513001d61

---
 .../recipes-kernel/linux/linux-arm64-ack-clang.inc        | 8 ++++++++
 .../recipes-kernel/linux/linux-arm64-ack_%.bbappend       | 3 +++
 2 files changed, 11 insertions(+)
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-clang.inc
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_%.bbappend
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-clang.inc new file +8 -0
new file mode 100644
index 00000000..c5b74634
@@ -0,0 +1,8 @@
+# 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}"
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_%.bbappend new file +3 -0
new file mode 100644
index 00000000..301041bc
@@ -0,0 +1,3 @@
+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}
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/3 arm: update Android common kernel and config

In reply to Anders Dellien

Move to newer tag of ACK as well as update to the latest gki_defconfig using fragments to support TC.

Change-Id I71fe31730ce063e9604b8adc879e0a626b3320e7
---
 .../bsp/arm-platforms/tc.scc                  |   7 +
 .../bsp/arm-platforms/tc/base.cfg             |  12 +
 .../bsp/arm-platforms/tc/devtmpfs.cfg         |   3 +
 .../bsp/arm-platforms/tc/dhcp.cfg             |   2 +
 .../bsp/arm-platforms/tc/gralloc.cfg          |   2 +
 .../bsp/arm-platforms/tc/mali.cfg             |   1 +
 .../bsp/arm-platforms/tc/tee.cfg              |   3 +
 .../bsp/arm-platforms/tc/virtio.cfg           |   2 +
 .../linux/linux-arm-platforms.inc             |  60 +-
 ...m-Add-component-aware-simple-encoder.patch |   4 +-
 ...dd-RENDER-capability-to-the-device-n.patch |   4 +-
 ...Adapt-ION-interface-to-match-Android.patch |  33 -
 ...ings-mailbox-arm-mhuv2-Add-bindings.patch} |   4 +-
 ...> 0004-mailbox-arm_mhuv2-Add-driver.patch} |   8 +-
 ...ilbox-arm_mhuv2-Fix-sparse-warnings.patch} |   4 +-
 ...v2-make-remove-callback-return-void.patch} |   4 +-
 ...-Skip-calling-kfree-with-invalid-po.patch} |   4 +-
 ...upport-for-SMCCCv1.2-extended-input.patch} |  10 +-
 ...Add-initial-FFA-bus-support-for-dev.patch} |   6 +-
 ...-Add-initial-Arm-FFA-driver-support.patch} |   6 +-
 ...Add-support-for-SMCCC-as-transport-.patch} |   6 +-
 ...Setup-in-kernel-users-of-FFA-partit.patch} |   6 +-
 ...ffa-Add-support-for-MEM_-interfaces.patch} |   6 +-
 ...-add-sec_world_id-to-struct-tee_shm.patch} |   6 +-
 ...> 0015-optee-simplify-optee_release.patch} |  12 +-
 ...h => 0016-optee-sync-OP-TEE-headers.patch} |  16 +-
 ...ctor-driver-with-internal-callbacks.patch} |  41 +-
 ...> 0018-optee-add-a-FF-A-memory-pool.patch} |   6 +-
 ...atch => 0019-optee-add-FF-A-support.patch} |  21 +-
 ...optee-hack-for-UUID-endianess-issue.patch} |   6 +-
 ...21-arm_ffa-add-support-for-FFA-v1.1.patch} |   4 +-
 .../linux/linux-arm64-ack-5.10/tc/defconfig   | 979 ------------------
 .../linux-arm64-ack-5.10/tc/gki_defconfig     | 689 ++++++++++++
 .../linux/linux-arm64-ack_5.10.bb             |   4 +-
 34 files changed, 842 insertions(+), 1139 deletions(-)
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc.scc
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/base.cfg
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/devtmpfs.cfg
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/dhcp.cfg
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/gralloc.cfg
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/mali.cfg
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/tee.cfg
 create 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.10/tc/0003-Adapt-ION-interface-to-match-Android.patch
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0004-dt-bindings-mailbox-arm-mhuv2-Add-bindings.patch => 0003-dt-bindings-mailbox-arm-mhuv2-Add-bindings.patch} (98%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0005-mailbox-arm_mhuv2-Add-driver.patch => 0004-mailbox-arm_mhuv2-Add-driver.patch} (99%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0006-mailbox-arm_mhuv2-Fix-sparse-warnings.patch => 0005-mailbox-arm_mhuv2-Fix-sparse-warnings.patch} (97%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0007-mailbox-arm_mhuv2-make-remove-callback-return-void.patch => 0006-mailbox-arm_mhuv2-make-remove-callback-return-void.patch} (92%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0008-mailbox-arm_mhuv2-Skip-calling-kfree-with-invalid-po.patch => 0007-mailbox-arm_mhuv2-Skip-calling-kfree-with-invalid-po.patch} (90%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0009-arm64-smccc-Add-support-for-SMCCCv1.2-extended-input.patch => 0008-arm64-smccc-Add-support-for-SMCCCv1.2-extended-input.patch} (97%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0010-firmware-arm_ffa-Add-initial-FFA-bus-support-for-dev.patch => 0009-firmware-arm_ffa-Add-initial-FFA-bus-support-for-dev.patch} (98%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0011-firmware-arm_ffa-Add-initial-Arm-FFA-driver-support.patch => 0010-firmware-arm_ffa-Add-initial-Arm-FFA-driver-support.patch} (98%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0012-firmware-arm_ffa-Add-support-for-SMCCC-as-transport-.patch => 0011-firmware-arm_ffa-Add-support-for-SMCCC-as-transport-.patch} (96%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0013-firmware-arm_ffa-Setup-in-kernel-users-of-FFA-partit.patch => 0012-firmware-arm_ffa-Setup-in-kernel-users-of-FFA-partit.patch} (98%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0014-firmware-arm_ffa-Add-support-for-MEM_-interfaces.patch => 0013-firmware-arm_ffa-Add-support-for-MEM_-interfaces.patch} (98%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0015-tee-add-sec_world_id-to-struct-tee_shm.patch => 0014-tee-add-sec_world_id-to-struct-tee_shm.patch} (91%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0016-optee-simplify-optee_release.patch => 0015-optee-simplify-optee_release.patch} (94%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0017-optee-sync-OP-TEE-headers.patch => 0016-optee-sync-OP-TEE-headers.patch} (98%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0018-optee-refactor-driver-with-internal-callbacks.patch => 0017-optee-refactor-driver-with-internal-callbacks.patch} (94%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0019-optee-add-a-FF-A-memory-pool.patch => 0018-optee-add-a-FF-A-memory-pool.patch} (96%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0020-optee-add-FF-A-support.patch => 0019-optee-add-FF-A-support.patch} (98%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0021-drivers-optee-hack-for-UUID-endianess-issue.patch => 0020-drivers-optee-hack-for-UUID-endianess-issue.patch} (92%)
 rename meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/{0022-arm_ffa-add-support-for-FFA-v1.1.patch => 0021-arm_ffa-add-support-for-FFA-v1.1.patch} (90%)
 delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/defconfig
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/gki_defconfig
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc.scc new file +7 -0
new file mode 100644
index 00000000..86e450c6
@@ -0,0 +1,7 @@
+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/tee.cfg
+kconf non-hardware tc/virtio.cfg
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/base.cfg new file +12 -0
new file mode 100644
index 00000000..90b08f12
@@ -0,0 +1,12 @@
+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
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/devtmpfs.cfg new file +3 -0
new file mode 100644
index 00000000..abde4123
@@ -0,0 +1,3 @@
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_VT=y
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/dhcp.cfg new file +2 -0
new file mode 100644
index 00000000..78c5a040
@@ -0,0 +1,2 @@
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/gralloc.cfg new file +2 -0
new file mode 100644
index 00000000..22abcb54
@@ -0,0 +1,2 @@
+CONFIG_DMABUF_HEAPS_SYSTEM=y
+CONFIG_DMABUF_HEAPS_CMA=y
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/mali.cfg new file +1 -0
new file mode 100644
index 00000000..166818f9
@@ -0,0 +1 @@
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/tee.cfg new file +3 -0
new file mode 100644
index 00000000..4b9cbd8c
@@ -0,0 +1,3 @@
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+CONFIG_ARM_FFA_TRANSPORT=y
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/tc/virtio.cfg new file +2 -0
new file mode 100644
index 00000000..9e6d21c4
@@ -0,0 +1,2 @@
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_MMIO=y
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +26 -34

74 lines not on this page · raw message

meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0001-drm-Add-component-aware-simple-encoder.patch +2 -2
index b698ec70..15860349 100644
@@ -1,7 +1,7 @@
-From 9080fb7fc011445d4d6ee164d02d86ff6df0822a Mon Sep 17 00:00:00 2001
+From 39e6b51150c36dd659b85de0c4339594da389da9 Mon Sep 17 00:00:00 2001
 From: Tushar Khandelwal <[email protected]>
 Date: Tue, 16 Jun 2020 12:39:06 +0000
-Subject: [PATCH 01/10] drm: Add component-aware simple encoder
+Subject: [PATCH 01/22] 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"
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0002-drm-arm-komeda-add-RENDER-capability-to-the-device-n.patch +2 -2
index c3febffc..77519f14 100644
@@ -1,7 +1,7 @@
-From 7a0e6189c7b104a679bc7b91465425e2de909456 Mon Sep 17 00:00:00 2001
+From 1b2c200673b4a08324f3a6575b30bd16030ed586 Mon Sep 17 00:00:00 2001
 From: Tushar Khandelwal <[email protected]>
 Date: Wed, 17 Jun 2020 10:49:26 +0000
-Subject: [PATCH 02/10] drm: arm: komeda: add RENDER capability to the device
+Subject: [PATCH 02/22] drm: arm: komeda: add RENDER capability to the device
  node
 
 this is required to make this driver work with android framework
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0003-Adapt-ION-interface-to-match-Android.patch deleted +0 -33
deleted file mode 100644
index 1d6a4033..00000000
@@ -1,33 +0,0 @@
-From b98c6070320ad31318a028482f026d6a5eddce5b Mon Sep 17 00:00:00 2001
-From: Anders Dellien <[email protected]>
-Date: Fri, 29 Jan 2021 09:44:38 +0000
-Subject: [PATCH 03/10] Adapt ION interface to match Android
-
-Change-Id: I62b69cc357868f725170899c862530b8f3069666
-Signed-off-by: Anders Dellien <[email protected]>
-
-Upstream-Status: Inappropriate [Product specific configuration]
-Signed-off-by: Arunachalam Ganapathy <[email protected]>
----
- include/uapi/linux/ion.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/include/uapi/linux/ion.h b/include/uapi/linux/ion.h
-index 371e44662755..7022ea223736 100644
---- a/include/uapi/linux/ion.h
-+++ b/include/uapi/linux/ion.h
-@@ -24,7 +24,10 @@
-  */
- enum ion_heap_type {
- 	ION_HEAP_TYPE_SYSTEM = 0,
--	ION_HEAP_TYPE_DMA = 2,
-+       ION_HEAP_TYPE_SYSTEM_CONTIG = 1,
-+       ION_HEAP_TYPE_CARVEOUT = 2,
-+       ION_HEAP_TYPE_CHUNK = 3,
-+       ION_HEAP_TYPE_DMA = 4,
- 	/* reserved range for future standard heap types */
- 	ION_HEAP_TYPE_CUSTOM = 16,
- 	ION_HEAP_TYPE_MAX = 31,
--- 
-2.17.1
-
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0003-dt-bindings-mailbox-arm-mhuv2-Add-bindings.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0004-dt-bindings-mailbox-arm-mhuv2-Add-bindings.patch +2 -2
similarity index 98%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0004-dt-bindings-mailbox-arm-mhuv2-Add-bindings.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0003-dt-bindings-mailbox-arm-mhuv2-Add-bindings.patch
index be5801ab..1da75ea8 100644
@@ -1,7 +1,7 @@
-From 4cafac5cd54c7f5069a4d6e17bdbd8f94cd5fa0b Mon Sep 17 00:00:00 2001
+From cdda49168d42c897574388356555f8130c021bb5 Mon Sep 17 00:00:00 2001
 From: Viresh Kumar <[email protected]>
 Date: Tue, 17 Nov 2020 15:32:05 +0530
-Subject: [PATCH 04/10] dt-bindings: mailbox : arm,mhuv2: Add bindings
+Subject: [PATCH 03/22] dt-bindings: mailbox : arm,mhuv2: Add bindings
 
 This patch adds device tree binding for ARM Message Handling Unit (MHU)
 controller version 2.
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0004-mailbox-arm_mhuv2-Add-driver.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0005-mailbox-arm_mhuv2-Add-driver.patch +4 -4
similarity index 99%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0005-mailbox-arm_mhuv2-Add-driver.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0004-mailbox-arm_mhuv2-Add-driver.patch
index f3f90ed1..a4dd9612 100644
@@ -1,7 +1,7 @@
-From 51f0bb9cf8e8fca22b040d89e7be802c5ea0cf16 Mon Sep 17 00:00:00 2001
+From eadd9235d084da8022df2d232c90590f2160e433 Mon Sep 17 00:00:00 2001
 From: Viresh Kumar <[email protected]>
 Date: Tue, 17 Nov 2020 15:32:06 +0530
-Subject: [PATCH 05/10] mailbox: arm_mhuv2: Add driver
+Subject: [PATCH 04/22] mailbox: arm_mhuv2: Add driver
 
 This adds driver for the ARM MHUv2 (Message Handling Unit) mailbox
 controller.
@@ -33,10 +33,10 @@ Signed-off-by: Arunachalam Ganapathy <[email protected]>
  create mode 100644 include/linux/mailbox/arm_mhuv2_message.h
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index db2a3dfb063d..389f356aed5d 100644
+index 354831907474..5234423c477a 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -10458,6 +10458,15 @@ F:	drivers/mailbox/
+@@ -10459,6 +10459,15 @@ F:	drivers/mailbox/
  F:	include/linux/mailbox_client.h
  F:	include/linux/mailbox_controller.h
  
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0005-mailbox-arm_mhuv2-Fix-sparse-warnings.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0006-mailbox-arm_mhuv2-Fix-sparse-warnings.patch +2 -2
similarity index 97%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0006-mailbox-arm_mhuv2-Fix-sparse-warnings.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0005-mailbox-arm_mhuv2-Fix-sparse-warnings.patch
index 46fe1aa5..8905f745 100644
@@ -1,7 +1,7 @@
-From f082677cb35ea843e749e1c9e5a9b9fba44c5d48 Mon Sep 17 00:00:00 2001
+From 1c75e7d566e29258e9daf7b1548f2d681efb4aea Mon Sep 17 00:00:00 2001
 From: Viresh Kumar <[email protected]>
 Date: Wed, 30 Dec 2020 10:12:04 +0530
-Subject: [PATCH 06/10] mailbox: arm_mhuv2: Fix sparse warnings
+Subject: [PATCH 05/22] mailbox: arm_mhuv2: Fix sparse warnings
 
 This patch fixes a bunch of sparse warnings in the newly added arm_mhuv2
 driver.
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0006-mailbox-arm_mhuv2-make-remove-callback-return-void.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0007-mailbox-arm_mhuv2-make-remove-callback-return-void.patch +2 -2
similarity index 92%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0007-mailbox-arm_mhuv2-make-remove-callback-return-void.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0006-mailbox-arm_mhuv2-make-remove-callback-return-void.patch
index cd1bb0b1..a353f31b 100644
@@ -1,7 +1,7 @@
-From a0e07a4d72dfe8892ebcfb29c0a1007c35eebd66 Mon Sep 17 00:00:00 2001
+From 107f39e7741bb77688df47ce3f56b25cceb301c3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <[email protected]>
 Date: Tue, 2 Feb 2021 20:43:08 +0100
-Subject: [PATCH 07/10] mailbox: arm_mhuv2: make remove callback return void
+Subject: [PATCH 06/22] mailbox: arm_mhuv2: make remove callback return void
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0007-mailbox-arm_mhuv2-Skip-calling-kfree-with-invalid-po.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0008-mailbox-arm_mhuv2-Skip-calling-kfree-with-invalid-po.patch +2 -2
similarity index 90%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0008-mailbox-arm_mhuv2-Skip-calling-kfree-with-invalid-po.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0007-mailbox-arm_mhuv2-Skip-calling-kfree-with-invalid-po.patch
index 6553594f..cf5b0b06 100644
@@ -1,7 +1,7 @@
-From c55091b7738802c503b1ce4276ee85d601604506 Mon Sep 17 00:00:00 2001
+From 81d76e92b03a6f33acefd8aef168948c5f595205 Mon Sep 17 00:00:00 2001
 From: Viresh Kumar <[email protected]>
 Date: Mon, 22 Feb 2021 12:48:06 +0530
-Subject: [PATCH 08/10] mailbox: arm_mhuv2: Skip calling kfree() with invalid
+Subject: [PATCH 07/22] mailbox: arm_mhuv2: Skip calling kfree() with invalid
  pointer
 
 It is possible that 'data' passed to kfree() is set to a error value
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0008-arm64-smccc-Add-support-for-SMCCCv1.2-extended-input.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0009-arm64-smccc-Add-support-for-SMCCCv1.2-extended-input.patch +5 -5
similarity index 97%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0009-arm64-smccc-Add-support-for-SMCCCv1.2-extended-input.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0008-arm64-smccc-Add-support-for-SMCCCv1.2-extended-input.patch
index ddcc4886..fdd74689 100644
@@ -1,7 +1,7 @@
-From 6cc4b54570d508413982d86bf68f60ccdb8687f8 Mon Sep 17 00:00:00 2001
+From 8f51e94b1c2c605fee7376fdb7ebac6a8fe16789 Mon Sep 17 00:00:00 2001
 From: Sudeep Holla <[email protected]>
 Date: Fri, 30 Apr 2021 11:24:24 +0100
-Subject: [PATCH 01/14] arm64: smccc: Add support for SMCCCv1.2 extended
+Subject: [PATCH 08/22] arm64: smccc: Add support for SMCCCv1.2 extended
  input/output registers
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -33,10 +33,10 @@ Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/sudee
  3 files changed, 121 insertions(+)
 
 diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
-index f396d951ee54..6545c497064e 100644
+index 93da876a58e6..bad4a367da28 100644
 --- a/arch/arm64/kernel/asm-offsets.c
 +++ b/arch/arm64/kernel/asm-offsets.c
-@@ -138,6 +138,15 @@ int main(void)
+@@ -139,6 +139,15 @@ int main(void)
    DEFINE(ARM_SMCCC_RES_X2_OFFS,		offsetof(struct arm_smccc_res, a2));
    DEFINE(ARM_SMCCC_QUIRK_ID_OFFS,	offsetof(struct arm_smccc_quirk, id));
    DEFINE(ARM_SMCCC_QUIRK_STATE_OFFS,	offsetof(struct arm_smccc_quirk, state));
@@ -184,5 +184,5 @@ index 62c54234576c..c8eb24af3c62 100644
   * struct arm_smccc_quirk - Contains quirk information
   * @id: quirk identification
 -- 
-2.29.2
+2.17.1
 
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0009-firmware-arm_ffa-Add-initial-FFA-bus-support-for-dev.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0010-firmware-arm_ffa-Add-initial-FFA-bus-support-for-dev.patch +3 -3
similarity index 98%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0010-firmware-arm_ffa-Add-initial-FFA-bus-support-for-dev.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0009-firmware-arm_ffa-Add-initial-FFA-bus-support-for-dev.patch
index 1083ffe5..fc53fccc 100644
@@ -1,7 +1,7 @@
-From 12e789c445956198f2c09798ecfc44fb2ff98b8e Mon Sep 17 00:00:00 2001
+From 95591bf20e67a2f9635b7823baf7975946a630c2 Mon Sep 17 00:00:00 2001
 From: Sudeep Holla <[email protected]>
 Date: Fri, 30 Apr 2021 11:24:33 +0100
-Subject: [PATCH 02/14] firmware: arm_ffa: Add initial FFA bus support for
+Subject: [PATCH 09/22] firmware: arm_ffa: Add initial FFA bus support for
  device enumeration
 
 The Arm FF for Armv8-A specification has concept of endpoints or
@@ -416,5 +416,5 @@ index 000000000000..aaff89364541
 +
 +#endif /* _LINUX_ARM_FFA_H */
 -- 
-2.29.2
+2.17.1
 
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0010-firmware-arm_ffa-Add-initial-Arm-FFA-driver-support.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0011-firmware-arm_ffa-Add-initial-Arm-FFA-driver-support.patch +3 -3
similarity index 98%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0011-firmware-arm_ffa-Add-initial-Arm-FFA-driver-support.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0010-firmware-arm_ffa-Add-initial-Arm-FFA-driver-support.patch
index 5236c231..7bba11c3 100644
@@ -1,7 +1,7 @@
-From 09e109d71c11f6c990d272cf5cc2c5515f184705 Mon Sep 17 00:00:00 2001
+From b81111a9cdfc182fb0ee5f219ab16710cd9146cd Mon Sep 17 00:00:00 2001
 From: Sudeep Holla <[email protected]>
 Date: Fri, 30 Apr 2021 11:24:39 +0100
-Subject: [PATCH 03/14] firmware: arm_ffa: Add initial Arm FFA driver support
+Subject: [PATCH 10/22] firmware: arm_ffa: Add initial Arm FFA driver support
 
 This just add a basic driver that sets up the transport(e.g. SMCCC),
 checks the FFA version implemented, get the partition ID for self and
@@ -411,5 +411,5 @@ index 000000000000..d74f03b773d2
 +MODULE_DESCRIPTION("Arm FF-A interface driver");
 +MODULE_LICENSE("GPL v2");
 -- 
-2.29.2
+2.17.1
 
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0011-firmware-arm_ffa-Add-support-for-SMCCC-as-transport-.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0012-firmware-arm_ffa-Add-support-for-SMCCC-as-transport-.patch +3 -3
similarity index 96%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0012-firmware-arm_ffa-Add-support-for-SMCCC-as-transport-.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0011-firmware-arm_ffa-Add-support-for-SMCCC-as-transport-.patch
index 27964e19..d62c4b62 100644
@@ -1,7 +1,7 @@
-From a4e518ab87ffdff5bbfa629334dff4a37524e579 Mon Sep 17 00:00:00 2001
+From 22b6c0e78b031f97af093f4d2b26984c42cf4c22 Mon Sep 17 00:00:00 2001
 From: Sudeep Holla <[email protected]>
 Date: Fri, 30 Apr 2021 11:24:43 +0100
-Subject: [PATCH 04/14] firmware: arm_ffa: Add support for SMCCC as transport
+Subject: [PATCH 11/22] firmware: arm_ffa: Add support for SMCCC as transport
  to FFA driver
 
 There are requests to keep the transport separate in order to allow
@@ -111,5 +111,5 @@ index 000000000000..22c34b788769
 +	return 0;
 +}
 -- 
-2.29.2
+2.17.1
 
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0012-firmware-arm_ffa-Setup-in-kernel-users-of-FFA-partit.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0013-firmware-arm_ffa-Setup-in-kernel-users-of-FFA-partit.patch +3 -3
similarity index 98%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0013-firmware-arm_ffa-Setup-in-kernel-users-of-FFA-partit.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0012-firmware-arm_ffa-Setup-in-kernel-users-of-FFA-partit.patch
index af28a680..c747642e 100644
@@ -1,7 +1,7 @@
-From 4eff52bdae3113edf0256bfd1e986866f7282365 Mon Sep 17 00:00:00 2001
+From c3da0efebc33b357c9fcf4c748c14167594e5c01 Mon Sep 17 00:00:00 2001
 From: Sudeep Holla <[email protected]>
 Date: Fri, 30 Apr 2021 11:24:48 +0100
-Subject: [PATCH 05/14] firmware: arm_ffa: Setup in-kernel users of FFA
+Subject: [PATCH 12/22] firmware: arm_ffa: Setup in-kernel users of FFA
  partitions
 
 Parse the FFA nodes from the device-tree and register all the partitions
@@ -394,5 +394,5 @@ index aaff89364541..b242fbbce4f0 100644
 +
  #endif /* _LINUX_ARM_FFA_H */
 -- 
-2.29.2
+2.17.1
 
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0013-firmware-arm_ffa-Add-support-for-MEM_-interfaces.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0014-firmware-arm_ffa-Add-support-for-MEM_-interfaces.patch +3 -3
similarity index 98%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0014-firmware-arm_ffa-Add-support-for-MEM_-interfaces.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0013-firmware-arm_ffa-Add-support-for-MEM_-interfaces.patch
index a9ff1fc2..897ba0a2 100644
@@ -1,7 +1,7 @@
-From 6795f86f52751608a03cc6de0dda8e28a5c68cd1 Mon Sep 17 00:00:00 2001
+From f4b26dbe513b342f8774810f91d526f545a7202d Mon Sep 17 00:00:00 2001
 From: Sudeep Holla <[email protected]>
 Date: Fri, 30 Apr 2021 11:24:51 +0100
-Subject: [PATCH 06/14] firmware: arm_ffa: Add support for MEM_* interfaces
+Subject: [PATCH 13/22] firmware: arm_ffa: Add support for MEM_* interfaces
 
 Most of the MEM_* APIs share the same parameters, so they can be
 generalised. Currently only MEM_SHARE is implemented and the user space
@@ -402,5 +402,5 @@ index b242fbbce4f0..6dc0f4e425b9 100644
  
  #endif /* _LINUX_ARM_FFA_H */
 -- 
-2.29.2
+2.17.1
 
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0014-tee-add-sec_world_id-to-struct-tee_shm.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0015-tee-add-sec_world_id-to-struct-tee_shm.patch +3 -3
similarity index 91%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0015-tee-add-sec_world_id-to-struct-tee_shm.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0014-tee-add-sec_world_id-to-struct-tee_shm.patch
index 286d6f87..eab65271 100644
@@ -1,7 +1,7 @@
-From 0f6e0009dc123faa5630bc02977674e182c5938c Mon Sep 17 00:00:00 2001
+From 812d2a649a9cc2a0004cbde2b3e411b46ec84af4 Mon Sep 17 00:00:00 2001
 From: Jens Wiklander <[email protected]>
 Date: Thu, 25 Mar 2021 15:08:44 +0100
-Subject: [PATCH 07/14] tee: add sec_world_id to struct tee_shm
+Subject: [PATCH 14/22] 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
@@ -40,5 +40,5 @@ index cdd049a724b1..93d836fded8b 100644
  
  /**
 -- 
-2.29.2
+2.17.1
 
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0015-optee-simplify-optee_release.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0016-optee-simplify-optee_release.patch +6 -6
similarity index 94%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0016-optee-simplify-optee_release.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0015-optee-simplify-optee_release.patch
index 6fe573d8..94973c77 100644
@@ -1,7 +1,7 @@
-From 0c25ca5835725220605f3dbf6225dcf22923cc0f Mon Sep 17 00:00:00 2001
+From cb4f6a55b9c61a82a65edcd4b18c505d92480710 Mon Sep 17 00:00:00 2001
 From: Jens Wiklander <[email protected]>
 Date: Thu, 25 Mar 2021 15:08:46 +0100
-Subject: [PATCH 08/14] optee: simplify optee_release()
+Subject: [PATCH 15/22] optee: simplify optee_release()
 
 Simplifies optee_release() with a new helper function,
 optee_close_session_helper() which has been factored out from
@@ -19,10 +19,10 @@ Upstream-Status: Pending [Not submitted to upstream yet]
  3 files changed, 39 insertions(+), 48 deletions(-)
 
 diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c
-index 780d7c4fd756..c0eca4d7d7f2 100644
+index 0790de29f0ca..1b339b743ff5 100644
 --- a/drivers/tee/optee/call.c
 +++ b/drivers/tee/optee/call.c
-@@ -283,12 +283,28 @@ int optee_open_session(struct tee_context *ctx,
+@@ -285,12 +285,28 @@ int optee_open_session(struct tee_context *ctx,
  	return rc;
  }
  
@@ -53,7 +53,7 @@ index 780d7c4fd756..c0eca4d7d7f2 100644
  	struct optee_session *sess;
  
  	/* Check that the session is valid and remove it from the list */
-@@ -301,16 +317,7 @@ int optee_close_session(struct tee_context *ctx, u32 session)
+@@ -303,16 +319,7 @@ int optee_close_session(struct tee_context *ctx, u32 session)
  		return -EINVAL;
  	kfree(sess);
  
@@ -175,5 +175,5 @@ index e25b216a14ef..2b63b796645e 100644
  int optee_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg,
  		      struct tee_param *param);
 -- 
-2.29.2
+2.17.1
 
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0016-optee-sync-OP-TEE-headers.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0017-optee-sync-OP-TEE-headers.patch +8 -8
similarity index 98%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0017-optee-sync-OP-TEE-headers.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0016-optee-sync-OP-TEE-headers.patch
index a8797a3b..5e3e8688 100644
@@ -1,7 +1,7 @@
-From c325e66e1cbacc074051034ce7e40b3e0e987c99 Mon Sep 17 00:00:00 2001
+From 1e43bd55c951da0610230c4f28a8ebdd13b30733 Mon Sep 17 00:00:00 2001
 From: Jens Wiklander <[email protected]>
 Date: Wed, 20 Jan 2021 11:14:12 +0100
-Subject: [PATCH 09/14] optee: sync OP-TEE headers
+Subject: [PATCH 16/22] optee: sync OP-TEE headers
 
 Pulls in updates in the internal headers from OP-TEE OS [1]. A few
 defines has been shortened, hence the changes in rpc.c. Defines not used
@@ -24,7 +24,7 @@ Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torva
  create mode 100644 drivers/tee/optee/optee_rpc_cmd.h
 
 diff --git a/drivers/tee/optee/optee_msg.h b/drivers/tee/optee/optee_msg.h
-index 7b2d919da2ac..1e1341a5eaf2 100644
+index c7ac7d02d6cc..5bef6a0165db 100644
 --- a/drivers/tee/optee/optee_msg.h
 +++ b/drivers/tee/optee/optee_msg.h
 @@ -1,6 +1,6 @@
@@ -36,7 +36,7 @@ index 7b2d919da2ac..1e1341a5eaf2 100644
  #ifndef _OPTEE_MSG_H
  #define _OPTEE_MSG_H
 @@ -12,11 +12,9 @@
-  * This file defines the OP-TEE message protocol used to communicate
+  * This file defines the OP-TEE message protocol (ABI) used to communicate
   * with an instance of OP-TEE running in secure world.
   *
 - * This file is divided into three sections.
@@ -59,7 +59,7 @@ index 7b2d919da2ac..1e1341a5eaf2 100644
   *
   * So, entries should be placed like members of this structure:
   *
-@@ -176,17 +174,9 @@ struct optee_msg_param {
+@@ -178,17 +176,9 @@ struct optee_msg_param {
   * @params: the parameters supplied to the OS Command
   *
   * All normal calls to Trusted OS uses this struct. If cmd requires further
@@ -79,7 +79,7 @@ index 7b2d919da2ac..1e1341a5eaf2 100644
   */
  struct optee_msg_arg {
  	u32 cmd;
-@@ -290,15 +280,12 @@ struct optee_msg_arg {
+@@ -292,15 +282,12 @@ struct optee_msg_arg {
   * OPTEE_MSG_CMD_REGISTER_SHM registers a shared memory reference. The
   * information is passed as:
   * [in] param[0].attr			OPTEE_MSG_ATTR_TYPE_TMEM_INPUT
@@ -97,7 +97,7 @@ index 7b2d919da2ac..1e1341a5eaf2 100644
   * memory reference. The information is passed as:
   * [in] param[0].attr			OPTEE_MSG_ATTR_TYPE_RMEM_INPUT
   * [in] param[0].u.rmem.shm_ref		holds shared memory reference
-@@ -313,131 +300,4 @@ struct optee_msg_arg {
+@@ -315,131 +302,4 @@ struct optee_msg_arg {
  #define OPTEE_MSG_CMD_UNREGISTER_SHM	5
  #define OPTEE_MSG_FUNCID_CALL_WITH_ARG	0x0004
  
@@ -640,5 +640,5 @@ index 6cbb3643c6c4..1849180b0278 100644
  		break;
  	default:
 -- 
-2.29.2
+2.17.1
 
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0017-optee-refactor-driver-with-internal-callbacks.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0018-optee-refactor-driver-with-internal-callbacks.patch +21 -20

153 lines not on this page · raw message

meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0018-optee-add-a-FF-A-memory-pool.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0019-optee-add-a-FF-A-memory-pool.patch +3 -3
similarity index 96%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0019-optee-add-a-FF-A-memory-pool.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0018-optee-add-a-FF-A-memory-pool.patch
index fc6ba049..6be15814 100644
@@ -1,7 +1,7 @@
-From 69f802594252a0745ba4e798012a0fb6524b6267 Mon Sep 17 00:00:00 2001
+From eafffa586795e3cb485310fbd287322c9c7dc3bb Mon Sep 17 00:00:00 2001
 From: Jens Wiklander <[email protected]>
 Date: Thu, 25 Mar 2021 15:08:52 +0100
-Subject: [PATCH 11/14] optee: add a FF-A memory pool
+Subject: [PATCH 18/22] optee: add a FF-A memory pool
 
 Adds a memory pool to be used when the driver uses FF-A [1] as transport
 layer.
@@ -127,5 +127,5 @@ index 28109d991c4b..34c5fd74a3ff 100644
  
  #endif
 -- 
-2.29.2
+2.17.1
 
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0019-optee-add-FF-A-support.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0020-optee-add-FF-A-support.patch +11 -10
similarity index 98%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0020-optee-add-FF-A-support.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0019-optee-add-FF-A-support.patch
index 6c4e4e62..faf6cd02 100644
@@ -1,7 +1,7 @@
-From c7fedcabea2762c23a9e22cd5f5e4bb0de1f5081 Mon Sep 17 00:00:00 2001
+From 5665ffd3fb8e94003abc1c0c05c9fa30d4028b67 Mon Sep 17 00:00:00 2001
 From: Jens Wiklander <[email protected]>
 Date: Thu, 25 Mar 2021 15:08:53 +0100
-Subject: [PATCH 12/14] optee: add FF-A support
+Subject: [PATCH 19/22] optee: add FF-A support
 
 Adds support for using FF-A [1] as transport to the OP-TEE driver.
 
@@ -28,7 +28,7 @@ Upstream-Status: Pending [Not submitted to upstream yet]
  create mode 100644 drivers/tee/optee/optee_ffa.h
 
 diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c
-index 1439ab896cd0..3d03a79dd246 100644
+index e7b93153252c..cf91a81a242a 100644
 --- a/drivers/tee/optee/call.c
 +++ b/drivers/tee/optee/call.c
 @@ -3,15 +3,18 @@
@@ -74,7 +74,7 @@ index 1439ab896cd0..3d03a79dd246 100644
  	if (IS_ERR(shm))
  		return shm;
  
-@@ -671,3 +684,198 @@ int optee_shm_unregister_supp(struct tee_context *ctx, struct tee_shm *shm)
+@@ -673,3 +686,198 @@ int optee_shm_unregister_supp(struct tee_context *ctx, struct tee_shm *shm)
  {
  	return 0;
  }
@@ -965,7 +965,7 @@ index 000000000000..ee3a03fc392c
 +
 +#endif /*__OPTEE_FFA_H*/
 diff --git a/drivers/tee/optee/optee_msg.h b/drivers/tee/optee/optee_msg.h
-index 1e1341a5eaf2..62348cee3e33 100644
+index 5bef6a0165db..1ee943980c68 100644
 --- a/drivers/tee/optee/optee_msg.h
 +++ b/drivers/tee/optee/optee_msg.h
 @@ -28,6 +28,9 @@
@@ -1011,15 +1011,16 @@ index 1e1341a5eaf2..62348cee3e33 100644
  /**
   * struct optee_msg_param_value - opaque value parameter
   *
-@@ -143,12 +165,14 @@ struct optee_msg_param_value {
+@@ -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,
+  * 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
@@ -1027,14 +1028,14 @@ index 1e1341a5eaf2..62348cee3e33 100644
   * OPTEE_MSG_ATTR_TYPE_NONE indicates that none of the members are used.
   */
  struct optee_msg_param {
-@@ -156,6 +180,7 @@ 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 c5741e96e967..1ffe74e66d15 100644
 --- a/drivers/tee/optee/optee_private.h
@@ -1265,5 +1266,5 @@ index 39562fb6841e..865a9ab3cf65 100644
 +}
 +#endif /*CONFIG_ARM_FFA_TRANSPORT*/
 -- 
-2.29.2
+2.17.1
 
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0020-drivers-optee-hack-for-UUID-endianess-issue.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0021-drivers-optee-hack-for-UUID-endianess-issue.patch +3 -3
similarity index 92%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0021-drivers-optee-hack-for-UUID-endianess-issue.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0020-drivers-optee-hack-for-UUID-endianess-issue.patch
index 8f3d3971..45319fc2 100644
@@ -1,7 +1,7 @@
-From 831d01e34ff2065c585da91c8923ea44146097cd Mon Sep 17 00:00:00 2001
+From 62e38805a966c1bc66a72bcdc83af7031c6a95df Mon Sep 17 00:00:00 2001
 From: Arunachalam Ganapathy <[email protected]>
 Date: Thu, 27 May 2021 13:40:33 +0100
-Subject: [PATCH 13/14] drivers: optee: hack for UUID endianess issue
+Subject: [PATCH 20/22] drivers: optee: hack for UUID endianess issue
 
 Signed-off-by: Arunachalam Ganapathy <[email protected]>
 Signed-off-by: Sudeep Holla <[email protected]>
@@ -54,5 +54,5 @@ index 056a3fca14d1..82c84fe10be2 100644
  		kfree(pbuf);
  
 -- 
-2.29.2
+2.17.1
 
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0021-arm_ffa-add-support-for-FFA-v1.1.patch renamed from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0022-arm_ffa-add-support-for-FFA-v1.1.patch +2 -2
similarity index 90%
rename from meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0022-arm_ffa-add-support-for-FFA-v1.1.patch
rename to meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/0021-arm_ffa-add-support-for-FFA-v1.1.patch
index 62a3eb36..bebac41c 100644
@@ -1,7 +1,7 @@
-From 90c09f49c4df35fa0e25dda5e9f15a2d30debce8 Mon Sep 17 00:00:00 2001
+From abb29275dc4965e015f7719951645acfa58bcab4 Mon Sep 17 00:00:00 2001
 From: Usama Arif <[email protected]>
 Date: Wed, 11 Aug 2021 09:45:35 +0100
-Subject: [PATCH] arm_ffa: add support for FFA v1.1
+Subject: [PATCH 21/22] arm_ffa: add support for FFA v1.1
 
 Change-Id: I3d5a72981c6a66a0a034fd76d5e38eeb33318d20
 Signed-off-by: Usama Arif <[email protected]>
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/defconfig deleted +0 -979

979 lines not on this page · raw message

meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/gki_defconfig new file +689 -0

689 lines not on this page · raw message

meta-arm/recipes-kernel/linux/linux-arm64-ack_5.10.bb +2 -2
index e71bdd0d..cf4951cd 100644
@@ -8,5 +8,5 @@ SRC_URI = " \
     git://android.googlesource.com/kernel/common.git;protocol=https;branch=android12-5.10-lts \
     "
 
-# tag: ASB-2021-06-05_12-5.10
-SRCREV = "00dc4c64e6592a2e469f7886a6a927778c4a2806"
+# tag: ASB-2021-09-05_12-5.10
+SRCREV = "3d371f087c953c0e08a228169d4e5c44aea99416"
Signature · 1 line
2.17.1
#3 lore raw
In reply to Anders Dellien

Can you also add this recipe to the ci/toolchains.yml job?

Ross

Quoted 82 lines · Anders Dellien

From: Usama Arif <[email protected]>

This Clang version is present in Android master
(as of October 8, 2021)

Change-Id I957742ee943ef68119fd7c7e2bd8ee62b717b31c
---
 .../androidclang_r416183b.bb                  | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/androidclang_r416183b.bb
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/androidclang_r416183b.bb new file +50 -1
new file mode 100644
index 00000000..316cbb93
@@ -0,0 +1,50 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2021 Arm Limited
+#
+
+SUMMARY = "Android Clang compiler"
+DESCRIPTION = "Android Clang compiler, version r416183b. This is based on Clang 12.0.5 \
+Intended usage is to build kernel images that match the output of the Android (hermetic) \
+build system"
+
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://MODULE_LICENSE_MIT;md5=d41d8cd98f00b204e9800998ecf8427e"
+
+ANDROID_CLANG_VERSION = "clang-r416183b"
+ANDROID_CLANG_HASH = "bd96dfe349c962681f0e5388af874c771ef96670"
+
+COMPATIBLE_HOST = "x86_64.*-linux"
+
+SRC_URI = "https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+archive/${ANDROID_CLANG_HASH}/${ANDROID_CLANG_VERSION}.tar.gz;subdir=${ANDROID_CLANG_VERSION}"
+
+# We need to set the checksum to "ignore" because the tarball is dynamically generated and has a new checksum every time
+# (the contents are the same, but the time stamp differs)
+BB_STRICT_CHECKSUM = "ignore"
+
+S = "${WORKDIR}/${ANDROID_CLANG_VERSION}"
+
+do_install() {
+    # We should really use ${libexecdir} here, but that as some files have invalid RPATH
+    # this results in lots of warning. So using ${datadir} for now
+    install -d ${D}${datadir}/${ANDROID_CLANG_VERSION}/
+
+    cp --no-preserve=ownership -r ${S}/. ${D}${datadir}/${ANDROID_CLANG_VERSION}/
+
+    install -d ${D}${bindir}
+    # Symlink all executables into bindir
+    for f in ${D}${datadir}/${ANDROID_CLANG_VERSION}/bin/*; do
+        ln -rs $f ${D}${bindir}/$(basename $f)
+    done
+}
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+INSANE_SKIP:${PN} = "already-stripped libdir staticdev file-rdeps arch dev-so"
+
+INHIBIT_SYSROOT_STRIP = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+BBCLASSEXTEND = "native nativesdk"
--

2.17.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#2840): https://lists.yoctoproject.org/g/meta-arm/message/2840
Mute This Topic: https://lists.yoctoproject.org/mt/88485376/1676615
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#4 lore raw
In reply to Anders Dellien
Quoted 6 lines · Anders Dellien

From: Usama Arif <[email protected]>

This Clang version is present in Android master
(as of October 8, 2021)

Is there any specific motivation to use a pre-built Android clang compiler rather than one built from source using meta-clang?

-Sumit

Quoted 76 lines
Change-Id I957742ee943ef68119fd7c7e2bd8ee62b717b31c
---
 .../androidclang_r416183b.bb                  | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/androidclang_r416183b.bb
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/androidclang_r416183b.bb new file +50 -1
new file mode 100644
index 00000000..316cbb93
@@ -0,0 +1,50 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2021 Arm Limited
+#
+
+SUMMARY = "Android Clang compiler"
+DESCRIPTION = "Android Clang compiler, version r416183b. This is based on Clang 12.0.5 \
+Intended usage is to build kernel images that match the output of the Android (hermetic) \
+build system"
+
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://MODULE_LICENSE_MIT;md5=d41d8cd98f00b204e9800998ecf8427e"
+
+ANDROID_CLANG_VERSION = "clang-r416183b"
+ANDROID_CLANG_HASH = "bd96dfe349c962681f0e5388af874c771ef96670"
+
+COMPATIBLE_HOST = "x86_64.*-linux"
+
+SRC_URI = "https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+archive/${ANDROID_CLANG_HASH}/${ANDROID_CLANG_VERSION}.tar.gz;subdir=${ANDROID_CLANG_VERSION}"
+
+# We need to set the checksum to "ignore" because the tarball is dynamically generated and has a new checksum every time
+# (the contents are the same, but the time stamp differs)
+BB_STRICT_CHECKSUM = "ignore"
+
+S = "${WORKDIR}/${ANDROID_CLANG_VERSION}"
+
+do_install() {
+    # We should really use ${libexecdir} here, but that as some files have invalid RPATH
+    # this results in lots of warning. So using ${datadir} for now
+    install -d ${D}${datadir}/${ANDROID_CLANG_VERSION}/
+
+    cp --no-preserve=ownership -r ${S}/. ${D}${datadir}/${ANDROID_CLANG_VERSION}/
+
+    install -d ${D}${bindir}
+    # Symlink all executables into bindir
+    for f in ${D}${datadir}/${ANDROID_CLANG_VERSION}/bin/*; do
+        ln -rs $f ${D}${bindir}/$(basename $f)
+    done
+}
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+INSANE_SKIP:${PN} = "already-stripped libdir staticdev file-rdeps arch dev-so"
+
+INHIBIT_SYSROOT_STRIP = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+BBCLASSEXTEND = "native nativesdk"
--

2.17.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#2840): https://lists.yoctoproject.org/g/meta-arm/message/2840
Mute This Topic: https://lists.yoctoproject.org/mt/88485376/1777089
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#5 lore raw

Hi,

The reason we need this is that we would like to use a Yocto-built BSP to boot our Android stack (which includes GPU support), and for that to work we need to build it with this specific compiler.

Thanks,
Anders
________________________________
From: Sumit Garg <[email protected]>
Sent: Tuesday, January 18, 2022 6:35 AM
To: Anders Dellien <[email protected]>
Cc: [email protected] <[email protected]>; Usama Arif <[email protected]>
Subject: Re: [meta-arm] [PATCH 1/3] arm-toolchain: Fetch prebuilt Android Clang, version r416183b

Quoted 6 lines · Anders Dellien

From: Usama Arif <[email protected]>

This Clang version is present in Android master
(as of October 8, 2021)

Is there any specific motivation to use a pre-built Android clang compiler rather than one built from source using meta-clang?

-Sumit

Quoted 76 lines
Change-Id I957742ee943ef68119fd7c7e2bd8ee62b717b31c
---
 .../androidclang_r416183b.bb                  | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/androidclang_r416183b.bb
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/androidclang_r416183b.bb new file +50 -1
new file mode 100644
index 00000000..316cbb93
@@ -0,0 +1,50 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2021 Arm Limited
+#
+
+SUMMARY = "Android Clang compiler"
+DESCRIPTION = "Android Clang compiler, version r416183b. This is based on Clang 12.0.5 \
+Intended usage is to build kernel images that match the output of the Android (hermetic) \
+build system"
+
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://MODULE_LICENSE_MIT;md5=d41d8cd98f00b204e9800998ecf8427e"
+
+ANDROID_CLANG_VERSION = "clang-r416183b"
+ANDROID_CLANG_HASH = "bd96dfe349c962681f0e5388af874c771ef96670"
+
+COMPATIBLE_HOST = "x86_64.*-linux"
+
+SRC_URI = "https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+archive/${ANDROID_CLANG_HASH}/${ANDROID_CLANG_VERSION}.tar.gz;subdir=${ANDROID_CLANG_VERSION}"
+
+# We need to set the checksum to "ignore" because the tarball is dynamically generated and has a new checksum every time
+# (the contents are the same, but the time stamp differs)
+BB_STRICT_CHECKSUM = "ignore"
+
+S = "${WORKDIR}/${ANDROID_CLANG_VERSION}"
+
+do_install() {
+    # We should really use ${libexecdir} here, but that as some files have invalid RPATH
+    # this results in lots of warning. So using ${datadir} for now
+    install -d ${D}${datadir}/${ANDROID_CLANG_VERSION}/
+
+    cp --no-preserve=ownership -r ${S}/. ${D}${datadir}/${ANDROID_CLANG_VERSION}/
+
+    install -d ${D}${bindir}
+    # Symlink all executables into bindir
+    for f in ${D}${datadir}/${ANDROID_CLANG_VERSION}/bin/*; do
+        ln -rs $f ${D}${bindir}/$(basename $f)
+    done
+}
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+INSANE_SKIP:${PN} = "already-stripped libdir staticdev file-rdeps arch dev-so"
+
+INHIBIT_SYSROOT_STRIP = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+BBCLASSEXTEND = "native nativesdk"
--

2.17.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#2840): https://lists.yoctoproject.org/g/meta-arm/message/2840
Mute This Topic: https://lists.yoctoproject.org/mt/88485376/1777089
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Applied
#6 lore raw
In reply to Anders Dellien
Quoted 2 lines · Anders Dellien

This Clang version is present in Android master
(as of October 8, 2021)

Applied, thanks!

[1/3] arm-toolchain: Fetch prebuilt Android Clang, version r416183b

      commit: c4fb4f53cb3fcf87d08e93ae30f4a6734bd16c7b
[2/3] arm-toolchain: Support linux-arm64-ack build with Android Clang
      commit: db56f59865383eb91273570645b7063bbf391716
[3/3] arm: update Android common kernel and config
      commit: daa8388dadb4ebc24e3884ceb596cdb9f166ea25

Best regards,

Signature · 1 line
Jon Mason <[email protected]>