mirror of
https://github.com/Fishwaldo/opensbi.git
synced 2025-03-15 19:31:32 +00:00
lib: sbi: Remove MCOUNTEREN and SCOUNTEREN hart features
If a hart implements privileged spec v1.10 (or higher) then we can safely assume that [m|s]counteren CSR are present and we don't need MCOUNTEREN and SCOUNTEREN as hart features. Signed-off-by: Anup Patel <apatel@ventanamicro.com> Reviewed-by: Atish Patra <atishp@rivosinc.com>
This commit is contained in:
parent
5b8b377178
commit
d4b563c881
4 changed files with 16 additions and 38 deletions
|
@ -26,24 +26,20 @@ enum sbi_hart_priv_versions {
|
|||
|
||||
/** Possible feature flags of a hart */
|
||||
enum sbi_hart_features {
|
||||
/** Hart has S-mode counter enable */
|
||||
SBI_HART_HAS_SCOUNTEREN = (1 << 0),
|
||||
/** Hart has M-mode counter enable */
|
||||
SBI_HART_HAS_MCOUNTEREN = (1 << 1),
|
||||
/** Hart has counter inhibit CSR */
|
||||
SBI_HART_HAS_MCOUNTINHIBIT = (1 << 2),
|
||||
SBI_HART_HAS_MCOUNTINHIBIT = (1 << 0),
|
||||
/** Hart has sscofpmf extension */
|
||||
SBI_HART_HAS_SSCOFPMF = (1 << 3),
|
||||
SBI_HART_HAS_SSCOFPMF = (1 << 1),
|
||||
/** HART has timer csr implementation in hardware */
|
||||
SBI_HART_HAS_TIME = (1 << 4),
|
||||
SBI_HART_HAS_TIME = (1 << 2),
|
||||
/** HART has AIA local interrupt CSRs */
|
||||
SBI_HART_HAS_AIA = (1 << 5),
|
||||
SBI_HART_HAS_AIA = (1 << 3),
|
||||
/** HART has menvcfg CSR */
|
||||
SBI_HART_HAS_MENVCFG = (1 << 6),
|
||||
SBI_HART_HAS_MENVCFG = (1 << 4),
|
||||
/** HART has mstateen CSR **/
|
||||
SBI_HART_HAS_SMSTATEEN = (1 << 7),
|
||||
SBI_HART_HAS_SMSTATEEN = (1 << 5),
|
||||
/** HART has SSTC extension implemented in hardware */
|
||||
SBI_HART_HAS_SSTC = (1 << 8),
|
||||
SBI_HART_HAS_SSTC = (1 << 6),
|
||||
|
||||
/** Last index of Hart features*/
|
||||
SBI_HART_HAS_LAST_FEATURE = SBI_HART_HAS_SSTC,
|
||||
|
|
|
@ -24,7 +24,7 @@ static bool hpm_allowed(int hpm_num, ulong prev_mode, bool virt)
|
|||
struct sbi_scratch *scratch = sbi_scratch_thishart_ptr();
|
||||
|
||||
if (prev_mode <= PRV_S) {
|
||||
if (sbi_hart_has_feature(scratch, SBI_HART_HAS_MCOUNTEREN)) {
|
||||
if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_10) {
|
||||
cen &= csr_read(CSR_MCOUNTEREN);
|
||||
if (virt)
|
||||
cen &= csr_read(CSR_HCOUNTEREN);
|
||||
|
@ -33,7 +33,7 @@ static bool hpm_allowed(int hpm_num, ulong prev_mode, bool virt)
|
|||
}
|
||||
}
|
||||
if (prev_mode == PRV_U) {
|
||||
if (sbi_hart_has_feature(scratch, SBI_HART_HAS_SCOUNTEREN))
|
||||
if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_10)
|
||||
cen &= csr_read(CSR_SCOUNTEREN);
|
||||
else
|
||||
cen = 0;
|
||||
|
|
|
@ -58,7 +58,7 @@ static void mstatus_init(struct sbi_scratch *scratch)
|
|||
|
||||
/* Disable user mode usage of all perf counters except default ones (CY, TM, IR) */
|
||||
if (misa_extension('S') &&
|
||||
sbi_hart_has_feature(scratch, SBI_HART_HAS_SCOUNTEREN))
|
||||
sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_10)
|
||||
csr_write(CSR_SCOUNTEREN, 7);
|
||||
|
||||
/**
|
||||
|
@ -66,7 +66,7 @@ static void mstatus_init(struct sbi_scratch *scratch)
|
|||
* Supervisor mode usage for all counters are enabled by default
|
||||
* But counters will not run until mcountinhibit is set.
|
||||
*/
|
||||
if (sbi_hart_has_feature(scratch, SBI_HART_HAS_MCOUNTEREN))
|
||||
if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_10)
|
||||
csr_write(CSR_MCOUNTEREN, -1);
|
||||
|
||||
/* All programmable counters will start running at runtime after S-mode request */
|
||||
|
@ -402,12 +402,6 @@ static inline char *sbi_hart_feature_id2string(unsigned long feature)
|
|||
return NULL;
|
||||
|
||||
switch (feature) {
|
||||
case SBI_HART_HAS_SCOUNTEREN:
|
||||
fstr = "scounteren";
|
||||
break;
|
||||
case SBI_HART_HAS_MCOUNTEREN:
|
||||
fstr = "mcounteren";
|
||||
break;
|
||||
case SBI_HART_HAS_MCOUNTINHIBIT:
|
||||
fstr = "mcountinhibit";
|
||||
break;
|
||||
|
@ -614,23 +608,10 @@ __mhpm_skip:
|
|||
#undef __check_csr_2
|
||||
#undef __check_csr
|
||||
|
||||
/* Detect if hart supports SCOUNTEREN feature */
|
||||
val = csr_read_allowed(CSR_SCOUNTEREN, (unsigned long)&trap);
|
||||
if (!trap.cause) {
|
||||
hfeatures->priv_version = SBI_HART_PRIV_VER_1_10;
|
||||
csr_write_allowed(CSR_SCOUNTEREN, (unsigned long)&trap, val);
|
||||
if (!trap.cause)
|
||||
hfeatures->features |= SBI_HART_HAS_SCOUNTEREN;
|
||||
}
|
||||
|
||||
/* Detect if hart supports MCOUNTEREN feature */
|
||||
/* Detect if hart supports Priv v1.10 */
|
||||
val = csr_read_allowed(CSR_MCOUNTEREN, (unsigned long)&trap);
|
||||
if (!trap.cause) {
|
||||
if (!trap.cause)
|
||||
hfeatures->priv_version = SBI_HART_PRIV_VER_1_10;
|
||||
csr_write_allowed(CSR_MCOUNTEREN, (unsigned long)&trap, val);
|
||||
if (!trap.cause)
|
||||
hfeatures->features |= SBI_HART_HAS_MCOUNTEREN;
|
||||
}
|
||||
|
||||
/* Detect if hart supports MCOUNTINHIBIT feature */
|
||||
val = csr_read_allowed(CSR_MCOUNTINHIBIT, (unsigned long)&trap);
|
||||
|
@ -651,7 +632,7 @@ __mhpm_skip:
|
|||
|
||||
/* Counter overflow/filtering is not useful without mcounter/inhibit */
|
||||
if (hfeatures->features & SBI_HART_HAS_MCOUNTINHIBIT &&
|
||||
hfeatures->features & SBI_HART_HAS_MCOUNTEREN) {
|
||||
hfeatures->priv_version >= SBI_HART_PRIV_VER_1_12) {
|
||||
/* Detect if hart supports sscofpmf */
|
||||
csr_read_allowed(CSR_SCOUNTOVF, (unsigned long)&trap);
|
||||
if (!trap.cause)
|
||||
|
|
|
@ -733,7 +733,8 @@ void sbi_pmu_exit(struct sbi_scratch *scratch)
|
|||
if (sbi_hart_has_feature(scratch, SBI_HART_HAS_MCOUNTINHIBIT))
|
||||
csr_write(CSR_MCOUNTINHIBIT, 0xFFFFFFF8);
|
||||
|
||||
csr_write(CSR_MCOUNTEREN, -1);
|
||||
if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_10)
|
||||
csr_write(CSR_MCOUNTEREN, -1);
|
||||
pmu_reset_event_map(hartid);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue