From patchwork Tue Mar 5 16:50:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 159685 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp5191123jad; Tue, 5 Mar 2019 08:59:35 -0800 (PST) X-Google-Smtp-Source: APXvYqxp3l0YH8q6xj9f3jZHehi3Qe+5mTszie5OoNEs9DrHvTsE/0+GAkJiAtdX+Xm2S//gsvGN X-Received: by 2002:a81:99c9:: with SMTP id q192mr1814618ywg.84.1551805175372; Tue, 05 Mar 2019 08:59:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551805175; cv=none; d=google.com; s=arc-20160816; b=HjYbr0unSjd8I43CGArQN6yueeoDiuP/Sf5+eJcbWgG8PfPGIqCY8CZktlSRKxZnFN hjjx9bdTpC6+M8uQVBDkqrB5Pvee8KJy4Y2eU3q7mNi6pci+XDreMj11tWoBmzXhAvFv 9weuoLUYYj5ziuQF/R5gAOFd/MrMdrcue3DyReZGlT0mm3YiSI/3MC86pOHZ6sec87ca VmpzMV896qCoMIKyr1kRtELcEsH84aEQL1PDHbY9nS0ggdqaleKfEJsqlDnYdOKK1a0D 1NMkEQoNDQHDKGRfNlscJv69E+YDHF94XRDxkxCAYmckdIoPPSsJ5US0KxsAhf+8tVIQ K+pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=RnVPpx2OVfkt5GWLUoe2wdUBcVdMnKZgxxYPUzvzK5w=; b=Ahd8TDR2+LSHPFBQGA+m0SERdV2NUJFKcmnctkRD+Awqo6eEcXizikOtpIs5Yz1BJO 3zN4CbXi4JHFp8nP9Vtq0P7rNfwIm0DiI/pJS00+ZRROiGEreAFCr0UKf7ZG3MgqSZFT JwYyxezQE5XaDQLhoaU+x4wbbFCGOhEdinPkN8gsIjVdKupCME9ri4ss0BmTOige7C4Z Upi1bgQBN9U4TYzANulEsc7P4nIZzEnq3sd370vfMq8dvLj6wBj1wAKqXiDI/tyJPxQt 2TlyGDQ0gUsi7mpZSdOMR2Jw2dVxo/CVsAZn4W2/cTM3vnLQor0psg2Fyvu0Xs6cqJSG fC8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qCv9+Qev; 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 u82si5190134ybb.128.2019.03.05.08.59.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Mar 2019 08:59:35 -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=qCv9+Qev; 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]:45827 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1DPi-0007jG-JV for patch@linaro.org; Tue, 05 Mar 2019 11:59:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1DHa-0001dE-T6 for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1DHZ-0000v6-Hj for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:10 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:41441) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1DHZ-0000uR-Aj for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:09 -0500 Received: by mail-wr1-x42c.google.com with SMTP id n2so10244776wrw.8 for ; Tue, 05 Mar 2019 08:51:09 -0800 (PST) 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=RnVPpx2OVfkt5GWLUoe2wdUBcVdMnKZgxxYPUzvzK5w=; b=qCv9+Qev6IUwNipwCyPdOjI1mSajJuNoK3X5AoVfA5FOEvq1t2/ayVmO+qqarMVZlz HvR+kEg0R0ztN0LJknuc4TpiI3L7IILmzEXeJQScSkZ4sJgGH1hzf+Y4iDtg1zp+It6f oxePSTgagQor54cfw1NEsrMXsXdJ7D8r3G52mxioqgjFrMJHauvp1mDvISyyZx60zrWD Kw5VgUsIVVKwhKrkHbuQv1lXMLF5JkMgtPCp16DhBj4WapDbiBV+eV5PqqP+MtbFwmNQ fyqQkX9G5xdlQGSS7TqH+5KP057vCweGlpdvr2EJNAJt0dbvsaHthWdNNExjvPN9yDmc n8yw== 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=RnVPpx2OVfkt5GWLUoe2wdUBcVdMnKZgxxYPUzvzK5w=; b=btGCb0cnBZxOW8W1SHrdI/DVzcS6+aQzIwWI42q2uFmLcEi6BMwfTqP/9V/yJZk1mz lpC+fomFKPMwyEvTBept5JA+SitrPC9OGOPvrgefDRyWJmCw8f2lPzJxaG1LtjlPLF63 H05X3qe3ABKL+xd+4BxypnDDcyB//AtOoFLIAQvFWWfzVTgAKWRfOK3WpHxCZcQHwLKj 8Amc0aG7/NPmdvcZ7+pLZSR8Gf691OnGZQ6Wvx/tpieZTB11awQ7Tsxl7aH+b87d+Sa5 17ng04RD1XHipT+fTt/CWP++JZF046p9RJSpBMHb0jlceGbjpjJKAAoHxsMLJO82NTUg d2VQ== X-Gm-Message-State: APjAAAUDqZeeslJvDO9AYm6Gv1UB7nxsTXnkRt+DIPU/ZN20nxiSV5/p +WoMnomH8aDBnJg3ra+HrehR/tdQWTY= X-Received: by 2002:adf:e982:: with SMTP id h2mr18055484wrm.241.1551804668081; Tue, 05 Mar 2019 08:51:08 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 2sm10071495wrg.89.2019.03.05.08.51.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 08:51:07 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 5 Mar 2019 16:50:41 +0000 Message-Id: <20190305165051.26860-13-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305165051.26860-1-peter.maydell@linaro.org> References: <20190305165051.26860-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::42c Subject: [Qemu-devel] [PULL 12/22] 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: , 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 Message-id: 20190304101339.25970-2-eric.auger@redhat.com Signed-off-by: Peter Maydell --- 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 d90af2f17d2..a830655e1af 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");