From: Atish Patra <atishp@rivosinc.com> To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, Bin Meng <bin.meng@windriver.com>, Atish Patra <atishp@rivosinc.com>, Alistair Francis <alistair.francis@wdc.com>, Palmer Dabbelt <palmer@dabbelt.com>, Bin Meng <bmeng.cn@gmail.com> Subject: [PATCH v4 05/11] target/riscv: Implement mcountinhibit CSR Date: Thu, 6 Jan 2022 16:48:40 -0800 [thread overview] Message-ID: <20220107004846.378859-6-atishp@rivosinc.com> (raw) In-Reply-To: <20220107004846.378859-1-atishp@rivosinc.com> From: Atish Patra <atish.patra@wdc.com> As per the privilege specification v1.11, mcountinhibit allows to start/stop a pmu counter selectively. Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Atish Patra <atish.patra@wdc.com> Signed-off-by: Atish Patra <atishp@rivosinc.com> --- target/riscv/cpu.h | 2 ++ target/riscv/cpu_bits.h | 4 ++++ target/riscv/csr.c | 25 +++++++++++++++++++++++++ target/riscv/machine.c | 1 + 4 files changed, 32 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index b353770596e8..6f2875fd9acd 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -222,6 +222,8 @@ struct CPURISCVState { target_ulong scounteren; target_ulong mcounteren; + target_ulong mcountinhibit; + target_ulong sscratch; target_ulong mscratch; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index 1e31f4d35f5b..dbd9ce9a85a3 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -283,6 +283,10 @@ #define CSR_MHPMCOUNTER29 0xb1d #define CSR_MHPMCOUNTER30 0xb1e #define CSR_MHPMCOUNTER31 0xb1f + +/* Machine counter-inhibit register */ +#define CSR_MCOUNTINHIBIT 0x320 + #define CSR_MHPMEVENT3 0x323 #define CSR_MHPMEVENT4 0x324 #define CSR_MHPMEVENT5 0x325 diff --git a/target/riscv/csr.c b/target/riscv/csr.c index e31c27e270a2..89d15b38be7c 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -834,6 +834,28 @@ static RISCVException write_mtvec(CPURISCVState *env, int csrno, return RISCV_EXCP_NONE; } +static RISCVException read_mcountinhibit(CPURISCVState *env, int csrno, + target_ulong *val) +{ + if (env->priv_ver < PRIV_VERSION_1_11_0) { + return RISCV_EXCP_ILLEGAL_INST; + } + + *val = env->mcountinhibit; + return RISCV_EXCP_NONE; +} + +static RISCVException write_mcountinhibit(CPURISCVState *env, int csrno, + target_ulong val) +{ + if (env->priv_ver < PRIV_VERSION_1_11_0) { + return RISCV_EXCP_ILLEGAL_INST; + } + + env->mcountinhibit = val; + return RISCV_EXCP_NONE; +} + static RISCVException read_mcounteren(CPURISCVState *env, int csrno, target_ulong *val) { @@ -2120,6 +2142,9 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MHPMCOUNTER30] = { "mhpmcounter30", mctr, read_zero }, [CSR_MHPMCOUNTER31] = { "mhpmcounter31", mctr, read_zero }, + [CSR_MCOUNTINHIBIT] = { "mcountinhibit", any, read_mcountinhibit, + write_mcountinhibit }, + [CSR_MHPMEVENT3] = { "mhpmevent3", any, read_zero }, [CSR_MHPMEVENT4] = { "mhpmevent4", any, read_zero }, [CSR_MHPMEVENT5] = { "mhpmevent5", any, read_zero }, diff --git a/target/riscv/machine.c b/target/riscv/machine.c index ad8248ebfda8..ea4a382c140a 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -205,6 +205,7 @@ const VMStateDescription vmstate_riscv_cpu = { VMSTATE_UINTTL(env.mtval, RISCVCPU), VMSTATE_UINTTL(env.scounteren, RISCVCPU), VMSTATE_UINTTL(env.mcounteren, RISCVCPU), + VMSTATE_UINTTL(env.mcountinhibit, RISCVCPU), VMSTATE_UINTTL(env.sscratch, RISCVCPU), VMSTATE_UINTTL(env.mscratch, RISCVCPU), VMSTATE_UINT64(env.mfromhost, RISCVCPU), -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Atish Patra <atishp@rivosinc.com> To: qemu-devel@nongnu.org Cc: Bin Meng <bmeng.cn@gmail.com>, Alistair Francis <alistair.francis@wdc.com>, Atish Patra <atishp@rivosinc.com>, Bin Meng <bin.meng@windriver.com>, Palmer Dabbelt <palmer@dabbelt.com>, qemu-riscv@nongnu.org Subject: [PATCH v4 05/11] target/riscv: Implement mcountinhibit CSR Date: Thu, 6 Jan 2022 16:48:40 -0800 [thread overview] Message-ID: <20220107004846.378859-6-atishp@rivosinc.com> (raw) In-Reply-To: <20220107004846.378859-1-atishp@rivosinc.com> From: Atish Patra <atish.patra@wdc.com> As per the privilege specification v1.11, mcountinhibit allows to start/stop a pmu counter selectively. Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Atish Patra <atish.patra@wdc.com> Signed-off-by: Atish Patra <atishp@rivosinc.com> --- target/riscv/cpu.h | 2 ++ target/riscv/cpu_bits.h | 4 ++++ target/riscv/csr.c | 25 +++++++++++++++++++++++++ target/riscv/machine.c | 1 + 4 files changed, 32 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index b353770596e8..6f2875fd9acd 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -222,6 +222,8 @@ struct CPURISCVState { target_ulong scounteren; target_ulong mcounteren; + target_ulong mcountinhibit; + target_ulong sscratch; target_ulong mscratch; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index 1e31f4d35f5b..dbd9ce9a85a3 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -283,6 +283,10 @@ #define CSR_MHPMCOUNTER29 0xb1d #define CSR_MHPMCOUNTER30 0xb1e #define CSR_MHPMCOUNTER31 0xb1f + +/* Machine counter-inhibit register */ +#define CSR_MCOUNTINHIBIT 0x320 + #define CSR_MHPMEVENT3 0x323 #define CSR_MHPMEVENT4 0x324 #define CSR_MHPMEVENT5 0x325 diff --git a/target/riscv/csr.c b/target/riscv/csr.c index e31c27e270a2..89d15b38be7c 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -834,6 +834,28 @@ static RISCVException write_mtvec(CPURISCVState *env, int csrno, return RISCV_EXCP_NONE; } +static RISCVException read_mcountinhibit(CPURISCVState *env, int csrno, + target_ulong *val) +{ + if (env->priv_ver < PRIV_VERSION_1_11_0) { + return RISCV_EXCP_ILLEGAL_INST; + } + + *val = env->mcountinhibit; + return RISCV_EXCP_NONE; +} + +static RISCVException write_mcountinhibit(CPURISCVState *env, int csrno, + target_ulong val) +{ + if (env->priv_ver < PRIV_VERSION_1_11_0) { + return RISCV_EXCP_ILLEGAL_INST; + } + + env->mcountinhibit = val; + return RISCV_EXCP_NONE; +} + static RISCVException read_mcounteren(CPURISCVState *env, int csrno, target_ulong *val) { @@ -2120,6 +2142,9 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MHPMCOUNTER30] = { "mhpmcounter30", mctr, read_zero }, [CSR_MHPMCOUNTER31] = { "mhpmcounter31", mctr, read_zero }, + [CSR_MCOUNTINHIBIT] = { "mcountinhibit", any, read_mcountinhibit, + write_mcountinhibit }, + [CSR_MHPMEVENT3] = { "mhpmevent3", any, read_zero }, [CSR_MHPMEVENT4] = { "mhpmevent4", any, read_zero }, [CSR_MHPMEVENT5] = { "mhpmevent5", any, read_zero }, diff --git a/target/riscv/machine.c b/target/riscv/machine.c index ad8248ebfda8..ea4a382c140a 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -205,6 +205,7 @@ const VMStateDescription vmstate_riscv_cpu = { VMSTATE_UINTTL(env.mtval, RISCVCPU), VMSTATE_UINTTL(env.scounteren, RISCVCPU), VMSTATE_UINTTL(env.mcounteren, RISCVCPU), + VMSTATE_UINTTL(env.mcountinhibit, RISCVCPU), VMSTATE_UINTTL(env.sscratch, RISCVCPU), VMSTATE_UINTTL(env.mscratch, RISCVCPU), VMSTATE_UINT64(env.mfromhost, RISCVCPU), -- 2.30.2
next prev parent reply other threads:[~2022-01-07 2:20 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-07 0:48 [PATCH v4 00/11] Improve PMU support Atish Patra 2022-01-07 0:48 ` Atish Patra 2022-01-07 0:48 ` [PATCH v4 01/11] target/riscv: Fix PMU CSR predicate function Atish Patra 2022-01-07 0:48 ` Atish Patra 2022-01-07 0:48 ` [PATCH v4 02/11] target/riscv: Implement PMU CSR predicate function for S-mode Atish Patra 2022-01-07 0:48 ` Atish Patra 2022-01-07 7:50 ` Bin Meng 2022-01-07 7:50 ` Bin Meng 2022-01-07 0:48 ` [PATCH v4 03/11] target/riscv: pmu: Rename the counters extension to pmu Atish Patra 2022-01-07 0:48 ` Atish Patra 2022-01-07 0:48 ` [PATCH v4 04/11] target/riscv: pmu: Make number of counters configurable Atish Patra 2022-01-07 0:48 ` Atish Patra 2022-01-07 7:50 ` Bin Meng 2022-01-07 7:50 ` Bin Meng 2022-01-10 6:46 ` Alistair Francis 2022-01-10 6:46 ` Alistair Francis 2022-01-07 0:48 ` Atish Patra [this message] 2022-01-07 0:48 ` [PATCH v4 05/11] target/riscv: Implement mcountinhibit CSR Atish Patra 2022-01-07 0:48 ` [PATCH v4 06/11] target/riscv: Add support for hpmcounters/hpmevents Atish Patra 2022-01-07 0:48 ` Atish Patra 2022-01-07 10:52 ` Bin Meng 2022-01-07 10:52 ` Bin Meng 2022-01-07 0:48 ` [PATCH v4 07/11] target/riscv: Support mcycle/minstret write operation Atish Patra 2022-01-07 0:48 ` Atish Patra 2022-01-10 7:25 ` Bin Meng 2022-01-10 7:25 ` Bin Meng 2022-01-11 19:57 ` Atish Patra 2022-01-11 19:57 ` Atish Patra 2022-01-12 14:01 ` Bin Meng 2022-01-12 14:01 ` Bin Meng 2022-01-07 0:48 ` [PATCH v4 08/11] target/riscv: Add sscofpmf extension support Atish Patra 2022-01-07 0:48 ` Atish Patra 2022-01-10 11:34 ` Anup Patel 2022-01-10 11:34 ` Anup Patel 2022-01-10 22:38 ` Atish Kumar Patra 2022-01-10 22:38 ` Atish Kumar Patra 2022-01-07 0:48 ` [PATCH v4 09/11] target/riscv: Simplify counter predicate function Atish Patra 2022-01-07 0:48 ` Atish Patra 2022-01-10 8:26 ` Bin Meng 2022-01-10 8:26 ` Bin Meng 2022-01-10 22:35 ` Atish Kumar Patra 2022-01-10 22:35 ` Atish Kumar Patra 2022-01-07 0:48 ` [PATCH v4 10/11] target/riscv: Add few cache related PMU events Atish Patra 2022-01-07 0:48 ` Atish Patra 2022-01-07 0:48 ` [PATCH v4 11/11] hw/riscv: virt: Add PMU DT node to the device tree Atish Patra 2022-01-07 0:48 ` Atish Patra 2022-01-07 13:51 ` Philippe Mathieu-Daudé 2022-01-07 13:51 ` Philippe Mathieu-Daudé 2022-01-10 1:23 ` Atish Patra 2022-01-10 1:23 ` Atish Patra 2022-01-10 7:55 ` Bin Meng 2022-01-10 7:55 ` Bin Meng 2022-01-10 22:42 ` Atish Kumar Patra 2022-01-10 22:42 ` Atish Kumar Patra
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220107004846.378859-6-atishp@rivosinc.com \ --to=atishp@rivosinc.com \ --cc=alistair.francis@wdc.com \ --cc=bin.meng@windriver.com \ --cc=bmeng.cn@gmail.com \ --cc=palmer@dabbelt.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-riscv@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.