From patchwork Wed Jan 23 10:14:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 156346 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp548507jaa; Wed, 23 Jan 2019 02:17:15 -0800 (PST) X-Google-Smtp-Source: ALg8bN4f4jZ4ImlAT0tUqXwQYjuThsmmRl/h+TUfNMWQOgN7NrX2WvvfmK7gLWZ9qY5ALdtpRRBX X-Received: by 2002:a5d:56d2:: with SMTP id m18mr2079729wrw.113.1548238635684; Wed, 23 Jan 2019 02:17:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548238635; cv=none; d=google.com; s=arc-20160816; b=ChQ7RGem8bLQvPADKTF4MVEArRP84NXq6VG08hX8PfdGVBtvy1VoVIW/oCMz1FzY0U D1GwgjOaRxQNgmJfEl1QQjQN8NkMy9eIHCsEIJtAKxAEFMr4nFrqDam2FADsejUCARo+ EuLNH5Hkmj1vpr3UapB9sB0KlnEze+v+KU1lfsL7sS1FGKVQALz6TEO/vKomr7IN2pjU wuZB/UA6AzelyGw1fgMWZVTKIuDG1pxHbHEjGLoUDEb6mgsnnjextPBFSRVn7hfaKp2h +m+QFTvnuR3TYlckov/mM36KBr1w5VdGqdxnNxuxPNE0RKgCazQsYp9Q17duQ/Nq3zUg GhFQ== 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=qyPEKVCJwT6QxU1qhrRf/hFkDsaxVpc15Uu3aLzSPD4=; b=DqblamIdfceaHTVlmvDJjr3PbFuXm9bIZSnYLw9VLbA81iph7x8WtcYtZFfy50PQ7o bc207T8if94WbqQ79SgknSNDtsvjbf2yyeAreo9vk1LYF4RlVaVdEB2mY9l4e5VtSesl /Fe01ZeZGr5jkHwuXC5xwypbGUq1aLsfiAYobStcSH7aubItA7YjY0B0paZUn417bReg fkUjP/0Un7ZZX2EEwjVdYu+VR3XxPoe94ocf9KBxEjAqGBSmzU6xyFaKqn7CkL30W6TM IuQ77PXg8wBFpUVl8QHFY8gLG8jNqyUKyJlKu/z3tFXHAxZTQiP6Lu/uFmuViLu7YV5f ngOw== 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 w62si36074153wmb.102.2019.01.23.02.17.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Jan 2019 02:17:15 -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]:59679 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmFas-0002Ff-GZ for patch@linaro.org; Wed, 23 Jan 2019 05:17:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmFZn-0001lC-0I for qemu-devel@nongnu.org; Wed, 23 Jan 2019 05:16:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmFZm-0007Vw-2J for qemu-devel@nongnu.org; Wed, 23 Jan 2019 05:16:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52840) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmFZh-0007S1-UG; Wed, 23 Jan 2019 05:16:03 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D6AA2DA314; Wed, 23 Jan 2019 10:16:00 +0000 (UTC) Received: from laptop.redhat.com (ovpn-117-91.ams2.redhat.com [10.36.117.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45888601AE; Wed, 23 Jan 2019 10:15:58 +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, 23 Jan 2019 11:14:52 +0100 Message-Id: <20190123101458.12478-13-eric.auger@redhat.com> In-Reply-To: <20190123101458.12478-1-eric.auger@redhat.com> References: <20190123101458.12478-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 23 Jan 2019 10:16:00 +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 v5 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 16f5da02fb..15432bb895 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");