Patch "xen/acpi: allow xen-acpi-processor driver to load on Xen 4.7" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
xen/acpi: allow xen-acpi-processor driver to load on Xen 4.7
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xen-acpi-allow-xen-acpi-processor-driver-to-load-on-xen-4.7.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
6f2d9d99213514360034c6d52d2c3919290b3504Mon Sep 17 00:00:00 2001
From: Jan Beulich <[email protected]>
Date: Fri, 8 Jul 2016 06:15:07 -0600
Subject: xen/acpi: allow xen-acpi-processor driver to load on Xen 4.7
From: Jan Beulich <[email protected]>
commit 6f2d9d99213514360034c6d52d2c3919290b3504 upstream.
As of Xen 4.7 PV CPUID doesn't expose either of CPUID[1].ECX[7] and CPUID[0x80000007].EDX[7] anymore, causing the driver to fail to load on both Intel and AMD systems. Doing any kind of hardware capability checks in the driver as a prerequisite was wrong anyway: With the hypervisor being in charge, all such checking should be done by it. If ACPI data gets uploaded despite some missing capability, the hypervisor is free to ignore part or all of that data.
Ditch the entire check_prereq() function, and do the only valid check (xen_initial_domain()) in the caller in its place.
--- drivers/xen/xen-acpi-processor.c | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-)
drivers/xen/xen-acpi-processor.c +3 -32
@@ -423,36 +423,7 @@ upload:return 0 ; } -static int __init check_prereq (void ) -{ -struct cpuinfo_x86 *c = &cpu_data (0 ); - -if (!xen_initial_domain ()) -return -ENODEV ; - -if (!acpi_gbl_FADT.smi_command) -return -ENODEV ; -if (c->x86_vendor ==X86_VENDOR_INTEL ) { -if (!cpu_has (c,X86_FEATURE_EST )) -return -ENODEV ; - -return 0 ; - } -if (c->x86_vendor ==X86_VENDOR_AMD ) { -/* Copied from powernow-k8.h, can't include ../cpufreq/powernow -* as we get compile warnings for the static functions. -*/ -#define CPUID_FREQ_VOLT_CAPABILITIES 0x80000007 -#define USE_HW_PSTATE 0x00000080 -u32 eax, ebx, ecx, edx; -cpuid (CPUID_FREQ_VOLT_CAPABILITIES , &eax, &ebx, &ecx, &edx); -if ((edx &USE_HW_PSTATE ) !=USE_HW_PSTATE ) -return -ENODEV ; -return 0 ; - } -return -ENODEV ; -}/* acpi_perf_data is a pointer to percpu data. */ static struct acpi_processor_performance __percpu *acpi_perf_data;
@@ -509,10 +480,10 @@ struct notifier_block xen_acpi_processorstatic int __init xen_acpi_processor_init (void ) {unsigned int i; -int rc =check_prereq (); +int rc; -if (rc) -return rc; +if (!xen_initial_domain ()) +return -ENODEV ; nr_acpi_bits =get_max_acpi_id () +1 ; acpi_ids_done =kcalloc (BITS_TO_LONGS (nr_acpi_bits),sizeof (unsigned long ),GFP_KERNEL );
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/xen-acpi-allow-xen-acpi-processor-driver-to-load-on-xen-4.7.patch