Merge "msm_rtb: Redefine readX_no_log based on architecture" (3aaec090) · Commits · e / devices / android_kernel_fairphone_FP5

include/linux/msm_rtb.h

+12 −1

Original line number	Diff line number	Diff line
		/* 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; \