Merge "arm64: Prevent msm-rtb tracing in memcpy_{from,to}io and memset_io" into msm-4.8 (a86696a4) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/kernel/io.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -27,21 +27,21 @@ void __memcpy_fromio(void to, const volatile void __iomem from, size_t count)
		{
		while (count && (!IS_ALIGNED((unsigned long)from, 8) \|\|
		!IS_ALIGNED((unsigned long)to, 8))) {
		(u8 )to = __raw_readb(from);
		(u8 )to = __raw_readb_no_log(from);
		from++;
		to++;
		count--;
		}

		while (count >= 8) {
		(u64 )to = __raw_readq(from);
		(u64 )to = __raw_readq_no_log(from);
		from += 8;
		to += 8;
		count -= 8;
		}

		while (count) {
		(u8 )to = __raw_readb(from);
		(u8 )to = __raw_readb_no_log(from);
		from++;
		to++;
		count--;
		@@ -56,21 +56,21 @@ void __memcpy_toio(volatile void __iomem to, const void from, size_t count)
		{
		while (count && (!IS_ALIGNED((unsigned long)to, 8) \|\|
		!IS_ALIGNED((unsigned long)from, 8))) {
		__raw_writeb((volatile u8 )from, to);
		__raw_writeb_no_log((volatile u8 )from, to);
		from++;
		to++;
		count--;
		}

		while (count >= 8) {
		__raw_writeq((volatile u64 )from, to);
		__raw_writeq_no_log((volatile u64 )from, to);
		from += 8;
		to += 8;
		count -= 8;
		}

		while (count) {
		__raw_writeb((volatile u8 )from, to);
		__raw_writeb_no_log((volatile u8 )from, to);
		from++;
		to++;
		count--;
		@@ -90,19 +90,19 @@ void __memset_io(volatile void __iomem *dst, int c, size_t count)
		qc \|= qc << 32;

		while (count && !IS_ALIGNED((unsigned long)dst, 8)) {
		__raw_writeb(c, dst);
		__raw_writeb_no_log(c, dst);
		dst++;
		count--;
		}

		while (count >= 8) {
		__raw_writeq(qc, dst);
		__raw_writeq_no_log(qc, dst);
		dst += 8;
		count -= 8;
		}

		while (count) {
		__raw_writeb(c, dst);
		__raw_writeb_no_log(c, dst);
		dst++;
		count--;
		}