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

arch/arm64/kernel/io.c

+9 −9

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

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

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

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

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

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

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

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