| From 3262ee6a5300221969e61eff7a8f18336a135a73 Mon Sep 17 00:00:00 2001 |
| From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> |
| Date: Fri, 16 Dec 2022 17:20:58 +0000 |
| Subject: [PATCH 28/43] sandbox64: fix: return unsigned long in readq() |
| |
| make readq return unsigned long |
| |
| readq should return 64-bit data |
| |
| Upstream-Status: Submitted |
| Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> |
| Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> |
| --- |
| arch/sandbox/cpu/cpu.c | 2 +- |
| arch/sandbox/include/asm/io.h | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c |
| index 636d3545b954..248d17a85c82 100644 |
| --- a/arch/sandbox/cpu/cpu.c |
| +++ b/arch/sandbox/cpu/cpu.c |
| @@ -230,7 +230,7 @@ phys_addr_t map_to_sysmem(const void *ptr) |
| return mentry->tag; |
| } |
| |
| -unsigned int sandbox_read(const void *addr, enum sandboxio_size_t size) |
| +unsigned long sandbox_read(const void *addr, enum sandboxio_size_t size) |
| { |
| struct sandbox_state *state = state_get_current(); |
| |
| diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h |
| index ad6c29a4e26c..31ab7289b4bd 100644 |
| --- a/arch/sandbox/include/asm/io.h |
| +++ b/arch/sandbox/include/asm/io.h |
| @@ -45,7 +45,7 @@ static inline void unmap_sysmem(const void *vaddr) |
| /* Map from a pointer to our RAM buffer */ |
| phys_addr_t map_to_sysmem(const void *ptr); |
| |
| -unsigned int sandbox_read(const void *addr, enum sandboxio_size_t size); |
| +unsigned long sandbox_read(const void *addr, enum sandboxio_size_t size); |
| void sandbox_write(void *addr, unsigned int val, enum sandboxio_size_t size); |
| |
| #define readb(addr) sandbox_read((const void *)addr, SB_SIZE_8) |
| -- |
| 2.39.2 |
| |