From patchwork Tue Feb 5 17:33:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 157515 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5461488jaa; Tue, 5 Feb 2019 10:01:06 -0800 (PST) X-Google-Smtp-Source: AHgI3IbKG5OFwBA68e4TYS0ALR1ThzU+PsjTa9W17cs6WiO3PhFOIe0+bC86ormuANB12TVIcUEv X-Received: by 2002:a25:4e03:: with SMTP id c3mr5005493ybb.415.1549389666613; Tue, 05 Feb 2019 10:01:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549389666; cv=none; d=google.com; s=arc-20160816; b=TiyN8F4rx4flcAwWmZ4nv+Ji89Im3+yIUe0j0kXGL5v5OXRmQT2Y24I5/SqGIG+/RI gnt5HnVZ+9GFyvY/8ihR6IGiJm1zoSCescxeFkmqQyUx4ldf/wyzUfTZpG/3WJj6Bteo s0HIgHnWDMRS2vuDarNo8OdRXemJWbRXiOcw77nm9quDYE9udETkkNzkbnAlueRaeVba 8tEksXGZMu/60GVmG+l7/jfM9aDZt13O256DwBFrwdGl2eZ606ALAt294B/YKJINY8Cw Yfpw+FrZKFUn55Ua5RG22KKsB3iz2pbaAZhxPHBARQ+SLNw5ufcfVaZ8MqBlCymbEpz9 rbyQ== 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=fNpkJ3K+HJYZd5J+b1EYN6ZYygINbcP1oR9lIkJ1wBs=; b=PiCYQFU/AWKpoovPwF9/d38WsDlHUDH9FIFLp4lN6IA8pancoV8sdLHzrLMqzW5B96 +/G1HkvdCEPktsem6I9p+7amsRhr90wi+zHBkNoQ74i7k0uS2IabQeXjEkWCZjsugjW5 3fX3oiFvgU8WPL/CdJFJk++1MnGJ84wA3Xd4Kg+R+jt+Tw1OY4ElLFrfgZXcVspP6SIk tzulK0q4HWs1XQ65FIpS8Dl3jj/D2BwQCBRU8ZgVT36Uhr+DhJ/V6zUm9Ndh8f5GikH7 YVjyOrZB2LE1kv/8MkGNdSRFsJdBtnQfkfgK/kwbRwKZdGib9eiyQ/DGUaDB/gMJ5lRB 1zrw== 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 s198si95289ybc.156.2019.02.05.10.01.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Feb 2019 10:01:06 -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]:36122 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr51u-0005t7-5i for patch@linaro.org; Tue, 05 Feb 2019 13:01:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr4bt-0000QG-S5 for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:34:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr4bs-0004TZ-Tl for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:34:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51229) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gr4bq-0004RT-0Q; Tue, 05 Feb 2019 12:34:10 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0885F59469; Tue, 5 Feb 2019 17:34:09 +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 5206657982; Tue, 5 Feb 2019 17:34:06 +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, 5 Feb 2019 18:33:00 +0100 Message-Id: <20190205173306.20483-13-eric.auger@redhat.com> In-Reply-To: <20190205173306.20483-1-eric.auger@redhat.com> References: <20190205173306.20483-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 05 Feb 2019 17:34:09 +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 v6 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: 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 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 --- 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 | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) -- 2.20.1 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 2ef367e15b..2a70e8aa82 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" @@ -526,6 +527,34 @@ 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; + 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) { @@ -621,6 +650,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");