commit 217748dba986096a61c1dbf0c231293755ca060b
author Soby Mathew <soby.mathew@arm.com> Wed Oct 02 11:02:19 2024 +0100
committer Soby Mathew <soby.mathew@arm.com> Thu Oct 03 09:31:43 2024 +0100
tree 773155b1790653fbf31b580e7bcd9be4217d32ec
parent 826e4a928942e9665dfaa773d460e56f1a9e798b

fix(lib/s2tt): Remove SH from Host-controlled attributes

This patch does the necessary changes to remove SH from Host-controlled
attributes as mandated by RMM v1.0 REL specification. The unit tests
are also fixed up by this patch.

Change-Id: I75fc5e529d5ebb1679031eeeacc7a9dfb98db8c4
Signed-off-by: Soby Mathew <soby.mathew@arm.com>

lib/s2tt/tests/s2tt_test_helpers.c

diff --git a/lib/s2tt/tests/s2tt_test_helpers.c b/lib/s2tt/tests/s2tt_test_helpers.c
index 80ac31f..b2f742f 100644
--- a/lib/s2tt/tests/s2tt_test_helpers.c
+++ b/lib/s2tt/tests/s2tt_test_helpers.c
@@ -155,11 +155,11 @@
 {
 	unsigned long attrs_mask;
 
-	if (ns == true) {
-		attrs_mask = S2TTE_NS_ATTR_RMM | S2TT_DESC_TYPE_MASK;
-		attrs_mask |= (is_feat_lpa2_4k_2_present() == true) ?
-			S2TTE_NS_ATTR_LPA2_MASK :
-			S2TTE_NS_ATTR_MASK;
+	if (ns) {
+		attrs_mask = S2TTE_NS_ATTR_RMM | S2TT_DESC_TYPE_MASK | S2TTE_NS_ATTR_MASK;
+		if (!is_feat_lpa2_4k_2_present()) {
+			attrs_mask |= S2TTE_SH_MASK;
+		}
 	} else {
 		attrs_mask = ((is_feat_lpa2_4k_2_present() == true) ?
 			S2TTE_ATTRS_LPA2_MASK :
@@ -180,19 +180,11 @@
 			bool inv_attrs;
 
 			attrs = test_helpers_get_rand_in_range(0UL, ULONG_MAX);
-
-			attrs &= (is_feat_lpa2_4k_2_present() == true) ?
-				S2TTE_NS_ATTR_LPA2_MASK :
-				S2TTE_NS_ATTR_MASK;
+			attrs &= S2TTE_NS_ATTR_MASK;
 
 			/* Find out if we are done or not */
 			inv_attrs = ((attrs & S2TTE_MEMATTR_MASK) ==
 						S2TTE_MEMATTR_FWB_RESERVED);
-
-			if (is_feat_lpa2_4k_2_present() == false) {
-				inv_attrs |= ((attrs & S2TTE_SH_MASK) !=
-						S2TTE_SH_IS);
-			}
 			done = (reserved == inv_attrs);
 		} while (!done);
 	} else {