[PATCH] lib: sbi: Fix location of sbi_domain_context_init

[Alvin Che-Chia Chang(張哲嘉)]

Hi Xiang,

The domain data can be allocated during every domain registration:
sbi_domain_register() --> sbi_domain_setup_data() --> domain_setup_data_one()

Thus, it's unnecessary to call sbi_domain_context_init() in sbi_domain_finalize().

Did you encounter any bug on original flow ?

Regards,
Alvin

> -----Original Message-----
> From: Xiang W <wxjstz at 126.com>
> Sent: Wednesday, March 26, 2025 5:18 PM
> To: opensbi at lists.infradead.org
> Cc: anup at brainfault.org; peterlin at andestech.com; 2931013282 at sjtu.edu.cn;
> Alvin Che-Chia Chang(張哲嘉) <alvinga at andestech.com>; yong.li at intel.com;
> samuel.holland at sifive.com; Xiang W <wxjstz at 126.com>
> Subject: [PATCH] lib: sbi: Fix location of sbi_domain_context_init
>
> [EXTERNAL MAIL]
>
> sbi_domain_context_init needs to assign context to each hart of each domain,
> so it must be called after all the domains are registered.
>
> Signed-off-by: Xiang W <wxjstz at 126.com>
> ---
>  lib/sbi/sbi_domain.c | 17 +++++++++--------
>  1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/lib/sbi/sbi_domain.c b/lib/sbi/sbi_domain.c index
> 51c82a75..ad393644 100644
> --- a/lib/sbi/sbi_domain.c
> +++ b/lib/sbi/sbi_domain.c
> @@ -765,6 +765,14 @@ int sbi_domain_finalize(struct sbi_scratch *scratch)
>          */
>         domain_finalized = true;
>
> +       /* Initialize domain context support */
> +       rc = sbi_domain_context_init();
> +       if (rc) {
> +               sbi_printf("%s: sbi_domain_context_init() failed (error
> %d)\n",
> +                          __func__, rc);
> +               return rc;
> +       }
> +
>         return 0;
>  }
>
> @@ -795,16 +803,11 @@ int sbi_domain_init(struct sbi_scratch *scratch, u32
> cold_hartid)
>         if (!domain_hart_ptr_offset)
>                 return SBI_ENOMEM;
>
> -       /* Initialize domain context support */
> -       rc = sbi_domain_context_init();
> -       if (rc)
> -               goto fail_free_domain_hart_ptr_offset;
> -
>         root_memregs = sbi_calloc(sizeof(*root_memregs),
> ROOT_REGION_MAX + 1);
>         if (!root_memregs) {
>                 sbi_printf("%s: no memory for root regions\n", __func__);
>                 rc = SBI_ENOMEM;
> -               goto fail_deinit_context;
> +               goto fail_free_domain_hart_ptr_offset;
>         }
>         root.regions = root_memregs;
>
> @@ -869,8 +872,6 @@ fail_free_root_hmask:
>         sbi_free(root_hmask);
>  fail_free_root_memregs:
>         sbi_free(root_memregs);
> -fail_deinit_context:
> -       sbi_domain_context_deinit();
>  fail_free_domain_hart_ptr_offset:
>         sbi_scratch_free_offset(domain_hart_ptr_offset);
>         return rc;
> --
> 2.47.2

CONFIDENTIALITY NOTICE:

This e-mail (and its attachments) may contain confidential and legally privileged information or information protected from disclosure. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution, or use of the information contained herein is strictly prohibited. In this case, please immediately notify the sender by return e-mail, delete the message (and any accompanying documents) and destroy all printed hard copies. Thank you for your cooperation.

Copyright ANDES TECHNOLOGY CORPORATION - All Rights Reserved.