From patchwork Mon Mar 4 10:13:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 159544 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp3621786jad; Mon, 4 Mar 2019 02:31:00 -0800 (PST) X-Google-Smtp-Source: APXvYqwpdAzG5M5jAtBP5nT/Jyc89VpcccPr71Qxf5OIUnwaWX9BXFFs4wXO3uoHIflBA5CJa3P0 X-Received: by 2002:a81:4907:: with SMTP id w7mr13871167ywa.150.1551695460246; Mon, 04 Mar 2019 02:31:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551695460; cv=none; d=google.com; s=arc-20160816; b=jBCoLitpCSXnNrWg5GXFO/RvX259VTkjdSwUbgq/M4Dp0RCUKHGdQp1J/EFbHvLwwt 1VpOBU0eJ5sp4oecyNCJsgehEkGWxUTp8B5Uex8mjCjD0lny5xzp+Fynqw70gHKTJRJ0 z5BbaN9qfBQR81h69tnifkogCcmoY1B49fY7+zzGuC0zTwKbjf1eaM4a/2S0PsW2L8k+ QtLVX1rmjBFJoJiEKwWrzClDTNCSnTvVKLoT1j2ZZpkNcqoOGgemSz6fPRlwthQUR8LM znVwGGjgaz6HyhM4Y6RyTe79qDo0jpLU1+SgDITMKgk0YqOUMYSj+jaTpLBrZH7u6ayf TU7A== 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; bh=qijqz8VeZWRe7yjrx+6vkeYLbsTjZopnAaqaA6wc+ds=; b=QfrS0A/xjWukilShI1/IeoF2rjsZX5ogy5YDZRq1MAHo8oPnsCWRINNmQqxf9ySYS3 V/lvKztfazsWiO43PBu0I96VyjK3RGTuSQYW5OqI7BL+XUFJf70KyKpOc5xjhIPLLOJZ e6tgs+SPpPIN16UqY8qMvwrDeydapxZbScAOMu62v2bwLUcl6CHZBdH9AYurrdkGjdAG 6e9Va+bXZ4SpQnYeqXNV5rOehUFCD1btNru3XwesrVFCYH//9bT5gNImIawEEGxjKjhd 9GFqYdzbrymYp4sfVKxl0+NZFnnnxLzae6dOQnpbcBfUT0sg7RzPc4XicHjjirOSPFnB Aj4A== ARC-Authentication-Results: i=1; mx.google.com; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d184si2752716ybf.417.2019.03.04.02.31.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 04 Mar 2019 02:31:00 -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; 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=redhat.com Received: from localhost ([127.0.0.1]:51560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0ks7-0005Im-J9 for patch@linaro.org; Mon, 04 Mar 2019 05:30:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0kjl-00084T-Lp for qemu-devel@nongnu.org; Mon, 04 Mar 2019 05:22:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0kjk-0006Ca-Rt for qemu-devel@nongnu.org; Mon, 04 Mar 2019 05:22:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44806) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h0kjh-00067o-5f; Mon, 04 Mar 2019 05:22:17 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B0DCD368E6; Mon, 4 Mar 2019 10:14:07 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-102.ams2.redhat.com [10.36.116.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECC052B893; Mon, 4 Mar 2019 10:13:52 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, shameerali.kolothum.thodi@huawei.com, imammedo@redhat.com, david@redhat.com Date: Mon, 4 Mar 2019 11:13:30 +0100 Message-Id: <20190304101339.25970-2-eric.auger@redhat.com> In-Reply-To: <20190304101339.25970-1-eric.auger@redhat.com> References: <20190304101339.25970-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 04 Mar 2019 10:14:07 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v12 01/10] hw/arm/boot: introduce fdt_add_memory_node helper 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: pbonzini@redhat.com, drjones@redhat.com, dgilbert@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Shameer Kolothum We introduce an helper to create a memory node. Signed-off-by: Eric Auger Signed-off-by: Shameer Kolothum Reviewed-by: Igor Mammedov Reviewed-by: Richard Henderson --- v7 -> v8: - Added Igor's R-b v6 -> v7: - msg error in the caller - add comment about NUMA ID --- hw/arm/boot.c | 54 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 20 deletions(-) -- 2.20.1 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index d90af2f17d..a830655e1a 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -423,6 +423,32 @@ static void set_kernel_args_old(const struct arm_boot_info *info, } } +static int fdt_add_memory_node(void *fdt, uint32_t acells, hwaddr mem_base, + uint32_t scells, hwaddr mem_len, + int numa_node_id) +{ + char *nodename; + int ret; + + nodename = g_strdup_printf("/memory@%" PRIx64, mem_base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory"); + ret = qemu_fdt_setprop_sized_cells(fdt, nodename, "reg", acells, mem_base, + scells, mem_len); + if (ret < 0) { + goto out; + } + + /* only set the NUMA ID if it is specified */ + if (numa_node_id >= 0) { + ret = qemu_fdt_setprop_cell(fdt, nodename, + "numa-node-id", numa_node_id); + } +out: + g_free(nodename); + return ret; +} + static void fdt_add_psci_node(void *fdt) { uint32_t cpu_suspend_fn; @@ -502,7 +528,6 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, void *fdt = NULL; int size, rc, n = 0; uint32_t acells, scells; - char *nodename; unsigned int i; hwaddr mem_base, mem_len; char **node_path; @@ -576,35 +601,24 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, mem_base = binfo->loader_start; for (i = 0; i < nb_numa_nodes; i++) { mem_len = numa_info[i].node_mem; - nodename = g_strdup_printf("/memory@%" PRIx64, mem_base); - qemu_fdt_add_subnode(fdt, nodename); - qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory"); - rc = qemu_fdt_setprop_sized_cells(fdt, nodename, "reg", - acells, mem_base, - scells, mem_len); + rc = fdt_add_memory_node(fdt, acells, mem_base, + scells, mem_len, i); if (rc < 0) { - fprintf(stderr, "couldn't set %s/reg for node %d\n", nodename, - i); + fprintf(stderr, "couldn't add /memory@%"PRIx64" node\n", + mem_base); goto fail; } - qemu_fdt_setprop_cell(fdt, nodename, "numa-node-id", i); mem_base += mem_len; - g_free(nodename); } } else { - nodename = g_strdup_printf("/memory@%" PRIx64, binfo->loader_start); - qemu_fdt_add_subnode(fdt, nodename); - qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory"); - - rc = qemu_fdt_setprop_sized_cells(fdt, nodename, "reg", - acells, binfo->loader_start, - scells, binfo->ram_size); + rc = fdt_add_memory_node(fdt, acells, binfo->loader_start, + scells, binfo->ram_size, -1); if (rc < 0) { - fprintf(stderr, "couldn't set %s reg\n", nodename); + fprintf(stderr, "couldn't add /memory@%"PRIx64" node\n", + binfo->loader_start); goto fail; } - g_free(nodename); } rc = fdt_path_offset(fdt, "/chosen");