[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1398827428-25540-1-git-send-email-tianyu.lan@intel.com>
Date: Wed, 30 Apr 2014 11:10:28 +0800
From: Lan Tianyu <tianyu.lan@...el.com>
To: rjw@...ysocki.net, lenb@...nel.org, katoh@...age.ne.jp,
smf.linux@...world.com
Cc: Lan Tianyu <tianyu.lan@...el.com>, linux-acpi@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] ACPI/Processor: Fix failure of loading acpi-cpufreq driver
According commit d640113fe(ACPI: processor: fix acpi_get_cpuid for UP
processor), Bios may not provide _MAT or MADT tables and acpi_get_apicid()
always returns -1. For these cases, original code will pass apic_id with
vaule of -1 to acpi_map_cpuid() and it will check the acpi_id. If acpi_id
is equal to zero, ignores apic_id and return zero for CPU0.
Commit b981513(ACPI / scan: bail out early if failed to parse APIC
ID for CPU) changed the behavior. Return ENODEV when find apic_id is
less than zero after calling acpi_get_apicid(). This causes acpi-cpufreq
driver fails to be loaded on some machines. This patch is to fix it.
Reference:https://bugzilla.kernel.org/show_bug.cgi?id=73781
Cc: stable@...r.kernel.org v3.14
Reported-and-tested-by: KATO Hiroshi <katoh@...age.ne.jp>
Reported-and-tested-by: Stuart Foster <smf.linux@...world.com>
Signed-off-by: Lan Tianyu <tianyu.lan@...el.com>
---
drivers/acpi/acpi_processor.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index c29c2c3..d55b603 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -260,10 +260,8 @@ static int acpi_processor_get_info(struct acpi_device *device)
}
apic_id = acpi_get_apicid(pr->handle, device_declaration, pr->acpi_id);
- if (apic_id < 0) {
+ if (apic_id < 0)
acpi_handle_debug(pr->handle, "failed to get CPU APIC ID.\n");
- return -ENODEV;
- }
pr->apic_id = apic_id;
cpu_index = acpi_map_cpuid(pr->apic_id, pr->acpi_id);
--
1.8.4.rc0.1.g8f6a3e5.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists