[PATCH 1/2] Update tf-rmm to support FEAT_S1PIE

[Richard Henderson <richard.henderson@linaro.org>]

There appears to be no tagged release with FEAT_S1PIE, but
it is upstream.  As is the PMU patch we were carrying.
---
 build_tf_rmm.sh                              | 10 ++---
 patches/rmm-support-lower-pmu-versions.patch | 44 --------------------
 2 files changed, 5 insertions(+), 49 deletions(-)
 delete mode 100644 patches/rmm-support-lower-pmu-versions.patch

diff --git a/build_tf_rmm.sh b/build_tf_rmm.sh
index bd1c612..009966d 100755
--- a/build_tf_rmm.sh
+++ b/build_tf_rmm.sh
@@ -11,14 +11,14 @@ fi
 clone()
 {
     rm -f tf-rmm
-    url=https://github.com/TF-RMM/tf-rmm
-    version=tf-rmm-v0.7.0
-    src=$version-support-lower-pmu-versions-release
+    url=https://git.trustedfirmware.org/TF-RMM/tf-rmm
+    version=481cb7f4e64f5c48c03a72b75b736f183f3011d5
+    src=tf-rmm-main-s1pie
     if [ ! -d $src ]; then
-        git clone $url --single-branch --branch $version --depth 1 $src
+        git clone $url $src
         pushd $src
+        git checkout $version
         git submodule update --init --depth 1
-        git am ../patches/rmm-support-lower-pmu-versions.patch
         popd
     fi
     ln -s $src tf-rmm
diff --git a/patches/rmm-support-lower-pmu-versions.patch b/patches/rmm-support-lower-pmu-versions.patch
deleted file mode 100644
index 0993edc..0000000
--- a/patches/rmm-support-lower-pmu-versions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2235e01874d2b51e32650b2326c94ae2285c554a Mon Sep 17 00:00:00 2001
-From: Jean-Philippe Brucker <jean-philippe@linaro.org>
-Date: Fri, 14 Jul 2023 10:54:43 +0100
-Subject: [PATCH] TMP: fix(qemu): Support lower PMU versions
-
-Although RME mandates v3p7, QEMU has v3p5 at the moment. Until we
-implement the p7 extension, which provides counter isolation for EL3,
-allow p5.
-
-Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
-Change-Id: Id1dd30486f203187e3f882c7495116b743d3883a
----
- lib/arch/include/arch.h | 1 +
- runtime/rmi/feature.c   | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/arch/include/arch.h b/lib/arch/include/arch.h
-index cecdf2a5..fc64365e 100644
---- a/lib/arch/include/arch.h
-+++ b/lib/arch/include/arch.h
-@@ -493,6 +493,7 @@
- #define ID_AA64DFR0_EL1_PMUVer_WIDTH		UL(4)
- 
- /* Performance Monitors Extension version */
-+#define ID_AA64DFR0_EL1_PMUv3p5			UL(5)
- #define ID_AA64DFR0_EL1_PMUv3p7			UL(7)
- #define ID_AA64DFR0_EL1_PMUv3p8			UL(8)
- #define ID_AA64DFR0_EL1_PMUv3p9			UL(9)
-diff --git a/runtime/rmi/feature.c b/runtime/rmi/feature.c
-index 5468f137..52487c0d 100644
---- a/runtime/rmi/feature.c
-+++ b/runtime/rmi/feature.c
-@@ -35,7 +35,7 @@ unsigned long get_feature_register_0(void)
- 						RMI_FEATURE_TRUE);
- 
- 	/* RMM supports PMUv3p7+ */
--	assert(read_pmu_version() >= ID_AA64DFR0_EL1_PMUv3p7);
-+	assert(read_pmu_version() >= ID_AA64DFR0_EL1_PMUv3p5);
- 
- 	/* Set support for PMUv3 */
- 	feat_reg0 |= INPLACE(RMI_FEATURE_REGISTER_0_PMU_EN,
--- 
-GitLab
-
-- 
2.43.0