stm32mp1: split IO compensation activation

To mask the time consumed waiting for CMPCR_READY bit, the function to
enable IO compensation is split in 2, a start and a finish function.
This is used at boot, and in return from STOP mode.

Change-Id: Ic2b67c0e68415eb1abd3c7ba916b0fae21737235
Signed-off-by: Yann Gautier <yann.gautier@st.com>
Reviewed-on: https://gerrit.st.com/c/mpu/oe/st/tf-a/+/188608


Reviewed-by: CITOOLS <MDG-smet-aci-reviews@list.st.com>
Reviewed-by: CIBUILD <MDG-smet-aci-builds@list.st.com>

plat/st/stm32mp1/bl2_plat_setup.c

@@ -503,6 +503,8 @@ skip_console_init:
 
 	update_monotonic_counter();
 
+	stm32mp1_syscfg_enable_io_compensation_finish();
+
 	if (dt_pmic_status() > 0) {
 		initialize_pmic();
 		print_pmic_info_and_debug();

plat/st/stm32mp1/include/stm32mp1_private.h

@@ -36,7 +36,8 @@ bool stm32_boot_is_serial(void);
 enum etzpc_decprot_attributes stm32mp_etzpc_binding2decprot(uint32_t mode);
 
 void stm32mp1_syscfg_init(void);
-void stm32mp1_syscfg_enable_io_compensation(void);
+void stm32mp1_syscfg_enable_io_compensation_start(void);
+void stm32mp1_syscfg_enable_io_compensation_finish(void);
 void stm32mp1_syscfg_disable_io_compensation(void);
 
 #if STM32MP_USE_STM32IMAGE

plat/st/stm32mp1/stm32mp1_low_power.c

@@ -261,6 +261,7 @@ void stm32_exit_cstop(void)
 
 	enter_cstop_done = false;
 
+	stm32mp1_syscfg_enable_io_compensation_start();
 
 	plat_ic_set_priority_mask(gicc_pmr);
 
@@ -284,11 +285,11 @@ void stm32_exit_cstop(void)
 						   &sleep_time);
 	stm32mp_stgen_restore_counter(stgen_cnt, stdby_time_in_ms);
 
-	stm32mp1_syscfg_enable_io_compensation();
-
 	if (stm32mp1_clock_stopmode_resume() != 0) {
 		panic();
 	}
+
+	stm32mp1_syscfg_enable_io_compensation_finish();
 }
 
 static int get_locked(volatile int *state)

plat/st/stm32mp1/stm32mp1_syscfg.c

@@ -129,13 +129,11 @@ void stm32mp1_syscfg_init(void)
 		}
 	}
 
-	stm32mp1_syscfg_enable_io_compensation();
+	stm32mp1_syscfg_enable_io_compensation_start();
 }
 
-void stm32mp1_syscfg_enable_io_compensation(void)
+void stm32mp1_syscfg_enable_io_compensation_start(void)
 {
-	uint64_t start;
-
 	/*
 	 * Activate automatic I/O compensation.
 	 * Warning: need to ensure CSI enabled and ready in clock driver.
@@ -145,6 +143,11 @@ void stm32mp1_syscfg_enable_io_compensation(void)
 
 	mmio_setbits_32(SYSCFG_BASE + SYSCFG_CMPENSETR,
 			SYSCFG_CMPENSETR_MPU_EN);
+}
+
+void stm32mp1_syscfg_enable_io_compensation_finish(void)
+{
+	uint64_t start;
 
 	start = timeout_init_us(SYSCFG_CMPCR_READY_TIMEOUT_US);