From: Jiangyifei <jiangyifei@huawei.com> To: Alistair Francis <alistair23@gmail.com> Cc: "open list:RISC-V" <qemu-riscv@nongnu.org>, Zhanghailiang <zhang.zhanghailiang@huawei.com>, Sagar Karandikar <sagark@eecs.berkeley.edu>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, "Zhangxiaofeng \(F\)" <victor.zhangxiaofeng@huawei.com>, "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>, Alistair Francis <Alistair.Francis@wdc.com>, yinyipeng <yinyipeng1@huawei.com>, Palmer Dabbelt <palmer@dabbelt.com>, "Wubin \(H\)" <wu.wubin@huawei.com>, "dengkai \(A\)" <dengkai1@huawei.com> Subject: RE: [PATCH 2/5] target/riscv: Add PMP state description Date: Fri, 9 Oct 2020 08:33:36 +0000 [thread overview] Message-ID: <f867553f20c744f6a4d0c0da639ca86d@huawei.com> (raw) In-Reply-To: <CAKmqyKMXdiTJYoNbATTfGTO-FT1+Ke9bHk_kGwpT0mH26xsSVg@mail.gmail.com> > -----Original Message----- > From: Alistair Francis [mailto:alistair23@gmail.com] > Sent: Tuesday, October 6, 2020 6:11 AM > To: Jiangyifei <jiangyifei@huawei.com> > Cc: qemu-devel@nongnu.org Developers <qemu-devel@nongnu.org>; open > list:RISC-V <qemu-riscv@nongnu.org>; Zhanghailiang > <zhang.zhanghailiang@huawei.com>; Sagar Karandikar > <sagark@eecs.berkeley.edu>; Bastian Koppelmann > <kbastian@mail.uni-paderborn.de>; Zhangxiaofeng (F) > <victor.zhangxiaofeng@huawei.com>; Alistair Francis > <Alistair.Francis@wdc.com>; yinyipeng <yinyipeng1@huawei.com>; Palmer > Dabbelt <palmer@dabbelt.com>; Wubin (H) <wu.wubin@huawei.com>; > dengkai (A) <dengkai1@huawei.com> > Subject: Re: [PATCH 2/5] target/riscv: Add PMP state description > > On Mon, Sep 28, 2020 at 7:05 PM Yifei Jiang <jiangyifei@huawei.com> wrote: > > > > In the case of supporting PMP feature, add PMP state description to > > vmstate_riscv_cpu. > > > > Signed-off-by: Yifei Jiang <jiangyifei@huawei.com> > > Signed-off-by: Yipeng Yin <yinyipeng1@huawei.com> > > --- > > target/riscv/machine.c | 49 > > ++++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 49 insertions(+) > > > > diff --git a/target/riscv/machine.c b/target/riscv/machine.c index > > 3451b888b1..b1fc839b43 100644 > > --- a/target/riscv/machine.c > > +++ b/target/riscv/machine.c > > @@ -4,6 +4,51 @@ > > #include "sysemu/kvm.h" > > #include "migration/cpu.h" > > > > +static bool pmp_needed(void *opaque) > > +{ > > + RISCVCPU *cpu = opaque; > > + CPURISCVState *env = &cpu->env; > > + > > + return riscv_feature(env, RISCV_FEATURE_PMP); } > > + > > +static const VMStateDescription vmstate_pmp_entry = { > > + .name = "cpu/pmp/entry", > > + .version_id = 1, > > + .minimum_version_id = 1, > > + .fields = (VMStateField[]) { > > + VMSTATE_UINTTL(addr_reg, pmp_entry_t), > > + VMSTATE_UINT8(cfg_reg, pmp_entry_t), > > + VMSTATE_END_OF_LIST() > > + } > > +}; > > + > > +static const VMStateDescription vmstate_pmp_addr = { > > + .name = "cpu/pmp/addr", > > + .version_id = 1, > > + .minimum_version_id = 1, > > + .fields = (VMStateField[]) { > > + VMSTATE_UINTTL(sa, pmp_addr_t), > > + VMSTATE_UINTTL(ea, pmp_addr_t), > > + VMSTATE_END_OF_LIST() > > + } > > +}; > > + > > +static const VMStateDescription vmstate_pmp = { > > + .name = "cpu/pmp", > > + .version_id = 1, > > + .minimum_version_id = 1, > > + .needed = pmp_needed, > > + .fields = (VMStateField[]) { > > + VMSTATE_STRUCT_ARRAY(env.pmp_state.pmp, RISCVCPU, > MAX_RISCV_PMPS, > > + 0, vmstate_pmp_entry, pmp_entry_t), > > + VMSTATE_STRUCT_ARRAY(env.pmp_state.addr, RISCVCPU, > MAX_RISCV_PMPS, > > + 0, vmstate_pmp_addr, pmp_addr_t), > > + VMSTATE_UINT32(env.pmp_state.num_rules, RISCVCPU), > > I would prefer to re-generate these from the PMP CSRs post load. > > Alistair > Thanks for your advice. Yes, you are right. vmstate_pmp_entry cannot be regenerated, but vmstate_pmp_addr and num_rules could be regenerated. I'll add post_load hook for regenerating vmstate_pmp_addr and num_rules in the next series. Yifei > > + VMSTATE_END_OF_LIST() > > + } > > +}; > > + > > const VMStateDescription vmstate_riscv_cpu = { > > .name = "cpu", > > .version_id = 1, > > @@ -55,5 +100,9 @@ const VMStateDescription vmstate_riscv_cpu = { > > VMSTATE_UINTTL(env.mstatush, RISCVCPU), #endif > > VMSTATE_END_OF_LIST() > > + }, > > + .subsections = (const VMStateDescription * []) { > > + &vmstate_pmp, > > + NULL > > } > > }; > > -- > > 2.19.1 > > > >
WARNING: multiple messages have this Message-ID (diff)
From: Jiangyifei <jiangyifei@huawei.com> To: Alistair Francis <alistair23@gmail.com> Cc: "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>, "open list:RISC-V" <qemu-riscv@nongnu.org>, Zhanghailiang <zhang.zhanghailiang@huawei.com>, Sagar Karandikar <sagark@eecs.berkeley.edu>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, "Zhangxiaofeng (F)" <victor.zhangxiaofeng@huawei.com>, Alistair Francis <Alistair.Francis@wdc.com>, yinyipeng <yinyipeng1@huawei.com>, Palmer Dabbelt <palmer@dabbelt.com>, "Wubin (H)" <wu.wubin@huawei.com>, "dengkai (A)" <dengkai1@huawei.com> Subject: RE: [PATCH 2/5] target/riscv: Add PMP state description Date: Fri, 9 Oct 2020 08:33:36 +0000 [thread overview] Message-ID: <f867553f20c744f6a4d0c0da639ca86d@huawei.com> (raw) In-Reply-To: <CAKmqyKMXdiTJYoNbATTfGTO-FT1+Ke9bHk_kGwpT0mH26xsSVg@mail.gmail.com> > -----Original Message----- > From: Alistair Francis [mailto:alistair23@gmail.com] > Sent: Tuesday, October 6, 2020 6:11 AM > To: Jiangyifei <jiangyifei@huawei.com> > Cc: qemu-devel@nongnu.org Developers <qemu-devel@nongnu.org>; open > list:RISC-V <qemu-riscv@nongnu.org>; Zhanghailiang > <zhang.zhanghailiang@huawei.com>; Sagar Karandikar > <sagark@eecs.berkeley.edu>; Bastian Koppelmann > <kbastian@mail.uni-paderborn.de>; Zhangxiaofeng (F) > <victor.zhangxiaofeng@huawei.com>; Alistair Francis > <Alistair.Francis@wdc.com>; yinyipeng <yinyipeng1@huawei.com>; Palmer > Dabbelt <palmer@dabbelt.com>; Wubin (H) <wu.wubin@huawei.com>; > dengkai (A) <dengkai1@huawei.com> > Subject: Re: [PATCH 2/5] target/riscv: Add PMP state description > > On Mon, Sep 28, 2020 at 7:05 PM Yifei Jiang <jiangyifei@huawei.com> wrote: > > > > In the case of supporting PMP feature, add PMP state description to > > vmstate_riscv_cpu. > > > > Signed-off-by: Yifei Jiang <jiangyifei@huawei.com> > > Signed-off-by: Yipeng Yin <yinyipeng1@huawei.com> > > --- > > target/riscv/machine.c | 49 > > ++++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 49 insertions(+) > > > > diff --git a/target/riscv/machine.c b/target/riscv/machine.c index > > 3451b888b1..b1fc839b43 100644 > > --- a/target/riscv/machine.c > > +++ b/target/riscv/machine.c > > @@ -4,6 +4,51 @@ > > #include "sysemu/kvm.h" > > #include "migration/cpu.h" > > > > +static bool pmp_needed(void *opaque) > > +{ > > + RISCVCPU *cpu = opaque; > > + CPURISCVState *env = &cpu->env; > > + > > + return riscv_feature(env, RISCV_FEATURE_PMP); } > > + > > +static const VMStateDescription vmstate_pmp_entry = { > > + .name = "cpu/pmp/entry", > > + .version_id = 1, > > + .minimum_version_id = 1, > > + .fields = (VMStateField[]) { > > + VMSTATE_UINTTL(addr_reg, pmp_entry_t), > > + VMSTATE_UINT8(cfg_reg, pmp_entry_t), > > + VMSTATE_END_OF_LIST() > > + } > > +}; > > + > > +static const VMStateDescription vmstate_pmp_addr = { > > + .name = "cpu/pmp/addr", > > + .version_id = 1, > > + .minimum_version_id = 1, > > + .fields = (VMStateField[]) { > > + VMSTATE_UINTTL(sa, pmp_addr_t), > > + VMSTATE_UINTTL(ea, pmp_addr_t), > > + VMSTATE_END_OF_LIST() > > + } > > +}; > > + > > +static const VMStateDescription vmstate_pmp = { > > + .name = "cpu/pmp", > > + .version_id = 1, > > + .minimum_version_id = 1, > > + .needed = pmp_needed, > > + .fields = (VMStateField[]) { > > + VMSTATE_STRUCT_ARRAY(env.pmp_state.pmp, RISCVCPU, > MAX_RISCV_PMPS, > > + 0, vmstate_pmp_entry, pmp_entry_t), > > + VMSTATE_STRUCT_ARRAY(env.pmp_state.addr, RISCVCPU, > MAX_RISCV_PMPS, > > + 0, vmstate_pmp_addr, pmp_addr_t), > > + VMSTATE_UINT32(env.pmp_state.num_rules, RISCVCPU), > > I would prefer to re-generate these from the PMP CSRs post load. > > Alistair > Thanks for your advice. Yes, you are right. vmstate_pmp_entry cannot be regenerated, but vmstate_pmp_addr and num_rules could be regenerated. I'll add post_load hook for regenerating vmstate_pmp_addr and num_rules in the next series. Yifei > > + VMSTATE_END_OF_LIST() > > + } > > +}; > > + > > const VMStateDescription vmstate_riscv_cpu = { > > .name = "cpu", > > .version_id = 1, > > @@ -55,5 +100,9 @@ const VMStateDescription vmstate_riscv_cpu = { > > VMSTATE_UINTTL(env.mstatush, RISCVCPU), #endif > > VMSTATE_END_OF_LIST() > > + }, > > + .subsections = (const VMStateDescription * []) { > > + &vmstate_pmp, > > + NULL > > } > > }; > > -- > > 2.19.1 > > > >
next prev parent reply other threads:[~2020-10-09 8:34 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-29 2:03 [PATCH 0/5] Support RISC-V migration Yifei Jiang 2020-09-29 2:03 ` Yifei Jiang 2020-09-29 2:03 ` [PATCH 1/5] target/riscv: Add basic vmstate description of CPU Yifei Jiang 2020-09-29 2:03 ` Yifei Jiang 2020-10-01 17:23 ` Richard Henderson 2020-10-09 8:11 ` Jiangyifei 2020-10-09 8:11 ` Jiangyifei 2020-09-29 2:03 ` [PATCH 2/5] target/riscv: Add PMP state description Yifei Jiang 2020-09-29 2:03 ` Yifei Jiang 2020-10-05 22:10 ` Alistair Francis 2020-10-05 22:10 ` Alistair Francis 2020-10-09 8:33 ` Jiangyifei [this message] 2020-10-09 8:33 ` Jiangyifei 2020-09-29 2:03 ` [PATCH 3/5] target/riscv: Add H extention " Yifei Jiang 2020-09-29 2:03 ` Yifei Jiang 2020-10-01 17:28 ` Richard Henderson 2020-10-05 22:09 ` Alistair Francis 2020-10-05 22:09 ` Alistair Francis 2020-10-09 8:29 ` Jiangyifei 2020-10-09 8:29 ` Jiangyifei 2020-09-29 2:03 ` [PATCH 4/5] target/riscv: Add V " Yifei Jiang 2020-09-29 2:03 ` Yifei Jiang 2020-10-01 17:30 ` Richard Henderson 2020-09-29 2:03 ` [PATCH 5/5] target/riscv: Add sifive_plic vmstate Yifei Jiang 2020-09-29 2:03 ` Yifei Jiang
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=f867553f20c744f6a4d0c0da639ca86d@huawei.com \ --to=jiangyifei@huawei.com \ --cc=Alistair.Francis@wdc.com \ --cc=alistair23@gmail.com \ --cc=dengkai1@huawei.com \ --cc=kbastian@mail.uni-paderborn.de \ --cc=palmer@dabbelt.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-riscv@nongnu.org \ --cc=sagark@eecs.berkeley.edu \ --cc=victor.zhangxiaofeng@huawei.com \ --cc=wu.wubin@huawei.com \ --cc=yinyipeng1@huawei.com \ --cc=zhang.zhanghailiang@huawei.com \ /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.