[PATCH v6 3/6] platform: generic: spacemit: k1: move hart init to nascent hook

[Anup Patel]

On Wed, Oct 28, 2026 at 7:24 PM Troy Mitchell
<troy.mitchell at linux.spacemit.com> wrote:
>
> cold_boot_allowed() is a policy query and should not modify per-hart
> state. The K1 callback currently programs ML2SETUP as a side effect.
>
> Move the ML2SETUP programming to nascent_init(), which runs on every
> hart before common initialization. Chain generic_nascent_init() to keep
> the generic per-hart setup intact.
>
> Fixes: 1f84ec2ac22e ("platform: generic: spacemit: add K1")
> Reported-by: Bo Gan <ganboing at gmail.com>
> Link: https://lore.kernel.org/r/56220293-88e3-451f-833e-8251656a83d9@gmail.com
> Reviewed-by: Bo Gan <ganboing at gmail.com>
> Signed-off-by: Troy Mitchell <troy.mitchell at linux.spacemit.com>

LGTM.

Reviewed-by: Anup Patel <anup at brainfault.org>

Applied this patch to the riscv/opensbi repo.

Thanks,
Anup

> ---
>  platform/generic/spacemit/k1.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/platform/generic/spacemit/k1.c b/platform/generic/spacemit/k1.c
> index 7ee5f17a..5e699f8e 100644
> --- a/platform/generic/spacemit/k1.c
> +++ b/platform/generic/spacemit/k1.c
> @@ -8,6 +8,7 @@
>   */
>
>  #include <platform_override.h>
> +#include <sbi/riscv_asm.h>
>  #include <sbi/riscv_io.h>
>  #include <sbi/sbi_hsm.h>
>  #include <spacemit/k1.h>
> @@ -86,16 +87,23 @@ static int spacemit_k1_early_init(bool cold_boot)
>         return 0;
>  }
>
> -static bool spacemit_cold_boot_allowed(u32 hartid)
> +static int spacemit_k1_nascent_init(void)
>  {
> -       csr_set(CSR_ML2SETUP, 1 << (hartid % PLATFORM_MAX_CPUS_PER_CLUSTER));
> +       csr_set(CSR_ML2SETUP,
> +               BIT(current_hartid() % PLATFORM_MAX_CPUS_PER_CLUSTER));
> +
> +       return generic_nascent_init();
> +}
>
> +static bool spacemit_cold_boot_allowed(u32 hartid)
> +{
>         return !hartid;
>  }
>
>  static int spacemit_k1_platform_init(const void *fdt, int nodeoff,
>                                      const struct fdt_match *match)
>  {
> +       generic_platform_ops.nascent_init = spacemit_k1_nascent_init;
>         generic_platform_ops.early_init = spacemit_k1_early_init;
>         generic_platform_ops.cold_boot_allowed = spacemit_cold_boot_allowed;
>
>
> --
> 2.55.0
>