Skip to contentSkip to conversation

x86: use enum cpuid_leafs instead of magic numbers

PATCH Applied Huaitong Han 3 participants 10 messages Jan 21, 2016

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 x86: use enum cpuid_leafs instead of magic numbers

v2:add a commit message.

Most of magic numbers of x86_capability have been converted to enum cpuid_leafs, and this patch does update the remaining part.

---
 arch/x86/include/asm/elf.h | 2 +-
 arch/x86/kernel/mpparse.c  | 2 +-
 arch/x86/lguest/boot.c     | 2 +-
 arch/x86/xen/enlighten.c   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/include/asm/elf.h +1 -1
index 1514753..15340e3 100644
@@ -256,7 +256,7 @@ extern int force_personality32;
    instruction set this CPU supports.  This could be done in user space,
    but it's not easy, and we've already done it here.  */
 
-#define ELF_HWCAP		(boot_cpu_data.x86_capability[0])
+#define ELF_HWCAP		(boot_cpu_data.x86_capability[CPUID_1_EDX])
 
 /* This yields a string that ld.so will use to load implementation
    specific libraries for optimization.  This is more specific in
arch/x86/kernel/mpparse.c +1 -1
index 30ca760..97340f2 100644
@@ -408,7 +408,7 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type)
 	processor.cpuflag = CPU_ENABLED;
 	processor.cpufeature = (boot_cpu_data.x86 << 8) |
 	    (boot_cpu_data.x86_model << 4) | boot_cpu_data.x86_mask;
-	processor.featureflag = boot_cpu_data.x86_capability[0];
+	processor.featureflag = boot_cpu_data.x86_capability[CPUID_1_EDX];
 	processor.reserved[0] = 0;
 	processor.reserved[1] = 0;
 	for (i = 0; i < 2; i++) {
arch/x86/lguest/boot.c +1 -1
index 4ba229a..a9033ae 100644
@@ -1535,7 +1535,7 @@ __init void lguest_init(void)
 	 */
 	cpu_detect(&new_cpu_data);
 	/* head.S usually sets up the first capability word, so do it here. */
-	new_cpu_data.x86_capability[0] = cpuid_edx(1);
+	new_cpu_data.x86_capability[CPUID_1_EDX] = cpuid_edx(1);
 
 	/* Math is always hard! */
 	set_cpu_cap(&new_cpu_data, X86_FEATURE_FPU);
arch/x86/xen/enlighten.c +1 -1
index d09e4c9..2c26108 100644
@@ -1654,7 +1654,7 @@ asmlinkage __visible void __init xen_start_kernel(void)
 	cpu_detect(&new_cpu_data);
 	set_cpu_cap(&new_cpu_data, X86_FEATURE_FPU);
 	new_cpu_data.wp_works_ok = 1;
-	new_cpu_data.x86_capability[0] = cpuid_edx(1);
+	new_cpu_data.x86_capability[CPUID_1_EDX] = cpuid_edx(1);
 #endif
 
 	if (xen_start_info->mod_start) {
Signature · 1 line
2.4.3
maintainer Applied
#1 lore raw
Quoted 5 lines · Huaitong Han

v2:add a commit message.

Most of magic numbers of x86_capability have been converted to enum cpuid_leafs, and this patch does update the remaining part.

Quoted 7 lines
---
 arch/x86/include/asm/elf.h | 2 +-
 arch/x86/kernel/mpparse.c  | 2 +-
 arch/x86/lguest/boot.c     | 2 +-
 arch/x86/xen/enlighten.c   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Applied, thanks.

Signature · 4 lines
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
#2 lore raw
Quoted 6 lines · Borislav Petkov
Quoted 5 lines · Huaitong Han

v2:add a commit message.

Most of magic numbers of x86_capability have been converted to enum cpuid_leafs, and this patch does update the remaining part.

Quoted 8 lines
Quoted 7 lines
---
 arch/x86/include/asm/elf.h | 2 +-
 arch/x86/kernel/mpparse.c  | 2 +-
 arch/x86/lguest/boot.c     | 2 +-
 arch/x86/xen/enlighten.c   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

I'm wondering, though, if it wouldn't be better to turn these into macros so that they can be used in assembly code. That way the definitions can be interspersed with the X86_FEATURE_ definitions, too.

-hpa

maintainer
#3 lore raw
Quoted 4 lines · H. Peter Anvin

I'm wondering, though, if it wouldn't be better to turn these into macros so that they can be used in assembly code. That way the definitions can be interspersed with the X86_FEATURE_ definitions, too.

What concrete use case do you have in mind, i.e., example?

Signature · 4 lines
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
#4 lore raw
Quoted 8 lines · Borislav Petkov
Quoted 4 lines · H. Peter Anvin

I'm wondering, though, if it wouldn't be better to turn these into macros so that they can be used in assembly code. That way the definitions can be interspersed with the X86_FEATURE_ definitions, too.

What concrete use case do you have in mind, i.e., example?

See X86_CAPABILITY in head_32.S for example.

-hpa

maintainer
#5 lore raw
Quoted 1 line · H. Peter Anvin

See X86_CAPABILITY in head_32.S for example.

... so that you can get rid of the offset games at least for CPUINFO_x86_capability in asm-offsets_32.c?

Signature · 4 lines
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
#6 lore raw
Quoted 6 lines · Borislav Petkov
Quoted 1 line · H. Peter Anvin

See X86_CAPABILITY in head_32.S for example.

... so that you can get rid of the offset games at least for CPUINFO_x86_capability in asm-offsets_32.c?

No, you still need to be able to find the beginning of the capability array, but the point is that right now it is implicit in that code that CPUID_1_EDX == 0.

-hpa

maintainer
#7 lore raw
Quoted 3 lines · H. Peter Anvin

No, you still need to be able to find the beginning of the capability array, but the point is that right now it is implicit in that code that CPUID_1_EDX == 0.

Ah, you wanna be able to do:

---

arch/x86/kernel/head_32.S +1 -1
index af1112980dd4..143646f0add1 100644
@@ -441,7 +443,7 @@ enable_paging:
 	movb %al,X86_MODEL
 	andb $0x0f,%cl		# mask mask revision
 	movb %cl,X86_MASK
-	movl %edx,X86_CAPABILITY
+	movl %edx,X86_CAPABILITY + CPUID_1_EDX*4
 
 is486:
 	movl $0x50022,%ecx	# set AM, WP, NE and MP
Signature · 4 lines
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
#8 lore raw
Quoted 21 lines · Borislav Petkov
Quoted 2 lines · H. Peter Anvin

No, you still need to be able to find the beginning of the capability array, but the point is that right now it is implicit in that code

that

Quoted 1 line

CPUID_1_EDX == 0.

Ah, you wanna be able to do:

---

arch/x86/kernel/head_32.S +1 -1
index af1112980dd4..143646f0add1 100644
@@ -441,7 +443,7 @@ enable_paging:
 	movb %al,X86_MODEL
 	andb $0x0f,%cl		# mask mask revision
 	movb %cl,X86_MASK
-	movl %edx,X86_CAPABILITY
+	movl %edx,X86_CAPABILITY + CPUID_1_EDX*4
 

is486:

Quoted 1 line
	movl $0x50022,%ecx	# set AM, WP, NE and MP

Basically, yes.

Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse brevity and formatting.