arm: patch clean-ups

Clean up various patches by
* Create email headers for those not present using the s-o-b as author and date
applied to the tree as the patch date
* regenerating the patch name via git rebase and format-patch
* replacing patch with backported version
* moving patch location to be more accurate

Signed-off-by: Jon Mason <jon.mason@arm.com>

meta-arm-bsp/recipes-bsp/external-system/external-system_0.1.0.bb

@@ -9,8 +9,7 @@ LIC_FILES_CHKSUM = "file://license.md;md5=e44b2531cd6ffe9dece394dbe988d9a0 \
                     file://cmsis/LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
 SRC_URI = "gitsm://git.gitlab.arm.com/arm-reference-solutions/corstone1000/external_system/rtx.git;protocol=https;branch=master \
-           file://race.patch"
-
+           file://0001-tools-gen_module_code-atomically-rewrite-the-generat.patch"
 SRCREV = "8c9dca74b104ff6c9722fb0738ba93dd3719c080"
 PV .= "+git"
 

meta-arm-bsp/recipes-bsp/external-system/files/0001-tools-gen_module_code-atomically-rewrite-the-generat.patch

@@ -1,11 +1,11 @@
-Upstream-Status: Submitted [https://gitlab.arm.com/arm-reference-solutions/corstone1000/external_system/rtx/-/issues/1]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-From 34e1c04534607f5605255f39fb46e26261fc9c4e Mon Sep 17 00:00:00 2001
+From fa5ed6204f9188134a87ac9dd569e1496759a7f6 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@arm.com>
 Date: Tue, 8 Sep 2020 11:49:08 +0100
 Subject: [PATCH] tools/gen_module_code: atomically rewrite the generated files
 
+Upstream-Status: Submitted [https://gitlab.arm.com/arm-reference-solutions/corstone1000/external_system/rtx/-/issues/1]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
 The gen_module rule in rules.mk is marked as .PHONY, so make will
 execute it whenever it is mentioned. This results in gen_module_code
 being executed 64 times for a Juno build.
@@ -21,12 +21,13 @@ writing the generated files.
 
 Change-Id: I82d44f9ea6537a91002e1f80de8861d208571630
 Signed-off-by: Ross Burton <ross.burton@arm.com>
+
 ---
  tools/gen_module_code.py | 19 ++++++++++++++-----
  1 file changed, 14 insertions(+), 5 deletions(-)
 
 diff --git a/tools/gen_module_code.py b/tools/gen_module_code.py
-index 7b3953845..ee099b713 100755
+index 6bf50e0..92623a7 100755
 --- a/tools/gen_module_code.py
 +++ b/tools/gen_module_code.py
 @@ -17,6 +17,7 @@
@@ -37,7 +38,7 @@ index 7b3953845..ee099b713 100755
  
  DEFAULT_PATH = 'build/'
  
-@@ -53,13 +54,21 @@
+@@ -55,13 +56,21 @@ TEMPLATE_C = "/* This file was auto generated using {} */\n" \
  
  def generate_file(path, filename, content):
      full_filename = os.path.join(path, filename)

meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc

@@ -11,8 +11,7 @@ COMPATIBLE_MACHINE = "n1sdp"
 EFIDIR             = "/EFI/BOOT"
 EFI_BOOT_IMAGE     = "bootaa64.efi"
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/files/edk2-platforms:"
-
+FILESEXTRAPATHS:prepend := "${THISDIR}/files/n1sdp:"
 SRC_URI:append = "\
     file://0001-Platform-ARM-N1sdp-Add-support-to-parse-NT_FW_CONFIG.patch;patchdir=edk2-platforms \
     file://0002-Platform-ARM-N1Sdp-Fix-RemoteDdrSize-cast.patch;patchdir=edk2-platforms \

meta-arm-bsp/recipes-security/optee/optee-test/0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch

@@ -1,3 +1,8 @@
+From 53642dc98630b9c725977ab935c5bdd9c401e1aa Mon Sep 17 00:00:00 2001
+From: Jon Mason <jon.mason@arm.com>
+Date: Sat, 15 Jul 2023 15:08:43 -0400
+Subject: [PATCH] xtest: regression_1000: remove unneeded stat.h include
+
 Hack to work around musl compile error:
  In file included from optee-test/3.17.0-r0/recipe-sysroot/usr/include/sys/stat.h:23,
                   from optee-test/3.17.0-r0/git/host/xtest/regression_1000.c:25:
@@ -7,11 +12,16 @@ Hack to work around musl compile error:
 
 stat.h is not needed, since it is not being used in this file.  So removing it.
 
-Upstream-Status: Pending [Not submitted to upstream yet]
+Upstream-Status: Backport
 Signed-off-by: Jon Mason <jon.mason@arm.com>
+Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
+Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
+---
+ host/xtest/regression_1000.c | 1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/host/xtest/regression_1000.c b/host/xtest/regression_1000.c
-index 4264884..7f1baca 100644
+index de32c4184fd8..25b4721cdc45 100644
 --- a/host/xtest/regression_1000.c
 +++ b/host/xtest/regression_1000.c
 @@ -22,7 +22,6 @@

meta-arm-bsp/recipes-security/optee/optee-test/0002-ffa_spmc-Add-arm_ffa_user-driver-compatibility-check.patch

@@ -1,7 +1,7 @@
-From 6734d14cc249af37705129de7874533df9535cd3 Mon Sep 17 00:00:00 2001
+From 717ff43f0d58e5f5a87893bd0cf3274a1e0164dc Mon Sep 17 00:00:00 2001
 From: Gabor Toth <gabor.toth2@arm.com>
 Date: Fri, 3 Mar 2023 12:25:58 +0100
-Subject: [PATCH 2/2] ffa_spmc: Add arm_ffa_user driver compatibility check
+Subject: [PATCH] ffa_spmc: Add arm_ffa_user driver compatibility check
 
 Check the version of the arm_ffa_user Kernel Driver and fail with a
 meaningful message if incompatible driver is detected.
@@ -15,7 +15,7 @@ Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
  1 file changed, 61 insertions(+), 7 deletions(-)
 
 diff --git a/host/xtest/ffa_spmc_1000.c b/host/xtest/ffa_spmc_1000.c
-index 15f4a46..1839d03 100644
+index 15f4a468a775..1839d03f29be 100644
 --- a/host/xtest/ffa_spmc_1000.c
 +++ b/host/xtest/ffa_spmc_1000.c
 @@ -1,11 +1,12 @@
@@ -158,6 +158,3 @@ index 15f4a46..1839d03 100644
  	ADBG_EXPECT_COMPARE_SIGNED(c, rc, ==, 0);
  	ADBG_EXPECT_COMPARE_UNSIGNED(c, args.args[0], ==, SPMC_TEST_OK);
  
--- 
-2.39.1.windows.1
-

meta-arm-bsp/recipes-security/optee/optee-test/0003-Update-arm_ffa_user-driver-dependency.patch

@@ -1,7 +1,7 @@
-From 7e15470f3dd45c844f0e0901f0c85c46a0882b8b Mon Sep 17 00:00:00 2001
+From 3de910a19f01a2a9e1c9a6bd6feee1aef547f676 Mon Sep 17 00:00:00 2001
 From: Gabor Toth <gabor.toth2@arm.com>
 Date: Fri, 3 Mar 2023 12:23:45 +0100
-Subject: [PATCH 1/2] Update arm_ffa_user driver dependency
+Subject: [PATCH] Update arm_ffa_user driver dependency
 
 Updating arm-ffa-user to v5.0.1 to get the following changes:
  - move to 64 bit direct messages
@@ -22,7 +22,7 @@ Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/host/xtest/include/uapi/linux/arm_ffa_user.h b/host/xtest/include/uapi/linux/arm_ffa_user.h
-index 9ef0be3..0acde4f 100644
+index 9ef0be3e1664..0acde4fb2020 100644
 --- a/host/xtest/include/uapi/linux/arm_ffa_user.h
 +++ b/host/xtest/include/uapi/linux/arm_ffa_user.h
 @@ -33,7 +33,7 @@ struct ffa_ioctl_ep_desc {
@@ -34,6 +34,3 @@ index 9ef0be3..0acde4f 100644
  	__u16 dst_id;
  };
  #define FFA_IOC_MSG_SEND	_IOWR(FFA_IOC_MAGIC, FFA_IOC_BASE + 1, \
--- 
-2.39.1.windows.1
-

meta-arm-bsp/recipes-security/optee/optee-test_3.18.0.bb

@@ -1,7 +1,7 @@
 require recipes-security/optee/optee-test.inc
 
 SRC_URI += " \
-    file://musl-workaround.patch \
+    file://0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch \
    "
 SRCREV = "da5282a011b40621a2cf7a296c11a35c833ed91b"
 

meta-arm-bsp/recipes-security/optee/optee-test_3.20.0.bb

@@ -1,9 +1,9 @@
 require recipes-security/optee/optee-test.inc
 
 SRC_URI += " \
-    file://Update-arm_ffa_user-driver-dependency.patch \
-    file://ffa_spmc-Add-arm_ffa_user-driver-compatibility-check.patch \
-    file://musl-workaround.patch \
+    file://0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch \
+    file://0002-ffa_spmc-Add-arm_ffa_user-driver-compatibility-check.patch \
+    file://0003-Update-arm_ffa_user-driver-dependency.patch \
    "
 SRCREV = "5db8ab4c733d5b2f4afac3e9aef0a26634c4b444"
 

meta-arm/recipes-bsp/scp-firmware/files/0001-OPTEE-Private-Includes.patch

@@ -1,3 +1,8 @@
+From b298400a5783453f64d8bebbd92db2c84c4a49fd Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Mon, 10 Jul 2023 14:09:16 +0100
+Subject: [PATCH] OPTEE Private Includes
+
 Change the optee module includes to be private instead of public, so they don't get used
 in every build, which can result in compile failures as /core/include/ doesn't exit.
 
@@ -5,9 +10,13 @@ For some reason this behaviour isn't deterministic, a ticket has been filed with
 
 Upstream-Status: Pending
 Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ module/optee/console/CMakeLists.txt | 2 +-
+ module/optee/mbx/CMakeLists.txt     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/module/optee/console/CMakeLists.txt b/module/optee/console/CMakeLists.txt
-index aebb7cc79..942aa98c8 100644
+index aebb7cc79766..942aa98c85ff 100644
 --- a/module/optee/console/CMakeLists.txt
 +++ b/module/optee/console/CMakeLists.txt
 @@ -14,7 +14,7 @@ target_include_directories(${SCP_MODULE_TARGET}
@@ -20,7 +29,7 @@ index aebb7cc79..942aa98c8 100644
                                    "${SCP_OPTEE_DIR}/lib/libutils/ext/include/"
                                    "${SCP_OPTEE_DIR}/lib/libutee/include/")
 diff --git a/module/optee/mbx/CMakeLists.txt b/module/optee/mbx/CMakeLists.txt
-index 305fa42b7..783a7970c 100644
+index 305fa42b7370..783a7970c2d5 100644
 --- a/module/optee/mbx/CMakeLists.txt
 +++ b/module/optee/mbx/CMakeLists.txt
 @@ -15,7 +15,7 @@ target_include_directories(${SCP_MODULE_TARGET}

meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.12.0.bb

@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://license.md;beginline=5;md5=9db9e3d2fb8d9300a6c3d15101
 
 SRC_URI_SCP_FIRMWARE ?= "gitsm://github.com/ARM-software/SCP-firmware.git;protocol=https"
 SRC_URI = "${SRC_URI_SCP_FIRMWARE};branch=${SRCBRANCH} \
-           file://optee-private-includes.patch"
+           file://0001-OPTEE-Private-Includes.patch \
+          "
 
 SRCBRANCH = "master"
 SRCREV  = "0c7236b1851d90124210a0414fd982dc55322c7c"

meta-arm/recipes-bsp/uefi/edk2-firmware_202302.bb

@@ -1,6 +1,6 @@
 SRCREV_edk2           ?= "f80f052277c88a67c55e107b550f504eeea947d3"
 SRCREV_edk2-platforms ?= "65e001a7f2abedf7799cfb36b057326c1540bd47"
 
-SRC_URI:append = " file://default.patch;patchdir=edk2-platforms"
+SRC_URI:append = " file://0001-Platform-ARM-fix-uninitialized-variable-FileSize-in-.patch;patchdir=edk2-platforms"
 
 require edk2-firmware.inc

meta-arm/recipes-bsp/uefi/files/0001-Platform-ARM-fix-uninitialized-variable-FileSize-in-.patch

@@ -1,4 +1,7 @@
-Platform/ARM: fix uninitialized variable FileSize in RunAxf
+From 223ad8d168df332445a7383c325845822825b972 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Mon, 13 Jun 2022 18:21:15 +0100
+Subject: [PATCH] Platform/ARM: fix uninitialized variable FileSize in RunAxf
 
 Clang 14 detects a potentially uninitialized variable FileSize:
 
@@ -13,11 +16,20 @@ can keep clang happy by initialising FileSize to 0.
 
 Upstream-Status: Pending
 Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c b/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
-index d23739ad38..fba5e0ba30 100644
+index d23739ad38d9..fba5e0ba300f 100644
 --- a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
 +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
-@@ -136,1 +136,1 @@ ShellDynCmdRunAxfHandler (
+@@ -133,7 +133,7 @@ ShellDynCmdRunAxfHandler (
+   ELF_ENTRYPOINT              StartElf;
+   CONST CHAR16                *FileName;
+   EFI_FILE_INFO               *Info;
 -  UINTN                       FileSize;
 +  UINTN                       FileSize = 0;
+   VOID                        *FileData;
+   VOID                        *Entrypoint;
+   LIST_ENTRY                  LoadList;