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

Commit 5e2a044d authored by Borislav Petkov's avatar Borislav Petkov Committed by H. Peter Anvin
Browse files

x86, head_32: Give the 6 label a real name 



Jumping here we are about to enable paging so rename the label
accordingly.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1360592538-10643-5-git-send-email-bp@alien8.de


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent c3a22a26

arch/x86/kernel/head_32.S

+6 −6
Original line number Original line Diff line number Diff line
@@ -329,7 +329,7 @@ default_entry: 
	pushfl

	pushfl

	popl %eax			# get EFLAGS

	popl %eax			# get EFLAGS

	testl $X86_EFLAGS_ID,%eax	# did EFLAGS.ID remained set?

	testl $X86_EFLAGS_ID,%eax	# did EFLAGS.ID remained set?

	jz 6f				# hw disallowed setting of ID bit

	jz enable_paging		# hw disallowed setting of ID bit

					# which means no CPUID and no CR4

					# which means no CPUID and no CR4





	xorl %eax,%eax

	xorl %eax,%eax
@@ -339,13 +339,13 @@ default_entry: 
	movl $1,%eax

	movl $1,%eax

	cpuid

	cpuid

	andl $~1,%edx			# Ignore CPUID.FPU

	andl $~1,%edx			# Ignore CPUID.FPU

	jz 6f				# No flags or only CPUID.FPU = no CR4

	jz enable_paging		# No flags or only CPUID.FPU = no CR4





	movl pa(mmu_cr4_features),%eax

	movl pa(mmu_cr4_features),%eax

	movl %eax,%cr4

	movl %eax,%cr4





	testb $X86_CR4_PAE, %al		# check if PAE is enabled

	testb $X86_CR4_PAE, %al		# check if PAE is enabled

	jz 6f

	jz enable_paging





	/* Check if extended functions are implemented */

	/* Check if extended functions are implemented */

	movl $0x80000000, %eax

	movl $0x80000000, %eax
@@ -353,7 +353,7 @@ default_entry: 
	/* Value must be in the range 0x80000001 to 0x8000ffff */

	/* Value must be in the range 0x80000001 to 0x8000ffff */

	subl $0x80000001, %eax

	subl $0x80000001, %eax

	cmpl $(0x8000ffff-0x80000001), %eax

	cmpl $(0x8000ffff-0x80000001), %eax

	ja 6f

	ja enable_paging





	/* Clear bogus XD_DISABLE bits */

	/* Clear bogus XD_DISABLE bits */

	call verify_cpu

	call verify_cpu
@@ -362,7 +362,7 @@ default_entry: 
	cpuid

	cpuid

	/* Execute Disable bit supported? */

	/* Execute Disable bit supported? */

	btl $(X86_FEATURE_NX & 31), %edx

	btl $(X86_FEATURE_NX & 31), %edx

	jnc 6f

	jnc enable_paging





	/* Setup EFER (Extended Feature Enable Register) */

	/* Setup EFER (Extended Feature Enable Register) */

	movl $MSR_EFER, %ecx

	movl $MSR_EFER, %ecx
@@ -372,7 +372,7 @@ default_entry: 
	/* Make changes effective */

	/* Make changes effective */

	wrmsr

	wrmsr





6:

enable_paging:





/*

/*

 * Enable paging

 * Enable paging