evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lib: iomap: Add MSM RTB support

Browse source 
The ioread* and the iowrite* functions and not inlined and hence
the RTB logs end up containing the ioread and iowrite functions
themselves and not the ones invoking them.

Add RTB support to the ioread*and iowrite* functions so that we can
get meaningful RTB logs.

Note that to avoid multiple RTB logs for ioread* and iowrite*
functions, read*_no_log and write*_no_log macros are added.

Change-Id: I2315d44c4dfbeee6be4a52f21bf4a20dd9508597
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Signed-off-by: David Keitel <dkeitel@codeaurora.org>

Conflicts:
	arch/arm64/include/asm/io.h
This commit is contained in:
Rohit Vaswani 2014-08-29 08:56:22 -07:00
parent 01397cdaa2
commit 7614923a9c
2 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
arch/arm64/include/asm/io.h
View file

@ -39,31 +39,26 @@
* Generic IO read/write. These perform native-endian accesses. * Generic IO read/write. These perform native-endian accesses.
* that some architectures will want to re-define __raw_{read,write}w. * that some architectures will want to re-define __raw_{read,write}w.
*/ */
#define __raw_writeb __raw_writeb
static inline void __raw_writeb_no_log(u8 val, volatile void __iomem *addr) static inline void __raw_writeb_no_log(u8 val, volatile void __iomem *addr)
{ {
asm volatile("strb %w0, [%1]" : : "r" (val), "r" (addr)); asm volatile("strb %w0, [%1]" : : "r" (val), "r" (addr));
} }
#define __raw_writew __raw_writew
static inline void __raw_writew_no_log(u16 val, volatile void __iomem *addr) static inline void __raw_writew_no_log(u16 val, volatile void __iomem *addr)
{ {
asm volatile("strh %w0, [%1]" : : "r" (val), "r" (addr)); asm volatile("strh %w0, [%1]" : : "r" (val), "r" (addr));
} }
#define __raw_writel __raw_writel
static inline void __raw_writel_no_log(u32 val, volatile void __iomem *addr) static inline void __raw_writel_no_log(u32 val, volatile void __iomem *addr)
{ {
asm volatile("str %w0, [%1]" : : "r" (val), "r" (addr)); asm volatile("str %w0, [%1]" : : "r" (val), "r" (addr));
} }
#define __raw_writeq __raw_writeq
static inline void __raw_writeq_no_log(u64 val, volatile void __iomem *addr) static inline void __raw_writeq_no_log(u64 val, volatile void __iomem *addr)
{ {
asm volatile("str %0, [%1]" : : "r" (val), "r" (addr)); asm volatile("str %0, [%1]" : : "r" (val), "r" (addr));
} }
#define __raw_readb __raw_readb
static inline u8 __raw_readb_no_log(const volatile void __iomem *addr) static inline u8 __raw_readb_no_log(const volatile void __iomem *addr)
{ {
u8 val; u8 val;
@ -74,7 +69,6 @@ static inline u8 __raw_readb_no_log(const volatile void __iomem *addr)
return val; return val;
} }
#define __raw_readw __raw_readw
static inline u16 __raw_readw_no_log(const volatile void __iomem *addr) static inline u16 __raw_readw_no_log(const volatile void __iomem *addr)
{ {
u16 val; u16 val;
@ -86,7 +80,6 @@ static inline u16 __raw_readw_no_log(const volatile void __iomem *addr)
return val; return val;
} }
#define __raw_readl __raw_readl
static inline u32 __raw_readl_no_log(const volatile void __iomem *addr) static inline u32 __raw_readl_no_log(const volatile void __iomem *addr)
{ {
u32 val; u32 val;
@ -97,7 +90,6 @@ static inline u32 __raw_readl_no_log(const volatile void __iomem *addr)
return val; return val;
} }
#define __raw_readq __raw_readq
static inline u64 __raw_readq_no_log(const volatile void __iomem *addr) static inline u64 __raw_readq_no_log(const volatile void __iomem *addr)
{ {
u64 val; u64 val;
@ -167,6 +159,16 @@ static inline u64 __raw_readq_no_log(const volatile void __iomem *addr)
#define writel_relaxed(v,c) ((void)__raw_writel((__force u32)cpu_to_le32(v),(c))) #define writel_relaxed(v,c) ((void)__raw_writel((__force u32)cpu_to_le32(v),(c)))
#define writeq_relaxed(v,c) ((void)__raw_writeq((__force u64)cpu_to_le64(v),(c))) #define writeq_relaxed(v,c) ((void)__raw_writeq((__force u64)cpu_to_le64(v),(c)))
#define readb_relaxed_no_log(c) ({ u8 __v = __raw_readb_no_log(c); __v; })
#define readw_relaxed_no_log(c) ({ u16 __v = le16_to_cpu((__force __le16)__raw_readw_no_log(c)); __v; })
#define readl_relaxed_no_log(c) ({ u32 __v = le32_to_cpu((__force __le32)__raw_readl_no_log(c)); __v; })
#define readq_relaxed_no_log(c) ({ u64 __v = le64_to_cpu((__force __le64)__raw_readq_no_log(c)); __v; })
#define writeb_relaxed_no_log(v, c) ((void)__raw_writeb_no_log((v), (c)))
#define writew_relaxed_no_log(v, c) ((void)__raw_writew_no_log((__force u16)cpu_to_le32(v), (c)))
#define writel_relaxed_no_log(v, c) ((void)__raw_writel_no_log((__force u32)cpu_to_le32(v), (c)))
#define writeq_relaxed_no_log(v, c) ((void)__raw_writeq_no_log((__force u64)cpu_to_le32(v), (c)))
/* /*
* I/O memory access primitives. Reads are ordered relative to any * I/O memory access primitives. Reads are ordered relative to any
* following Normal memory access. Writes are ordered relative to any prior * following Normal memory access. Writes are ordered relative to any prior
@ -182,6 +184,16 @@ static inline u64 __raw_readq_no_log(const volatile void __iomem *addr)
#define writel(v,c) ({ __iowmb(); writel_relaxed((v),(c)); }) #define writel(v,c) ({ __iowmb(); writel_relaxed((v),(c)); })
#define writeq(v,c) ({ __iowmb(); writeq_relaxed((v),(c)); }) #define writeq(v,c) ({ __iowmb(); writeq_relaxed((v),(c)); })
#define readb_no_log(c) ({ u8 __v = readb_relaxed_no_log(c); __iormb(); __v; })
#define readw_no_log(c) ({ u16 __v = readw_relaxed_no_log(c); __iormb(); __v; })
#define readl_no_log(c) ({ u32 __v = readl_relaxed_no_log(c); __iormb(); __v; })
#define readq_no_log(c) ({ u64 __v = readq_relaxed_no_log(c); __iormb(); __v; })
#define writeb_no_log(v, c) ({ __iowmb(); writeb_relaxed_no_log((v), (c)); })
#define writew_no_log(v, c) ({ __iowmb(); writew_relaxed_no_log((v), (c)); })
#define writel_no_log(v, c) ({ __iowmb(); writel_relaxed_no_log((v), (c)); })
#define writeq_no_log(v, c) ({ __iowmb(); writeq_relaxed_no_log((v), (c)); })
/* /*
* I/O port access primitives. * I/O port access primitives.
*/ */

23
lib/iomap.c
View file

@ -5,6 +5,7 @@
*/ */
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/msm_rtb.h>
#include <linux/export.h> #include <linux/export.h>
@ -70,26 +71,31 @@ static void bad_io_access(unsigned long port, const char *access)
unsigned int ioread8(void __iomem *addr) unsigned int ioread8(void __iomem *addr)
{ {
IO_COND(addr, return inb(port), return readb(addr)); uncached_logk_pc(LOGK_READL, __builtin_return_address(0), addr);
IO_COND(addr, return inb(port), return readb_no_log(addr));
return 0xff; return 0xff;
} }
unsigned int ioread16(void __iomem *addr) unsigned int ioread16(void __iomem *addr)
{ {
IO_COND(addr, return inw(port), return readw(addr)); uncached_logk_pc(LOGK_READL, __builtin_return_address(0), addr);
IO_COND(addr, return inw(port), return readw_no_log(addr));
return 0xffff; return 0xffff;
} }
unsigned int ioread16be(void __iomem *addr) unsigned int ioread16be(void __iomem *addr)
{ {
uncached_logk_pc(LOGK_READL, __builtin_return_address(0), addr);
IO_COND(addr, return pio_read16be(port), return mmio_read16be(addr)); IO_COND(addr, return pio_read16be(port), return mmio_read16be(addr));
return 0xffff; return 0xffff;
} }
unsigned int ioread32(void __iomem *addr) unsigned int ioread32(void __iomem *addr)
{ {
IO_COND(addr, return inl(port), return readl(addr)); uncached_logk_pc(LOGK_READL, __builtin_return_address(0), addr);
IO_COND(addr, return inl(port), return readl_no_log(addr));
return 0xffffffff; return 0xffffffff;
} }
unsigned int ioread32be(void __iomem *addr) unsigned int ioread32be(void __iomem *addr)
{ {
uncached_logk_pc(LOGK_READL, __builtin_return_address(0), addr);
IO_COND(addr, return pio_read32be(port), return mmio_read32be(addr)); IO_COND(addr, return pio_read32be(port), return mmio_read32be(addr));
return 0xffffffff; return 0xffffffff;
} }
@ -111,22 +117,27 @@ EXPORT_SYMBOL(ioread32be);
void iowrite8(u8 val, void __iomem *addr) void iowrite8(u8 val, void __iomem *addr)
{ {
IO_COND(addr, outb(val,port), writeb(val, addr)); uncached_logk_pc(LOGK_WRITEL, __builtin_return_address(0), addr);
IO_COND(addr, outb(val, port), writeb_no_log(val, addr));
} }
void iowrite16(u16 val, void __iomem *addr) void iowrite16(u16 val, void __iomem *addr)
{ {
IO_COND(addr, outw(val,port), writew(val, addr)); uncached_logk_pc(LOGK_WRITEL, __builtin_return_address(0), addr);
IO_COND(addr, outw(val, port), writew_no_log(val, addr));
} }
void iowrite16be(u16 val, void __iomem *addr) void iowrite16be(u16 val, void __iomem *addr)
{ {
uncached_logk_pc(LOGK_WRITEL, __builtin_return_address(0), addr);
IO_COND(addr, pio_write16be(val,port), mmio_write16be(val, addr)); IO_COND(addr, pio_write16be(val,port), mmio_write16be(val, addr));
} }
void iowrite32(u32 val, void __iomem *addr) void iowrite32(u32 val, void __iomem *addr)
{ {
IO_COND(addr, outl(val,port), writel(val, addr)); uncached_logk_pc(LOGK_WRITEL, __builtin_return_address(0), addr);
IO_COND(addr, outl(val, port), writel_no_log(val, addr));
} }
void iowrite32be(u32 val, void __iomem *addr) void iowrite32be(u32 val, void __iomem *addr)
{ {
uncached_logk_pc(LOGK_WRITEL, __builtin_return_address(0), addr);
IO_COND(addr, pio_write32be(val,port), mmio_write32be(val, addr)); IO_COND(addr, pio_write32be(val,port), mmio_write32be(val, addr));
} }
EXPORT_SYMBOL(iowrite8); EXPORT_SYMBOL(iowrite8);