tools headers: Import x86 MMIO helper overrides

Import the x86-specific overrides for <asm-generic/io.h> from the kernel
headers into tools/include/.

Changes made when importing:
- Replace CONFIG_X86_64 with __x86_64__.

Acked-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: David Matlack <dmatlack@google.com>
Link: https://lore.kernel.org/r/20250822212518.4156428-17-dmatlack@google.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

authored by

David Matlack and committed by

Alex Williamson 8 months ago ce5dc9aa 1f9c8edd

+79

2 changed files

expand all

tools

arch

x86

include

asm

io.h

include

asm

io.h

+75

tools/arch/x86/include/asm/io.h

··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 + #ifndef _TOOLS_ASM_X86_IO_H 3 + #define _TOOLS_ASM_X86_IO_H 4 + 5 + #include <linux/compiler.h> 6 + #include <linux/types.h> 7 + 8 + #define build_mmio_read(name, size, type, reg, barrier) \ 9 + static inline type name(const volatile void __iomem *addr) \ 10 + { type ret; asm volatile("mov" size " %1,%0":reg (ret) \ 11 + :"m" (*(volatile type __force *)addr) barrier); return ret; } 12 + 13 + #define build_mmio_write(name, size, type, reg, barrier) \ 14 + static inline void name(type val, volatile void __iomem *addr) \ 15 + { asm volatile("mov" size " %0,%1": :reg (val), \ 16 + "m" (*(volatile type __force *)addr) barrier); } 17 + 18 + build_mmio_read(readb, "b", unsigned char, "=q", :"memory") 19 + build_mmio_read(readw, "w", unsigned short, "=r", :"memory") 20 + build_mmio_read(readl, "l", unsigned int, "=r", :"memory") 21 + 22 + build_mmio_read(__readb, "b", unsigned char, "=q", ) 23 + build_mmio_read(__readw, "w", unsigned short, "=r", ) 24 + build_mmio_read(__readl, "l", unsigned int, "=r", ) 25 + 26 + build_mmio_write(writeb, "b", unsigned char, "q", :"memory") 27 + build_mmio_write(writew, "w", unsigned short, "r", :"memory") 28 + build_mmio_write(writel, "l", unsigned int, "r", :"memory") 29 + 30 + build_mmio_write(__writeb, "b", unsigned char, "q", ) 31 + build_mmio_write(__writew, "w", unsigned short, "r", ) 32 + build_mmio_write(__writel, "l", unsigned int, "r", ) 33 + 34 + #define readb readb 35 + #define readw readw 36 + #define readl readl 37 + #define readb_relaxed(a) __readb(a) 38 + #define readw_relaxed(a) __readw(a) 39 + #define readl_relaxed(a) __readl(a) 40 + #define __raw_readb __readb 41 + #define __raw_readw __readw 42 + #define __raw_readl __readl 43 + 44 + #define writeb writeb 45 + #define writew writew 46 + #define writel writel 47 + #define writeb_relaxed(v, a) __writeb(v, a) 48 + #define writew_relaxed(v, a) __writew(v, a) 49 + #define writel_relaxed(v, a) __writel(v, a) 50 + #define __raw_writeb __writeb 51 + #define __raw_writew __writew 52 + #define __raw_writel __writel 53 + 54 + #ifdef __x86_64__ 55 + 56 + build_mmio_read(readq, "q", u64, "=r", :"memory") 57 + build_mmio_read(__readq, "q", u64, "=r", ) 58 + build_mmio_write(writeq, "q", u64, "r", :"memory") 59 + build_mmio_write(__writeq, "q", u64, "r", ) 60 + 61 + #define readq_relaxed(a) __readq(a) 62 + #define writeq_relaxed(v, a) __writeq(v, a) 63 + 64 + #define __raw_readq __readq 65 + #define __raw_writeq __writeq 66 + 67 + /* Let people know that we have them */ 68 + #define readq readq 69 + #define writeq writeq 70 + 71 + #endif /* __x86_64__ */ 72 + 73 + #include <asm-generic/io.h> 74 + 75 + #endif /* _TOOLS_ASM_X86_IO_H */

tools/include/asm/io.h

··· 2 2 #ifndef _TOOLS_ASM_IO_H 3 3 #define _TOOLS_ASM_IO_H 4 4 5 + #if defined(__i386__) || defined(__x86_64__) 6 + #include "../../arch/x86/include/asm/io.h" 7 + #else 5 8 #include <asm-generic/io.h> 9 + #endif 6 10 7 11 #endif /* _TOOLS_ASM_IO_H */

Configure Feed

Configure Feed