From 29bd0e6688249ca6a70cc376393f90688968a99d Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Mon, 20 Feb 2017 17:55:50 +0530 Subject: [PATCH] xilinx: zynqmp: Read bootmode register using PM API Read boot mode register using pm_mmio_read if pmu is present otherwise access it directly using mmio_read_32(). Signed-off-by: Siva Durga Prasad Paladugu Acked-by: Michal Simek --- plat/xilinx/zynqmp/aarch64/zynqmp_common.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c index fd054beb9..ace4a0a95 100644 --- a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c +++ b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c @@ -10,6 +10,7 @@ #include #include #include "../zynqmp_private.h" +#include "pm_api_sys.h" /* * Table of regions to map using the MMU. @@ -241,7 +242,12 @@ int zynqmp_is_pmu_up(void) unsigned int zynqmp_get_bootmode(void) { - uint32_t r = mmio_read_32(CRL_APB_BOOT_MODE_USER); + uint32_t r; + + if (zynqmp_is_pmu_up()) + pm_mmio_read(CRL_APB_BOOT_MODE_USER, &r); + else + r = mmio_read_32(CRL_APB_BOOT_MODE_USER); return r & CRL_APB_BOOT_MODE_MASK; } -- GitLab