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

Commit 86fa7087 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/nmi: fix inline assembly constraints 



Add missing memory clobbers / barriers or use the Q constraint where
possible to tell the compiler that the inline assemblies actually
access memory and not only pointers to memory.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 7a71fd1c

arch/s390/kernel/nmi.c

+10 −9
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ static int notrace s390_validate_registers(union mci mci, int umode) 
{

{

	int kill_task;

	int kill_task;

	u64 zero;

	u64 zero;

	void *fpt_save_area, *fpt_creg_save_area;

	void *fpt_save_area;





	kill_task = 0;

	kill_task = 0;

	zero = 0;

	zero = 0;
@@ -130,7 +130,6 @@ static int notrace s390_validate_registers(union mci mci, int umode) 
			kill_task = 1;

			kill_task = 1;

	}

	}

	fpt_save_area = &S390_lowcore.floating_pt_save_area;

	fpt_save_area = &S390_lowcore.floating_pt_save_area;

	fpt_creg_save_area = &S390_lowcore.fpt_creg_save_area;

	if (!mci.fc) {

	if (!mci.fc) {

		/*

		/*

		 * Floating point control register can't be restored.

		 * Floating point control register can't be restored.
@@ -142,11 +141,13 @@ static int notrace s390_validate_registers(union mci mci, int umode) 
		 */

		 */

		if (S390_lowcore.fpu_flags & KERNEL_FPC)

		if (S390_lowcore.fpu_flags & KERNEL_FPC)

			s390_handle_damage();

			s390_handle_damage();

		asm volatile("lfpc 0(%0)" : : "a" (&zero), "m" (zero));

		asm volatile("lfpc %0" : : "Q" (zero));

		if (!test_cpu_flag(CIF_FPU))

		if (!test_cpu_flag(CIF_FPU))

			kill_task = 1;

			kill_task = 1;

	} else

	} else {

		asm volatile("lfpc 0(%0)" : : "a" (fpt_creg_save_area));

		asm volatile("lfpc %0"

			     : : "Q" (S390_lowcore.fpt_creg_save_area));

	}





	if (!MACHINE_HAS_VX) {

	if (!MACHINE_HAS_VX) {

		/* Validate floating point registers */

		/* Validate floating point registers */
@@ -167,7 +168,7 @@ static int notrace s390_validate_registers(union mci mci, int umode) 
			"	ld	13,104(%0)\n"

			"	ld	13,104(%0)\n"

			"	ld	14,112(%0)\n"

			"	ld	14,112(%0)\n"

			"	ld	15,120(%0)\n"

			"	ld	15,120(%0)\n"

			: : "a" (fpt_save_area));

			: : "a" (fpt_save_area) : "memory");

	} else {

	} else {

		/* Validate vector registers */

		/* Validate vector registers */

		union ctlreg0 cr0;

		union ctlreg0 cr0;
@@ -217,7 +218,7 @@ static int notrace s390_validate_registers(union mci mci, int umode) 
	} else {

	} else {

		asm volatile(

		asm volatile(

			"	lctlg	0,15,0(%0)"

			"	lctlg	0,15,0(%0)"

			: : "a" (&S390_lowcore.cregs_save_area));

			: : "a" (&S390_lowcore.cregs_save_area) : "memory");

	}

	}

	/*

	/*

	 * We don't even try to validate the TOD register, since we simply

	 * We don't even try to validate the TOD register, since we simply
@@ -234,9 +235,9 @@ static int notrace s390_validate_registers(union mci mci, int umode) 
			: : : "0", "cc");

			: : : "0", "cc");

	else

	else

		asm volatile(

		asm volatile(

			"	l	0,0(%0)\n"

			"	l	0,%0\n"

			"	sckpf"

			"	sckpf"

			: : "a" (&S390_lowcore.tod_progreg_save_area)

			: : "Q" (S390_lowcore.tod_progreg_save_area)

			: "0", "cc");

			: "0", "cc");

	/* Validate clock comparator register */

	/* Validate clock comparator register */

	set_clock_comparator(S390_lowcore.clock_comparator);

	set_clock_comparator(S390_lowcore.clock_comparator);