Commit 07d77759 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, hypervisor: add missing <linux/module.h>
  Modify the VMware balloon driver for the new x86_hyper API
  x86, hypervisor: Export the x86_hyper* symbols
  x86: Clean up the hypervisor layer
  x86, HyperV: fix up the license to mshyperv.c
  x86: Detect running on a Microsoft HyperV system
  x86, cpu: Make APERF/MPERF a normal table-driven flag
  x86, k8: Fix build error when K8_NB is disabled
  x86, cacheinfo: Disable index in all four subcaches
  x86, cacheinfo: Make L3 cache info per node
  x86, cacheinfo: Reorganize AMD L3 cache structure
  x86, cacheinfo: Turn off L3 cache index disable feature in virtualized environments
  x86, cacheinfo: Unify AMD L3 cache index disable checking
  cpufreq: Unify sysfs attribute definition macros
  powernow-k8: Fix frequency reporting
  x86, cpufreq: Add APERF/MPERF support for AMD processors
  x86: Unify APERF/MPERF support
  powernow-k8: Add core performance boost support
  x86, cpu: Add AMD core boosting feature flag to /proc/cpuinfo

Fix up trivial conflicts in arch/x86/kernel/cpu/intel_cacheinfo.c and
drivers/cpufreq/cpufreq_ondemand.c
parents b7723f9d 3998d095

arch/x86/include/asm/cpufeature.h

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ 
 */

#define X86_FEATURE_IDA		(7*32+ 0) /* Intel Dynamic Acceleration */

#define X86_FEATURE_ARAT	(7*32+ 1) /* Always Running APIC Timer */

#define X86_FEATURE_CPB		(7*32+ 2) /* AMD Core Performance Boost */



/* Virtualization flags: Linux defined */

#define X86_FEATURE_TPR_SHADOW  (8*32+ 0) /* Intel TPR Shadow */

arch/x86/include/asm/hyperv.h

+9 −2
Original line number Diff line number Diff line 
#ifndef _ASM_X86_KVM_HYPERV_H

#define _ASM_X86_KVM_HYPERV_H

#ifndef _ASM_X86_HYPERV_H

#define _ASM_X86_HYPERV_H



#include <linux/types.h>
@@ -14,6 +14,10 @@ 
#define HYPERV_CPUID_ENLIGHTMENT_INFO		0x40000004

#define HYPERV_CPUID_IMPLEMENT_LIMITS		0x40000005



#define HYPERV_HYPERVISOR_PRESENT_BIT		0x80000000

#define HYPERV_CPUID_MIN			0x40000005

#define HYPERV_CPUID_MAX			0x4000ffff



/*

 * Feature identification. EAX indicates which features are available

 * to the partition based upon the current partition privileges.
@@ -129,6 +133,9 @@ 
/* MSR used to provide vcpu index */

#define HV_X64_MSR_VP_INDEX			0x40000002



/* MSR used to read the per-partition time reference counter */

#define HV_X64_MSR_TIME_REF_COUNT		0x40000020



/* Define the virtual APIC registers */

#define HV_X64_MSR_EOI				0x40000070

#define HV_X64_MSR_ICR				0x40000071

arch/x86/include/asm/hypervisor.h

+25 −2
Original line number Diff line number Diff line
@@ -17,10 +17,33 @@ 
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

 *

 */

#ifndef ASM_X86__HYPERVISOR_H

#define ASM_X86__HYPERVISOR_H

#ifndef _ASM_X86_HYPERVISOR_H

#define _ASM_X86_HYPERVISOR_H



extern void init_hypervisor(struct cpuinfo_x86 *c);

extern void init_hypervisor_platform(void);



/*

 * x86 hypervisor information

 */

struct hypervisor_x86 {

	/* Hypervisor name */

	const char	*name;



	/* Detection routine */

	bool		(*detect)(void);



	/* Adjust CPU feature bits (run once per CPU) */

	void		(*set_cpu_features)(struct cpuinfo_x86 *);



	/* Platform setup (run once per boot) */

	void		(*init_platform)(void);

};



extern const struct hypervisor_x86 *x86_hyper;



/* Recognized hypervisors */

extern const struct hypervisor_x86 x86_hyper_vmware;

extern const struct hypervisor_x86 x86_hyper_ms_hyperv;



#endif

arch/x86/include/asm/mshyperv.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_MSHYPER_H

#define _ASM_X86_MSHYPER_H



#include <linux/types.h>

#include <asm/hyperv.h>



struct ms_hyperv_info {

	u32 features;

	u32 hints;

};



extern struct ms_hyperv_info ms_hyperv;



#endif

arch/x86/include/asm/processor.h

+0 −4
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ struct cpuinfo_x86 { 
	/* Index into per_cpu list: */

	u16			cpu_index;

#endif

	unsigned int		x86_hyper_vendor;

} __attribute__((__aligned__(SMP_CACHE_BYTES)));



#define X86_VENDOR_INTEL	0
@@ -127,9 +126,6 @@ struct cpuinfo_x86 { 


#define X86_VENDOR_UNKNOWN	0xff



#define X86_HYPER_VENDOR_NONE  0

#define X86_HYPER_VENDOR_VMWARE 1



/*

 * capabilities of CPUs

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE