From patchwork Tue Jul 3 07:19:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 140916 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp847851ljj; Tue, 3 Jul 2018 00:42:26 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeH/q0tF3o9j0lfm0LuOAp9XyNfEXC4tvW3W3Nez/ri/99bS3JOlljZFsdjNAbxSZC3D1K+ X-Received: by 2002:ac8:3676:: with SMTP id n51-v6mr26063380qtb.163.1530603746498; Tue, 03 Jul 2018 00:42:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530603746; cv=none; d=google.com; s=arc-20160816; b=ABVIDukLkGNzAtK6aPt22Z/B0pXGqzDnad3tWoyz5voCVCdBfihY0MWhEzSFfQ92RZ c6oNWsipnmTE38g6yvURG52sDa24RsRzOVIXpKBizVDGo0lV8CQMB284yWf8HxUFo2kj UGCvdVwHKzfEjivxXKSvyTmhm9OY4k8NLAbmFAQptflg3c864P8i0tIz2So9fUFf2MaB P4hD/RJE23RWuYc2056Wr+9miDiPvyneBHV8vWY6N2qbljUvzsYzNMjcZAjE/pPR+JDx 8O3x2JcOdEGVmABI4FZQywZNwfKZsSe0PW6+/44SGQC2rl7joI90vrKRbQZKNeYz822G bdZg== 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:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=aAzPnEaKDffulhRLMoM4Cv2nNHplizEpYX0pjLDgM6w=; b=sRKxUKIpq3kj2EaJYM0UPWGmoVeLy2eMJsOAVDiyPDIhjyBDWSrj2PgB/B29D6AQM+ 7fP/A1hLi3H8b9km2tQTPPkAKQ2ZWTiyLmvN92H3CMEY3+twvN4cT9zub+pUlhGnuFWD vqB8P5O7OVUJ6+KuojYuORbslRRg+DqW5A5HrsbMchLdcOQeEtvo2xjGDCz/2jID1Rw9 1tN4OKAaOqzmkcjSGsq+Wb1B64bi1Dgnt0B7EcoGDXu2969SJ3tSSzUm9j2D2SEe3SjN Iw6c8oYn0zIFyRRqUd38B5/ePuH/1KOaHYVrLxiOgtSgVmRe9Z4w/uDvHy/LWR7jfEWH DYBw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d21-v6si199875qtb.232.2018.07.03.00.42.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 00:42:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:38608 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faFxC-0006mE-1j for patch@linaro.org; Tue, 03 Jul 2018 03:42:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faFku-0004Kc-1u for qemu-devel@nongnu.org; Tue, 03 Jul 2018 03:31:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faFh1-0001oN-Gu for qemu-devel@nongnu.org; Tue, 03 Jul 2018 03:29:40 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:48870 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1faFcD-0005OY-Sl; Tue, 03 Jul 2018 03:20:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 043BF402346D; Tue, 3 Jul 2018 07:20:45 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-71.ams2.redhat.com [10.36.116.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 155861C5B5; Tue, 3 Jul 2018 07:20:42 +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, 3 Jul 2018 09:19:52 +0200 Message-Id: <1530602398-16127-10-git-send-email-eric.auger@redhat.com> In-Reply-To: <1530602398-16127-1-git-send-email-eric.auger@redhat.com> References: <1530602398-16127-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 03 Jul 2018 07:20:45 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 03 Jul 2018 07:20:45 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'eric.auger@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [RFC v3 09/15] 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: wei@redhat.com, drjones@redhat.com, david@gibson.dropbear.id.au, dgilbert@redhat.com, agraf@suse.de Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Shameer Kolothum This patch add 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 --- v1 -> v2: - added qapi_free_MemoryDeviceInfoList and simplify the loop --- hw/arm/boot.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) -- 2.5.5 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 5243a25..2c7d558 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" @@ -516,6 +517,35 @@ 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, + uint64_t base, uint64_t len, + uint32_t acells, uint32_t scells) { + MemoryDeviceInfoList *info, *info_list = qmp_memory_device_list(); + MemoryDeviceInfo *mi; + PCDIMMDeviceInfo *di; + bool is_nvdimm; + int ret = 0; + + for (info = info_list; info != NULL; info = info->next) { + mi = info->value; + is_nvdimm = (mi->type == MEMORY_DEVICE_INFO_KIND_NVDIMM); + di = !is_nvdimm ? mi->u.dimm.data : mi->u.nvdimm.data; + + if (is_nvdimm) { + ret = -ENOENT; /* NV-DIMM not yet supported */ + } else { + ret = fdt_add_memory_node(fdt, acells, di->addr, + scells, di->size, di->node); + } + if (ret < 0) { + 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) { @@ -611,6 +641,14 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, } } + rc = fdt_add_hotpluggable_memory_nodes(fdt, binfo->device_memory_start, + binfo->device_memory_size, + 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");