From patchwork Wed Feb 20 22:39:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 158846 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5478251jaa; Wed, 20 Feb 2019 14:44:13 -0800 (PST) X-Google-Smtp-Source: AHgI3IbUrqpVyBkKI7818RS03zLG4r9FicbHUoAtcGl7200Fj0gHQGV3nBc18VxoHv9tEwX5L2Nm X-Received: by 2002:a25:9106:: with SMTP id v6mr12282180ybl.148.1550702653857; Wed, 20 Feb 2019 14:44:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550702653; cv=none; d=google.com; s=arc-20160816; b=gO3q+PJtMsgO44AWq5bfz/R4w0e8Xtr0Twh9+n4CprTq7qVw2RG1cUdyVFomfGyGpT gh6mY1Uk8mddSprqIGODv0OGoimyZdIkrdP+Qe1ew+AklRfvtJBMvWeWhZoZuZ3TPB5t W25wGauaNzvl1LsRxi4jnt+AHUKbUr06B84/2b6/OTz9BDyHiEekAHhQh5fz0msGACn0 U9Xv+w6ea14XSIMHahov+C0nw8belJzLzdKHfvwF9/dIhluyvbETom2zOSYZHK/AesIW Yyw4dZ2U2v9xiA/Vek0Jm/WNlZrr+Scg55InxLRruyQp7UHESBUdHjwjQr+hAEt+98Lz JPRg== 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=5dPDWAx87Ze4hmStq03w9ozVPnbK9/T0lAVHWM9TvKM=; b=ImJXqpd+FvJX/jaxNCnLqIx+SeYxsEWtrkjKJXH1HVvzI77yoj2XI11R86aT8SezdQ /RshY2GdG5fj3zeeHY3IEatF/0oohb+uKjAwj8U3pMOilYPoBwdai/N3alQBvAk2uum4 YqEE2nsOw51JS2HyT8bU7ZTp/qC3YzPKZmc9bZCaBBghiKxRHC8Wa3vgUCVzFokaVB9y 62nHnlOvF5sMThIZxQlcwaS+KazEpVI00vhXgW8XvQo98f9/y5hbOLkyIdhbMBq5FYvC LlzUz1wC93aOtXWmMvRkvJx4YtNH0OKmHFxUVIfG2d7XSBDXiL9+Ozpl/lIBWYtFhEI4 po4w== 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 c11si12449230ybg.314.2019.02.20.14.44.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 20 Feb 2019 14:44:13 -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]:49962 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwab7-0006Vz-BB for patch@linaro.org; Wed, 20 Feb 2019 17:44:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwaXM-0003sU-Sn for qemu-devel@nongnu.org; Wed, 20 Feb 2019 17:40:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwaXL-0008Q0-Vf for qemu-devel@nongnu.org; Wed, 20 Feb 2019 17:40:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58752) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gwaXJ-0008Or-Mc; Wed, 20 Feb 2019 17:40:17 -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 E8CB8368D0; Wed, 20 Feb 2019 22:40:16 +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 4ABF15D6B3; Wed, 20 Feb 2019 22:40:14 +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: Wed, 20 Feb 2019 23:39:47 +0100 Message-Id: <20190220224003.4420-2-eric.auger@redhat.com> In-Reply-To: <20190220224003.4420-1-eric.auger@redhat.com> References: <20190220224003.4420-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]); Wed, 20 Feb 2019 22:40:17 +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 v7 01/17] 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, 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 --- 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 Reviewed-by: Igor Mammedov 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 Wed Feb 20 22:39:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 158848 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5488406jaa; Wed, 20 Feb 2019 14:58:37 -0800 (PST) X-Google-Smtp-Source: AHgI3IZYf4Wo4f3GG0sdCcqlqLN0+X8B/PVOkrNVb65xoDNX4hBDhcR4hyUCiP42w3A+ZKSQAQzQ X-Received: by 2002:a25:25c5:: with SMTP id l188mr30850194ybl.318.1550703517765; Wed, 20 Feb 2019 14:58:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550703517; cv=none; d=google.com; s=arc-20160816; b=mrcf1mLoE6/hi4rVKGemsxyozWylNNjXA+ZbcJsiYsn2g0opDol0igrR8cHRu7zacM mC+o4IE/CXkc0Sq8w6CcAEavdzXbmnlwS26xg5Aa6Od34PcqX36KE61Xr5alQoRgpYU8 x7b5lKzr/3HqL7k+pla4NbJpJTTARYr/dw0/MijjxICfARQ4jhTS3cHVfO/HBFZuQps5 KkqwSuIbgyCRpGtnquXgfvIab9H6yEYk8pDZC9Pk+26QiGOWl8TSRwYyBwdgoU/pdQAe AFK1qASn8FKzp4LfM+AkilY381kWv8BwgZMwILzKPl6pi2h46HNRvglm64P2vQ0hcfP4 BU8Q== 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=e6toacrp3PyV9BJtDSX7uGHaqBgdBV0OjJ5r29B9kdE=; b=lBWMXl61EQjvguS1S49GHTpvPuUPUKhZh7+b1ILZaLOVshZTiE5LIoOTRUNPQJpjjM 0/P4/W4gZE/AfDh3/V89+vsN1onSdnXfwlJwYAqNKXRhcEjW5adqRqxcvvDjYMTWFOuw 5wk7Ox7sckI1p0By+4ziUyDrmlKe9k0BA2hm0HGMaRsx99k96ungM2UTEdFgXYWtwoVJ 12RPtVVp7RuNcPaXOMWobyw/xSpdJIb0M1yEZd+fkWyaGfzqb1zzQVG2XuianCbxISex xOoEY2T8jIzKd0hptwemk+OwVDZBterGPaB1p7nqkGsKvGBmpxL4olGtzPtUsadl2dIH G3YQ== 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 l124si11590984ywb.135.2019.02.20.14.58.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 20 Feb 2019 14:58:37 -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]:50219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwap3-00016a-A3 for patch@linaro.org; Wed, 20 Feb 2019 17:58:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwaY9-0004PJ-IJ for qemu-devel@nongnu.org; Wed, 20 Feb 2019 17:41:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwaY8-0000Vl-IF for qemu-devel@nongnu.org; Wed, 20 Feb 2019 17:41:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58380) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gwaY1-0000D8-N8; Wed, 20 Feb 2019 17:41:03 -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 C3F52C049E24; Wed, 20 Feb 2019 22:40:54 +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 3073F5D6AA; Wed, 20 Feb 2019 22:40: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: Wed, 20 Feb 2019 23:39:57 +0100 Message-Id: <20190220224003.4420-12-eric.auger@redhat.com> In-Reply-To: <20190220224003.4420-1-eric.auger@redhat.com> References: <20190220224003.4420-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.31]); Wed, 20 Feb 2019 22:40:54 +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 v7 11/17] 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: 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. NV_DIMM and ACPI_NVDIMM configs are not yet set for ARM so we don't need to care about NV-DIMM at this stage. Signed-off-by: Shameer Kolothum Signed-off-by: Eric Auger --- 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 Reviewed-by: Igor Mammedov diff --git a/hw/arm/boot.c b/hw/arm/boot.c index a830655e1a..255aaca0cf 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 Wed Feb 20 22:39:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 158847 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5487996jaa; Wed, 20 Feb 2019 14:58:06 -0800 (PST) X-Google-Smtp-Source: AHgI3IbrKjxpt4GJ9cpXpTOR+MQnYI0Ow2m5NgzqhViOaDyOJjRZ31Hb49tNvGhqAn/p30Mglz9T X-Received: by 2002:a25:701:: with SMTP id 1mr30340232ybh.245.1550703485986; Wed, 20 Feb 2019 14:58:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550703485; cv=none; d=google.com; s=arc-20160816; b=wQ2KHMNyghnEskQoU5lELNPIWIBHKbaBhvkKPfBCdobLXcF6fzATs77fMihi35ia8I rr28S7mds/49wnzID3jiO6X/5tSZmztwcwQ32aFq+0DsKYyQgj7E6QQj9Tozse7DXXZt 80ipxRVjKBc1WJC++VeEnC1mSkzP3sipOgmNqnOHDzUyFbZIHBWNCJMyjU/TA9sWa6Zv WAtqC7vwPcV3K2GKctBOT6c9akvF/WVgW7Wz+2mFGKSbWv/HiLqTqekWTmviuMk8j5IA wiTwnC9UGnIxXPaLFn4H718Nqbd5OJp2lz6RlGD3lVlZLPTgz++r0R/JWaq/WFRtWb9o 4/oA== 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=KHDm4yY4SX73AeaEEuX3TPo3LcN5BJ8W2PH6R2XsBUo=; b=Mxko3JCTsenPve6GU7nj+8hm2Wj4RP5xGyjeZSCBpTlvWmaOi8b0YTTgHWjIMBnf32 Jrqse3eMf5XoVP1arapwm9Hj4Qvs1Hjv6GbDVeOO6D41MCYBUJivfdtGEoOrE2xwe3Ye bTlEU6JdlHnFOVMXBmxMfPNcQwjnjVv3VUZc/dBx3fhE8ebvvF6MUXGcrW8PH/fmt2Cb Dm/5fuZrRne3AXY4CRYymwD+PTnBgMyl2W6HXB1m5Xsqe3OWuCseDN37gXchQ40X8Ucd 0seBSf/VL4jCZTJRZ/cY/VO9sfe1qW5ZtbFAtIN8LgN7hUHMuW6zTcCTnAzz7lTj+U1I xRJg== 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 w201si5198229ywa.240.2019.02.20.14.58.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 20 Feb 2019 14:58:05 -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]:50200 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwaoX-0000GT-H1 for patch@linaro.org; Wed, 20 Feb 2019 17:58:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwaY7-0004No-Ve for qemu-devel@nongnu.org; Wed, 20 Feb 2019 17:41:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwaY5-0000SE-TT for qemu-devel@nongnu.org; Wed, 20 Feb 2019 17:41:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59186) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gwaY1-0000H7-Mc; Wed, 20 Feb 2019 17:41:02 -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 C2EF1307D8BE; Wed, 20 Feb 2019 22:40:57 +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 2F71E5D6AA; Wed, 20 Feb 2019 22:40:54 +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: Wed, 20 Feb 2019 23:39:58 +0100 Message-Id: <20190220224003.4420-13-eric.auger@redhat.com> In-Reply-To: <20190220224003.4420-1-eric.auger@redhat.com> References: <20190220224003.4420-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.48]); Wed, 20 Feb 2019 22:40:57 +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 v7 12/17] 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: 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 829d2f0035..781eafaf5e 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); }