From patchwork Tue Feb 26 20:44:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 159241 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp3650103jad; Tue, 26 Feb 2019 12:45:57 -0800 (PST) X-Google-Smtp-Source: AHgI3IbzSHxK02hFOXplKBy1VKU2sutba0X8MWxZZebuxACVSKxREd52sym1VbGn9O4inMmbf6yZ X-Received: by 2002:a25:8388:: with SMTP id t8mr4719382ybk.514.1551213957853; Tue, 26 Feb 2019 12:45:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551213957; cv=none; d=google.com; s=arc-20160816; b=aHO2MJayJD5Zgjqx1dqlzMl2BJpK5yg8gvXNznnfhvfOrl/vQk0phHyw8UjdmF3GxU g3Ia1/A6DW4vRI9/zMxLZ4eDPkc8py4we5unGBiTr+uJioNG7SUUuy+9blc17Xb5km/s UbiUcFdmEToUIcV4p+zdPOVe9N7jC2Q9BgrvYefW9wbhVKCjfI77UKruqwp2IT/jQZux 5JX+8w0hmnNd9988eWBoLUbMJogrMa5RawBu013TpGkYpes5Lfue2YZiZkMc1uG7xxGm wCgmEl7RATDzfWz5TYWFhpVoXx65A2KWuAzpxxSnvWdcQJkotCsMLhPWSOUymfV5CS57 k13g== 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=tyXit8NmLkEhnnY3W1d0QFoJU3Ko7hayo3uNKlOBb9o=; b=yE2QrYjuo4URIosozWc/k3vZZhxE/DNxZjqvjeGy8bbsB3+pNWbYjU+LuB21D7PhNR tRgRvL/+X6xFzP5vK1PSYrYk2dBArW6PlQ7iDNkLYhNtWUuNqtOjqB8rwbnAq7UqMV2x ACoTB04HKxqBCyL/Yo1njePFNj5WsoJ25wdvCGTBKUHs0j/xiS0dFDyvc+jNBVyCAQFl d4NsQ+yTYA229h7oNwSYtf1fquZNv8kXpD31V44SKZmHmJcBx13XhbGe9rUM6iF7tuNS PoD8z2PdCBYLRPUEGnsEJUnnKX02H6f4pXENqvNpqqWjdigZm5W/d8CtfzVwPdmE0RtO zdrA== 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 z3si7716084ybh.391.2019.02.26.12.45.57 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 26 Feb 2019 12:45:57 -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]:32925 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyjbx-0005wS-AC for patch@linaro.org; Tue, 26 Feb 2019 15:45:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyjb4-0005aR-Vo for qemu-devel@nongnu.org; Tue, 26 Feb 2019 15:45:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyjb4-0008Jp-3x for qemu-devel@nongnu.org; Tue, 26 Feb 2019 15:45:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58950) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyjaz-0008GC-9q; Tue, 26 Feb 2019 15:44:58 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7AD0630BD2A1; Tue, 26 Feb 2019 20:44:55 +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 480EA5D6AA; Tue, 26 Feb 2019 20:44: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: Tue, 26 Feb 2019 21:44:22 +0100 Message-Id: <20190226204439.2296-2-eric.auger@redhat.com> In-Reply-To: <20190226204439.2296-1-eric.auger@redhat.com> References: <20190226204439.2296-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 26 Feb 2019 20:44: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 v9 01/18] 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 --- 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"); From patchwork Tue Feb 26 20:44:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 159243 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp3657276jad; Tue, 26 Feb 2019 12:56:14 -0800 (PST) X-Google-Smtp-Source: AHgI3IaHdAQGg/4g0gzuU5qo7y9kLnq24pzO1AhpsqbrvNecxBzYl5yJyUZUYz4wzrcFLZgMFanM X-Received: by 2002:a25:388:: with SMTP id 130mr18271511ybd.128.1551214574695; Tue, 26 Feb 2019 12:56:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551214574; cv=none; d=google.com; s=arc-20160816; b=HRXKebMJi7J+a94pE35/u0z+kIPvWNmzEJW4RUZ9RJXKyu2YMNu+y4bt0Qlre4e5Lw EbnhhBjZ6c/scAJfaJ5VQbThpga6XSRMVpyyNYmI4edLRW5hlCH0ei5G9HRAzlOzBxdu kOCP7t4KmjVXB6cuUSKG5XCVwCHdZQJHio4c99958ZtqL16X+tVa+R6h9t1FEquEQKMh 7zVw51E2gVI3zcw+IYwRgRFG762mWiLI9xfS7Bavh3qyxco6DK6lq0ejM9x4+Ew7D0yx tjiEOkD9RK9n0rosWNx6P8HJWyREkcq/Vt4J1SlkOTLxwr2gfoZoaoKozZPoCzmhTtsp XNpg== 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=QJyCUjcJR8fmZm+RiBLmtsE3CJ5rEZHX6385zrKdqHU=; b=lMxQA9fV74AM1ZHUI/WR3cN7rdm1wIHz15GCwR9pcLb3xtIbrOQsDsZ0snX72s1Lbv mvLx2VrLh07KlK4t2ZedFnb2LK7Zbxz/CEqXI2f0wBJHLRGCfKxPbbmoo2RVm52JW3Ov rAG8x8nHSqdg3kb8ryXhjxPG6b2qL5h+Rbuq+JngsyYPJJUhxuqdqGzHl/vkAIS7kgMJ Az9AQ0o0YB+Qsb4qLS1c93Yv6DfFSgLb3tRihB1ii2MD8kcWgjTt5C4KmrOxNdnNiT0K uQWKq7UZ/RsNIyyE6nvXhNzIn2kTNP8FRMLsC+oQSuIfX757/3TO3kp92Yr6cmQAFLFQ x57g== 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 u83si7394586ybb.19.2019.02.26.12.56.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 26 Feb 2019 12:56:14 -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]:33080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyjlt-0005Vf-K9 for patch@linaro.org; Tue, 26 Feb 2019 15:56:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyjcC-0006Wf-4S for qemu-devel@nongnu.org; Tue, 26 Feb 2019 15:46:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyjcA-0000pg-Mq for qemu-devel@nongnu.org; Tue, 26 Feb 2019 15:46:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41828) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyjc7-0000QQ-JX; Tue, 26 Feb 2019 15:46:07 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 31F1D1F560; Tue, 26 Feb 2019 20:45:53 +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 ED0625D6A6; Tue, 26 Feb 2019 20:45:46 +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: Tue, 26 Feb 2019 21:44:33 +0100 Message-Id: <20190226204439.2296-13-eric.auger@redhat.com> In-Reply-To: <20190226204439.2296-1-eric.auger@redhat.com> References: <20190226204439.2296-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 26 Feb 2019 20:45:53 +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 v9 12/18] hw/arm/boot: Expose the PC-DIMM nodes in the DT 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 This patch adds memory nodes corresponding to PC-DIMM regions. NVDIMM and ACPI_NVDIMM configs are not yet set for ARM so we don't need to care about NVDIMM at this stage. Signed-off-by: Shameer Kolothum Signed-off-by: Eric Auger --- v8 -> v9: - removed Igor's R-b v7 -> v8: - s/NV_DIMM/NVDIMM - fix indent v6 -> v7: - rework the error messages, use a switch/case v3 -> v4: - git rid of @base and @len in fdt_add_hotpluggable_memory_nodes v1 -> v2: - added qapi_free_MemoryDeviceInfoList and simplify the loop --- hw/arm/boot.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) -- 2.20.1 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index a830655e1a..4caaf91583 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -19,6 +19,7 @@ #include "sysemu/numa.h" #include "hw/boards.h" #include "hw/loader.h" +#include "hw/mem/memory-device.h" #include "elf.h" #include "sysemu/device_tree.h" #include "qemu/config-file.h" @@ -522,6 +523,41 @@ static void fdt_add_psci_node(void *fdt) qemu_fdt_setprop_cell(fdt, "/psci", "migrate", migrate_fn); } +static int fdt_add_hotpluggable_memory_nodes(void *fdt, + uint32_t acells, uint32_t scells) { + MemoryDeviceInfoList *info, *info_list = qmp_memory_device_list(); + MemoryDeviceInfo *mi; + int ret = 0; + + for (info = info_list; info != NULL; info = info->next) { + mi = info->value; + switch (mi->type) { + case MEMORY_DEVICE_INFO_KIND_DIMM: + { + PCDIMMDeviceInfo *di = mi->u.dimm.data; + + ret = fdt_add_memory_node(fdt, acells, di->addr, + scells, di->size, di->node); + if (ret) { + fprintf(stderr, + "couldn't add PCDIMM /memory@%"PRIx64" node\n", + di->addr); + goto out; + } + break; + } + default: + fprintf(stderr, "%s memory nodes are not yet supported\n", + MemoryDeviceInfoKind_str(mi->type)); + ret = -ENOENT; + goto out; + } + } +out: + qapi_free_MemoryDeviceInfoList(info_list); + return ret; +} + int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, hwaddr addr_limit, AddressSpace *as) { @@ -621,6 +657,12 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, } } + rc = fdt_add_hotpluggable_memory_nodes(fdt, acells, scells); + if (rc < 0) { + fprintf(stderr, "couldn't add hotpluggable memory nodes\n"); + goto fail; + } + rc = fdt_path_offset(fdt, "/chosen"); if (rc < 0) { qemu_fdt_add_subnode(fdt, "/chosen"); From patchwork Tue Feb 26 20:44:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 159242 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp3655465jad; Tue, 26 Feb 2019 12:53:18 -0800 (PST) X-Google-Smtp-Source: AHgI3Ia/rqAbPLEwmZPgOvgBu+DeiGINQ15QH6JW9XfN5ubzT23PVYvjj+jrADIdNqN+ksWuu3o1 X-Received: by 2002:a25:770f:: with SMTP id s15mr20139263ybc.47.1551214398178; Tue, 26 Feb 2019 12:53:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551214398; cv=none; d=google.com; s=arc-20160816; b=cex5PHOInTGXITsjpUJJHVflHqjwA5/sy+o+/U7Xlalq1AaU0ZMIxq3nkuvF6zh/9O sjRgjBI/KC0+j6/lX3qhfwgGO5Ri4fZ6UJz78eUJOqIHddtJ8lk0g7qD8fVaCow3S2ZC nHyRs+C0BWnk3XL0IglBuJSA5yMn14WzaLH4XqaSQjoXqV3yKLhT5KxiUNhQRWXvByqq 99FDSGK3aXlloFpyKDVURzzHdCqmTgg8NeWZaRU80/R+ZpF4KWyt0a9N8xrSnS5BJSzM //McDk/u+0Djq1t4PQgVNJyeh13Iqjb1ux94XhTjAhdUXQn5Z3VM3zzp0WJ+D4m9ABL5 U62w== 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=Anmpy+zjHyfa1KpPS2WniZccTsyVTtYFJ6aVKEWRdv4=; b=YqtE+3d6H3slPhY111LbshG4laPhFaxvp7T7Sd8wTm2KZBzHdBaldL3oZxsIVtqxR7 0rLy2avq049V7rfi/Z/fEA1UVbiTV7NR/OyKI5scsGVQuINrCfHpRsJ29MDtEApy8tQC VBedUV30jdu4jlt++dAk9zwfqgoA1wVvBrROspPMEMnmhK0QDJtEA+yZnlpkaUNS3sCH IqShiHXu75HXuXS1VwRFD5ZizhI4cpVdUVthibZkEZr2wZbCKMuVC37DlHwu1YOznhqR z6tOxm3Y2NXHqzjXcYlQ9OTSpujKfbWR2TjZ6I+0IZQm7TxrJHsdHpcY1kpixo+FJgU3 G4Jw== 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 k185si8154185ywg.357.2019.02.26.12.53.18 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 26 Feb 2019 12:53:18 -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]:33027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyjj3-00034v-Mo for patch@linaro.org; Tue, 26 Feb 2019 15:53:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyjcB-0006WV-Vd for qemu-devel@nongnu.org; Tue, 26 Feb 2019 15:46:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyjcA-0000pT-87 for qemu-devel@nongnu.org; Tue, 26 Feb 2019 15:46:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20045) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyjc7-0000T1-6k; Tue, 26 Feb 2019 15:46:07 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 63F3D30FD831; Tue, 26 Feb 2019 20:45:56 +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 8A7265D6A6; Tue, 26 Feb 2019 20:45:53 +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: Tue, 26 Feb 2019 21:44:34 +0100 Message-Id: <20190226204439.2296-14-eric.auger@redhat.com> In-Reply-To: <20190226204439.2296-1-eric.auger@redhat.com> References: <20190226204439.2296-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 26 Feb 2019 20:45:56 +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 v9 13/18] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT 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 Generate Memory Affinity Structures for PC-DIMM ranges. Signed-off-by: Shameer Kolothum Signed-off-by: Eric Auger Reviewed-by: Igor Mammedov --- v6 -> v7: - add Igor's R-b v5 -> v6: - fix mingw compil issue v4 -> v5: - Align to x86 code and especially "pc: acpi: revert back to 1 SRAT entry for hotpluggable area" v3 -> v4: - do not use vms->bootinfo.device_memory_start/device_memory_size anymore v1 -> v2: - build_srat_hotpluggable_memory movedc to aml-build --- hw/arm/virt-acpi-build.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.20.1 diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index d7e2e4885b..8151fda239 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -516,6 +516,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) int i, srat_start; uint64_t mem_base; MachineClass *mc = MACHINE_GET_CLASS(vms); + MachineState *ms = MACHINE(vms); const CPUArchIdList *cpu_list = mc->possible_cpu_arch_ids(MACHINE(vms)); srat_start = table_data->len; @@ -541,6 +542,14 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } + if (ms->device_memory) { + numamem = acpi_data_push(table_data, sizeof *numamem); + build_srat_memory(numamem, ms->device_memory->base, + memory_region_size(&ms->device_memory->mr), + nb_numa_nodes - 1, + MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED); + } + build_header(linker, table_data, (void *)(table_data->data + srat_start), "SRAT", table_data->len - srat_start, 3, NULL, NULL); }