| Message ID | 20221111182535.64844-11-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | use MemTxAttrs to avoid current_cpu in hw/ | expand |
On Fri, Nov 11, 2022 at 06:25:25PM +0000, Alex Bennée wrote: > Both of these functions deal with CPU based access (as is evidenced by > the secure check straight after). Use the new MEMTXATTRS_CPU > constructor to ensure the correct CPU id is filled in should it ever > be needed by any devices later. Looks good to me! Reviewed-by: Edgar E. Iglesias <edgar@zeroasic.com> > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > target/microblaze/helper.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c > index 98bdb82de8..655be3b320 100644 > --- a/target/microblaze/helper.c > +++ b/target/microblaze/helper.c > @@ -44,7 +44,7 @@ bool mb_cpu_tlb_fill(CPUState *cs, vaddr address, int size, > MicroBlazeMMULookup lu; > unsigned int hit; > int prot; > - MemTxAttrs attrs = {}; > + MemTxAttrs attrs = MEMTXATTRS_CPU(cs); > > attrs.secure = mb_cpu_access_is_secure(cpu, access_type); > > @@ -235,7 +235,7 @@ hwaddr mb_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, > unsigned int hit; > > /* Caller doesn't initialize */ > - *attrs = (MemTxAttrs) {}; > + *attrs = MEMTXATTRS_CPU(cs); > attrs->secure = mb_cpu_access_is_secure(cpu, MMU_DATA_LOAD); > > if (mmu_idx != MMU_NOMMU_IDX) { > -- > 2.34.1 >
On 11/12/22 04:25, Alex Bennée wrote: > Both of these functions deal with CPU based access (as is evidenced by > the secure check straight after). Use the new MEMTXATTRS_CPU > constructor to ensure the correct CPU id is filled in should it ever > be needed by any devices later. > > Signed-off-by: Alex Bennée<alex.bennee@linaro.org> > --- > target/microblaze/helper.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 11/11/22 19:25, Alex Bennée wrote: > Both of these functions deal with CPU based access (as is evidenced by > the secure check straight after). Use the new MEMTXATTRS_CPU > constructor to ensure the correct CPU id is filled in should it ever > be needed by any devices later. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > target/microblaze/helper.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c index 98bdb82de8..655be3b320 100644 --- a/target/microblaze/helper.c +++ b/target/microblaze/helper.c @@ -44,7 +44,7 @@ bool mb_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MicroBlazeMMULookup lu; unsigned int hit; int prot; - MemTxAttrs attrs = {}; + MemTxAttrs attrs = MEMTXATTRS_CPU(cs); attrs.secure = mb_cpu_access_is_secure(cpu, access_type); @@ -235,7 +235,7 @@ hwaddr mb_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, unsigned int hit; /* Caller doesn't initialize */ - *attrs = (MemTxAttrs) {}; + *attrs = MEMTXATTRS_CPU(cs); attrs->secure = mb_cpu_access_is_secure(cpu, MMU_DATA_LOAD); if (mmu_idx != MMU_NOMMU_IDX) {
Both of these functions deal with CPU based access (as is evidenced by the secure check straight after). Use the new MEMTXATTRS_CPU constructor to ensure the correct CPU id is filled in should it ever be needed by any devices later. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- target/microblaze/helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)