From patchwork Thu Oct 18 14:27:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 149146 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp2050756lji; Thu, 18 Oct 2018 07:28:33 -0700 (PDT) X-Google-Smtp-Source: ACcGV618o/g1+ErrhnM2EzQ1j8yTwgX7rEcwSe3np8DfpI9cXMjAKjHZjL+60wpkx1CT73F0/ABa X-Received: by 2002:aed:2bc6:: with SMTP id e64-v6mr28893960qtd.132.1539872913287; Thu, 18 Oct 2018 07:28:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539872913; cv=none; d=google.com; s=arc-20160816; b=WaR17P86tQSZnd1IxPndszrA/Sz1Y5pgj+7odovifTJ3lPzs3Ppj/MGiNUiftrIDnG 29ZwdRRDZSknkcRCCQcR9gj+ROqvkQb4OVnpwTgS1bLSERsMPsjhUpXV0MQVKlpf/B/4 H/kfMW+RLRasI6H0uXh1pnPy5qIN4X8o2mBl1WATWhXhxkNP0XPJysRvvAtTe0jMD2d/ zPzBrPA0bl5RCa1IIE2rLWcJCandvio5MvuzW4gMo4rZdy39KPUPLJ9cgWA8ZGuD9cek gPtJoTknaZqncmAyrLTI1cvXgw79t6Oc6sb+M/yyWjng7sNNulO39lFkqmHJg+gNk3sZ WsvA== 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:message-id:date:to:from; bh=/WJ0TxOmncz27/r1vYV31AzYqjxdhk3u4hcYOk6zGgc=; b=eFOrQKXbbcTFHAjHJjiMp3xLrpjidgAewon3HZSL/evqwfRdH+Ij03NX4Mj6ZJ3uhX Ob5oxlbNl5m/Jw4nh7lS6S0hShLClSA3/q5zjJb00nNsqy51XG8Bwmstb6XqtXaKTU8h kCk4XFQd5YcbxeTchxDeG2buy174geWDsrHguOpzDYoRWp4DiYQeOH9zPUgdmSnH6lFL iWKf22KjFr07Iucr5KP/e0rH47Forc47vQtv1hX9uyOzmrlRodvZBPQXLm0TvPzENJPl 1mKOi3UeDISEVyJErkXNuqL7n+oOpBLkBdrACW96Bcv4eUgE9SBHTP4YivdwcjTjSI/s Pi3g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r5-v6si2431638qki.212.2018.10.18.07.28.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 18 Oct 2018 07:28:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:42652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gD9Hs-0003VF-Q1 for patch@linaro.org; Thu, 18 Oct 2018 10:28:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gD9HQ-0003Kv-2H for qemu-devel@nongnu.org; Thu, 18 Oct 2018 10:28:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gD9HP-0002yu-4m for qemu-devel@nongnu.org; Thu, 18 Oct 2018 10:28:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57814) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gD9HI-0002uu-9H; Thu, 18 Oct 2018 10:27:56 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 72CBE80F8D; Thu, 18 Oct 2018 14:27:55 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-215.ams2.redhat.com [10.36.116.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id 811A957C98; Thu, 18 Oct 2018 14:27:51 +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 Date: Thu, 18 Oct 2018 16:27:43 +0200 Message-Id: <20181018142743.29489-1-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 18 Oct 2018 14:27:55 +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] 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: drjones@redhat.com 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 --- hw/arm/boot.c | 54 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 20 deletions(-) -- 2.17.1 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 20c71d7d96..ba2004da5c 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -413,6 +413,36 @@ 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 = NULL; + 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) { + fprintf(stderr, "couldn't set %s/reg\n", nodename); + goto out; + } + if (numa_node_id < 0) { + goto out; + } + + ret = qemu_fdt_setprop_cell(fdt, nodename, "numa-node-id", numa_node_id); + if (ret < 0) { + fprintf(stderr, "couldn't set %s/numa-node-id\n", nodename); + } + +out: + g_free(nodename); + return ret; +} + static void fdt_add_psci_node(void *fdt) { uint32_t cpu_suspend_fn; @@ -492,7 +522,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; @@ -566,35 +595,20 @@ 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); 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); goto fail; } - g_free(nodename); } rc = fdt_path_offset(fdt, "/chosen");