From 858bae4d1ccc1fe172ec1f03302aeedb19bc2ea5 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Thu, 8 Aug 2013 10:32:56 +0200 Subject: x86/cpuidle: Change logging for unknown APIC IDs Dom0 uses this hypercall to pass ACPI information to Xen. It is not very uncommon for more cpus to be listed in the ACPI tables than are present on the system, particularly on systems with a common BIOS for a 2 and 4 socket server varients. As Dom0 does not control the number of entries in the ACPI tables, and is required to pass everything it finds to Xen, change the logging. There is now an single unconditional warning for the first unknown ID, and further warnings if "cpuinfo" is requested by the user on the command line. Signed-off-by: Andrew Cooper master commit: 85047d9e4f4afeb73bca1e98f705a2f4f1d51c03 master date: 2013-07-17 08:45:20 +0200 --- xen/arch/x86/acpi/cpu_idle.c | 5 ++++- xen/arch/x86/cpu/common.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index b4dd6ad9e3..f9d74d69e4 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -1042,7 +1042,10 @@ long set_cx_pminfo(uint32_t cpu, struct xen_processor_power *power) cpu_id = get_cpu_id(cpu); if ( cpu_id == -1 ) { - printk(XENLOG_ERR "no cpu_id for acpi_id %d\n", cpu); + static bool_t warn_once = 1; + if ( warn_once || opt_cpu_info ) + printk(XENLOG_WARNING "No CPU ID for APIC ID %#x\n", cpu); + warn_once = 0; return -EINVAL; } diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 321d942fbe..b8cd59c2c9 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -66,7 +66,7 @@ static struct cpu_dev default_cpu = { }; static struct cpu_dev * this_cpu = &default_cpu; -bool_t __cpuinitdata opt_cpu_info; +bool_t opt_cpu_info; boolean_param("cpuinfo", opt_cpu_info); int __cpuinit get_model_name(struct cpuinfo_x86 *c) -- cgit v1.2.3