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

Commit c758ecf6 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: unify cpuid functions 



cpuid is not very different between i386 and x86_64.
We move away the x86_64 version from msr.h, and
unify them at processor.h, where they belong.

cpuid() paravirt then comes for free.

Signed-off-by: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4e87173e

include/asm-x86/msr.h

+0 −67
Original line number Diff line number Diff line
@@ -203,73 +203,6 @@ static inline int wrmsr_safe(u32 __msr, u32 __low, u32 __high) 
			  : "c" (counter))





static inline void cpuid(int op, unsigned int *eax, unsigned int *ebx,

			 unsigned int *ecx, unsigned int *edx)

{

	__asm__("cpuid"

		: "=a" (*eax),

		  "=b" (*ebx),

		  "=c" (*ecx),

		  "=d" (*edx)

		: "0" (op));

}



/* Some CPUID calls want 'count' to be placed in ecx */

static inline void cpuid_count(int op, int count, int *eax, int *ebx, int *ecx,

			       int *edx)

{

	__asm__("cpuid"

		: "=a" (*eax),

		  "=b" (*ebx),

		  "=c" (*ecx),

		  "=d" (*edx)

		: "0" (op), "c" (count));

}



/*

 * CPUID functions returning a single datum

 */

static inline unsigned int cpuid_eax(unsigned int op)

{

	unsigned int eax;



	__asm__("cpuid"

		: "=a" (eax)

		: "0" (op)

		: "bx", "cx", "dx");

	return eax;

}

static inline unsigned int cpuid_ebx(unsigned int op)

{

	unsigned int eax, ebx;



	__asm__("cpuid"

		: "=a" (eax), "=b" (ebx)

		: "0" (op)

		: "cx", "dx" );

	return ebx;

}

static inline unsigned int cpuid_ecx(unsigned int op)

{

	unsigned int eax, ecx;



	__asm__("cpuid"

		: "=a" (eax), "=c" (ecx)

		: "0" (op)

		: "bx", "dx" );

	return ecx;

}

static inline unsigned int cpuid_edx(unsigned int op)

{

	unsigned int eax, edx;



	__asm__("cpuid"

		: "=a" (eax), "=d" (edx)

		: "0" (op)

		: "bx", "cx");

	return edx;

}



#ifdef __KERNEL__



/* wrmsr with exception handling */

include/asm-x86/processor.h

+78 −0
Original line number Diff line number Diff line 
#ifndef __ASM_X86_PROCESSOR_H

#define __ASM_X86_PROCESSOR_H



static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,

					 unsigned int *ecx, unsigned int *edx)

{

	/* ecx is often an input as well as an output. */

	__asm__("cpuid"

		: "=a" (*eax),

		  "=b" (*ebx),

		  "=c" (*ecx),

		  "=d" (*edx)

		: "0" (*eax), "2" (*ecx));

}





#ifdef CONFIG_X86_32

# include "processor_32.h"

#else

# include "processor_64.h"

#endif



#ifndef CONFIG_PARAVIRT

#define __cpuid native_cpuid

#endif



/*

 * Generic CPUID function

 * clear %ecx since some cpus (Cyrix MII) do not set or clear %ecx

 * resulting in stale register contents being returned.

 */

static inline void cpuid(unsigned int op,

			 unsigned int *eax, unsigned int *ebx,

			 unsigned int *ecx, unsigned int *edx)

{

	*eax = op;

	*ecx = 0;

	__cpuid(eax, ebx, ecx, edx);

}



/* Some CPUID calls want 'count' to be placed in ecx */

static inline void cpuid_count(unsigned int op, int count,

			       unsigned int *eax, unsigned int *ebx,

			       unsigned int *ecx, unsigned int *edx)

{

	*eax = op;

	*ecx = count;

	__cpuid(eax, ebx, ecx, edx);

}



/*

 * CPUID functions returning a single datum

 */

static inline unsigned int cpuid_eax(unsigned int op)

{

	unsigned int eax, ebx, ecx, edx;



	cpuid(op, &eax, &ebx, &ecx, &edx);

	return eax;

}

static inline unsigned int cpuid_ebx(unsigned int op)

{

	unsigned int eax, ebx, ecx, edx;



	cpuid(op, &eax, &ebx, &ecx, &edx);

	return ebx;

}

static inline unsigned int cpuid_ecx(unsigned int op)

{

	unsigned int eax, ebx, ecx, edx;



	cpuid(op, &eax, &ebx, &ecx, &edx);

	return ecx;

}

static inline unsigned int cpuid_edx(unsigned int op)

{

	unsigned int eax, ebx, ecx, edx;



	cpuid(op, &eax, &ebx, &ecx, &edx);

	return edx;

}



#endif

include/asm-x86/processor_32.h

+0 −69
Original line number Diff line number Diff line
@@ -133,18 +133,6 @@ extern void detect_ht(struct cpuinfo_x86 *c); 
static inline void detect_ht(struct cpuinfo_x86 *c) {}

#endif



static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,

					 unsigned int *ecx, unsigned int *edx)

{

	/* ecx is often an input as well as an output. */

	__asm__("cpuid"

		: "=a" (*eax),

		  "=b" (*ebx),

		  "=c" (*ecx),

		  "=d" (*edx)

		: "0" (*eax), "2" (*ecx));

}



#define load_cr3(pgdir) write_cr3(__pa(pgdir))



/*
@@ -580,7 +568,6 @@ static inline void native_set_iopl_mask(unsigned mask) 
#include <asm/paravirt.h>

#else

#define paravirt_enabled() 0

#define __cpuid native_cpuid



static inline void load_sp0(struct tss_struct *tss, struct thread_struct *thread)

{
@@ -598,62 +585,6 @@ static inline void load_sp0(struct tss_struct *tss, struct thread_struct *thread 
#define set_iopl_mask native_set_iopl_mask

#endif /* CONFIG_PARAVIRT */



/*

 * Generic CPUID function

 * clear %ecx since some cpus (Cyrix MII) do not set or clear %ecx

 * resulting in stale register contents being returned.

 */

static inline void cpuid(unsigned int op,

			 unsigned int *eax, unsigned int *ebx,

			 unsigned int *ecx, unsigned int *edx)

{

	*eax = op;

	*ecx = 0;

	__cpuid(eax, ebx, ecx, edx);

}



/* Some CPUID calls want 'count' to be placed in ecx */

static inline void cpuid_count(unsigned int op, int count,

			       unsigned int *eax, unsigned int *ebx,

			       unsigned int *ecx, unsigned int *edx)

{

	*eax = op;

	*ecx = count;

	__cpuid(eax, ebx, ecx, edx);

}



/*

 * CPUID functions returning a single datum

 */

static inline unsigned int cpuid_eax(unsigned int op)

{

	unsigned int eax, ebx, ecx, edx;



	cpuid(op, &eax, &ebx, &ecx, &edx);

	return eax;

}

static inline unsigned int cpuid_ebx(unsigned int op)

{

	unsigned int eax, ebx, ecx, edx;



	cpuid(op, &eax, &ebx, &ecx, &edx);

	return ebx;

}

static inline unsigned int cpuid_ecx(unsigned int op)

{

	unsigned int eax, ebx, ecx, edx;



	cpuid(op, &eax, &ebx, &ecx, &edx);

	return ecx;

}

static inline unsigned int cpuid_edx(unsigned int op)

{

	unsigned int eax, ebx, ecx, edx;



	cpuid(op, &eax, &ebx, &ecx, &edx);

	return edx;

}



/* generic versions from gas */

#define GENERIC_NOP1	".byte 0x90\n"

#define GENERIC_NOP2    	".byte 0x89,0xf6\n"