Backport OSS changeset 19991.

Tim Deegan's change to initialize safe state for Cx.

diff --git a/master/cx-initialize-safe-state b/master/cx-initialize-safe-state
new file mode 100644 (file)
index 0000000..df27854
--- /dev/null
+++ b/master/cx-initialize-safe-state
@@ -0,0 +1,12 @@
+diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c
+index 839532b..12f6d2a 100644
+--- a/xen/arch/x86/acpi/cpu_idle.c
++++ b/xen/arch/x86/acpi/cpu_idle.c
+@@ -419,6 +419,7 @@ static int init_cx_pminfo(struct acpi_processor_power *acpi_power)
+     acpi_power->states[ACPI_STATE_C1].valid = 1;
+ 
+     acpi_power->count = 2;
++    acpi_power->safe_state = &acpi_power->states[ACPI_STATE_C1];
+ 
+     return 0;
+ }

diff --git a/master/series b/master/series
index fa873319a024ad534f6820cad4805db686d821e9..cd54ddcf2fb90f38eec8128804731fa4923fcec8 100644 (file)
--- a/master/series
+++ b/master/series
@@ -15,3 +15,4 @@ video-memory-workaround
 tools-hvm-info
 disable-abr
 default-iommu-inclusive-mapping
+cx-initialize-safe-state