On Wed, Dec 15, 2021 at 12:10 AM Nikita Shubin <nikita.shubin@xxxxxxxxxxx> wrote: > > Hello Atish! > > On Mon, 25 Oct 2021 12:53:44 -0700 > Atish Patra <atish.patra@xxxxxxx> wrote: > > > This patch adds all the definitions defined by the SBI PMU extension. > > > > Signed-off-by: Atish Patra <atish.patra@xxxxxxx> > > --- > > arch/riscv/include/asm/sbi.h | 97 > > ++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) > > > > diff --git a/arch/riscv/include/asm/sbi.h > > b/arch/riscv/include/asm/sbi.h index 0d42693cb65e..7a14ca06ba8f 100644 > > --- a/arch/riscv/include/asm/sbi.h > > +++ b/arch/riscv/include/asm/sbi.h > > @@ -27,6 +27,7 @@ enum sbi_ext_id { > > SBI_EXT_IPI = 0x735049, > > SBI_EXT_RFENCE = 0x52464E43, > > SBI_EXT_HSM = 0x48534D, > > + SBI_EXT_PMU = 0x504D55, > > }; > > > > enum sbi_ext_base_fid { > > @@ -70,6 +71,99 @@ enum sbi_hsm_hart_status { > > SBI_HSM_HART_STATUS_STOP_PENDING, > > }; > > > > + > > +enum sbi_ext_pmu_fid { > > + SBI_EXT_PMU_NUM_COUNTERS = 0, > > + SBI_EXT_PMU_COUNTER_GET_INFO, > > + SBI_EXT_PMU_COUNTER_CFG_MATCH, > > + SBI_EXT_PMU_COUNTER_START, > > + SBI_EXT_PMU_COUNTER_STOP, > > + SBI_EXT_PMU_COUNTER_FW_READ, > > +}; > > + > > +#define RISCV_PMU_RAW_EVENT_MASK GENMASK_ULL(55, 0) > > +#define RISCV_PMU_RAW_EVENT_IDX 0x20000 > > + > > +/** General pmu event codes specified in SBI PMU extension */ > > +enum sbi_pmu_hw_generic_events_t { > > + SBI_PMU_HW_NO_EVENT = 0, > > + SBI_PMU_HW_CPU_CYCLES = 1, > > + SBI_PMU_HW_INSTRUCTIONS = 2, > > + SBI_PMU_HW_CACHE_REFERENCES = 3, > > + SBI_PMU_HW_CACHE_MISSES = 4, > > + SBI_PMU_HW_BRANCH_INSTRUCTIONS = 5, > > + SBI_PMU_HW_BRANCH_MISSES = 6, > > + SBI_PMU_HW_BUS_CYCLES = 7, > > + SBI_PMU_HW_STALLED_CYCLES_FRONTEND = 8, > > + SBI_PMU_HW_STALLED_CYCLES_BACKEND = 9, > > + SBI_PMU_HW_REF_CPU_CYCLES = 10, > > + > > + SBI_PMU_HW_GENERAL_MAX, > > +}; > > + > > +/** > > + * Special "firmware" events provided by the firmware, even if the > > hardware > > + * does not support performance events. These events are encoded as > > a raw > > + * event type in Linux kernel perf framework. > > + */ > > +enum sbi_pmu_fw_generic_events_t { > > + SBI_PMU_FW_MISALIGNED_LOAD = 0, > > + SBI_PMU_FW_MISALIGNED_STORE = 1, > > + SBI_PMU_FW_ACCESS_LOAD = 2, > > + SBI_PMU_FW_ACCESS_STORE = 3, > > + SBI_PMU_FW_ILLEGAL_INSN = 4, > > + SBI_PMU_FW_SET_TIMER = 5, > > + SBI_PMU_FW_IPI_SENT = 6, > > + SBI_PMU_FW_IPI_RECVD = 7, > > + SBI_PMU_FW_FENCE_I_SENT = 8, > > + SBI_PMU_FW_FENCE_I_RECVD = 9, > > + SBI_PMU_FW_SFENCE_VMA_SENT = 10, > > + SBI_PMU_FW_SFENCE_VMA_RCVD = 11, > > + SBI_PMU_FW_SFENCE_VMA_ASID_SENT = 12, > > + SBI_PMU_FW_SFENCE_VMA_ASID_RCVD = 13, > > + > > + SBI_PMU_FW_HFENCE_GVMA_SENT = 14, > > + SBI_PMU_FW_HFENCE_GVMA_RCVD = 15, > > + SBI_PMU_FW_HFENCE_GVMA_VMID_SENT = 16, > > + SBI_PMU_FW_HFENCE_GVMA_VMID_RCVD = 17, > > + > > + SBI_PMU_FW_HFENCE_VVMA_SENT = 18, > > + SBI_PMU_FW_HFENCE_VVMA_RCVD = 19, > > + SBI_PMU_FW_HFENCE_VVMA_ASID_SENT = 20, > > + SBI_PMU_FW_HFENCE_VVMA_ASID_RCVD = 21, > > + SBI_PMU_FW_MAX, > > +}; > > + > > +/* SBI PMU event types */ > > +enum sbi_pmu_event_type { > > + SBI_PMU_EVENT_TYPE_HW = 0x0, > > + SBI_PMU_EVENT_TYPE_CACHE = 0x1, > > + SBI_PMU_EVENT_TYPE_RAW = 0x2, > > + SBI_PMU_EVENT_TYPE_FW = 0xf, > > +}; > > + > > +/* SBI PMU event types */ > > +enum sbi_pmu_ctr_type { > > + SBI_PMU_CTR_TYPE_HW = 0x0, > > + SBI_PMU_CTR_TYPE_FW, > > +}; > > + > > +/* Flags defined for config matching function */ > > +#define SBI_PMU_CFG_FLAG_SKIP_MATCH (1 << 0) > > +#define SBI_PMU_CFG_FLAG_CLEAR_VALUE (1 << 1) > > +#define SBI_PMU_CFG_FLAG_AUTO_START (1 << 2) > > +#define SBI_PMU_CFG_FLAG_SET_MINH (1 << 3) > > +#define SBI_PMU_CFG_FLAG_SET_SINH (1 << 4) > > +#define SBI_PMU_CFG_FLAG_SET_UINH (1 << 5) > > +#define SBI_PMU_CFG_FLAG_SET_VSINH (1 << 6) > > +#define SBI_PMU_CFG_FLAG_SET_VUINH (1 << 7) > > It looks like you have a typo here, the defines in OpenSBI are > different: > > #define SBI_PMU_CFG_FLAG_SET_VUINH (1 << 3) > #define SBI_PMU_CFG_FLAG_SET_VSINH (1 << 4) > #define SBI_PMU_CFG_FLAG_SET_UINH (1 << 5) > #define SBI_PMU_CFG_FLAG_SET_SINH (1 << 6) > #define SBI_PMU_CFG_FLAG_SET_MINH (1 << 7) > > Thanks for catching that. OpenSBI has the correct one as per the specification[1]. I will fix it in the next version. [1] https://github.com/riscv-software-src/opensbi/blob/master/include/sbi/sbi_ecall_interface.h > > + > > +/* Flags defined for counter start function */ > > +#define SBI_PMU_START_FLAG_SET_INIT_VALUE (1 << 0) > > + > > +/* Flags defined for counter stop function */ > > +#define SBI_PMU_STOP_FLAG_RESET (1 << 0) > > + > > #define SBI_SPEC_VERSION_DEFAULT 0x1 > > #define SBI_SPEC_VERSION_MAJOR_SHIFT 24 > > #define SBI_SPEC_VERSION_MAJOR_MASK 0x7f > > @@ -82,6 +176,9 @@ enum sbi_hsm_hart_status { > > #define SBI_ERR_INVALID_PARAM -3 > > #define SBI_ERR_DENIED -4 > > #define SBI_ERR_INVALID_ADDRESS -5 > > +#define SBI_ERR_ALREADY_AVAILABLE -6 > > +#define SBI_ERR_ALREADY_STARTED -7 > > +#define SBI_ERR_ALREADY_STOPPED -8 > > > > extern unsigned long sbi_spec_version; > > struct sbiret { > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/linux-riscv -- Regards, Atish