From nobody Thu Nov 6 14:16:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1489428392383479.84636001791534; Mon, 13 Mar 2017 11:06:32 -0700 (PDT) Received: from localhost ([::1]:53672 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnUMT-0003mu-06 for importer@patchew.org; Mon, 13 Mar 2017 14:06:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnULZ-0003kq-OJ for qemu-devel@nongnu.org; Mon, 13 Mar 2017 14:05:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnULY-0001MT-NQ for qemu-devel@nongnu.org; Mon, 13 Mar 2017 14:05:29 -0400 Received: from mail.kernel.org ([198.145.29.136]:50684) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnULT-0001Ju-SF; Mon, 13 Mar 2017 14:05:24 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF1B8203B1; Mon, 13 Mar 2017 18:05:21 +0000 (UTC) Received: from localhost.localdomain (bzq-79-180-56-222.red.bezeqint.net [79.180.56.222]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DE5CE203B0; Mon, 13 Mar 2017 18:05:17 +0000 (UTC) From: Krzysztof Kozlowski To: Peter Maydell , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Igor Mitsyanko Date: Mon, 13 Mar 2017 20:04:28 +0200 Message-Id: <20170313180432.7067-2-krzk@kernel.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170313180432.7067-1-krzk@kernel.org> References: <20170313180432.7067-1-krzk@kernel.org> MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 198.145.29.136 Subject: [Qemu-devel] [PATCH v2 1/5] hw/intc/exynos4210_gic: Fix GIC memory mappings for secondary CPU 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: Krzysztof Kozlowski Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Recent Linux kernel (tested next-20170224) was complaining about missing GIC mask and was unable to bring up secondary CPU: [ =C2=A0 =C2=A00.000000] NR_IRQS:16 nr_irqs:16 16 [ 0.000000] GIC CPU mask not found - kernel will fail to boot. ... [ =C2=A0 =C2=A00.400492] smp: Bringing up secondary CPUs ... [ =C2=A0 =C2=A01.413184] CPU1: failed to boot: -110 [ =C2=A0 =C2=A01.423981] smp: Brought up 1 node, 1 CPU In its instance_init() call, the Exynos GIC driver was setting GIC memory mappings for each CPU, from 1 up to "num-cpu" property. The Exynos4210 machine init call on the other hand, first created Exynos GIC device and then set the "num-cpu" property which was too late. The init already happened with default "num-cpu" value of 1 thus GIC mappings were created only for the first CPU. Split the Exynos GIC init code into realize function so the code will see updated "num-cpu" property. This fixes the warning and brings second CPU: [ 0.435780] CPU1: thread -1, cpu 1, socket 9, mpidr 80000901 [ 0.451838] smp: Brought up 1 node, 2 CPUs Signed-off-by: Krzysztof Kozlowski Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/exynos4210_gic.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index 2a55817b7660..222cfd6c6387 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -283,9 +283,20 @@ static void exynos4210_gic_set_irq(void *opaque, int i= rq, int level) =20 static void exynos4210_gic_init(Object *obj) { - DeviceState *dev =3D DEVICE(obj); Exynos4210GicState *s =3D EXYNOS4210_GIC(obj); - SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + + memory_region_init(&s->cpu_container, obj, "exynos4210-cpu-container", + EXYNOS4210_EXT_GIC_CPU_REGION_SIZE); + memory_region_init(&s->dist_container, obj, "exynos4210-dist-container= ", + EXYNOS4210_EXT_GIC_DIST_REGION_SIZE); + +} + +static void exynos4210_gic_realize(DeviceState *dev, Error **errp) +{ + Exynos4210GicState *s =3D EXYNOS4210_GIC(dev); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); + Object *obj =3D OBJECT(dev); uint32_t i; const char cpu_prefix[] =3D "exynos4210-gic-alias_cpu"; const char dist_prefix[] =3D "exynos4210-gic-alias_dist"; @@ -306,11 +317,6 @@ static void exynos4210_gic_init(Object *obj) qdev_init_gpio_in(dev, exynos4210_gic_set_irq, EXYNOS4210_GIC_NIRQ - 32); =20 - memory_region_init(&s->cpu_container, obj, "exynos4210-cpu-container", - EXYNOS4210_EXT_GIC_CPU_REGION_SIZE); - memory_region_init(&s->dist_container, obj, "exynos4210-dist-container= ", - EXYNOS4210_EXT_GIC_DIST_REGION_SIZE); - for (i =3D 0; i < s->num_cpu; i++) { /* Map CPU interface per SMP Core */ sprintf(cpu_alias_name, "%s%x", cpu_prefix, i); @@ -346,6 +352,7 @@ static void exynos4210_gic_class_init(ObjectClass *klas= s, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 + dc->realize =3D exynos4210_gic_realize; dc->props =3D exynos4210_gic_properties; } =20 --=20 2.9.3 From nobody Thu Nov 6 14:16:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1489428463597295.9458168117766; Mon, 13 Mar 2017 11:07:43 -0700 (PDT) Received: from localhost ([::1]:53684 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnUNg-0004t5-8X for importer@patchew.org; Mon, 13 Mar 2017 14:07:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnULa-0003l4-P2 for qemu-devel@nongnu.org; Mon, 13 Mar 2017 14:05:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnULZ-0001Mr-LN for qemu-devel@nongnu.org; Mon, 13 Mar 2017 14:05:30 -0400 Received: from mail.kernel.org ([198.145.29.136]:50726) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnULX-0001L1-3m; Mon, 13 Mar 2017 14:05:27 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 488F9203F1; Mon, 13 Mar 2017 18:05:25 +0000 (UTC) Received: from localhost.localdomain (bzq-79-180-56-222.red.bezeqint.net [79.180.56.222]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1794E203ED; Mon, 13 Mar 2017 18:05:21 +0000 (UTC) From: Krzysztof Kozlowski To: Peter Maydell , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Igor Mitsyanko Date: Mon, 13 Mar 2017 20:04:29 +0200 Message-Id: <20170313180432.7067-3-krzk@kernel.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170313180432.7067-1-krzk@kernel.org> References: <20170313180432.7067-1-krzk@kernel.org> X-Virus-Scanned: ClamAV using ClamSMTP X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 198.145.29.136 Subject: [Qemu-devel] [PATCH v2 2/5] hw/intc/exynos4210_gic: Use more meaningful name for local variable 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: Krzysztof Kozlowski Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There are to SysBusDevice variables in exynos4210_gic_realize() function: one for the device itself and second for arm_gic device. Add a prefix "gic" to the second one so it will be easier to understand the code. While at it, put local uninitialized 'i' variable at the end, next to other uninitialized ones. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/exynos4210_gic.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index 222cfd6c6387..9a2254f0b13c 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -297,21 +297,21 @@ static void exynos4210_gic_realize(DeviceState *dev, = Error **errp) Exynos4210GicState *s =3D EXYNOS4210_GIC(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); Object *obj =3D OBJECT(dev); - uint32_t i; const char cpu_prefix[] =3D "exynos4210-gic-alias_cpu"; const char dist_prefix[] =3D "exynos4210-gic-alias_dist"; char cpu_alias_name[sizeof(cpu_prefix) + 3]; char dist_alias_name[sizeof(cpu_prefix) + 3]; - SysBusDevice *busdev; + SysBusDevice *gicbusdev; + uint32_t i; =20 s->gic =3D qdev_create(NULL, "arm_gic"); qdev_prop_set_uint32(s->gic, "num-cpu", s->num_cpu); qdev_prop_set_uint32(s->gic, "num-irq", EXYNOS4210_GIC_NIRQ); qdev_init_nofail(s->gic); - busdev =3D SYS_BUS_DEVICE(s->gic); + gicbusdev =3D SYS_BUS_DEVICE(s->gic); =20 /* Pass through outbound IRQ lines from the GIC */ - sysbus_pass_irq(sbd, busdev); + sysbus_pass_irq(sbd, gicbusdev); =20 /* Pass through inbound GPIO lines to the GIC */ qdev_init_gpio_in(dev, exynos4210_gic_set_irq, @@ -322,7 +322,7 @@ static void exynos4210_gic_realize(DeviceState *dev, Er= ror **errp) sprintf(cpu_alias_name, "%s%x", cpu_prefix, i); memory_region_init_alias(&s->cpu_alias[i], obj, cpu_alias_name, - sysbus_mmio_get_region(busdev, 1), + sysbus_mmio_get_region(gicbusdev, 1), 0, EXYNOS4210_GIC_CPU_REGION_SIZE); memory_region_add_subregion(&s->cpu_container, @@ -332,7 +332,7 @@ static void exynos4210_gic_realize(DeviceState *dev, Er= ror **errp) sprintf(dist_alias_name, "%s%x", dist_prefix, i); memory_region_init_alias(&s->dist_alias[i], obj, dist_alias_name, - sysbus_mmio_get_region(busdev, 0), + sysbus_mmio_get_region(gicbusdev, 0), 0, EXYNOS4210_GIC_DIST_REGION_SIZE); memory_region_add_subregion(&s->dist_container, --=20 2.9.3 From nobody Thu Nov 6 14:16:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1489428561681785.4181380048541; Mon, 13 Mar 2017 11:09:21 -0700 (PDT) Received: from localhost ([::1]:53695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnUPG-0006Gp-Ga for importer@patchew.org; Mon, 13 Mar 2017 14:09:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnULd-0003nW-9c for qemu-devel@nongnu.org; Mon, 13 Mar 2017 14:05:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnULc-0001PD-Au for qemu-devel@nongnu.org; Mon, 13 Mar 2017 14:05:33 -0400 Received: from mail.kernel.org ([198.145.29.136]:50750) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnULZ-0001Mf-V9; Mon, 13 Mar 2017 14:05:30 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 235B1203B0; Mon, 13 Mar 2017 18:05:28 +0000 (UTC) Received: from localhost.localdomain (bzq-79-180-56-222.red.bezeqint.net [79.180.56.222]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A68B6203B1; Mon, 13 Mar 2017 18:05:25 +0000 (UTC) From: Krzysztof Kozlowski To: Peter Maydell , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Igor Mitsyanko Date: Mon, 13 Mar 2017 20:04:30 +0200 Message-Id: <20170313180432.7067-4-krzk@kernel.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170313180432.7067-1-krzk@kernel.org> References: <20170313180432.7067-1-krzk@kernel.org> X-Virus-Scanned: ClamAV using ClamSMTP X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 198.145.29.136 Subject: [Qemu-devel] [PATCH v2 3/5] hw/timer/exynos4210_mct: Fix checkpatch style errors 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: Krzysztof Kozlowski Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fix checkpatch errors: 1. ERROR: spaces required around that '+' (ctx:VxV) 2. ERROR: spaces required around that '&' (ctx:VxV) No functional changes. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/exynos4210_mct.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index 0c189348ae04..cd290637f357 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -936,7 +936,7 @@ static void exynos4210_mct_update_freq(Exynos4210MCTSta= te *s) { uint32_t freq =3D s->freq; s->freq =3D 24000000 / - ((MCT_CFG_GET_PRESCALER(s->reg_mct_cfg)+1) * + ((MCT_CFG_GET_PRESCALER(s->reg_mct_cfg) + 1) * MCT_CFG_GET_DIVIDER(s->reg_mct_cfg)); =20 if (freq !=3D s->freq) { @@ -1161,7 +1161,7 @@ static void exynos4210_mct_write(void *opaque, hwaddr= offset, =20 DPRINTF("comparator %d write 0x%llx val << %d\n", index, value, shift); =20 - if (offset&0x4) { + if (offset & 0x4) { s->g_timer.reg.wstat |=3D G_WSTAT_COMP_U(index); } else { s->g_timer.reg.wstat |=3D G_WSTAT_COMP_L(index); --=20 2.9.3 From nobody Thu Nov 6 14:16:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1489428508641483.79905070991083; Mon, 13 Mar 2017 11:08:28 -0700 (PDT) Received: from localhost ([::1]:53687 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnUOP-0005SL-Al for importer@patchew.org; Mon, 13 Mar 2017 14:08:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnULm-0003vC-0B for qemu-devel@nongnu.org; Mon, 13 Mar 2017 14:05:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnULk-0001by-Tt for qemu-devel@nongnu.org; Mon, 13 Mar 2017 14:05:42 -0400 Received: from mail.kernel.org ([198.145.29.136]:50774) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnULd-0001Qe-N5; Mon, 13 Mar 2017 14:05:33 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C109B203B0; Mon, 13 Mar 2017 18:05:31 +0000 (UTC) Received: from localhost.localdomain (bzq-79-180-56-222.red.bezeqint.net [79.180.56.222]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BBB47203ED; Mon, 13 Mar 2017 18:05:28 +0000 (UTC) From: Krzysztof Kozlowski To: Peter Maydell , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Igor Mitsyanko Date: Mon, 13 Mar 2017 20:04:31 +0200 Message-Id: <20170313180432.7067-5-krzk@kernel.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170313180432.7067-1-krzk@kernel.org> References: <20170313180432.7067-1-krzk@kernel.org> X-Virus-Scanned: ClamAV using ClamSMTP X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 198.145.29.136 Subject: [Qemu-devel] [PATCH v2 4/5] hw/timer/exynos4210_mct: Cleanup indentation and empty new lines 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: Krzysztof Kozlowski Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Statements under 'case' were in some places wrongly indented bringing confusion and making the code less readable. Remove also few unneeded blank lines. No functional changes. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/exynos4210_mct.c | 45 ++++++++++++++++++++-----------------------= -- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index cd290637f357..4dd3e441e2e6 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -1015,9 +1015,9 @@ static uint64_t exynos4210_mct_read(void *opaque, hwa= ddr offset, =20 case G_COMP_L(0): case G_COMP_L(1): case G_COMP_L(2): case G_COMP_L(3): case G_COMP_U(0): case G_COMP_U(1): case G_COMP_U(2): case G_COMP_U(3): - index =3D GET_G_COMP_IDX(offset); - shift =3D 8 * (offset & 0x4); - value =3D UINT32_MAX & (s->g_timer.reg.comp[index] >> shift); + index =3D GET_G_COMP_IDX(offset); + shift =3D 8 * (offset & 0x4); + value =3D UINT32_MAX & (s->g_timer.reg.comp[index] >> shift); break; =20 case G_TCON: @@ -1066,7 +1066,6 @@ static uint64_t exynos4210_mct_read(void *opaque, hwa= ddr offset, lt_i =3D GET_L_TIMER_IDX(offset); =20 value =3D exynos4210_lfrc_get_count(&s->l_timer[lt_i]); - break; =20 case L0_TCON: case L1_TCON: @@ -1152,23 +1151,23 @@ static void exynos4210_mct_write(void *opaque, hwad= dr offset, =20 case G_COMP_L(0): case G_COMP_L(1): case G_COMP_L(2): case G_COMP_L(3): case G_COMP_U(0): case G_COMP_U(1): case G_COMP_U(2): case G_COMP_U(3): - index =3D GET_G_COMP_IDX(offset); - shift =3D 8 * (offset & 0x4); - s->g_timer.reg.comp[index] =3D - (s->g_timer.reg.comp[index] & - (((uint64_t)UINT32_MAX << 32) >> shift)) + - (value << shift); + index =3D GET_G_COMP_IDX(offset); + shift =3D 8 * (offset & 0x4); + s->g_timer.reg.comp[index] =3D + (s->g_timer.reg.comp[index] & + (((uint64_t)UINT32_MAX << 32) >> shift)) + + (value << shift); =20 - DPRINTF("comparator %d write 0x%llx val << %d\n", index, value, shift); + DPRINTF("comparator %d write 0x%llx val << %d\n", index, value, sh= ift); =20 - if (offset & 0x4) { - s->g_timer.reg.wstat |=3D G_WSTAT_COMP_U(index); - } else { - s->g_timer.reg.wstat |=3D G_WSTAT_COMP_L(index); - } + if (offset & 0x4) { + s->g_timer.reg.wstat |=3D G_WSTAT_COMP_U(index); + } else { + s->g_timer.reg.wstat |=3D G_WSTAT_COMP_L(index); + } =20 - exynos4210_gfrc_restart(s); - break; + exynos4210_gfrc_restart(s); + break; =20 case G_TCON: old_val =3D s->g_timer.reg.tcon; @@ -1206,7 +1205,6 @@ static void exynos4210_mct_write(void *opaque, hwaddr= offset, break; =20 case G_INT_ENB: - /* Raise IRQ if transition from disabled to enabled and CSTAT pend= ing */ for (i =3D 0; i < MCT_GT_CMP_NUM; i++) { if ((value & G_INT_ENABLE(i)) > (s->g_timer.reg.tcon & @@ -1287,7 +1285,6 @@ static void exynos4210_mct_write(void *opaque, hwaddr= offset, break; =20 case L0_TCNTB: case L1_TCNTB: - lt_i =3D GET_L_TIMER_IDX(offset); index =3D GET_L_TIMER_CNT_REG_IDX(offset, lt_i); =20 @@ -1315,7 +1312,6 @@ static void exynos4210_mct_write(void *opaque, hwaddr= offset, break; =20 case L0_ICNTB: case L1_ICNTB: - lt_i =3D GET_L_TIMER_IDX(offset); index =3D GET_L_TIMER_CNT_REG_IDX(offset, lt_i); =20 @@ -1352,13 +1348,12 @@ static void exynos4210_mct_write(void *opaque, hwad= dr offset, if (icntb_max[lt_i] < value) { icntb_max[lt_i] =3D value; } -DPRINTF("local timer[%d] ICNTB write %llx; max=3D%x, min=3D%x\n\n", - lt_i, value, icntb_max[lt_i], icntb_min[lt_i]); + DPRINTF("local timer[%d] ICNTB write %llx; max=3D%x, min=3D%x\n\n", + lt_i, value, icntb_max[lt_i], icntb_min[lt_i]); #endif -break; + break; =20 case L0_FRCNTB: case L1_FRCNTB: - lt_i =3D GET_L_TIMER_IDX(offset); index =3D GET_L_TIMER_CNT_REG_IDX(offset, lt_i); =20 --=20 2.9.3 From nobody Thu Nov 6 14:16:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1489428645183461.2956876055749; Mon, 13 Mar 2017 11:10:45 -0700 (PDT) Received: from localhost ([::1]:53702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnUQd-0007DJ-0m for importer@patchew.org; Mon, 13 Mar 2017 14:10:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnULj-0003t2-L3 for qemu-devel@nongnu.org; Mon, 13 Mar 2017 14:05:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnULi-0001Y8-PT for qemu-devel@nongnu.org; Mon, 13 Mar 2017 14:05:39 -0400 Received: from mail.kernel.org ([198.145.29.136]:50798) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnULg-0001Tl-Jp; Mon, 13 Mar 2017 14:05:36 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3BF0203B0; Mon, 13 Mar 2017 18:05:34 +0000 (UTC) Received: from localhost.localdomain (bzq-79-180-56-222.red.bezeqint.net [79.180.56.222]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3DBD5203B1; Mon, 13 Mar 2017 18:05:32 +0000 (UTC) From: Krzysztof Kozlowski To: Peter Maydell , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Igor Mitsyanko Date: Mon, 13 Mar 2017 20:04:32 +0200 Message-Id: <20170313180432.7067-6-krzk@kernel.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170313180432.7067-1-krzk@kernel.org> References: <20170313180432.7067-1-krzk@kernel.org> X-Virus-Scanned: ClamAV using ClamSMTP X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 198.145.29.136 Subject: [Qemu-devel] [PATCH v2 5/5] hw/timer/exynos4210_mct: Remove unused defines 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: Krzysztof Kozlowski Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Remove defines not used anywhere. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Peter Maydell --- hw/timer/exynos4210_mct.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index 4dd3e441e2e6..6069116942a4 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -172,13 +172,10 @@ enum LocalTimerRegCntIndexes { L_REG_CNT_AMOUNT }; =20 -#define MCT_NIRQ 6 #define MCT_SFR_SIZE 0x444 =20 #define MCT_GT_CMP_NUM 4 =20 -#define MCT_GT_MAX_VAL UINT64_MAX - #define MCT_GT_COUNTER_STEP 0x100000000ULL #define MCT_LT_COUNTER_STEP 0x100000000ULL #define MCT_LT_CNT_LOW_LIMIT 0x100 --=20 2.9.3