diff options
| author | Tom Rini <[email protected]> | 2025-10-01 14:30:35 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-10-10 13:58:49 -0600 |
| commit | b30155c08e95550296668766bfd7d3da27c970fe (patch) | |
| tree | a7dfcc4109959ae96cc6a77d713b6aa2fee7e67f | |
| parent | 9de2fc9878e7a79752fab26312f9d160b4103e3e (diff) | |
sandbox: Rework readX/writeX macros to be more like ARM
The way that the current readX/writeX macros are implemented on sandbox
means that when IO_TRACE is not enabled some code will throw up
incorrect warnings due to how sandbox_{read,write} is implemented. We
instead need to do the "uX __v; __v = sandbox..(..v); __v;" trick that
ARM does.
Signed-off-by: Tom Rini <[email protected]>
| -rw-r--r-- | arch/sandbox/include/asm/io.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h index cd3f5d6fd40..e3034b9c703 100644 --- a/arch/sandbox/include/asm/io.h +++ b/arch/sandbox/include/asm/io.h @@ -44,17 +44,17 @@ phys_addr_t map_to_sysmem(const void *ptr); 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) -#define readw(addr) sandbox_read((const void *)addr, SB_SIZE_16) -#define readl(addr) sandbox_read((const void *)addr, SB_SIZE_32) +#define readb(addr) ({ u8 __v = sandbox_read((const void *)addr, SB_SIZE_8); __v; }) +#define readw(addr) ({ u16 __v = sandbox_read((const void *)addr, SB_SIZE_16); __v; }) +#define readl(addr) ({ u32 __v = sandbox_read((const void *)addr, SB_SIZE_32); __v; }) #ifdef CONFIG_64BIT -#define readq(addr) sandbox_read((const void *)addr, SB_SIZE_64) +#define readq(addr) ({ u64 __v = sandbox_read((const void *)addr, SB_SIZE_64); __v; }) #endif -#define writeb(v, addr) sandbox_write((void *)addr, v, SB_SIZE_8) -#define writew(v, addr) sandbox_write((void *)addr, v, SB_SIZE_16) -#define writel(v, addr) sandbox_write((void *)addr, v, SB_SIZE_32) +#define writeb(v, addr) ({ u8 __v = v; sandbox_write((void *)addr, __v, SB_SIZE_8); __v; }) +#define writew(v, addr) ({ u16 __v = v; sandbox_write((void *)addr, __v, SB_SIZE_16); __v; }) +#define writel(v, addr) ({ u32 __v = v; sandbox_write((void *)addr, __v, SB_SIZE_32); __v; }) #ifdef CONFIG_64BIT -#define writeq(v, addr) sandbox_write((void *)addr, v, SB_SIZE_64) +#define writeq(v, addr) ({ u64 __v = v; sandbox_write((void *)addr, __v, SB_SIZE_64); __v; }) #endif #define readb_relaxed readb |