From a5e0cfbec69e8fc5050f9ba725e14a39c2f646a1 Mon Sep 17 00:00:00 2001 From: Melody Olvera Date: Tue, 6 Apr 2021 15:15:46 -0700 Subject: [PATCH] msm_rtb: Redefine readX_no_log based on architecture The readX_no_log macros use __iormb(), which has a different function prototype based off of whether or not the architecture is 32-bit or 64-bit, so define these macros accordingly. Change-Id: Id52fd0217822371e4db9efd49c8ea35af434d71f Signed-off-by: Melody Olvera --- include/linux/msm_rtb.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/linux/msm_rtb.h b/include/linux/msm_rtb.h index 391c266705a0..2ddba4aa8811 100644 --- a/include/linux/msm_rtb.h +++ b/include/linux/msm_rtb.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2012-2014, 2016, 2018-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2014, 2016, 2018-2021, The Linux Foundation. All rights reserved. */ #ifndef __MSM_RTB_H__ @@ -125,6 +125,16 @@ int uncached_logk(enum logk_event_type log_type, void *data); __r; \ }) +#ifdef CONFIG_ARM +#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; }) +#else #define readb_no_log(c) \ ({ u8 __v = readb_relaxed_no_log(c); __iormb(__v); __v; }) #define readw_no_log(c) \ @@ -133,6 +143,7 @@ int uncached_logk(enum logk_event_type log_type, void *data); ({ u32 __v = readl_relaxed_no_log(c); __iormb(__v); __v; }) #define readq_no_log(c) \ ({ u64 __v = readq_relaxed_no_log(c); __iormb(__v); __v; }) +#endif #define __raw_write_logged(v, a, _t) ({ \ int _ret; \