diff options
| author | Tom Rini <[email protected]> | 2025-10-16 09:52:14 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-10-16 09:52:14 -0600 |
| commit | 7fa9e29a3ab372455b6e2744122030ff3ac72f27 (patch) | |
| tree | b93002dc7df1df26b3fc7b2c653c046e033f6d76 | |
| parent | 2ba64e303b2706e5c42a6bf982326d632342ca66 (diff) | |
| parent | 0ab7710a06401f8cac1d49bac5e66d25f3e6e4e1 (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-riscv
CI: https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/27926
- Revert "riscv: Add a Zalrsc-only alternative for synchronization in
start.S" to fix regression
- clk: sophgo: Fix a warning about void returns value
| -rw-r--r-- | arch/riscv/cpu/start.S | 26 | ||||
| -rw-r--r-- | drivers/clk/sophgo/clk-common.h | 2 |
2 files changed, 2 insertions, 26 deletions
diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S index 6324ff585d4..7bafdfd390a 100644 --- a/arch/riscv/cpu/start.S +++ b/arch/riscv/cpu/start.S @@ -151,16 +151,9 @@ call_harts_early_init: */ la t0, hart_lottery li t1, 1 -#if CONFIG_IS_ENABLED(RISCV_ISA_ZAAMO) amoswap.w s2, t1, 0(t0) bnez s2, wait_for_gd_init #else - lr.w s2, (t0) - bnez s2, wait_for_gd_init - sc.w s2, t1, (t0) - bnez s2, wait_for_gd_init -#endif -#else /* * FIXME: gp is set before it is initialized. If an XIP U-Boot ever * encounters a pending IPI on boot it is liable to jump to whatever @@ -184,12 +177,7 @@ call_harts_early_init: #if !CONFIG_IS_ENABLED(XIP) #ifdef CONFIG_AVAILABLE_HARTS la t0, available_harts_lock -#if CONFIG_IS_ENABLED(RISCV_ISA_ZAAMO) amoswap.w.rl zero, zero, 0(t0) -#else - fence rw, w - sw zero, 0(t0) -#endif #endif wait_for_gd_init: @@ -202,14 +190,7 @@ wait_for_gd_init: #ifdef CONFIG_AVAILABLE_HARTS la t0, available_harts_lock li t1, 1 -1: -#if CONFIG_IS_ENABLED(RISCV_ISA_ZAAMO) - amoswap.w.aq t1, t1, 0(t0) -#else - lr.w.aq t1, 0(t0) - bnez t1, 1b - sc.w.rl t1, t1, 0(t0) -#endif +1: amoswap.w.aq t1, t1, 0(t0) bnez t1, 1b /* register available harts in the available_harts mask */ @@ -219,12 +200,7 @@ wait_for_gd_init: or t2, t2, t1 SREG t2, GD_AVAILABLE_HARTS(gp) -#if CONFIG_IS_ENABLED(RISCV_ISA_ZAAMO) amoswap.w.rl zero, zero, 0(t0) -#else - fence rw, w - sw zero, 0(t0) -#endif #endif /* diff --git a/drivers/clk/sophgo/clk-common.h b/drivers/clk/sophgo/clk-common.h index a9e83d0d689..a18673f397c 100644 --- a/drivers/clk/sophgo/clk-common.h +++ b/drivers/clk/sophgo/clk-common.h @@ -70,7 +70,7 @@ cv1800b_clk_setfield(void *base, struct cv1800b_clk_regfield *field, u32 val) u32 new_val = (readl(base + field->offset) & ~mask) | ((val << field->shift) & mask); - return writel(new_val, base + field->offset); + writel(new_val, base + field->offset); } #endif /* __CLK_SOPHGO_COMMON_H__ */ |