xlat_v2: Fix descriptor debug print

The XN, PXN and UXN bits are part of the upper attributes, not the
lower attributes.

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

diff --git a/lib/xlat_tables_v2/xlat_tables_internal.c b/lib/xlat_tables_v2/xlat_tables_internal.c
index a38f97f2ff7de3ee71f55e9f93a1b5b872a91086..3b586b2a0449d01df8b30a6da3bd382e438e124c 100644 (file)
--- a/lib/xlat_tables_v2/xlat_tables_internal.c
+++ b/lib/xlat_tables_v2/xlat_tables_internal.c
@@ -1087,13 +1087,13 @@ static void xlat_desc_print(const xlat_ctx_t *ctx, uint64_t desc)
 
        if (xlat_regime == EL3_REGIME) {
                /* For EL3, the XN bit is all what matters */
-               tf_printf("%s", LOWER_ATTRS(XN) & desc ? xn_str : exec_str);
+               tf_printf("%s", (UPPER_ATTRS(XN) & desc) ? xn_str : exec_str);
        } else {
                /* For EL0 and EL1, we need to know who has which rights */
-               tf_printf("%s", LOWER_ATTRS(PXN) & desc ? xn_str : exec_str);
+               tf_printf("%s", (UPPER_ATTRS(PXN) & desc) ? xn_str : exec_str);
                tf_printf("%s", priv_str);
 
-               tf_printf("%s", LOWER_ATTRS(UXN) & desc ? xn_str : exec_str);
+               tf_printf("%s", (UPPER_ATTRS(UXN) & desc) ? xn_str : exec_str);
                tf_printf("%s", user_str);
        }