[PATCH 07/11] lib: sbi: Fix AIA feature detection

[Atish Patra]

On Fri, Apr 29, 2022 at 8:52 AM Anup Patel <apatel at ventanamicro.com> wrote:
>
> The AIA feature detection uses unnecessary goto which is not need
> and AIA case in sbi_hart_feature_id2string() does not break. This
> patch fixes both issues in AIA feature detection.
>
> Signed-off-by: Anup Patel <apatel at ventanamicro.com>
> ---
>  lib/sbi/sbi_hart.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c
> index 5ee5ddd..fdfb6d9 100644
> --- a/lib/sbi/sbi_hart.c
> +++ b/lib/sbi/sbi_hart.c
> @@ -408,6 +408,7 @@ static inline char *sbi_hart_feature_id2string(unsigned long feature)
>                 break;
>         case SBI_HART_HAS_AIA:
>                 fstr = "aia";
> +               break;
>         case SBI_HART_HAS_SSTC:
>                 fstr = "sstc";
>                 break;
> @@ -632,10 +633,8 @@ __mhpm_skip:
>
>         /* Detect if hart has AIA local interrupt CSRs */
>         csr_read_allowed(CSR_MTOPI, (unsigned long)&trap);
> -       if (trap.cause)
> -               goto __aia_skip;
> -       hfeatures->features |= SBI_HART_HAS_AIA;
> -__aia_skip:
> +       if (!trap.cause)
> +               hfeatures->features |= SBI_HART_HAS_AIA;
>
>         /* Detect if hart supports stimecmp CSR(Sstc extension) */
>         if (hfeatures->priv_version >= SBI_HART_PRIV_VER_1_12) {
> --
> 2.34.1
>

Reviewed-by: Atish Patra <atishp at rivosinc.com>

-- 
Regards,
Atish