SPM: Fix calculation of max page granularity

The code was incorrectly reading from ID_AA64PRF0_EL1 instead of
ID_AA64MMFR0_EL1 causing the supported granularity sizes returned by the
code to be wrong.

This wasn't causing any problem because it's just used to check the
alignment of the base of the buffer shared between Non-secure and Secure
worlds, and it was aligned to more than 64 KiB, which is the maximum
granularity supported by the architecture.

Change-Id: Icc0d949d9521cc0ef13afb753825c475ea62d462
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

diff --git a/services/std_svc/spm/secure_partition_setup.c b/services/std_svc/spm/secure_partition_setup.c
index 673016083f081ae2047987fab4441414e341c888..6f4b0571366f31d337c3a53ca86a535693562547 100644 (file)
--- a/services/std_svc/spm/secure_partition_setup.c
+++ b/services/std_svc/spm/secure_partition_setup.c
@@ -92,20 +92,20 @@ void secure_partition_setup(void)
 
        /* Get max granularity supported by the platform. */
 
-       u_register_t id_aa64prf0_el1 = read_id_aa64pfr0_el1();
+       u_register_t id_aa64mmfr0_el1 = read_id_aa64mmfr0_el1();
 
        int tgran64_supported =
-               ((id_aa64prf0_el1 >> ID_AA64MMFR0_EL1_TGRAN64_SHIFT) &
+               ((id_aa64mmfr0_el1 >> ID_AA64MMFR0_EL1_TGRAN64_SHIFT) &
                 ID_AA64MMFR0_EL1_TGRAN64_MASK) ==
                 ID_AA64MMFR0_EL1_TGRAN64_SUPPORTED;
 
        int tgran16_supported =
-               ((id_aa64prf0_el1 >> ID_AA64MMFR0_EL1_TGRAN16_SHIFT) &
+               ((id_aa64mmfr0_el1 >> ID_AA64MMFR0_EL1_TGRAN16_SHIFT) &
                 ID_AA64MMFR0_EL1_TGRAN16_MASK) ==
                 ID_AA64MMFR0_EL1_TGRAN16_SUPPORTED;
 
        int tgran4_supported =
-               ((id_aa64prf0_el1 >> ID_AA64MMFR0_EL1_TGRAN4_SHIFT) &
+               ((id_aa64mmfr0_el1 >> ID_AA64MMFR0_EL1_TGRAN4_SHIFT) &
                 ID_AA64MMFR0_EL1_TGRAN4_MASK) ==
                 ID_AA64MMFR0_EL1_TGRAN4_SUPPORTED;
 
@@ -121,7 +121,7 @@ void secure_partition_setup(void)
        }
 
        VERBOSE("Max translation granule supported: %lu KiB\n",
-               max_granule_size);
+               max_granule_size / 1024);
 
        uintptr_t max_granule_size_mask = max_granule_size - 1;