Received: by 10.25.159.19 with SMTP id i19csp2274097lfe; Mon, 1 Feb 2016 02:43:22 -0800 (PST) X-Received: by 10.55.74.14 with SMTP id x14mr27929187qka.70.1454323402112; Mon, 01 Feb 2016 02:43:22 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k9si31565659qge.20.2016.02.01.02.43.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 01 Feb 2016 02:43:22 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Received: from localhost ([::1]:51694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQBx3-0005HH-LU for alex.bennee@linaro.org; Mon, 01 Feb 2016 05:43:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQBx0-0005DB-RN for qemu-arm@nongnu.org; Mon, 01 Feb 2016 05:43:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQBwx-0006cY-AA for qemu-arm@nongnu.org; Mon, 01 Feb 2016 05:43:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQBwx-0006cC-2M; Mon, 01 Feb 2016 05:43:15 -0500 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 (Postfix) with ESMTPS id 8BE23804E6; Mon, 1 Feb 2016 10:43:14 +0000 (UTC) Received: from nial.brq.redhat.com (dhcp-1-118.brq.redhat.com [10.34.1.118]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u11AhCaP015166; Mon, 1 Feb 2016 05:43:12 -0500 Date: Mon, 1 Feb 2016 11:43:09 +0100 From: Igor Mammedov To: Shannon Zhao Message-ID: <20160201114309.5517e83d@nial.brq.redhat.com> In-Reply-To: <56AC16E6.8010300@huawei.com> References: <1454077485-242598-1-git-send-email-imammedo@redhat.com> <56AC16E6.8010300@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, drjones@redhat.com, mst@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org Subject: Re: [Qemu-arm] [Qemu-devel] [PATCH] arm: virt-acpi: each MADT.GICC entry as enabled unconditionally X-BeenThere: qemu-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: rILmeKMwi959 On Sat, 30 Jan 2016 09:50:30 +0800 Shannon Zhao wrote: > On 2016/1/29 22:24, Igor Mammedov wrote: > > in current impl. condition > > > > build_madt() { > > ... > > if (test_bit(i, cpuinfo->found_cpus)) > > > > is always true since loop handles only present CPUs > > in range [0..smp_cpus). > > But to fill usless cpuinfo->found_cpus we do unnecessary > > scan over QOM tree to find the same CPUs. > > So mark GICC as present always and drop not needed > > code that fills cpuinfo->found_cpus. > > > > Signed-off-by: Igor Mammedov > > --- > > It's just simple cleanup but I'm trying to generalize > > a bit CPU related ACPI tables and as part of it get rid > > of found_cpus bitmap and if possible cpu_index usage > > in ACPI parts of code. > > --- > > hw/arm/virt-acpi-build.c | 26 +++----------------------- > > 1 file changed, 3 insertions(+), 23 deletions(-) > > > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > > index 87fbe7c..3ed39fc 100644 > > --- a/hw/arm/virt-acpi-build.c > > +++ b/hw/arm/virt-acpi-build.c > > @@ -46,20 +46,6 @@ > > #define ARM_SPI_BASE 32 > > #define ACPI_POWER_BUTTON_DEVICE "PWRB" > > > > -typedef struct VirtAcpiCpuInfo { > > - DECLARE_BITMAP(found_cpus, VIRT_ACPI_CPU_ID_LIMIT); > The definition of VIRT_ACPI_CPU_ID_LIMIT should be removed as well. Ok, I'll send v2 with fixup. > > Otherwise: > > Reviewed-by: Shannon Zhao > > > -} VirtAcpiCpuInfo; > > - > > -static void virt_acpi_get_cpu_info(VirtAcpiCpuInfo *cpuinfo) > > -{ > > - CPUState *cpu; > > - > > - memset(cpuinfo->found_cpus, 0, sizeof cpuinfo->found_cpus); > > - CPU_FOREACH(cpu) { > > - set_bit(cpu->cpu_index, cpuinfo->found_cpus); > > - } > > -} > > - > > static void acpi_dsdt_add_cpus(Aml *scope, int smp_cpus) > > { > > uint16_t i; > > @@ -458,8 +444,7 @@ build_gtdt(GArray *table_data, GArray *linker) > > > > /* MADT */ > > static void > > -build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info, > > - VirtAcpiCpuInfo *cpuinfo) > > +build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info) > > { > > int madt_start = table_data->len; > > const MemMapEntry *memmap = guest_info->memmap; > > @@ -489,9 +474,7 @@ build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info, > > gicc->cpu_interface_number = i; > > gicc->arm_mpidr = armcpu->mp_affinity; > > gicc->uid = i; > > - if (test_bit(i, cpuinfo->found_cpus)) { > > - gicc->flags = cpu_to_le32(ACPI_GICC_ENABLED); > > - } > > + gicc->flags = cpu_to_le32(ACPI_GICC_ENABLED); > > } > > > > if (guest_info->gic_version == 3) { > > @@ -599,11 +582,8 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables) > > { > > GArray *table_offsets; > > unsigned dsdt, rsdt; > > - VirtAcpiCpuInfo cpuinfo; > > GArray *tables_blob = tables->table_data; > > > > - virt_acpi_get_cpu_info(&cpuinfo); > > - > > table_offsets = g_array_new(false, true /* clear */, > > sizeof(uint32_t)); > > > > @@ -630,7 +610,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables) > > build_fadt(tables_blob, tables->linker, dsdt); > > > > acpi_add_table(table_offsets, tables_blob); > > - build_madt(tables_blob, tables->linker, guest_info, &cpuinfo); > > + build_madt(tables_blob, tables->linker, guest_info); > > > > acpi_add_table(table_offsets, tables_blob); > > build_gtdt(tables_blob, tables->linker); >