From nobody Tue Feb 10 05:45:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1586195955; cv=none; d=zohomail.com; s=zohoarc; b=BgNEnFvBCZx7UEONEl5f0RPds+EONzSnqNZxAYdgo2EEqrm8pRk+0zGLTGxiKNt1AWiMsss3JFkbku/LNNWD9wbyB8wEB9+Dp6ZuaPuD9QGAsKRp/qwV9f/57fHvcX+Jikn12ibT3pMiyHU5v8TS89BSV4kC7VqTR5+B7SJp8lU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586195955; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9GzJBcaH7YPzqJchPXzUGJQV7uPNUIzvdkgPb+3/qBw=; b=Sn6rx/HKc7gyiSGLe3xRvqgXYn0q3OzfQjgiYNVwrAxd5TwWvAN/IYRQua1B6DtSSgzqArXi2oDl3bRinlMwrHAYnUKp2qE1GWstvvHjvWgnx7LoeI953aaBLW3DkvCkJQL0nM3H2qE6MdC6w4lT6QjGG0wPbbC12OO0ji/W0G4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586195955139313.7574387461493; Mon, 6 Apr 2020 10:59:15 -0700 (PDT) Received: from localhost ([::1]:36070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLW1g-0005I5-CF for importer@patchew.org; Mon, 06 Apr 2020 13:59:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36122) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLVr2-0001vQ-0T for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:48:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLVqz-0002dU-O7 for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:48:11 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:39148) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLVqz-0002V2-HI; Mon, 06 Apr 2020 13:48:09 -0400 Received: by mail-wr1-x444.google.com with SMTP id p10so493725wrt.6; Mon, 06 Apr 2020 10:48:09 -0700 (PDT) Received: from x1w.redhat.com (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id a67sm364880wmc.30.2020.04.06.10.48.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 10:48:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9GzJBcaH7YPzqJchPXzUGJQV7uPNUIzvdkgPb+3/qBw=; b=lJezb71x6OD7EoU5SBsLyeXUDP99ZBy0CoJ2JTT9wrKvQUrcAA+9t72QAzfSE1WKGY EuPlLcv0ZcepsfwePaaxGy+zU7JE2uUkM1GqwPcaDLqcCelTrOHmQNMqm2ei0ABRHkWt aKg7QHkbs0qjq8UVo6L8r1RZq+ZElSn6kIcFWnDMOKx0Io7ptetsDceQeD/ULVjwWjVl uUrUJrfxI1NG0HsZ1DS0n8pnfGvQV559182Rs9a0IsPAk4p8cgVKaU5LSLarEY9Vq255 aqLVBlzgTwXtNVaGTyW/y29r3kd0E1LhZROdcw105xJuLHfej+x9WsqQH6Jy7zHYNN5I 9S6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9GzJBcaH7YPzqJchPXzUGJQV7uPNUIzvdkgPb+3/qBw=; b=hGfi+fS7iNFWY8ks17ZVB5C7o+VGMDQYkkZwoaIcXLAh/QGOTYTtwWDg9c+jO+oGSQ Q9DWQQk1u9pN4WOZmAGhu9i+R+qCwM70hskqVG0o3vRFLizhEmnioHyq5atBAM3ldmzH PlFMpnaufNZ08FJg0HBQkG2SqsRIg928bpyDCn859KQ5TAp0hQFSWUTI9fFdD9mw/QQL 8+kNxIoiS7bXgJpjlacc3uQD4clyfAXysPN/sT4GX+QvJYv39mlR+d1KqJ/okIKJZ8NI eB3gQihMmTJ1h/hOcOKdVzMLfvjFnFETInJ68HZxCO5yxhNj4T3iz4IHMVId4wsIa6cq SSlw== X-Gm-Message-State: AGi0PuZxVKHjLHoq5WMjjVsqSB+7miYs6oUoDdHNfM3rq7UEwCa3Q8v4 z+HLZswk2xDR5B6Vd0gNav8jbEu1T2g= X-Google-Smtp-Source: APiQypKT8yu3DseEnPCJ1+pdq8XW7v+6zneWJaBf4wB7jVdEClEFcvHCrcRVbTpkWP/+nguC88Lzlw== X-Received: by 2002:adf:db4f:: with SMTP id f15mr362504wrj.95.1586195288048; Mon, 06 Apr 2020 10:48:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Markus Armbruster Subject: [PATCH-for-5.1 v2 16/54] hw/arm/xlnx-zynqmp: Move some code from realize() to init() Date: Mon, 6 Apr 2020 19:47:05 +0200 Message-Id: <20200406174743.16956-17-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200406174743.16956-1-f4bug@amsat.org> References: <20200406174743.16956-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "open list:Xilinx ZynqMP" , "Edgar E. Iglesias" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Coccinelle failed at processing this file: $ spatch ... --timeout 60 --sp-file \ scripts/coccinelle/simplify-init-realize-error_propagate.cocci HANDLING: ./hw/arm/xlnx-zynqmp.c EXN: Coccinelle_modules.Common.Timeout Move the calls using &error_abort which don't depend of input updated before realize() to init(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/xlnx-zynqmp.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 457057198a..5ec9c24ee7 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -242,6 +242,11 @@ static void xlnx_zynqmp_init(Object *obj) &s->apu_cpu[i], sizeof(s->apu_cpu[i]), ARM_CPU_TYPE_NAME("cortex-a53"), &error_abort, NULL); + + object_property_set_int(OBJECT(&s->apu_cpu[i]), QEMU_PSCI_CONDUIT_= SMC, + "psci-conduit", &error_abort); + object_property_set_int(OBJECT(&s->apu_cpu[i]), GIC_BASE_ADDR, + "reset-cbar", &error_abort); } =20 sysbus_init_child_obj(obj, "gic", &s->gic, sizeof(s->gic), @@ -250,6 +255,10 @@ static void xlnx_zynqmp_init(Object *obj) for (i =3D 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) { sysbus_init_child_obj(obj, "gem[*]", &s->gem[i], sizeof(s->gem[i]), TYPE_CADENCE_GEM); + object_property_set_int(OBJECT(&s->gem[i]), GEM_REVISION, "revisio= n", + &error_abort); + object_property_set_int(OBJECT(&s->gem[i]), 2, "num-priority-queue= s", + &error_abort); } =20 for (i =3D 0; i < XLNX_ZYNQMP_NUM_UARTS; i++) { @@ -259,6 +268,8 @@ static void xlnx_zynqmp_init(Object *obj) =20 sysbus_init_child_obj(obj, "sata", &s->sata, sizeof(s->sata), TYPE_SYSBUS_AHCI); + object_property_set_int(OBJECT(&s->sata), SATA_NUM_PORTS, "num-ports", + &error_abort); =20 for (i =3D 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) { sysbus_init_child_obj(obj, "sdhci[*]", &s->sdhci[i], @@ -370,9 +381,6 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error= **errp) for (i =3D 0; i < num_apus; i++) { char *name; =20 - object_property_set_int(OBJECT(&s->apu_cpu[i]), QEMU_PSCI_CONDUIT_= SMC, - "psci-conduit", &error_abort); - name =3D object_get_canonical_path_component(OBJECT(&s->apu_cpu[i]= )); if (strcmp(name, boot_cpu)) { /* Secondary CPUs start in PSCI powered-down state */ @@ -387,8 +395,6 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error= **errp) s->secure, "has_el3", NULL); object_property_set_bool(OBJECT(&s->apu_cpu[i]), s->virt, "has_el2", NULL); - object_property_set_int(OBJECT(&s->apu_cpu[i]), GIC_BASE_ADDR, - "reset-cbar", &error_abort); object_property_set_int(OBJECT(&s->apu_cpu[i]), num_apus, "core-count", &error_abort); object_property_set_bool(OBJECT(&s->apu_cpu[i]), true, "realized", @@ -490,10 +496,6 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) qemu_check_nic_model(nd, TYPE_CADENCE_GEM); qdev_set_nic_properties(DEVICE(&s->gem[i]), nd); } - object_property_set_int(OBJECT(&s->gem[i]), GEM_REVISION, "revisio= n", - &error_abort); - object_property_set_int(OBJECT(&s->gem[i]), 2, "num-priority-queue= s", - &error_abort); object_property_set_bool(OBJECT(&s->gem[i]), true, "realized", &er= r); if (err) { goto out_propagate_error; @@ -514,8 +516,6 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error= **errp) gic_spi[uart_intr[i]]); } =20 - object_property_set_int(OBJECT(&s->sata), SATA_NUM_PORTS, "num-ports", - &error_abort); object_property_set_bool(OBJECT(&s->sata), true, "realized", &err); if (err) { goto out_propagate_error; --=20 2.21.1