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");