From patchwork Thu Oct 18 14:30:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 149147 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp2055713lji; Thu, 18 Oct 2018 07:32:46 -0700 (PDT) X-Google-Smtp-Source: ACcGV62tdol6sWMmoVd8iAY7nvAdX12ouVSmhHqwDF/OhqPbdUGIwhJmzi6jsA2x17ElrHWsEDU1 X-Received: by 2002:ac8:2501:: with SMTP id 1-v6mr29365603qtm.53.1539873166356; Thu, 18 Oct 2018 07:32:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539873166; cv=none; d=google.com; s=arc-20160816; b=hkj6yBGlTNV4AbsUeUmDfV8tWn/ciXnyTZ1TIh7Nh2EKNwf1JpFm2Wp8j0/5FwEh6V Kr0YfL1sH7n73W208pWPYx+afWtYfE/lKR7nwAbD3AIFTbrLu9aKVTmFM1cJTibjl9cn u6h1MQiZ/TsUdZ7v5GLOp3RJoOkhxnnzrEuY/g9HnOpb510VHvZ1a95fzQGknfPoJdvG V+HQ69Su122rR7hqVPEgSCGax8jFdFC3yMvElyRFjYmGBhSrjgHhKnh/oiJElULglO14 rz/ukqBPv9LL5e1hhSdS9+JuqkwTgoW5Bl0ljPFm8vewLV6u+xj2bTPgxIdL65dWbzHY KC9A== 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; bh=/WJ0TxOmncz27/r1vYV31AzYqjxdhk3u4hcYOk6zGgc=; b=Q/KfesDm+p5sw7H8MF06nSihf+cdBuI8nW7v5fhApzFbr10hUecoFlwupY66XJb2tF 7700ZzoDFeMeMsSsoQaRmwjldd85JkhDbRDez63IaSvlMjnGXOwNuhUdW2HaX5ZIXFf5 dZLwcjtSYGggPDpqlb7fz820ok/4ib5D1eLhc1bgGwkZpsniFJBP9II11AKlKZI25+4Z TQ04QjHWx1G3Of0kMtS/kDtki0H9iBaQwrDFgb310qcq5VpHbMSopbvfRv/WoZpquBSS AyRsI7FDaJsOZoKS3tyoX4vkH+slXr6qpwebzVG5veeyFONRtKtYfw9L+o5T0bqjYMOe +IsQ== 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 a95-v6si718340qkh.119.2018.10.18.07.32.46 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 18 Oct 2018 07:32:46 -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]:42681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gD9Lx-0006Lr-MO for patch@linaro.org; Thu, 18 Oct 2018 10:32:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gD9KR-0005Uh-8J for qemu-devel@nongnu.org; Thu, 18 Oct 2018 10:31:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gD9KQ-0006ae-88 for qemu-devel@nongnu.org; Thu, 18 Oct 2018 10:31:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53470) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gD9KL-0006OY-Qb; Thu, 18 Oct 2018 10:31:06 -0400 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 31D233001A5E; Thu, 18 Oct 2018 14:31:00 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-215.ams2.redhat.com [10.36.116.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id C93C47899E; Thu, 18 Oct 2018 14:30:57 +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, kwangwoo.lee@sk.com, imammedo@redhat.com, david@redhat.com Date: Thu, 18 Oct 2018 16:30:27 +0200 Message-Id: <20181018143042.29588-2-eric.auger@redhat.com> In-Reply-To: <20181018143042.29588-1-eric.auger@redhat.com> References: <20181018143042.29588-1-eric.auger@redhat.com> 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.44]); Thu, 18 Oct 2018 14:31: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] [RFC v4 01/16] 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: drjones@redhat.com, dgilbert@redhat.com, Suzuki.Poulose@arm.com 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 --- hw/arm/boot.c | 54 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 20 deletions(-) -- 2.17.1 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 20c71d7d96..ba2004da5c 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -413,6 +413,36 @@ 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 = NULL; + 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) { + fprintf(stderr, "couldn't set %s/reg\n", nodename); + goto out; + } + if (numa_node_id < 0) { + goto out; + } + + ret = qemu_fdt_setprop_cell(fdt, nodename, "numa-node-id", numa_node_id); + if (ret < 0) { + fprintf(stderr, "couldn't set %s/numa-node-id\n", nodename); + } + +out: + g_free(nodename); + return ret; +} + static void fdt_add_psci_node(void *fdt) { uint32_t cpu_suspend_fn; @@ -492,7 +522,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; @@ -566,35 +595,20 @@ 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); 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); goto fail; } - g_free(nodename); } rc = fdt_path_offset(fdt, "/chosen"); From patchwork Thu Oct 18 14:30:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 149149 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp2074928lji; Thu, 18 Oct 2018 07:49:36 -0700 (PDT) X-Google-Smtp-Source: ACcGV60xrwltHTWoIyT7HVYa7g6nHnvo0KeEpoCO71jAj7U0hYLk5Jbo3DUIUhpf0XKP1AK38DEj X-Received: by 2002:ac8:1c1a:: with SMTP id a26-v6mr30254357qtk.16.1539874176684; Thu, 18 Oct 2018 07:49:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539874176; cv=none; d=google.com; s=arc-20160816; b=HHzYbcEkmXKGDsWzvBNlPZJN9ipl9gB3pv8rSHOXegnOtkCZ6Bxs5zozRCgppCrSSZ 3DASJu+IhoAuTQ6vtdxhWFLPtOtCoeEaQ/YvgZQJ2eK12hDtT0k2Y7L/A1OdWrF1VN55 atlG9oba7wfgxNfeJ9NfuiQr0+Ootrd4UDXatyY9gLG4lAjfkfLfBYzwoG/B23/T2NSY 8ISRoiqNfX3lUEvqTiDKRvULHbhlSlcT0tGwXAK9aDnmguFPLtNG3amhQ8NMG6j26hc8 it3ZNfyMbc98bKh3RLg1uKsBXd7sFNpeBzPrKqyheoFdKORxZIPKV9Axfl/o948GjUJX e9kA== 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; bh=ySm1KNYC5NIeS7JynpDCR8kKK26rDNpI8Ki8atmKPPk=; b=xqzGptvj/x9oIimvyfWbK6tNr4UMpFD2TQka49s1y7aPsTqm0Qf4qjGpPs0PXXQ50N lAn5Gd5BZVXuyB2ZvLNIWU6acjuUtS9VkJnsbMV0MmhFO1s6Wdw4X7pB85F0Gc9PzeCW X+kOySbBpnML/2c1iDWEFgZcOeAJNfrG5cOoLPdemtHienfi2XGbyIt8R8SIWjya3hSJ NEG5dDTCv9LbOJi44/83/QzNFz8wR3ol2Yrs+RGsdpffdChtLlGD6Zfs6O2yhWw/4L84 +ooRLx93YyghfX6sTT/Lb2JXXXEaRtpcDGzu//tV1QHYvWDWrnOMKxXq9h777oJXbFSI bCkQ== 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 e189-v6si2018451qka.82.2018.10.18.07.49.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 18 Oct 2018 07:49:36 -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]:42789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gD9cF-0003rC-Vs for patch@linaro.org; Thu, 18 Oct 2018 10:49:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gD9LC-000665-Hg for qemu-devel@nongnu.org; Thu, 18 Oct 2018 10:31:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gD9LB-0007Uf-I3 for qemu-devel@nongnu.org; Thu, 18 Oct 2018 10:31:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34532) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gD9L6-0007Qm-6D; Thu, 18 Oct 2018 10:31:52 -0400 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 2538E7F7B5; Thu, 18 Oct 2018 14:31:51 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-215.ams2.redhat.com [10.36.116.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id A65E060150; Thu, 18 Oct 2018 14:31: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, kwangwoo.lee@sk.com, imammedo@redhat.com, david@redhat.com Date: Thu, 18 Oct 2018 16:30:35 +0200 Message-Id: <20181018143042.29588-10-eric.auger@redhat.com> In-Reply-To: <20181018143042.29588-1-eric.auger@redhat.com> References: <20181018143042.29588-1-eric.auger@redhat.com> 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.28]); Thu, 18 Oct 2018 14:31:51 +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] [RFC v4 09/16] hw/arm/virt: Add memory hotplug framework 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, Suzuki.Poulose@arm.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Shameer Kolothum This patch adds the the memory hot-plug/hot-unplug infrastructure in machvirt. Signed-off-by: Eric Auger Signed-off-by: Shameer Kolothum Signed-off-by: Kwangwoo Lee --- v3 -> v4: - check the memory device is not hotplugged v2 -> v3: - change in pc_dimm_plug()'s signature - add pc_dimm_pre_plug call v1 -> v2: - s/virt_dimm_plug|unplug/virt_memory_plug|unplug - s/pc_dimm_memory_plug/pc_dimm_plug - reworded title and commit message - added pre_plug cb - don't handle get_memory_region failure anymore --- default-configs/arm-softmmu.mak | 2 ++ hw/arm/virt.c | 64 ++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 2420491aac..1c110cfe7f 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -159,3 +159,5 @@ CONFIG_PCI_DESIGNWARE=y CONFIG_STRONGARM=y CONFIG_HIGHBANK=y CONFIG_MUSICPAL=y +CONFIG_MEM_HOTPLUG=y + diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9b06797090..1548e9480a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -60,6 +60,8 @@ #include "standard-headers/linux/input.h" #include "hw/arm/smmuv3.h" #include "hw/acpi/acpi.h" +#include "hw/mem/pc-dimm.h" +#include "hw/mem/nvdimm.h" #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \ static void virt_##major##_##minor##_class_init(ObjectClass *oc, \ @@ -1771,6 +1773,49 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms) return ms->possible_cpus; } +static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, + Error **errp) +{ + const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); + + if (dev->hotplugged) { + error_setg(errp, "memory hotplug is not supported"); + } + + if (is_nvdimm) { + error_setg(errp, "nvdimm is not yet supported"); + return; + } + + pc_dimm_pre_plug(dev, MACHINE(hotplug_dev), NULL, errp); +} + +static void virt_memory_plug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + VirtMachineState *vms = VIRT_MACHINE(hotplug_dev); + Error *local_err = NULL; + + pc_dimm_plug(dev, MACHINE(vms), &local_err); + + error_propagate(errp, local_err); +} + +static void virt_memory_unplug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + pc_dimm_unplug(dev, MACHINE(hotplug_dev)); + object_unparent(OBJECT(dev)); +} + +static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { + virt_memory_pre_plug(hotplug_dev, dev, errp); + } +} + static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { @@ -1782,12 +1827,27 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev, SYS_BUS_DEVICE(dev)); } } + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { + virt_memory_plug(hotplug_dev, dev, errp); + } +} + +static void virt_machine_device_unplug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { + virt_memory_unplug(hotplug_dev, dev, errp); + } else { + error_setg(errp, "device unplug request for unsupported device" + " type: %s", object_get_typename(OBJECT(dev))); + } } static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, DeviceState *dev) { - if (object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE)) { + if (object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE) || + (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM))) { return HOTPLUG_HANDLER(machine); } @@ -1853,7 +1913,9 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->kvm_type = virt_kvm_type; assert(!mc->get_hotplug_handler); mc->get_hotplug_handler = virt_machine_get_hotplug_handler; + hc->pre_plug = virt_machine_device_pre_plug_cb; hc->plug = virt_machine_device_plug_cb; + hc->unplug = virt_machine_device_unplug_cb; } static const TypeInfo virt_machine_info = { From patchwork Thu Oct 18 14:30:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 149148 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp2067983lji; Thu, 18 Oct 2018 07:43:22 -0700 (PDT) X-Google-Smtp-Source: ACcGV61hKHrlgN0A1Idervs+b88qZlOZkDm8i16lkEc+Aouz0S+qXm9OUhUu+uoMHAw1F7dY5Z2J X-Received: by 2002:ac8:8e8:: with SMTP id y37-v6mr29381407qth.3.1539873802610; Thu, 18 Oct 2018 07:43:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539873802; cv=none; d=google.com; s=arc-20160816; b=ozTlP2WOZAWPRvnOAAD48S/0iDoxHxjZaOHS7k70EHa1J92Kui5weqrRx9g3wtoOfj vzOgXhPewd3AIcivT4iVd6cDjYFV8W9FJ2/CtJZ3NrAQ44CPaRdxqkvsQsscVoRJvfkR JIte8YDnjgSkXCfJOSM/is8o5VMgT+fgXIxfP+GZ02dI+OKV9hFLdbD64Wrj/zCZM6rf fzOFBT97pU2fivfsF3FvfoDBk1EcPJiWujFf8lehiokvFadGNJvNRSCpDIQkFusKHuDy jkBCvnh5Z7//dCntEvgPrPM23BDbvRbFxV4cuJv0VTJZHB8brJujX3qw4SjGay6hwdnS ZK3A== 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; bh=vRnQ0CldHInWyBID1QzqAS4tOWLZz+a3YO1/Bi+iJc0=; b=P+Www1VMwWCoKKSW6pYLTQY5G7IsXUKPYLJzi+cvJyNBmwbWndbV7q9/eSeU0Hp7Oo gblD/0LbQyGA5Dd1pNHiMTWKfKqWOfWB4VkHYJQaz2/jky3M+KWdAAZimOpQVEvi2uzF OGhg4cvNPim5OG2+N3w/BFK2jJsVMQsDH2KQyCvPVtePYSFe44ov4B9qO/r4A3WolkbN /c8jZ18Ba23t8r5PKTPYUU5knbGpvQHKUhgthkVIdv/ycGgVK/NEvXqs27Li9+8XIreU G8tB9JeFhWgTDHoIXLcqec7VRYgdEVvG7KgBmpK+ypRrgGANfzZxLHb62Dw25qUC7Hcx GYhg== 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 e13si11104561qvs.14.2018.10.18.07.43.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 18 Oct 2018 07:43:22 -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]:42747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gD9WE-0007RS-2j for patch@linaro.org; Thu, 18 Oct 2018 10:43:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gD9LC-00065k-BJ for qemu-devel@nongnu.org; Thu, 18 Oct 2018 10:32:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gD9LB-0007Uk-In for qemu-devel@nongnu.org; Thu, 18 Oct 2018 10:31:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56694) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gD9L9-0007ST-0A; Thu, 18 Oct 2018 10:31:55 -0400 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 CAEB430F8BF3; Thu, 18 Oct 2018 14:31:53 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-215.ams2.redhat.com [10.36.116.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6DF7E60150; Thu, 18 Oct 2018 14:31:51 +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, kwangwoo.lee@sk.com, imammedo@redhat.com, david@redhat.com Date: Thu, 18 Oct 2018 16:30:36 +0200 Message-Id: <20181018143042.29588-11-eric.auger@redhat.com> In-Reply-To: <20181018143042.29588-1-eric.auger@redhat.com> References: <20181018143042.29588-1-eric.auger@redhat.com> 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.46]); Thu, 18 Oct 2018 14:31: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] [RFC v4 10/16] 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, Suzuki.Poulose@arm.com 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.17.1 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index ba2004da5c..81d621ce14 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,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) { @@ -611,6 +640,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 Thu Oct 18 14:30:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 149150 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp2078638lji; Thu, 18 Oct 2018 07:52:54 -0700 (PDT) X-Google-Smtp-Source: ACcGV61vwmDHwAnnWtzQSQGRHiyoKARUkXuwtjhFwV3ONlP9Ki3EzfZ8qH53dzJee87lyADIrqbo X-Received: by 2002:ac8:f06:: with SMTP id e6-v6mr29879798qtk.262.1539874374472; Thu, 18 Oct 2018 07:52:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539874374; cv=none; d=google.com; s=arc-20160816; b=Ip4nvCujFwjSJRxSDH45E2pwKfldtFTRbxNiteMnaafSRfCHTT/mkZiI4tFqGZ6APL VtyDP501O0SeZ69TewEQOaNxL3iPLcdIIkDOR9b0aIc2EDKqiGSVUU7USJS0/X0G3nTe AffOoGRF1QCaMNAUqXd7HGdw5UzIIC1PnAuB0oPJ+KMZX4ITh6Pv1a6DMVHKq4VeLW0/ LntroOjrCOuiNuGeUizcqMDVGlJT+IR0A9i0sRPikAae+aKLw3uvjQDUFJHqtJw5fwrY cfM7tHviWVD6jTpEHlCVLdReHmf8ceBHeDBrHB6o1sTwivSypRHd/s4sruI4LvbvLDio iYmw== 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; bh=FGW4797BOW3bBWuqz44PqBzIhumtT03TrPnE7mZ2dKE=; b=av6/cgfGQsSdxEzWPETwYsoMOEkZF8c0XpcBXAsjD26eaYtFt6rAtWucczuLkVSFbL Bor/YaNOzBF1lnH4ig4SgKjBwVN8rVN4tyV+mw9DOqmVO09e6jr0D2hZB8VQdOLltD3b c2vC293oHD1Uh77cuTplYHl51RFYFui034aOx5/75NIFgZqTI1e5758Z1VV7wONme+1Q jlOHx4TlAIzaEnMZ+5Px4puMNFnU9mxrZyUFUaBi+VCU9VAatDFFNhdQfl52cnISoaqJ WF/bZ4XV1wEIJQS99l4rJ/q89/G374zcuK77SgxfcFP0FVpyGOV6iyGrpg88BXqOzILO sd7w== 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 h1-v6si563691qkj.159.2018.10.18.07.52.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 18 Oct 2018 07:52:54 -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]:42813 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gD9fR-0006WD-SM for patch@linaro.org; Thu, 18 Oct 2018 10:52:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gD9LK-0006Cu-3F for qemu-devel@nongnu.org; Thu, 18 Oct 2018 10:32:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gD9LJ-0007gY-FU for qemu-devel@nongnu.org; Thu, 18 Oct 2018 10:32:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56788) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gD9LH-0007aP-7c; Thu, 18 Oct 2018 10:32:03 -0400 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 0E40830F8BF0; Thu, 18 Oct 2018 14:32:02 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-215.ams2.redhat.com [10.36.116.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id A55FD7899E; Thu, 18 Oct 2018 14:31:59 +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, kwangwoo.lee@sk.com, imammedo@redhat.com, david@redhat.com Date: Thu, 18 Oct 2018 16:30:38 +0200 Message-Id: <20181018143042.29588-13-eric.auger@redhat.com> In-Reply-To: <20181018143042.29588-1-eric.auger@redhat.com> References: <20181018143042.29588-1-eric.auger@redhat.com> 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.46]); Thu, 18 Oct 2018 14:32:02 +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] [RFC v4 12/16] 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: drjones@redhat.com, dgilbert@redhat.com, Suzuki.Poulose@arm.com 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 --- 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 | 4 ++++ 1 file changed, 4 insertions(+) -- 2.17.1 diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 5785fb697c..8818bbf5ec 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -545,6 +545,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; @@ -570,6 +571,9 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } + build_srat_hotpluggable_memory(table_data, ms->device_memory->base, + ms->device_memory->mr.size, 0); + build_header(linker, table_data, (void *)(table_data->data + srat_start), "SRAT", table_data->len - srat_start, 3, NULL, NULL); }