From patchwork Mon Apr 14 23:55:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 3987991 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4FDFCBFF02 for ; Mon, 14 Apr 2014 23:57:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 83FDD201E7 for ; Mon, 14 Apr 2014 23:57:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 984D6201E4 for ; Mon, 14 Apr 2014 23:57:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754777AbaDNX5Y (ORCPT ); Mon, 14 Apr 2014 19:57:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22794 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754607AbaDNX5X (ORCPT ); Mon, 14 Apr 2014 19:57:23 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3ENvIqY023422 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Apr 2014 19:57:18 -0400 Received: from dhcp-16-105.nay.redhat.com (dhcp-16-119.nay.redhat.com [10.66.16.119]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3ENvE2X006194; Mon, 14 Apr 2014 19:57:15 -0400 From: Baoquan He To: linux-kernel@vger.kernel.org Cc: rjw@rjwysocki.net, lenb@kernel.org, linux-acpi@vger.kernel.org, jiang.liu@linux.intel.com, vgoyal@redhat.com, Baoquan He Subject: [PATCH] acpi: try to trust cpu_index from x86_cpu_to_apicid Date: Tue, 15 Apr 2014 07:55:54 +0800 Message-Id: <1397519754-10205-1-git-send-email-bhe@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In smp with multi cpus, when enter into kdump kernel with only 1 cpu, a warning message is printed out: acpi LNXCPU:0a: BIOS reported wrong ACPI id 0 for the processor In this case kdump kernel use the same ACPI tables as 1st kernel, means lapic information is got from MADT. The acpi_id related to this cpu index and lapic_id may not be 0, so the code to assign value to cpu_index is not correct in this case per cpu0_initialized. cpu index stored in x86_cpu_to_apicid need be respected. Now fix it in this patch per boot_cpu_physical_apicid. When cpu index related to boot_cpu_physical_apicid is not stored in x86_cpu_to_apicid, then we can say this is UP system running SMP kernel with no LAPIC in MADT Signed-off-by: Baoquan He --- drivers/acpi/acpi_processor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index c29c2c3..1ae460c 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -267,7 +267,7 @@ static int acpi_processor_get_info(struct acpi_device *device) pr->apic_id = apic_id; cpu_index = acpi_map_cpuid(pr->apic_id, pr->acpi_id); - if (!cpu0_initialized) { + if (!cpu0_initialized && (boot_cpu_physical_apicid == pr->apic_id)) { cpu0_initialized = 1; /* Handle UP system running SMP kernel, with no LAPIC in MADT */ if ((cpu_index == -1) && (num_online_cpus() == 1))