From patchwork Sun May 31 02:31:51 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Zhao, Yakui" <yakui.zhao@intel.com>
X-Patchwork-Id: 27091
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4V2UBpZ024880
	for <patchwork-acpi@patchwork.kernel.org>;
	Sun, 31 May 2009 02:30:11 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752524AbZEaCaH (ORCPT
	<rfc822;patchwork-acpi@patchwork.kernel.org>);
	Sat, 30 May 2009 22:30:07 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753643AbZEaCaH
	(ORCPT <rfc822;linux-acpi-outgoing>);
	Sat, 30 May 2009 22:30:07 -0400
Received: from mga09.intel.com ([134.134.136.24]:56995 "EHLO mga09.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752524AbZEaCaG (ORCPT <rfc822;linux-acpi@vger.kernel.org>);
	Sat, 30 May 2009 22:30:06 -0400
Received: from orsmga002.jf.intel.com ([10.7.209.21])
	by orsmga102.jf.intel.com with ESMTP; 30 May 2009 19:19:13 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.41,277,1241420400"; d="scan'208";a="417180920"
Received: from yakui_zhao.sh.intel.com (HELO [10.239.13.172])
	([10.239.13.172])
	by orsmga002.jf.intel.com with ESMTP; 30 May 2009 19:37:37 -0700
Subject: [Resend] [PATCH]: ACPI: Rename ACPI processor device bus ID
From: yakui_zhao <yakui.zhao@intel.com>
To: lenb@kernel.org
Cc: linux-acpi@vger.kernel.org
Organization: Intel Open Source Technology Center
Date: Sun, 31 May 2009 10:31:51 +0800
Message-Id: <1243737111.3634.168.camel@localhost.localdomain>
Mime-Version: 1.0
X-Mailer: Evolution 2.22.1 (2.22.1-2.fc9) 
Sender: linux-acpi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-acpi.vger.kernel.org>
X-Mailing-List: linux-acpi@vger.kernel.org

From: Zhao Yakui <yakui.zhao@intel.com

On some boxes several processors use the same processor bus id.
But they are located in different scope. For example:
	\_SB.SCK0.CPU0
	\_SB.SCK1.CPU0
	As they use the same bus id, it can't be registered when
registering proc I/F. It causes that the ACPI processor driver can't
be bound with the processor device.
	
Rename the processor device bus id. And the new bus id will be 
generated as the following format:
	CPU+ CPU ID
	
For example: If the cpu ID is 5, then the bus ID will be "CPU5".
	If the CPU ID is 10, then the bus ID will be "CPUA".

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
---
 drivers/acpi/processor_core.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)



--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Index: linux-2.6/drivers/acpi/processor_core.c
===================================================================
--- linux-2.6.orig/drivers/acpi/processor_core.c	2009-05-27 08:38:44.000000000 +0800
+++ linux-2.6/drivers/acpi/processor_core.c	2009-05-31 10:21:21.000000000 +0800
@@ -649,7 +649,16 @@
 			return -ENODEV;
 		}
 	}
-
+	/*
+	 * On some boxes several processors use the same processor bus id.
+	 * But they are located in different scope. For example:
+	 * \_SB.SCK0.CPU0
+	 * \_SB.SCK1.CPU0
+	 * Rename the processor device bus id. And the new bus id will be
+	 * generated as the following format:
+	 * CPU+CPU ID.
+	 */
+	sprintf(acpi_device_bid(device), "CPU%X", pr->id);
 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Processor [%d:%d]\n", pr->id,
 			  pr->acpi_id));