[PATCH 3/3] tests: Add test for ASID2 and write/read of feature bits

Jim MacArthur posted 3 patches 2 months, 3 weeks ago
Maintainers: Peter Maydell <peter.maydell@linaro.org>
There is a newer version of this series
[PATCH 3/3] tests: Add test for ASID2 and write/read of feature bits
Posted by Jim MacArthur 2 months, 3 weeks ago
Tests ASID2 is present and FNG1, FNG0, and A2 are writable, and read
value shows the update.

Signed-off-by: Jim MacArthur <jim.macarthur@linaro.org>
---
 tests/tcg/aarch64/system/asid2.c | 53 ++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 tests/tcg/aarch64/system/asid2.c

diff --git a/tests/tcg/aarch64/system/asid2.c b/tests/tcg/aarch64/system/asid2.c
new file mode 100644
index 0000000000..cfe69db2ae
--- /dev/null
+++ b/tests/tcg/aarch64/system/asid2.c
@@ -0,0 +1,53 @@
+/*
+ * ASID2 Feature presence and enabled TCR2_EL1 bits test
+ *
+ * Copyright (c) 2025 Linaro Ltd
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include <stdint.h>
+#include <minilib.h>
+
+#define ID_AA64MMFR4_EL1 "S3_0_C0_C7_4"
+#define TCR2_EL1 "S3_0_C2_C0_3"
+
+int main()
+{
+    /*
+     * Test for presence of ASID2 and three feature bits enabled by it:
+     * https://developer.arm.com/documentation/109697/2025_09/Feature-descriptions/The-Armv9-5-architecture-extension
+     * Bits added are FNG1, FNG0, and A2. These should be RES0 if A2 is
+     * not enabled and read as the written value if A2 is enabled.
+     */
+
+    uint64_t out;
+    uint64_t idreg;
+
+    /* Mask is FNG1, FNG0, and A2 */
+    const uint64_t feature_mask = (1ULL << 18 | 1ULL << 17 | 1ULL << 16);
+    const uint64_t in = feature_mask;
+
+    asm("mrs %[x1], " ID_AA64MMFR4_EL1 "\n\t"
+        : [x1] "=r" (idreg));
+    if ((idreg & 0xF00) != 0) {
+        /* ASID2 is enabled */
+    } else {
+        ml_printf("FAIL: ASID2 not present in ID_AA64MMFR4 (%lx)\n", idreg);
+        return 1;
+    }
+
+    asm("msr " TCR2_EL1 ", %[x0]\n\t"
+        "mrs %[x1], " TCR2_EL1 "\n\t"
+        : [x1] "=r" (out)
+        : [x0] "r" (in));
+
+    if ((out & feature_mask) == in) {
+        ml_printf("OK\n");
+        return 0;
+    } else {
+        ml_printf("FAIL: read value %lx != written value %lx\n",
+                  out & feature_mask, in);
+        return 1;
+    }
+}
-- 
2.43.0
Re: [PATCH 3/3] tests: Add test for ASID2 and write/read of feature bits
Posted by Alex Bennée 2 months, 2 weeks ago
Jim MacArthur <jim.macarthur@linaro.org> writes:

> Tests ASID2 is present and FNG1, FNG0, and A2 are writable, and read
> value shows the update.
>
> Signed-off-by: Jim MacArthur <jim.macarthur@linaro.org>
> ---
>  tests/tcg/aarch64/system/asid2.c | 53 ++++++++++++++++++++++++++++++++
>  1 file changed, 53 insertions(+)
>  create mode 100644 tests/tcg/aarch64/system/asid2.c
>
> diff --git a/tests/tcg/aarch64/system/asid2.c b/tests/tcg/aarch64/system/asid2.c
> new file mode 100644
> index 0000000000..cfe69db2ae
> --- /dev/null
> +++ b/tests/tcg/aarch64/system/asid2.c
> @@ -0,0 +1,53 @@
> +/*
> + * ASID2 Feature presence and enabled TCR2_EL1 bits test
> + *
> + * Copyright (c) 2025 Linaro Ltd
> + *
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + */
> +
> +#include <stdint.h>
> +#include <minilib.h>
> +
> +#define ID_AA64MMFR4_EL1 "S3_0_C0_C7_4"
> +#define TCR2_EL1 "S3_0_C2_C0_3"
> +
> +int main()
> +{
> +    /*
> +     * Test for presence of ASID2 and three feature bits enabled by it:
> +     * https://developer.arm.com/documentation/109697/2025_09/Feature-descriptions/The-Armv9-5-architecture-extension
> +     * Bits added are FNG1, FNG0, and A2. These should be RES0 if A2 is
> +     * not enabled and read as the written value if A2 is enabled.
> +     */
> +
> +    uint64_t out;
> +    uint64_t idreg;
> +
> +    /* Mask is FNG1, FNG0, and A2 */
> +    const uint64_t feature_mask = (1ULL << 18 | 1ULL << 17 | 1ULL << 16);
> +    const uint64_t in = feature_mask;
> +
> +    asm("mrs %[x1], " ID_AA64MMFR4_EL1 "\n\t"
> +        : [x1] "=r" (idreg));
> +    if ((idreg & 0xF00) != 0) {
> +        /* ASID2 is enabled */
> +    } else {
> +        ml_printf("FAIL: ASID2 not present in ID_AA64MMFR4 (%lx)\n", idreg);
> +        return 1;
> +    }

If we instead use this to test for the presence of the feature and then...

> +
> +    asm("msr " TCR2_EL1 ", %[x0]\n\t"
> +        "mrs %[x1], " TCR2_EL1 "\n\t"
> +        : [x1] "=r" (out)
> +        : [x0] "r" (in));
> +
> +    if ((out & feature_mask) == in) {
> +        ml_printf("OK\n");
> +        return 0;
> +    } else {
> +        ml_printf("FAIL: read value %lx != written value %lx\n",
> +                  out & feature_mask, in);
> +        return 1;
> +    }

extend this part to check the bits are behaving as the feature dictates
then we can add a second test like this (Makefile.softmmu-target):

  run-asid2-oldcpu: asid2
          $(call run-test, $<, \
            $(QEMU) -monitor none -display none \
                    -chardev file$(COMMA)path=$<.out$(COMMA)id=output \
                    $(QEMU_OPTS) $<)

  run-asid2-oldcpu: QEMU_OPTS=-M virt -cpu cortex-a72 -display none $(QEMU_BASE_ARGS) -kernel

  EXTRA_RUNS += run-asid2-oldcpu

Although its a bit clunky - one day I'll get around to converting this
lot to meson.

> +}

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro
Re: [PATCH 3/3] tests: Add test for ASID2 and write/read of feature bits
Posted by Jim MacArthur 2 months, 2 weeks ago
On Mon, 24 Nov 2025 at 15:01, Alex Bennée <alex.bennee@linaro.org> wrote:
> If we instead use this to test for the presence of the feature and then...
>
> > +
> > +    asm("msr " TCR2_EL1 ", %[x0]\n\t"
> > +        "mrs %[x1], " TCR2_EL1 "\n\t"
> > +        : [x1] "=r" (out)
> > +        : [x0] "r" (in));
> > +
> > +    if ((out & feature_mask) == in) {
> > +        ml_printf("OK\n");
> > +        return 0;
> > +    } else {
> > +        ml_printf("FAIL: read value %lx != written value %lx\n",
> > +                  out & feature_mask, in);
> > +        return 1;
> > +    }
>
> extend this part to check the bits are behaving as the feature dictates
> then we can add a second test like this (Makefile.softmmu-target):
>
>   run-asid2-oldcpu: asid2
>           $(call run-test, $<, \
>             $(QEMU) -monitor none -display none \
>                     -chardev file$(COMMA)path=$<.out$(COMMA)id=output \
>                     $(QEMU_OPTS) $<)
>
>   run-asid2-oldcpu: QEMU_OPTS=-M virt -cpu cortex-a72 -display none $(QEMU_BASE_ARGS) -kernel
>
>   EXTRA_RUNS += run-asid2-oldcpu
>
> Although its a bit clunky - one day I'll get around to converting this
> lot to meson.

Good idea, but as far as I can see cortex-a72 doesn't implement
FEAT_TCR2, and nor does anything other than cpu-max, so the write and
read to TCR2_EL1 will be undefined behaviour (and causes an error in
the test). I could (and probably should) add a test for FEAT_TCR2 as
well, but it won't test anything more than my original test covers.

Jim
Re: [PATCH 3/3] tests: Add test for ASID2 and write/read of feature bits
Posted by Alex Bennée 2 months, 2 weeks ago
Jim MacArthur <jim.macarthur@linaro.org> writes:

> On Mon, 24 Nov 2025 at 15:01, Alex Bennée <alex.bennee@linaro.org> wrote:
>> If we instead use this to test for the presence of the feature and then...
>>
>> > +
>> > +    asm("msr " TCR2_EL1 ", %[x0]\n\t"
>> > +        "mrs %[x1], " TCR2_EL1 "\n\t"
>> > +        : [x1] "=r" (out)
>> > +        : [x0] "r" (in));
>> > +
>> > +    if ((out & feature_mask) == in) {
>> > +        ml_printf("OK\n");
>> > +        return 0;
>> > +    } else {
>> > +        ml_printf("FAIL: read value %lx != written value %lx\n",
>> > +                  out & feature_mask, in);
>> > +        return 1;
>> > +    }
>>
>> extend this part to check the bits are behaving as the feature dictates
>> then we can add a second test like this (Makefile.softmmu-target):
>>
>>   run-asid2-oldcpu: asid2
>>           $(call run-test, $<, \
>>             $(QEMU) -monitor none -display none \
>>                     -chardev file$(COMMA)path=$<.out$(COMMA)id=output \
>>                     $(QEMU_OPTS) $<)
>>
>>   run-asid2-oldcpu: QEMU_OPTS=-M virt -cpu cortex-a72 -display none $(QEMU_BASE_ARGS) -kernel
>>
>>   EXTRA_RUNS += run-asid2-oldcpu
>>
>> Although its a bit clunky - one day I'll get around to converting this
>> lot to meson.
>
> Good idea, but as far as I can see cortex-a72 doesn't implement
> FEAT_TCR2, and nor does anything other than cpu-max, so the write and
> read to TCR2_EL1 will be undefined behaviour (and causes an error in
> the test). I could (and probably should) add a test for FEAT_TCR2 as
> well, but it won't test anything more than my original test covers.

Ahh I see - until we have a new CPU type that has FEAT_TCR2 without
ASID2 there isn't much point jumping the hoops to test the edge case. I
think the most modern non-max CPU we have at the moment is the
neoverse-n2. We have TRMs for the -n3 and -v3's now so we could check
those to see if we have enough of the features to add them to the list
and if they meet the criteria of FEAT_TCR2 without FEAT_ASID2.

In the meantime no need to hold this up:

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>


>
> Jim

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro