Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6888b254 authored by Jordan Crouse's avatar Jordan Crouse
Browse files

msm: Don't use RTB logging for big endian operations 



There is something strange in the big-endian io operations
that doesn't work with the RTB logging macros. Switch the
big-endian operations to no_log since they are unlikely
to be used in conjunction with RTB anyway.

Change-Id: Ic0dedbad12279907fc38e079db1b8c7bf662636b
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent ee8a2b03

arch/arm64/include/asm/io.h

+6 −6
Original line number Diff line number Diff line
@@ -251,13 +251,13 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size); 
/*

 * io{read,write}{16,32,64}be() macros

 */

#define ioread16be(p)		({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(); __v; })

#define ioread32be(p)		({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(); __v; })

#define ioread64be(p)		({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(); __v; })

#define ioread16be(p)		({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw_no_log(p)); __iormb(); __v; })

#define ioread32be(p)		({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl_no_log(p)); __iormb(); __v; })

#define ioread64be(p)		({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq_no_log(p)); __iormb(); __v; })



#define iowrite16be(v,p)	({ __iowmb(); __raw_writew((__force __u16)cpu_to_be16(v), p); })

#define iowrite32be(v,p)	({ __iowmb(); __raw_writel((__force __u32)cpu_to_be32(v), p); })

#define iowrite64be(v,p)	({ __iowmb(); __raw_writeq((__force __u64)cpu_to_be64(v), p); })

#define iowrite16be(v,p)	({ __iowmb(); __raw_writew_no_log((__force __u16)cpu_to_be16(v), p); })

#define iowrite32be(v,p)	({ __iowmb(); __raw_writel_no_log((__force __u32)cpu_to_be32(v), p); })

#define iowrite64be(v,p)	({ __iowmb(); __raw_writeq_no_log((__force __u64)cpu_to_be64(v), p); })



#include <asm-generic/io.h>