diff options
| author | Nicolas Toromanoff <nicolas.toromanoff@foss.st.com> | 2022-02-09 12:26:31 +0100 |
|---|---|---|
| committer | Yann Gautier <yann.gautier@st.com> | 2022-02-11 11:05:30 +0100 |
| commit | c870188d2791b2c83118a16f3e537e8104017cc0 (patch) | |
| tree | 817045a1e8a1e7aeab4a98a60e2bcda0466c8bb7 | |
| parent | cbadfe694207c9bf0c8f0e639b56666f47a4c712 (diff) | |
| download | arm-trusted-firmware-c870188d2791b2c83118a16f3e537e8104017cc0.tar.gz | |
refactor(stm32mp1): update tamp_bkpr return type
tamp_bkpr() returns a register address. So use uintptr_t instead of
uin32_t.
Signed-off-by: Nicolas Toromanoff <nicolas.toromanoff@foss.st.com>
Change-Id: I5eddfa525465313dadfec18d128248a968ba74e2
| -rw-r--r-- | plat/st/stm32mp1/stm32mp1_def.h | 2 | ||||
| -rw-r--r-- | plat/st/stm32mp1/stm32mp1_pm.c | 10 | ||||
| -rw-r--r-- | plat/st/stm32mp1/stm32mp1_private.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/plat/st/stm32mp1/stm32mp1_def.h b/plat/st/stm32mp1/stm32mp1_def.h index fd1215992..aabe81f1b 100644 --- a/plat/st/stm32mp1/stm32mp1_def.h +++ b/plat/st/stm32mp1/stm32mp1_def.h @@ -429,7 +429,7 @@ enum ddr_type { #define TAMP_BKP_REGISTER_BASE (TAMP_BASE + U(0x100)) #if !(defined(__LINKER__) || defined(__ASSEMBLER__)) -static inline uint32_t tamp_bkpr(uint32_t idx) +static inline uintptr_t tamp_bkpr(uint32_t idx) { return TAMP_BKP_REGISTER_BASE + (idx << 2); } diff --git a/plat/st/stm32mp1/stm32mp1_pm.c b/plat/st/stm32mp1/stm32mp1_pm.c index ed4d5e5c7..389215129 100644 --- a/plat/st/stm32mp1/stm32mp1_pm.c +++ b/plat/st/stm32mp1/stm32mp1_pm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2021, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2022, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,8 +7,6 @@ #include <assert.h> #include <errno.h> -#include <platform_def.h> - #include <arch_helpers.h> #include <bl32/sp_min/platform_sp_min.h> #include <common/debug.h> @@ -20,6 +18,8 @@ #include <lib/psci/psci.h> #include <plat/common/platform.h> +#include <platform_def.h> + static uintptr_t stm32_sec_entrypoint; static uint32_t cntfrq_core0; @@ -60,9 +60,9 @@ static void stm32_cpu_standby(plat_local_state_t cpu_state) static int stm32_pwr_domain_on(u_register_t mpidr) { unsigned long current_cpu_mpidr = read_mpidr_el1(); - uint32_t bkpr_core1_addr = + uintptr_t bkpr_core1_addr = tamp_bkpr(BOOT_API_CORE1_BRANCH_ADDRESS_TAMP_BCK_REG_IDX); - uint32_t bkpr_core1_magic = + uintptr_t bkpr_core1_magic = tamp_bkpr(BOOT_API_CORE1_MAGIC_NUMBER_TAMP_BCK_REG_IDX); if (mpidr == current_cpu_mpidr) { diff --git a/plat/st/stm32mp1/stm32mp1_private.c b/plat/st/stm32mp1/stm32mp1_private.c index 9b39b9d3e..1125a69e0 100644 --- a/plat/st/stm32mp1/stm32mp1_private.c +++ b/plat/st/stm32mp1/stm32mp1_private.c @@ -568,7 +568,7 @@ uint32_t stm32mp_get_ddr_ns_size(void) void stm32_save_boot_interface(uint32_t interface, uint32_t instance) { - uint32_t bkpr_itf_idx = tamp_bkpr(TAMP_BOOT_MODE_BACKUP_REG_ID); + uintptr_t bkpr_itf_idx = tamp_bkpr(TAMP_BOOT_MODE_BACKUP_REG_ID); clk_enable(RTCAPB); @@ -585,7 +585,7 @@ void stm32_get_boot_interface(uint32_t *interface, uint32_t *instance) static uint32_t itf; if (itf == 0U) { - uint32_t bkpr = tamp_bkpr(TAMP_BOOT_MODE_BACKUP_REG_ID); + uintptr_t bkpr = tamp_bkpr(TAMP_BOOT_MODE_BACKUP_REG_ID); clk_enable(RTCAPB); |