lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparc32: simpler cputype check in head_32.S

Browse Source 
We know this is not a sun4/sun4c - as we checked earlier.
So no need to repeat the check.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sam Ravnborg
2012-05-12 01:43:49 +00:00
committed by David S. Miller
parent eb06f47630
commit d6ea55733d
1 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
arch/sparc/kernel/head_32.S
View File

@@ -699,35 +699,26 @@ execute_in_high_mem:
ba continue_boot ba continue_boot
nop nop
#endif #endif
/* Check to cputype. We may be booted on a sun4u (64 bit box),
* and sun4d needs special treatment.
*/
set cputypval, %o2 set cputypval, %o2
ldub [%o2 + 0x4], %l1 ldub [%o2 + 0x4], %l1
cmp %l1, ' ' cmp %l1, 'm'
be no_sun4c_here be sun4m_init
cmp %l1, 'c'
be no_sun4c_here
cmp %l1, 'm'
be 1f
cmp %l1, 's' cmp %l1, 's'
be 1f be sun4m_init
cmp %l1, 'd' cmp %l1, 'd'
be 1f be sun4d_init
cmp %l1, 'e' cmp %l1, 'e'
be no_sun4e_here ! Could be a sun4e. be no_sun4e_here ! Could be a sun4e.
nop nop
b no_sun4u_here ! AIEEE, a V9 sun4u... Get our BIG BROTHER kernel :)) b no_sun4u_here ! AIEEE, a V9 sun4u... Get our BIG BROTHER kernel :))
nop nop
1: set cputypval, %l1
ldub [%l1 + 0x4], %l1
cmp %l1, 'd' ! Let us see how the beast will die
be sun4d_init
nop
/* If not sun4d assume sun4m */
b sun4m_init
nop
/* CPUID in bootbus can be found at PA 0xff0140000 */ /* CPUID in bootbus can be found at PA 0xff0140000 */
#define SUN4D_BOOTBUS_CPUID 0xf0140000 #define SUN4D_BOOTBUS_CPUID 0xf0140000
@@ -1026,13 +1017,6 @@ continue_boot:
/* We should not get here. */ /* We should not get here. */
call halt_me call halt_me
nop nop
no_sun4c_here:
ld [%g7 + 0x68], %o1
set sun4c_notsup, %o0
call %o1
nop
b halt_me
nop
no_sun4e_here: no_sun4e_here:
ld [%g7 + 0x68], %o1 ld [%g7 + 0x68], %o1