From patchwork Tue May 17 14:43:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 9113481 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DD4649F30C for ; Tue, 17 May 2016 15:00:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 33555201ED for ; Tue, 17 May 2016 15:00:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6087C20123 for ; Tue, 17 May 2016 15:00:09 +0000 (UTC) Received: from localhost ([::1]:50819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2gTg-00038p-Lk for patchwork-qemu-devel@patchwork.kernel.org; Tue, 17 May 2016 11:00:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2gEH-0001Bx-W6 for qemu-devel@nongnu.org; Tue, 17 May 2016 10:44:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2gED-0006U0-Iy for qemu-devel@nongnu.org; Tue, 17 May 2016 10:44:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45949) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2gED-0006Tt-Bl for qemu-devel@nongnu.org; Tue, 17 May 2016 10:44:09 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E7AAC15568 for ; Tue, 17 May 2016 14:44:08 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4HEhRtI006153; Tue, 17 May 2016 10:44:07 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 17 May 2016 16:43:15 +0200 Message-Id: <1463496205-251412-24-git-send-email-imammedo@redhat.com> In-Reply-To: <1463496205-251412-1-git-send-email-imammedo@redhat.com> References: <1463496205-251412-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 17 May 2016 14:44:08 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 23/33] acpi: add CPU devices AML to DSDT X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: drjones@redhat.com, ehabkost@redhat.com, rkrcmar@redhat.com, mst@redhat.com, armbru@redhat.com, marcel@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Signed-off-by: Igor Mammedov --- hw/acpi/cpu.c | 38 ++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-build.c | 10 +++++++++- include/hw/acpi/cpu.h | 3 +++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index 73258a1..b3e1cca 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -205,3 +205,41 @@ const VMStateDescription vmstate_cpu_hotplug = { VMSTATE_END_OF_LIST() } }; + +#define CPU_NAME_FMT "C%.03X" + +void build_cpus_aml(Aml *table, MachineState *machine, bool acpi1_compat) +{ + Aml *cpus_dev; + Aml *sb_scope = aml_scope("_SB"); + MachineClass *mc = MACHINE_GET_CLASS(machine); + CPUArchIdList *arch_ids = mc->possible_cpu_arch_ids(machine); + cpus_dev = aml_device("\\_SB.CPUS"); + { + int i; + + aml_append(cpus_dev, aml_name_decl("_HID", aml_string("ACPI0010"))); + aml_append(cpus_dev, aml_name_decl("_CID", aml_eisaid("PNP0A05"))); + + /* build Processor object for each processor */ + for (i = 0; i < arch_ids->len; i++) { + Aml *dev; + Aml *uid = aml_int(i); + int arch_id = arch_ids->cpus[i].arch_id; + + if (acpi1_compat && arch_id < 255) { + dev = aml_processor(i, 0, 0, CPU_NAME_FMT, i); + } else { + dev = aml_device(CPU_NAME_FMT, arch_id); + aml_append(dev, aml_name_decl("_HID", aml_string("ACPI0007"))); + aml_append(dev, aml_name_decl("_UID", uid)); + } + + aml_append(cpus_dev, dev); + } + } + aml_append(sb_scope, cpus_dev); + aml_append(table, sb_scope); + + g_free(arch_ids); +} diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index af939bc..47d4182 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -93,6 +93,7 @@ typedef struct AcpiPmInfo { uint32_t gpe0_blk; uint32_t gpe0_blk_len; uint32_t io_base; + bool legacy_cpu_hp; uint16_t cpu_hp_io_base; uint16_t mem_hp_io_base; uint16_t mem_hp_io_len; @@ -141,6 +142,9 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) } assert(obj); + pm->legacy_cpu_hp = object_property_get_bool(obj, "cpu-hotplug-legacy", + NULL); + pm->mem_hp_io_base = ACPI_MEMORY_HOTPLUG_BASE; pm->mem_hp_io_len = ACPI_MEMORY_HOTPLUG_IO_LEN; @@ -1942,7 +1946,11 @@ build_dsdt(GArray *table_data, GArray *linker, build_q35_pci0_int(dsdt); } - build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base); + if (pm->legacy_cpu_hp) { + build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base); + } else { + build_cpus_aml(dsdt, machine, true); + } build_memory_hotplug_aml(dsdt, nr_mem, pm->mem_hp_io_base, pm->mem_hp_io_len); diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h index 3fdf4eb..ca32e07 100644 --- a/include/hw/acpi/cpu.h +++ b/include/hw/acpi/cpu.h @@ -14,6 +14,7 @@ #include "hw/qdev-core.h" #include "hw/acpi/acpi.h" +#include "hw/acpi/aml-build.h" #include "hw/hotplug.h" typedef struct AcpiCpuStatus { @@ -44,6 +45,8 @@ void acpi_cpu_unplug_cb(CPUHotplugState *cpu_st, void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner, CPUHotplugState *state, hwaddr base_addr); +void build_cpus_aml(Aml *table, MachineState *machine, bool apci1_compat); + extern const VMStateDescription vmstate_cpu_hotplug; #define VMSTATE_CPU_HOTPLUG(cpuhp, state) \ VMSTATE_STRUCT(cpuhp, state, 1, \