From patchwork Mon Jan 14 11:56:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 155454 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3572391jaa; Mon, 14 Jan 2019 03:59:21 -0800 (PST) X-Google-Smtp-Source: ALg8bN5zXl5YA8PIxB1GZlHcRSNfg1DJUX8fLHVLbEG26rEUIzJRZ00B3uNSfRakM0r+81eoTZ3F X-Received: by 2002:adf:9205:: with SMTP id 5mr23984190wrj.189.1547467161747; Mon, 14 Jan 2019 03:59:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547467161; cv=none; d=google.com; s=arc-20160816; b=gMFDOwBPZJmVSEeXaW1LG7BQiiUlI5JbcjdWyl9Is6Q8kl5p5/6J2iNuiC+VO3wiM+ Eo+6+jzRyRlKO4JX1Ugg2NZGsosG2FhTNrb+xC6uWRZgn346xR6lCRtTQy/Cn9pAuFAc wlX/MvW7zPSR06mRV5elT+MCTbOLGPfEezB9mXvYUwmHLVxNGTswLDiBvjrVMAnSWgEM 7FGHc4jxKr24XL0p/V5VxhdZqoaBJgF0GrrY6HH//npHw27eZ0Aek/ry70QYVjTC6shk lo9CUi6oiMq8tcaT/cFldKBGVRAMbhTk0tfXhhH1s95AiWdD1AXLd9F/Ll3AW04+MztP cYJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=I8BvMLz1v72BoXMnzdr5sWeD9HZE5rwvOIP96mH0G5U=; b=SKGbbMYfbo41L0unGCCS77e85dyC9gbLZD7iPMkOpvtgXZZz0+LoWj3wCf3jfjgEWq 0gSrAxAWxo0feXC8wHD208DYhqy2E5uQ3jYSUlayCcVd0UFbEDBv8XexHtnQm2TzJhAy 9a8ynNn5yUGZ/GL/WQIBJZBJbt7Z9T4GIJ0Hc8RIDtO0nyLi5P+yjijnHr7nzCYy6gFa H0OO9pwDETBWS4KgufzRLlWzrd1sG5LG8zVrNhCbd1/WAgTzDTCW0hHYIL6c1HrKsn1h yw+R7fUcKPY1NXWBTKcFjaO+OPth/09VWCyY/Sfs355oyzLAM36MYMKajw5T+nO76F+T RN/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=feHMsEEa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u18si50030985wro.78.2019.01.14.03.59.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 14 Jan 2019 03:59:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=feHMsEEa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:57910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj0tk-0007bY-Od for patch@linaro.org; Mon, 14 Jan 2019 06:59:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj0rG-0006WK-Q2 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 06:56:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj0rE-0005qd-QM for qemu-devel@nongnu.org; Mon, 14 Jan 2019 06:56:46 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35987) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj0rE-0005pF-FO for qemu-devel@nongnu.org; Mon, 14 Jan 2019 06:56:44 -0500 Received: by mail-wr1-x442.google.com with SMTP id u4so22526712wrp.3 for ; Mon, 14 Jan 2019 03:56:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I8BvMLz1v72BoXMnzdr5sWeD9HZE5rwvOIP96mH0G5U=; b=feHMsEEaPULmfBkM9G8mYah7kiWDdXIsZCGGXpuuz0i4TKBIJeL+z1/x880CnUzH3u ro+y30hYdrh9TRoVEFKlVrC8Dpn8NjZzgzskY8f1pHDEtK99LinH/Yodxa/1Zcwmmw5x BgSc8J6GOR55DGrUJfD2djkoxC49CZiY/bqNY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I8BvMLz1v72BoXMnzdr5sWeD9HZE5rwvOIP96mH0G5U=; b=bmezBhBmknDkg1DgIj52Yuiiwpm3hRN5O+GFxx8+DQ1Fyao/rLzkfIbFIdeKpKpq1c H2YWgbHMvYKk33lmTqVwfXkpBpUMLpRRDwk7UI82lcgUK+uK+9COwcZ6lsXmsA2wJTpF eD1bqXmwSDWSty+mn3cVVeYw6JeYeKOwSkUTNV9vNet5qaVFXCrU3Z/zGp7uz7xhZmU3 7oIO6mSt50/f4JMj+jeiaQAzx3BlZ4mpRmj12zyhsfJVCpPzT1usgLMFO/ORLlcns5OE dkS2dna2crCf7s10FTLXiQLpkyoltiuaiEWDqYk1yA4n+LWY1QcDOJ5405p1N0UA7QWa f09w== X-Gm-Message-State: AJcUukdDD0qgSjZ0aWkSXeK4BTXkkC95K8M1n0YgMFP0ZvhqjRfy7BKi Atb4jnATULdTokkhJJD4GZrkLQ== X-Received: by 2002:adf:a743:: with SMTP id e3mr23024597wrd.56.1547467002004; Mon, 14 Jan 2019 03:56:42 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 125sm47835842wmm.26.2019.01.14.03.56.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Jan 2019 03:56:41 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Mon, 14 Jan 2019 11:56:34 +0000 Message-Id: <20190114115637.6335-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190114115637.6335-1-peter.maydell@linaro.org> References: <20190114115637.6335-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v2 1/4] hw/arm/xlx-zynqmp: Realize cluster after putting RPUs in it 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: Eduardo Habkost , Peter Crosthwaite , Alistair Francis , Richard Henderson , "Emilio G . Cota" , "Edgar E. Iglesias" , Paolo Bonzini , Aleksandar Markovic Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Currently the cluster implementation doesn't have any constraints on the ordering of realizing the TYPE_CPU_CLUSTER and populating it with child objects. We want to impose a constraint that realize must happen only after all the child objects are added, so move the realize of rpu_cluster. (The apu_cluster is already realized after child population.) Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Luc Michel Reviewed-by: Alistair Francis --- hw/arm/xlnx-zynqmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index c67ac2e64ac..370b0e44a38 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -183,8 +183,6 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState *s, const char *boot_cpu, &error_abort, NULL); qdev_prop_set_uint32(DEVICE(&s->rpu_cluster), "cluster-id", 1); - qdev_init_nofail(DEVICE(&s->rpu_cluster)); - for (i = 0; i < num_rpus; i++) { char *name; @@ -212,6 +210,8 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState *s, const char *boot_cpu, return; } } + + qdev_init_nofail(DEVICE(&s->rpu_cluster)); } static void xlnx_zynqmp_init(Object *obj)