From nobody Fri Dec 19 17:42:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1588248367; cv=none; d=zohomail.com; s=zohoarc; b=CYOgQco+Hu1KAjh9vo3iD5ZzaaCGUHOcYpmuImFXeGBshgNa0q9d+B3Gy/2tGY4wylVli5NXUuXvM2/GH7nvFlPvcf9nsD5egHZWmCOL7s8I3CWtEfMz0qAlX++2Ah/LzwrVpbqLOWO4I7bV+9CBmTdkdcqHaO+78TA5d85odgg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588248367; h=Content-Transfer-Encoding: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=ldO2tE9PLYd0GigcvjlBiYXaMzZxcyyWw/7hDoBADyU=; b=i6zwwPswGRcn/4rOdOLwDtktwel5jOI2D5qD7FeQpd66L7MdFQozTc3rhjeeEGt0L85VN/5em6e4YX5NUUPUiUet4OuaBUeaCYuSv99CrNsrTmDn/7GEEzbvlO+an2BDHZUtclOCLnGfmqdvSzObxMlrzq8oqJBG9hU0f5LgC0A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588248367149430.4158342097212; Thu, 30 Apr 2020 05:06:07 -0700 (PDT) Received: from localhost ([::1]:33092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU7x7-0004HY-Ps for importer@patchew.org; Thu, 30 Apr 2020 08:06:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33892) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU7ji-0003Jo-PH for qemu-devel@nongnu.org; Thu, 30 Apr 2020 07:52:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jU7jf-0000Qz-GC for qemu-devel@nongnu.org; Thu, 30 Apr 2020 07:52:14 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:37987) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jU7jf-0000QU-1h for qemu-devel@nongnu.org; Thu, 30 Apr 2020 07:52:11 -0400 Received: by mail-wr1-x42b.google.com with SMTP id x17so6513399wrt.5 for ; Thu, 30 Apr 2020 04:52:10 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j22sm491518wre.84.2020.04.30.04.52.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2020 04:52:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ldO2tE9PLYd0GigcvjlBiYXaMzZxcyyWw/7hDoBADyU=; b=UcX1g7Rt05VLqU4ftMVwz9UUz3Oa382gumesSBYqw8HiIBBzVghDmDtNaFIw+JE+m8 nFg5Nhgrs/jztpuydoSxZ7jICyip9n0OE14uqLobP1txm20phWl7uUT3GWdeIEZdBq8l 3PYQOV5BxMvrxg/dSK3zYGRz1fvQRzrIep5WR4vkYZc+1I31UzF73oC8X0qbsXAc0O3G CNSFal+72paOIYjwLrNmA0hpCVQhjL8ftsDMRmKAZMqJR8+wdZ0vfYBYg1ZkHQlfM5iE 3rAQ+ZRTcfuO2odwdTtE6TIA7eDrL8e2i7nF2ER4B/4bg9CrOyLNkO4zl2gl6bsaD3ub Xx3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ldO2tE9PLYd0GigcvjlBiYXaMzZxcyyWw/7hDoBADyU=; b=l45Kw7tB5bRDcdcRJ5ZM0MQj3TvZ4igkq2n7aP4BWkDgP4e3WqLVsH0uUfN2uDNIdn 2ea1ZJR4TwyUbnBBTtVsMB8YtXMF4u4oUOUnvHlroiC2+EsQM9Y3hC4NMdvNl/noEh2L z6fFcBWCggs+RNXqy6NFTYCK63UsWcvMi3F0H7C/+mtFUTc49fpA535/i4qHOqbJCzro qJwDCUKGlPpRwXTim2iO2q0KFqYFvfBI7bAxyrR95nV180Mwqgx8RZLLQXxzSAvjtYBw uGjbJ1MdQghQDWQF3Wrwhk1z6RTOejq5ZGYcbi5xjassqIubILWDgDrwwuVQQFvXnZIv mvAg== X-Gm-Message-State: AGi0PuYri1rKpjNaPjKIJ1Psp7+zDHBmrFLDe+mf3fmuj61VJa2SpGyZ QA7/2ukNfWjxs9T6aaZz6KSnZloW0Q1HNw== X-Google-Smtp-Source: APiQypItvsTYYdro7NGrJL4ADdQn2ej2D0OLF689DaApILcOjeCepuyfanCgPVt0LL722Or8cUpPjw== X-Received: by 2002:adf:e944:: with SMTP id m4mr3452365wrn.366.1588247529322; Thu, 30 Apr 2020 04:52:09 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 22/31] hw/arm/virt: dt: move creation of /secure-chosen to create_fdt() Date: Thu, 30 Apr 2020 12:51:33 +0100 Message-Id: <20200430115142.13430-23-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430115142.13430-1-peter.maydell@linaro.org> References: <20200430115142.13430-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.google.com X-detected-operating-system: by eggs.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-Received-From: 2a00:1450:4864:20::42b 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Jerome Forissier The /secure-chosen node is currently used only by create_uart(), but this will change. Therefore move the creation of this node to create_fdt(). Signed-off-by: Jerome Forissier Message-id: 20200420121807.8204-2-jerome@forissier.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/virt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index cca53162563..0d92674f32b 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -234,6 +234,10 @@ static void create_fdt(VirtMachineState *vms) /* /chosen must exist for load_dtb to fill in necessary properties lat= er */ qemu_fdt_add_subnode(fdt, "/chosen"); =20 + if (vms->secure) { + qemu_fdt_add_subnode(fdt, "/secure-chosen"); + } + /* Clock node, for the benefit of the UART. The kernel device tree * binding documentation claims the PL011 node clock properties are * optional but in practice if you omit them the kernel refuses to @@ -761,7 +765,6 @@ static void create_uart(const VirtMachineState *vms, in= t uart, qemu_fdt_setprop_string(vms->fdt, nodename, "status", "disabled"); qemu_fdt_setprop_string(vms->fdt, nodename, "secure-status", "okay= "); =20 - qemu_fdt_add_subnode(vms->fdt, "/secure-chosen"); qemu_fdt_setprop_string(vms->fdt, "/secure-chosen", "stdout-path", nodename); } --=20 2.20.1