From patchwork Wed Oct 3 13:29:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 188770 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DF6DC2C00C0 for ; Wed, 3 Oct 2012 23:35:23 +1000 (EST) Received: from localhost ([::1]:41047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJP1U-0006we-SX for incoming@patchwork.ozlabs.org; Wed, 03 Oct 2012 09:30:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJP03-0004Dv-Tk for qemu-devel@nongnu.org; Wed, 03 Oct 2012 09:28:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJOzt-0006bI-7d for qemu-devel@nongnu.org; Wed, 03 Oct 2012 09:28:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJOzs-0006aM-TQ for qemu-devel@nongnu.org; Wed, 03 Oct 2012 09:28:21 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q93DSK8r010401 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 3 Oct 2012 09:28:20 -0400 Received: from blackpad.lan.raisama.net (vpn1-7-147.gru2.redhat.com [10.97.7.147]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q93DSJ2d028499; Wed, 3 Oct 2012 09:28:19 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id A4575203631; Wed, 3 Oct 2012 10:29:21 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 3 Oct 2012 10:29:10 -0300 Message-Id: <1349270954-4657-15-git-send-email-ehabkost@redhat.com> In-Reply-To: <1349270954-4657-1-git-send-email-ehabkost@redhat.com> References: <1349270954-4657-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gleb Natapov , Paolo Bonzini Subject: [Qemu-devel] [RFC 14/18] pc: create apic_id_for_cpu() function (v3) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Currently we need a way to calculate the Initial APIC ID using only the CPU index (without needing a CPU object), as the NUMA fw_cfg data is APIC-ID-based, and may include data for hotplug CPUs (that don't exist yet), up to max_cpus. Changes v2 -> v3: - Move the whole code to hw/pc.c, now only the PC code will need to handle topology-based APIC IDs Changes v1 -> v2: - make function return value 'unsigned int' (it's not specific for the 8-bit xAPIC ID) - move implementation to cpu.c Signed-off-by: Eduardo Habkost --- hw/pc.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/hw/pc.c b/hw/pc.c index c64c218..4b30f38 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -568,6 +568,20 @@ static void pc_register_type(void) type_init(pc_register_type); +/* Calculates initial APIC ID for a specific CPU index + * + * Currently we need to be able to calculate the APIC ID from the CPU index + * alone, as the QEMU<->Seabios interfaces have no concept of "CPU index", + * and the NUMA tables need the APIC ID of all CPUs up to max_cpus. + */ +static uint32_t apic_id_for_cpu(PC *pc, int cpu_index) +{ + /* right now APIC ID == CPU index. this will eventually change to use + * the CPU topology configuration properly + */ + return cpu_index; +} + int e820_add_entry(uint64_t address, uint64_t length, uint32_t type) { int index = le32_to_cpu(e820_table.count); @@ -935,7 +949,7 @@ void pc_cpus_init(PC *pc, const char *cpu_model) } for(i = 0; i < smp_cpus; i++) { - pc_new_cpu(pc, cpu_model, i); + pc_new_cpu(pc, cpu_model, apic_id_for_cpu(pc, i)); } }