platform/x86: don't unconditionally attach Intel PMC when virtualized
Subsystems (2)
PATCH 1/1 platform/x86: don't unconditionally attach Intel PMC when virtualized
The current logic in the Intel PMC driver will forcefully attach it when detecting any CPU on the intel_pmc_core_platform_ids array, even if the matching ACPI device is not present.
There's no checking in pmc_core_probe() to assert that the PMC device is present, and hence on virtualized environments the PMC device probes successfully, even if the underlying registers are not present. Previous to 21ae43570940 the driver would check for the presence of a specific PCI device, and that prevented the driver from attaching when running virtualized.
Fix by only forcefully attaching the PMC device when not running virtualized. Note that virtualized platforms can still get the device to load if the appropriate ACPI device is present on the tables provided to the VM.
Make an exception for the Xen initial domain, which does have full hardware access, and hence can attach to the PMC if present.
--- drivers/platform/x86/intel/pmc/pltdrv.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/platform/x86/intel/pmc/pltdrv.c +10 -0
@@ -18,6 +18,8 @@#include <asm/cpu_device_id.h> #include <asm/intel-family.h> +#include <xen/xen.h> +static void intel_pmc_core_release (struct device *dev) {kfree (dev);
@@ -53,6 +55,14 @@ static int __init pmc_core_platform_init(void)if (acpi_dev_present ("INT33A1" ,NULL ,-1 ))return -ENODEV ; +/* +* Skip forcefully attaching the device for VMs. Make an exception for +* Xen dom0, which does have full hardware access. +*/ +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ) && + !xen_initial_domain ()) +return -ENODEV ; +if (!x86_match_cpu (intel_pmc_core_platform_ids))return -ENODEV ;
Signature · 1 line
2.37.3
Quoted 46 lines · Roger Pau Monne
The current logic in the Intel PMC driver will forcefully attach it when detecting any CPU on the
intel_pmc_core_platform_idsarray, even if the matching ACPI device is not present.There's no checking in
pmc_core_probe()to assert that the PMC device is present, and hence on virtualized environments the PMC device probes successfully, even if the underlying registers are not present. Previous to21ae43570940the driver would check for the presence of a specific PCI device, and that prevented the driver from attaching when running virtualized.Fix by only forcefully attaching the PMC device when not running virtualized. Note that virtualized platforms can still get the device to load if the appropriate ACPI device is present on the tables provided to the VM.
Make an exception for the Xen initial domain, which does have full hardware access, and hence can attach to the PMC if present.
Fixes 21ae43570940 ('platform/x86: intel_pmc_core: Substitute PCI with CPUID enumeration')Signed-off-by Roger Pau Monné <[email protected]>Cc Rajneesh Bhardwaj <[email protected]>Cc David E Box <[email protected]>Cc Hans de Goede <[email protected]>Cc Mark Gross <[email protected]>Cc Andy Shevchenko <[email protected]>Cc Srinivas Pandruvada <[email protected]>--- drivers/platform/x86/intel/pmc/pltdrv.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/platform/x86/intel/pmc/pltdrv.c +2
-0@@ -18,6 +18,8 @@#include <asm/cpu_device_id.h> #include <asm/intel-family.h> +#include <xen/xen.h> +static void intel_pmc_core_release (struct device *dev) {kfree (dev);
drivers/platform/x86/intel/pmc/pltdrv.c static int __init pmc_core_platform_init(void) · line 62
Quoted 8 lines
drivers/platform/x86/intel/pmc/pltdrv.c +5
-0@@ -53,6 +55,14 @@ static int __init pmc_core_platform_init(void)if (acpi_dev_present ("INT33A1" ,NULL ,-1 ))return -ENODEV ; +/* +* Skip forcefully attaching the device for VMs. Make an exception for +* Xen dom0, which does have full hardware access. +*/ + if (boot_cpu_has(X86_FEATURE_HYPERVISOR) &&
Please use cpu_feature_enabled() instead of boot_cpu_has().
Juergen
Quoted 10 lines · Roger Pau Monne
The current logic in the Intel PMC driver will forcefully attach it when detecting any CPU on the
intel_pmc_core_platform_idsarray, even if the matching ACPI device is not present.There's no checking in
pmc_core_probe()to assert that the PMC device is present, and hence on virtualized environments the PMC device probes successfully, even if the underlying registers are not present. Previous to21ae43570940the driver would check for the presence of a specific PCI device, and that prevented the driver from attaching when running virtualized.
Yeah, that PCI device was short lived. It was available on Skylake/Kabylake but then removed on future generations. When this happened we changed the driver to use ACPI binding instead. But there were several generations of ChromeOS/coreboo t platforms (listed in intel_pmc_core_platform_ids) that did not have the ACPI device present in their firmware. This file exists specifically to support those platforms and uses the forced binding because (given that there's actual silicon) we know the PMC will be there.
Quoted 42 lines
Fix by only forcefully attaching the PMC device when not running virtualized. Note that virtualized platforms can still get the device to load if the appropriate ACPI device is present on the tables provided to the VM.
Make an exception for the Xen initial domain, which does have full hardware access, and hence can attach to the PMC if present.
Fixes 21ae43570940 ('platform/x86: intel_pmc_core: Substitute PCI with CPUIDenumeration')
Signed-off-by Roger Pau Monné <[email protected]>Cc Rajneesh Bhardwaj <[email protected]>Cc David E Box <[email protected]>Cc Hans de Goede <[email protected]>Cc Mark Gross <[email protected]>Cc Andy Shevchenko <[email protected]>Cc Srinivas Pandruvada <[email protected]>--- drivers/platform/x86/intel/pmc/pltdrv.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/platform/x86/intel/pmc/pltdrv.c +3
-0@@ -18,6 +18,8 @@#include <asm/cpu_device_id.h> #include <asm/intel-family.h> +#include <xen/xen.h> +static void intel_pmc_core_release (struct device *dev) {kfree (dev);@@ -53,6 +55,14 @@ static int __init pmc_core_platform_init(void)if (acpi_dev_present ("INT33A1" ,NULL ,-1 ))return -ENODEV ; +/*
drivers/platform/x86/intel/pmc/pltdrv.c static int __init pmc_core_platform_init(void) · line 68
Quoted 10 lines
drivers/platform/x86/intel/pmc/pltdrv.c +7
-0+* Skip forcefully attaching the device for VMs. Make an exception for +* Xen dom0, which does have full hardware access. +*/ +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ) && + !xen_initial_domain ()) +return -ENODEV ; +if (!x86_match_cpu (intel_pmc_core_platform_ids))return -ENODEV ;