Message ID | 20200330094946.24678-4-clg@kaod.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | target/ppc: Add support for Radix partition-scoped translation | expand |
On Mon, 30 Mar 2020 11:49:42 +0200 Cédric Le Goater <clg@kaod.org> wrote: > Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com> > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > target/ppc/mmu-radix64.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c > index f6007e956569..d2422d1c54c9 100644 > --- a/target/ppc/mmu-radix64.c > +++ b/target/ppc/mmu-radix64.c > @@ -231,6 +231,7 @@ int ppc_radix64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr, int rwx, > ppc_v3_pate_t pate; > bool relocation; > > + assert(!(msr_hv && cpu->vhyp)); > assert((rwx == 0) || (rwx == 1) || (rwx == 2)); > > relocation = ((rwx == 2) && (msr_ir == 1)) || ((rwx != 2) && (msr_dr == 1));
On Mon, Mar 30, 2020 at 11:49:42AM +0200, Cédric Le Goater wrote: > Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com> > Signed-off-by: Cédric Le Goater <clg@kaod.org> Applied to ppc-for-5.1. > --- > target/ppc/mmu-radix64.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c > index f6007e956569..d2422d1c54c9 100644 > --- a/target/ppc/mmu-radix64.c > +++ b/target/ppc/mmu-radix64.c > @@ -231,6 +231,7 @@ int ppc_radix64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr, int rwx, > ppc_v3_pate_t pate; > bool relocation; > > + assert(!(msr_hv && cpu->vhyp)); > assert((rwx == 0) || (rwx == 1) || (rwx == 2)); > > relocation = ((rwx == 2) && (msr_ir == 1)) || ((rwx != 2) && (msr_dr == 1));
diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c index f6007e956569..d2422d1c54c9 100644 --- a/target/ppc/mmu-radix64.c +++ b/target/ppc/mmu-radix64.c @@ -231,6 +231,7 @@ int ppc_radix64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr, int rwx, ppc_v3_pate_t pate; bool relocation; + assert(!(msr_hv && cpu->vhyp)); assert((rwx == 0) || (rwx == 1) || (rwx == 2)); relocation = ((rwx == 2) && (msr_ir == 1)) || ((rwx != 2) && (msr_dr == 1));