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

Commit 640d17d6 authored by Grant Likely's avatar Grant Likely Committed by Josh Boyer
Browse files

powerpc/virtex5: Fix Virtex5 machine check handling 



The 440x5 core in the Virtex5 uses the 440A type machine check
(ie, they have MCSRR0/MCSRR1). They thus need to call the
appropriate fixup function to hook the right variant of the
exception.

Without this, all machine checks become fatal due to loss
of context when entering the exception handler.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
parent feaf3848

arch/powerpc/kernel/cpu_setup_44x.S

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ _GLOBAL(__setup_cpu_460gt) 
	mtlr	r4

	blr



_GLOBAL(__setup_cpu_440x5)

_GLOBAL(__setup_cpu_440gx)

_GLOBAL(__setup_cpu_440spe)

	b	__fixup_440A_mcheck

arch/powerpc/kernel/cputable.c

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec); 
extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_440x5(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);
@@ -1500,6 +1501,8 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.cpu_user_features	= COMMON_USER_BOOKE,

		.icache_bsize		= 32,

		.dcache_bsize		= 32,

		.cpu_setup		= __setup_cpu_440x5,

		.machine_check		= machine_check_440A,

		.platform		= "ppc440",

	},

	{ /* 460EX */