| Message ID | 1564048432710.98755@bt.com |
|---|---|
| State | New |
| Headers | show |
| Series | Invert Endian bit in SPARCv9 MMU TTE | expand |
On 7/25/19 11:53 AM, tony.nguyen@bt.com wrote: > Signed-off-by: Tony Nguyen <tony.nguyen@bt.com> > --- > hw/intc/armv7m_nvic.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c > index 9f8f0d3..25bb88a 100644 > --- a/hw/intc/armv7m_nvic.c > +++ b/hw/intc/armv7m_nvic.c > @@ -18,6 +18,7 @@ > #include "hw/intc/armv7m_nvic.h" > #include "target/arm/cpu.h" > #include "exec/exec-all.h" > +#include "exec/memop.h" > #include "qemu/log.h" > #include "qemu/module.h" > #include "trace.h" > @@ -2345,7 +2346,8 @@ static MemTxResult nvic_sysreg_ns_write(void *opaque, hwaddr addr, > if (attrs.secure) { > /* S accesses to the alias act like NS accesses to the real region */ > attrs.secure = 0; > - return memory_region_dispatch_write(mr, addr, value, size, attrs); > + return memory_region_dispatch_write(mr, addr, value, SIZE_MEMOP(size), > + attrs); > } else { > /* NS attrs are RAZ/WI for privileged, and BusFault for user */ > if (attrs.user) { > @@ -2364,7 +2366,8 @@ static MemTxResult nvic_sysreg_ns_read(void *opaque, hwaddr addr, > if (attrs.secure) { > /* S accesses to the alias act like NS accesses to the real region */ > attrs.secure = 0; > - return memory_region_dispatch_read(mr, addr, data, size, attrs); > + return memory_region_dispatch_read(mr, addr, data, SIZE_MEMOP(size), > + attrs); > } else { > /* NS attrs are RAZ/WI for privileged, and BusFault for user */ > if (attrs.user) { > @@ -2390,7 +2393,8 @@ static MemTxResult nvic_systick_write(void *opaque, hwaddr addr, > > /* Direct the access to the correct systick */ > mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->systick[attrs.secure]), 0); > - return memory_region_dispatch_write(mr, addr, value, size, attrs); > + return memory_region_dispatch_write(mr, addr, value, SIZE_MEMOP(size), > + attrs); > } > > static MemTxResult nvic_systick_read(void *opaque, hwaddr addr, > @@ -2402,7 +2406,7 @@ static MemTxResult nvic_systick_read(void *opaque, hwaddr addr, > > /* Direct the access to the correct systick */ > mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->systick[attrs.secure]), 0); > - return memory_region_dispatch_read(mr, addr, data, size, attrs); > + return memory_region_dispatch_read(mr, addr, data, SIZE_MEMOP(size), attrs); > } > > static const MemoryRegionOps nvic_systick_ops = { > -- > 1.8.3.1 > > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 9f8f0d3..25bb88a 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -18,6 +18,7 @@ #include "hw/intc/armv7m_nvic.h" #include "target/arm/cpu.h" #include "exec/exec-all.h" +#include "exec/memop.h" #include "qemu/log.h" #include "qemu/module.h" #include "trace.h" @@ -2345,7 +2346,8 @@ static MemTxResult nvic_sysreg_ns_write(void *opaque, hwaddr addr, if (attrs.secure) { /* S accesses to the alias act like NS accesses to the real region */ attrs.secure = 0; - return memory_region_dispatch_write(mr, addr, value, size, attrs); + return memory_region_dispatch_write(mr, addr, value, SIZE_MEMOP(size), + attrs); } else { /* NS attrs are RAZ/WI for privileged, and BusFault for user */ if (attrs.user) { @@ -2364,7 +2366,8 @@ static MemTxResult nvic_sysreg_ns_read(void *opaque, hwaddr addr, if (attrs.secure) { /* S accesses to the alias act like NS accesses to the real region */ attrs.secure = 0; - return memory_region_dispatch_read(mr, addr, data, size, attrs); + return memory_region_dispatch_read(mr, addr, data, SIZE_MEMOP(size), + attrs); } else { /* NS attrs are RAZ/WI for privileged, and BusFault for user */ if (attrs.user) { @@ -2390,7 +2393,8 @@ static MemTxResult nvic_systick_write(void *opaque, hwaddr addr, /* Direct the access to the correct systick */ mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->systick[attrs.secure]), 0); - return memory_region_dispatch_write(mr, addr, value, size, attrs); + return memory_region_dispatch_write(mr, addr, value, SIZE_MEMOP(size), + attrs); } static MemTxResult nvic_systick_read(void *opaque, hwaddr addr, @@ -2402,7 +2406,7 @@ static MemTxResult nvic_systick_read(void *opaque, hwaddr addr, /* Direct the access to the correct systick */ mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->systick[attrs.secure]), 0); - return memory_region_dispatch_read(mr, addr, data, size, attrs); + return memory_region_dispatch_read(mr, addr, data, SIZE_MEMOP(size), attrs); } static const MemoryRegionOps nvic_systick_ops = {
Signed-off-by: Tony Nguyen <tony.nguyen@bt.com> --- hw/intc/armv7m_nvic.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- 1.8.3.1