arm64: versal2: Move board_early_init_r clock setup to mach code

board_early_init_r() programmed the IOU switch clock and the system
timestamp counter directly with readl()/writel() in board code. This is
SoC register setup rather than board policy, and the same block is
duplicated across the Xilinx SoCs.

Move it into versal2_timer_setup() in arch/arm/mach-versal2 so the board
hook only keeps the EL3 guard and calls the helper.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://patch.msgid.link/08e835a183c39de6f666375ac390eee6a8f3f12e.1782219202.git.michal.simek@amd.com

diff --git a/arch/arm/mach-versal2/cpu.c b/arch/arm/mach-versal2/cpu.c
index 2b30a81d250a5254b61104376ed69f30e92644b2..07bb1a61b179923670763160b3f118d51f438b85 100644 (file)
--- a/arch/arm/mach-versal2/cpu.c
+++ b/arch/arm/mach-versal2/cpu.c
@@ -7,6 +7,8 @@
  */
 
 #include <init.h>
+#include <log.h>
+#include <time.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
@@ -152,6 +154,47 @@ u8 __weak versal2_get_bootmode(void)
        return bootmode;
 }
 
+void versal2_timer_setup(void)
+{
+       u32 val;
+
+       debug("iou_switch ctrl div0 %x\n",
+             readl(&crlapb_base->iou_switch_ctrl));
+
+       writel(IOU_SWITCH_CTRL_CLKACT_BIT |
+              (CONFIG_IOU_SWITCH_DIVISOR0 << IOU_SWITCH_CTRL_DIVISOR0_SHIFT),
+              &crlapb_base->iou_switch_ctrl);
+
+       /* Global timer init - Program time stamp reference clk */
+       val = readl(&crlapb_base->timestamp_ref_ctrl);
+       val |= CRL_APB_TIMESTAMP_REF_CTRL_CLKACT_BIT;
+       writel(val, &crlapb_base->timestamp_ref_ctrl);
+
+       debug("ref ctrl 0x%x\n",
+             readl(&crlapb_base->timestamp_ref_ctrl));
+
+       /* Clear reset of timestamp reg */
+       writel(0, &crlapb_base->rst_timestamp);
+
+       /*
+        * Program freq register in System counter and
+        * enable system counter.
+        */
+       writel(CONFIG_COUNTER_FREQUENCY,
+              &iou_scntr_secure->base_frequency_id_register);
+
+       debug("counter val 0x%x\n",
+             readl(&iou_scntr_secure->base_frequency_id_register));
+
+       writel(IOU_SCNTRS_CONTROL_EN,
+              &iou_scntr_secure->counter_control_register);
+
+       debug("scntrs control 0x%x\n",
+             readl(&iou_scntr_secure->counter_control_register));
+       debug("timer 0x%llx\n", get_ticks());
+       debug("timer 0x%llx\n", get_ticks());
+}
+
 U_BOOT_DRVINFO(soc_amd_versal2) = {
        .name = "soc_amd_versal2",
 };

diff --git a/arch/arm/mach-versal2/include/mach/sys_proto.h b/arch/arm/mach-versal2/include/mach/sys_proto.h
index b3118c208e8f68b85044cd06c1e25664a79f1964..b8d12d1dd3bbaff517053b04250cd1f42829f3e1 100644 (file)
--- a/arch/arm/mach-versal2/include/mach/sys_proto.h
+++ b/arch/arm/mach-versal2/include/mach/sys_proto.h
@@ -19,5 +19,7 @@ u32 versal2_pmc_multi_boot(void);
 u32 versal2_multi_boot_reg(void);
 /* Weak bootmode decode (MMIO default); a firmware/SCMI build may override */
 u8 versal2_get_bootmode(void);
+/* EL3 clock/timer register setup, called from board_early_init_r() */
+void versal2_timer_setup(void);
 
 #endif /* _ASM_ARCH_SYS_PROTO_H */

diff --git a/board/amd/versal2/board.c b/board/amd/versal2/board.c
index c4e88440d64ee006bb6edd061ba0c32497b4801b..7f2fb4c1ec635998dcf95fae78ddc9574f31edba 100644 (file)
--- a/board/amd/versal2/board.c
+++ b/board/amd/versal2/board.c
@@ -132,46 +132,10 @@ bool soc_detection(void)
 
 int board_early_init_r(void)
 {
-       u32 val;
-
        if (current_el() != 3)
                return 0;
 
-       debug("iou_switch ctrl div0 %x\n",
-             readl(&crlapb_base->iou_switch_ctrl));
-
-       writel(IOU_SWITCH_CTRL_CLKACT_BIT |
-              (CONFIG_IOU_SWITCH_DIVISOR0 << IOU_SWITCH_CTRL_DIVISOR0_SHIFT),
-              &crlapb_base->iou_switch_ctrl);
-
-       /* Global timer init - Program time stamp reference clk */
-       val = readl(&crlapb_base->timestamp_ref_ctrl);
-       val |= CRL_APB_TIMESTAMP_REF_CTRL_CLKACT_BIT;
-       writel(val, &crlapb_base->timestamp_ref_ctrl);
-
-       debug("ref ctrl 0x%x\n",
-             readl(&crlapb_base->timestamp_ref_ctrl));
-
-       /* Clear reset of timestamp reg */
-       writel(0, &crlapb_base->rst_timestamp);
-
-       /*
-        * Program freq register in System counter and
-        * enable system counter.
-        */
-       writel(CONFIG_COUNTER_FREQUENCY,
-              &iou_scntr_secure->base_frequency_id_register);
-
-       debug("counter val 0x%x\n",
-             readl(&iou_scntr_secure->base_frequency_id_register));
-
-       writel(IOU_SCNTRS_CONTROL_EN,
-              &iou_scntr_secure->counter_control_register);
-
-       debug("scntrs control 0x%x\n",
-             readl(&iou_scntr_secure->counter_control_register));
-       debug("timer 0x%llx\n", get_ticks());
-       debug("timer 0x%llx\n", get_ticks());
+       versal2_timer_setup();
 
        return 0;
 }