From patchwork Tue Feb 26 13:49: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: 159203 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp3240853jad; Tue, 26 Feb 2019 05:53:49 -0800 (PST) X-Google-Smtp-Source: AHgI3IZJCg0r6gErtLcUurS1sAEbEOkhwq+Am4WI13lZyUzLBTclrtBdkNbuVSPALSdopmWMVNad X-Received: by 2002:a25:c887:: with SMTP id y129mr18971253ybf.398.1551189229881; Tue, 26 Feb 2019 05:53:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551189229; cv=none; d=google.com; s=arc-20160816; b=IMn6w9g3UbqqnfIvxQhY1QjqC4lR8darCyEOD3r9UTJ2eXR6dJ032VEYlrmpeutrKq Yz2arKKJuVhMTMyhqH0hUQsXedePsqNabZLGJ+tcXqnROjsIRYnV6FOuCgwTpDiHS9S2 mHTis1ZC8atiMYV1+vLskudZGhFhT2r2/nL7M6mk4ZEe2bn6BMRdm2JnWwPCVVWiv/H7 79XMXGFF4+z6TGEmYxP+ZEUVamARiXy9HI64QcCVOjQE2+AdGwqFtGm6x7Jw1XvQ+mE5 lJ8o+v4mrA5KBqf0utZsWeESsb8A4z2vs1UWcWbeQ1dcFrtjGig/C7tjqvXLCqanWphl E0ug== 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=hHx+93QpyHOoSTxcLtUTuileF9H+YKqrSMXKB2tpPkFhsb4qPDhjEXkDtabsTERzAI pz0l4FRefEFXoT1m5hXFaUQv38Kmh1Ln2Hz1y2OekI70V9Vj03YIssodR2e2BZQr+aJv Fuo33QWksGBL7bXCBZkXRXyrSvncCH8aQKG94mCQL+PHC1c9o6TPmej/qBy9jjFTXE5L WNqRAdn1gl4ZxJ8JVD2qqAKkgutwpsvVNaofeZ7Q5jkVQCq8H9nd7Q5MQmKedPlJnoES meB7apdQ90OX9xf93KYzUDB1ifm9kLNvCiR7TvvSnoX3RAmVJsWB7CZ3YHHCWu4ZNq6H 9Cbw== 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 j3si2158004ywa.284.2019.02.26.05.53.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 26 Feb 2019 05:53:49 -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]:55624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gydB7-0001E4-EM for patch@linaro.org; Tue, 26 Feb 2019 08:53:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyd89-0008KT-M1 for qemu-devel@nongnu.org; Tue, 26 Feb 2019 08:50:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyd87-0006Y4-0H for qemu-devel@nongnu.org; Tue, 26 Feb 2019 08:50:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54030) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyd83-0006Ro-6W; Tue, 26 Feb 2019 08:50:39 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 56CE030BC3F5; Tue, 26 Feb 2019 13:50:34 +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 9D5A35E1B0; Tue, 26 Feb 2019 13:50:31 +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 14:49:57 +0100 Message-Id: <20190226135014.31854-2-eric.auger@redhat.com> In-Reply-To: <20190226135014.31854-1-eric.auger@redhat.com> References: <20190226135014.31854-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 26 Feb 2019 13:50:34 +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 v8 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 13:50:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 159204 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp3256123jad; Tue, 26 Feb 2019 06:07:47 -0800 (PST) X-Google-Smtp-Source: AHgI3IYO0qpPuQVzn6wTzhd4ebuMNrImXjfrwbU/ttL53lvwKFuzTg0dTPKcBeyfvyYObHWZhwPy X-Received: by 2002:a25:75c4:: with SMTP id q187mr18270293ybc.440.1551190067184; Tue, 26 Feb 2019 06:07:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551190067; cv=none; d=google.com; s=arc-20160816; b=ygwjyL4plwsrJugqOEzoz4p1FhQFKpEs7rdGEV67+YyntFVurXh2bsTspZhnmcursD LydJH+nVfXzI2G1ufNpEz2mYcNEldwexbfdhE4Vuwx8vw72gCAlMvVNRNg3p/BxZohnP qfv4JXdUaOLIqNrp+cuWGpgisHT0UHfnr8maSmLhyWaTxouR60vhQP1/uhp8pg1iYipc qqRd6h0Q3DZ4PH90hFg9xp5dp8YGGYQslp/PyKokz5dbRnjgHxQebYaMGjUyaPa2eB/0 Dcg+s5yj3GteAeLU5Ubx/5yf1B9zJKogwAEdF8uAYinPPXgwQ8Wk9y640kbvu+/3RyDJ OSVA== 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=aZubl2mG0koGiCPBDf80HgL9leTYg1oZlwce9ZJErWo=; b=d87DfmfUw4sjlDGCElznIbSCc+J+qcOMS8yUcnxs+VpQwrCNI01h9KV5i19V9coFEl rVcQF01E1EzI3Bf/XS9tD8B70XepJkmFQ/T3I8LS7lOwp93ySmbmJUuKNlnQQFaPqGMq kQrML7BC5LW4g4AjlBQUGKuEfQDgLxwqUi7g+bDTAPZpKggtP2CabOyKkERUbAdXD7Mc XQZithJlTuFYL0wU4P+kARuc1PhvfXSTpsqLfpEydA8Rb8Z+Vd/Va//jU5dOce8WzHu8 PrA2z9d6pyDuf05mw+tbOkG27FoTVLdwftDuKdrVrkZ6kafYyiN7k722t+470aA2O7r1 8CBQ== 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 t2si7329611ywe.34.2019.02.26.06.07.46 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 26 Feb 2019 06:07:47 -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]:55954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gydOc-000405-Ja for patch@linaro.org; Tue, 26 Feb 2019 09:07:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyd91-0000aY-DC for qemu-devel@nongnu.org; Tue, 26 Feb 2019 08:51:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyd90-0007X7-GP for qemu-devel@nongnu.org; Tue, 26 Feb 2019 08:51:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52066) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyd8o-0007Lr-MU; Tue, 26 Feb 2019 08:51:28 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9434730821E2; Tue, 26 Feb 2019 13:51:24 +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 A78105E1BD; Tue, 26 Feb 2019 13:51:18 +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 14:50:08 +0100 Message-Id: <20190226135014.31854-13-eric.auger@redhat.com> In-Reply-To: <20190226135014.31854-1-eric.auger@redhat.com> References: <20190226135014.31854-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 26 Feb 2019 13:51:24 +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 v8 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 Reviewed-by: Igor Mammedov --- 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 13:50:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 159205 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp3258623jad; Tue, 26 Feb 2019 06:10:04 -0800 (PST) X-Google-Smtp-Source: AHgI3Ia90GzETJ8Hbzyb/PV4uJ1JGi6/XdJa35cTu/wcbzf21k9E698CMA1vx35ChoRQTxx9Aoe3 X-Received: by 2002:a25:870a:: with SMTP id a10mr9527320ybl.339.1551190204364; Tue, 26 Feb 2019 06:10:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551190204; cv=none; d=google.com; s=arc-20160816; b=Bn0v2VjdCsfnBPFIHp59Z/gmsr48zKOOVW3MKHU0wECdKxptqlHzq+Bwfplqoh0pVN PK+58SGCPAGfnZtSS3KlmAomDUgQuVBAl1nD4c5MCX4y1+7zucK3wm91Df/iZYIsMLqB jBoszT4Y1LSHrM4f+X1AmVIroJokARfRFqJvvif13Kn4Y59uxQPNDFVUWY/jqD3qV8xR WmLlVYdyPHkksE8JhW1PUFZg9ycVRMpxE8ocdpTvTW2V3bW2576kX8BWfFopDnwyyAoK kffK2bhQtcILtd9PkGH+aq/zZXa8wSacm0Btw4VRvop0ebFChpxQT4G3iFYRToTOW1PS VNeQ== 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=OicyR3bHx2U8ECyhZnKHHPxi3PUQg8/8lavgJpjtXHGFpM+LS5ESxpw+Te/43BCbDj pH/7kR3kA+kvXf1phggu4rAYJ4K6y0pF5nopszQUNK7kV1+WuAfJ09+tCqNaQqvFX6Ee XtmQA63YByaQZGRz8TflUcDpn2gWoq0v5YMLsZxADWRU2t0CY/Q/wesei/ND7YXs2BCv XV+RoRWOyrbdaQdRMRsd7WBX4EJQsEyaBKrRV+fx4B4vuJOYx7FcHZOIdQtRXSm0UsIu muVYdnU7emKmn6wNmyUPZqSOcQgxqu6PMm3fAHqiK0an9zltRPDhEM0ZjRIDK5WXiCX6 uMlg== 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 z128si7742675ywd.210.2019.02.26.06.10.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 26 Feb 2019 06:10:04 -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]:56006 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gydQp-0005Z4-QA for patch@linaro.org; Tue, 26 Feb 2019 09:10:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyd92-0000dK-H4 for qemu-devel@nongnu.org; Tue, 26 Feb 2019 08:51:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyd91-0007Xw-KN for qemu-devel@nongnu.org; Tue, 26 Feb 2019 08:51:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49936) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyd8z-0007U4-KK; Tue, 26 Feb 2019 08:51:37 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A341630C1929; Tue, 26 Feb 2019 13:51:35 +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 EA93F5E1B0; Tue, 26 Feb 2019 13:51:24 +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 14:50:09 +0100 Message-Id: <20190226135014.31854-14-eric.auger@redhat.com> In-Reply-To: <20190226135014.31854-1-eric.auger@redhat.com> References: <20190226135014.31854-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 26 Feb 2019 13:51:35 +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 v8 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); }