From patchwork Fri Feb 5 18:07:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 8237921 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D9AF0BEEE5 for ; Fri, 5 Feb 2016 18:11:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 267A820397 for ; Fri, 5 Feb 2016 18:11:59 +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 4558C20392 for ; Fri, 5 Feb 2016 18:11:58 +0000 (UTC) Received: from localhost ([::1]:49814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRkrN-0007Fo-Ke for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Feb 2016 13:11:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRkmx-0007x3-PG for qemu-devel@nongnu.org; Fri, 05 Feb 2016 13:07:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRkmw-0008M9-JS for qemu-devel@nongnu.org; Fri, 05 Feb 2016 13:07:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57816) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRkmw-0008Lo-Be for qemu-devel@nongnu.org; Fri, 05 Feb 2016 13:07:22 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 0E6FAE1B6C; Fri, 5 Feb 2016 18:07:22 +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-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u15I762T026672; Fri, 5 Feb 2016 13:07:20 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Fri, 5 Feb 2016 19:07:04 +0100 Message-Id: <1454695626-70225-9-git-send-email-imammedo@redhat.com> In-Reply-To: <1454695626-70225-1-git-send-email-imammedo@redhat.com> References: <1454695626-70225-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, marcel.apfelbaum@gmail.com, ehabkost@redhat.com, afaerber@suse.de, mst@redhat.com Subject: [Qemu-devel] [PATCH v2 08/10] pc: acpi: move cpu->found_cpus bitmap to build_processor_devices() 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org 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 cpu->found_cpus bitmap is used for setting present flag in CPON AML package. But it takes a bunch of code to fill bitmap and could be simplified by getting presense info from possible CPUs list directly. So move found_cpus bitmap to the only place that uses it for building sparse CPON AML package. Signed-off-by: Igor Mammedov --- hw/i386/acpi-build.c | 51 +++++++++++++++------------------------------------ 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 72ecb0c..6ac05b3 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -77,10 +77,6 @@ #define ACPI_BUILD_DPRINTF(fmt, ...) #endif -typedef struct AcpiCpuInfo { - DECLARE_BITMAP(found_cpus, ACPI_CPU_HOTPLUG_ID_LIMIT); -} AcpiCpuInfo; - typedef struct AcpiMcfgInfo { uint64_t mcfg_base; uint32_t mcfg_size; @@ -122,31 +118,6 @@ typedef struct AcpiBuildPciBusHotplugState { bool pcihp_bridge_en; } AcpiBuildPciBusHotplugState; -static -int acpi_add_cpu_info(Object *o, void *opaque) -{ - AcpiCpuInfo *cpu = opaque; - uint64_t apic_id; - - if (object_dynamic_cast(o, TYPE_CPU)) { - apic_id = object_property_get_int(o, "apic-id", NULL); - assert(apic_id < ACPI_CPU_HOTPLUG_ID_LIMIT); - - set_bit(apic_id, cpu->found_cpus); - } - - object_child_foreach(o, acpi_add_cpu_info, opaque); - return 0; -} - -static void acpi_get_cpu_info(AcpiCpuInfo *cpu) -{ - Object *root = object_get_root(); - - memset(cpu->found_cpus, 0, sizeof cpu->found_cpus); - object_child_foreach(root, acpi_add_cpu_info, cpu); -} - static void acpi_get_pm_info(AcpiPmInfo *pm) { Object *piix = piix4_pm_find(); @@ -969,7 +940,7 @@ static Aml *build_crs(PCIHostState *host, } static void build_processor_devices(Aml *sb_scope, MachineState *machine, - AcpiCpuInfo *cpu, AcpiPmInfo *pm) + AcpiPmInfo *pm) { int i; Aml *dev; @@ -981,7 +952,9 @@ static void build_processor_devices(Aml *sb_scope, MachineState *machine, MachineClass *mc = MACHINE_GET_CLASS(machine); GArray *apic_id_list = mc->possible_cpu_arch_ids(); PCMachineState *pcms = PC_MACHINE(machine); + DECLARE_BITMAP(found_cpus, ACPI_CPU_HOTPLUG_ID_LIMIT); + memset(found_cpus, 0, sizeof found_cpus); /* The current AML generator can cover the APIC ID range [0..255], * inclusive, for VCPU hotplug. */ QEMU_BUILD_BUG_ON(ACPI_CPU_HOTPLUG_ID_LIMIT > 256); @@ -1015,6 +988,14 @@ static void build_processor_devices(Aml *sb_scope, MachineState *machine, int apic_id = id.arch_id; assert(apic_id < ACPI_CPU_HOTPLUG_ID_LIMIT); + /* + * prefill present CPUs bitmap which will be used + * later for generating sparse CPU_ON_BITMAP + */ + if (id.cpu != NULL) { + set_bit(apic_id, found_cpus); + } + dev = aml_processor(apic_id, 0, 0, "CP%.02X", apic_id); method = aml_method("_MAT", 0, AML_NOTSERIALIZED); @@ -1065,7 +1046,7 @@ static void build_processor_devices(Aml *sb_scope, MachineState *machine, aml_varpackage(pcms->apic_id_limit); for (i = 0; i < pcms->apic_id_limit; i++) { - uint8_t b = test_bit(i, cpu->found_cpus) ? 0x01 : 0x00; + uint8_t b = test_bit(i, found_cpus) ? 0x01 : 0x00; aml_append(pkg, aml_int(b)); } aml_append(sb_scope, aml_name_decl(CPU_ON_BITMAP, pkg)); @@ -1990,7 +1971,7 @@ static Aml *build_q35_osc_method(void) static void build_dsdt(GArray *table_data, GArray *linker, - AcpiCpuInfo *cpu, AcpiPmInfo *pm, AcpiMiscInfo *misc, + AcpiPmInfo *pm, AcpiMiscInfo *misc, PcPciInfo *pci, MachineState *machine) { CrsRangeEntry *entry; @@ -2297,7 +2278,7 @@ build_dsdt(GArray *table_data, GArray *linker, sb_scope = aml_scope("\\_SB"); { - build_processor_devices(sb_scope, machine, cpu, pm); + build_processor_devices(sb_scope, machine, pm); build_memory_devices(sb_scope, nr_mem, pm->mem_hp_io_base, pm->mem_hp_io_len); @@ -2651,7 +2632,6 @@ void acpi_build(AcpiBuildTables *tables) PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); GArray *table_offsets; unsigned facs, dsdt, rsdt, fadt; - AcpiCpuInfo cpu; AcpiPmInfo pm; AcpiMiscInfo misc; AcpiMcfgInfo mcfg; @@ -2662,7 +2642,6 @@ void acpi_build(AcpiBuildTables *tables) AcpiSlicOem slic_oem = { .id = NULL, .table_id = NULL }; MachineState *machine = MACHINE(qdev_get_machine()); - acpi_get_cpu_info(&cpu); acpi_get_pm_info(&pm); acpi_get_misc_info(&misc); acpi_get_pci_info(&pci); @@ -2686,7 +2665,7 @@ void acpi_build(AcpiBuildTables *tables) /* DSDT is pointed to by FADT */ dsdt = tables_blob->len; - build_dsdt(tables_blob, tables->linker, &cpu, &pm, &misc, &pci, machine); + build_dsdt(tables_blob, tables->linker, &pm, &misc, &pci, machine); /* Count the size of the DSDT and SSDT, we will need it for legacy * sizing of ACPI tables.