[PATCH v2 1/1] lib: sbi: Allow programmable counters to monitor cycle/instret events for Andes PMU

[PATCH v2 1/1] lib: sbi: Allow programmable counters to monitor cycle/instret events for Andes PMU

[Leo Yu-Chi Liang]

Referencing commit 0c304b661965
("lib: sbi: Allow programmable counters to monitor cycle/instret events")
to support this functionality for Andes PMU.

Signed-off-by: Leo Yu-Chi Liang <ycliang@andestech.com>
Reviewed-by: Samuel Holland <samuel.holland@sifive.com>
---
Change since v1:
	- Modify the comment
---
 lib/sbi/sbi_pmu.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/sbi/sbi_pmu.c b/lib/sbi/sbi_pmu.c
index b9e84543..575799eb 100644
--- a/lib/sbi/sbi_pmu.c
+++ b/lib/sbi/sbi_pmu.c
@@ -719,12 +719,13 @@ static int pmu_ctr_find_hw(struct sbi_pmu_hart_state *phs,
 		return SBI_EINVAL;
 
 	/**
-	 * If Sscof is present try to find the programmable counter for
-	 * cycle/instret as well.
+	 * If Sscofpmf or Andes PMU is present, try to find
+	 * the programmable counter for cycle/instret as well.
 	 */
 	fixed_ctr = pmu_ctr_find_fixed_hw(event_idx);
 	if (fixed_ctr >= 0 &&
-	    !sbi_hart_has_extension(scratch, SBI_HART_EXT_SSCOFPMF))
+	    !sbi_hart_has_extension(scratch, SBI_HART_EXT_SSCOFPMF) &&
+	    !sbi_hart_has_extension(scratch, SBI_HART_EXT_XANDESPMU))
 		return pmu_fixed_ctr_update_inhibit_bits(fixed_ctr, flags);
 
 	if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_11)
-- 
2.34.1


-- 
opensbi mailing list
opensbi@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi

Re: [PATCH v2 1/1] lib: sbi: Allow programmable counters to monitor cycle/instret events for Andes PMU

[Atish Patra]

On 3/28/25 1:41 AM, Leo Yu-Chi Liang wrote:
> Referencing commit 0c304b661965
> ("lib: sbi: Allow programmable counters to monitor cycle/instret events")
> to support this functionality for Andes PMU.
> 
> Signed-off-by: Leo Yu-Chi Liang <ycliang@andestech.com>
> Reviewed-by: Samuel Holland <samuel.holland@sifive.com>
> ---
> Change since v1:
> 	- Modify the comment
> ---
>   lib/sbi/sbi_pmu.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/sbi/sbi_pmu.c b/lib/sbi/sbi_pmu.c
> index b9e84543..575799eb 100644
> --- a/lib/sbi/sbi_pmu.c
> +++ b/lib/sbi/sbi_pmu.c
> @@ -719,12 +719,13 @@ static int pmu_ctr_find_hw(struct sbi_pmu_hart_state *phs,
>   		return SBI_EINVAL;
>   
>   	/**
> -	 * If Sscof is present try to find the programmable counter for
> -	 * cycle/instret as well.
> +	 * If Sscofpmf or Andes PMU is present, try to find
> +	 * the programmable counter for cycle/instret as well.
>   	 */
>   	fixed_ctr = pmu_ctr_find_fixed_hw(event_idx);
>   	if (fixed_ctr >= 0 &&
> -	    !sbi_hart_has_extension(scratch, SBI_HART_EXT_SSCOFPMF))
> +	    !sbi_hart_has_extension(scratch, SBI_HART_EXT_SSCOFPMF) &&
> +	    !sbi_hart_has_extension(scratch, SBI_HART_EXT_XANDESPMU))
>   		return pmu_fixed_ctr_update_inhibit_bits(fixed_ctr, flags);
>   
>   	if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_11)

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

-- 
opensbi mailing list
opensbi@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi

Re: [PATCH v2 1/1] lib: sbi: Allow programmable counters to monitor cycle/instret events for Andes PMU

[Anup Patel]

On Fri, Mar 28, 2025 at 2:12 PM Leo Yu-Chi Liang <ycliang@andestech.com> wrote:
>
> Referencing commit 0c304b661965
> ("lib: sbi: Allow programmable counters to monitor cycle/instret events")
> to support this functionality for Andes PMU.
>
> Signed-off-by: Leo Yu-Chi Liang <ycliang@andestech.com>
> Reviewed-by: Samuel Holland <samuel.holland@sifive.com>

Applied this patch to the riscv/opensbi repo.

Thanks,
Anup

> ---
> Change since v1:
>         - Modify the comment
> ---
>  lib/sbi/sbi_pmu.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/lib/sbi/sbi_pmu.c b/lib/sbi/sbi_pmu.c
> index b9e84543..575799eb 100644
> --- a/lib/sbi/sbi_pmu.c
> +++ b/lib/sbi/sbi_pmu.c
> @@ -719,12 +719,13 @@ static int pmu_ctr_find_hw(struct sbi_pmu_hart_state *phs,
>                 return SBI_EINVAL;
>
>         /**
> -        * If Sscof is present try to find the programmable counter for
> -        * cycle/instret as well.
> +        * If Sscofpmf or Andes PMU is present, try to find
> +        * the programmable counter for cycle/instret as well.
>          */
>         fixed_ctr = pmu_ctr_find_fixed_hw(event_idx);
>         if (fixed_ctr >= 0 &&
> -           !sbi_hart_has_extension(scratch, SBI_HART_EXT_SSCOFPMF))
> +           !sbi_hart_has_extension(scratch, SBI_HART_EXT_SSCOFPMF) &&
> +           !sbi_hart_has_extension(scratch, SBI_HART_EXT_XANDESPMU))
>                 return pmu_fixed_ctr_update_inhibit_bits(fixed_ctr, flags);
>
>         if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_11)
> --
> 2.34.1
>
>
> --
> opensbi mailing list
> opensbi@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/opensbi

-- 
opensbi mailing list
opensbi@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi