From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Mon, 27 Feb 2012 01:08:48 +0000 (-0500)
Subject: Merge branch 'stable/cpufreq-xen.v6.rebased' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~595^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2fa5344c95525da55cd6896af85541fc23c1bdc0;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stable/cpufreq-xen.v6.rebased' into uek2-merge

* stable/cpufreq-xen.v6.rebased:
  [CPUFREQ] xen: governor for Xen hypervisor frequency scaling.
  xen/enlighten: Expose MWAIT and MWAIT_LEAF if hypervisor OKs it.

Conflicts:
	drivers/xen/Kconfig
	drivers/xen/Makefile
---

2fa5344c95525da55cd6896af85541fc23c1bdc0
diff --cc drivers/xen/Kconfig
index 73dced010765,f8a8203535fc..e2a7d748187a
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -143,62 -105,19 +143,63 @@@ config SWIOTLB_XE
  	depends on PCI
  	select SWIOTLB
  
 +config XEN_MCE_LOG
 +	bool "Xen platform mcelog"
 +	depends on XEN_DOM0 && X86_64 && X86_MCE
 +	default y
 +	help
 +	  Allow kernel fetching mce log from xen platform and
 +	  converting it into linux mcelog format for mcelog tools
 +
- 
- config XEN_PROCESSOR_PASSTHRU
- 	tristate "Processor passthrough driver for Xen"
- 	depends on XEN
- 	depends on ACPI_PROCESSOR
- 	depends on X86
- 	depends on CPU_FREQ
+ config CPU_FREQ_GOV_XEN
+ 	tristate "'xen' governor for hypervisor scaling"
+ 	depends on XEN && X86 && ACPI_PROCESSOR && CPU_FREQ
+ 	default m
  	help
- 	  This driver parses the processor structure and passes the information
- 	  to the Xen hypervisor. It is used to allow the Xen hypervisor to have the
- 	  full power management data and be able to select proper Cx and Pxx states.
+           This cpufreq governor leaves the frequency decision to the Xen hypervisor.
+ 
+ 	  To do that the driver parses the Power Management data and uploads said
+ 	  information to the Xen hypervisor. Then the Xen hypervisor can select the
+           proper Cx and Pxx states.
+ 
+           To compile this driver as a module, choose M here: the
+           module will be called cpufreq_xen.  If you do not know what to choose,
+           select M here.
  
- 	  The driver should be loaded after acpi processor and cpufreq drivers have
- 	  been loaded. If you do not know what to choose, select M here.
 +
 +
 +config XEN_PRIVCMD
 +	tristate
 +	depends on XEN
 +	default m
 +
 +config XEN_TMEM
 +	bool
 +	default y if (CLEANCACHE || FRONTSWAP)
 +	help
 +	  Shim to interface in-kernel Transcendent Memory hooks
 +	  (e.g. cleancache and frontswap) to Xen tmem hypercalls.
 +
 +config XEN_PCIDEV_BACKEND
 +	tristate "Xen PCI-device backend driver"
 +	depends on PCI && X86 && XEN
 +	depends on XEN_BACKEND
 +	default m
 +	help
 +	  The PCI device backend driver allows the kernel to export arbitrary
 +	  PCI devices to other guests. If you select this to be a module, you
 +	  will need to make sure no other driver has bound to the device(s)
 +	  you want to make visible to other guests.
 +
 +	  The parameter "passthrough" allows you specify how you want the PCI
 +	  devices to appear in the guest. You can choose the default (0) where
 +	  PCI topology starts at 00.00.0, or (1) for passthrough if you want
 +	  the PCI devices topology appear the same as in the host.
 +
 +	  The "hide" parameter (only applicable if backend driver is compiled
 +	  into the kernel) allows you to bind the PCI devices to this module
 +	  from the default device drivers. The argument is the list of PCI BDFs:
 +	  xen-pciback.hide=(03:00.0)(04:00.0)
 +
 +	  If in doubt, say m.
  endmenu
diff --cc drivers/xen/Makefile
index 2f3ba85a3c84,43d6ceacaca6..9b25bcc05945
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -14,13 -14,10 +14,13 @@@ obj-$(CONFIG_XEN_GNTDEV)		+= xen-gntdev
  obj-$(CONFIG_XEN_GRANT_DEV_ALLOC)	+= xen-gntalloc.o
  obj-$(CONFIG_XENFS)			+= xenfs/
  obj-$(CONFIG_XEN_SYS_HYPERVISOR)	+= sys-hypervisor.o
 -obj-$(CONFIG_XEN_PLATFORM_PCI)		+= xen-platform-pci.o
 +obj-$(CONFIG_XEN_MCE_LOG)		+= mcelog.o
 +obj-$(CONFIG_XEN_TMEM)			+= tmem.o
  obj-$(CONFIG_SWIOTLB_XEN)		+= swiotlb-xen.o
 -obj-$(CONFIG_XEN_DOM0)			+= pci.o
 +obj-$(CONFIG_XEN_DOM0)			+= pci.o acpi.o
 +obj-$(CONFIG_XEN_PRIVCMD)		+= xen-privcmd.o
- obj-$(CONFIG_XEN_PROCESSOR_PASSTHRU)	+= processor-passthru.o
+ obj-$(CONFIG_CPU_FREQ_GOV_XEN)		+= cpufreq_xen.o
 +obj-$(CONFIG_XEN_PCIDEV_BACKEND)	+= xen-pciback/
  xen-evtchn-y				:= evtchn.o
  xen-gntdev-y				:= gntdev.o
  xen-gntalloc-y				:= gntalloc.o