From patchwork Tue Jul 3 07:19:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 140915 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp839546ljj; Tue, 3 Jul 2018 00:32:46 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeALaEM4YdjfChVJRBKSTdTU1usRrYPWvC4P2D7Sbe1qE7YvMoJpMKs0Z4xqzigAmlO99TF X-Received: by 2002:ac8:2c86:: with SMTP id 6-v6mr26584941qtw.420.1530603166476; Tue, 03 Jul 2018 00:32:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530603166; cv=none; d=google.com; s=arc-20160816; b=Ab5ICma20idxVgk7Ri7PhIpk7h2MbYpH+jvyaymFRXppllF9BAz8RyX6rv93lKyc5Z FC3h4VudJ2QoQKV97wwdyGZn6BoN1IcQAJ/NcUWlt8To+17YJYXRAol/EqkXIijskipN 1pdJTk9PGAIoAnWhZHEcAnNE0Yd9mnTQNG3+Ti8CazUGf8LQbPnAD0aLgO7T/BDFsMbL 1V/64//9VJiytMySksJ2W3B6iEXIQPpzIYar5Pp/+myRdmQCkShJoZ+/wCGtQ9MoOJ/O K4j1jSkQw4J6OqlprD2N9w5AVbLc+sfIlyZUPb5q1a3LPlj/i0HmtgtRavFOYGMXakIh SrNw== 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=MD5FWFTHqHcqNQMAgyK4vZSep1yEYXrpCdl/NeIiQAg=; b=BHt+sRU+I+NTyyySb95EOL9Ne5FMewpsWUWBxzTAlFfXX552FsH2huwgMIvCg7yVrq KLB+VkDUPOR7KPn3lCWYleOcGW32WNFzzZG42Vb6ERXHhceqR6a+JXziXC4rM569USWU YigvnShKH9Dp/oihSS/8yfW0vArS+N807tfUwxX3Ul/TFlNqRQsIzJc6QMxdStf3xLpd fwL2CL+cfsRN8t9O/7V3JHpQyzoha5Reoeyu071pV7YSzsGaPawQJe6lR3ilmrDbsmcG QjXQt/dUZO9brZDApg0nDJgldeOTgvqL+98ZK11K8a9hUmXd4e9kqED2bv1kzq0IpFoJ R+DA== 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 c66-v6si484863qkg.161.2018.07.03.00.32.46 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 00: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]:38530 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faFnp-0007aL-QA for patch@linaro.org; Tue, 03 Jul 2018 03:32:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faFl2-00045R-99 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 03:31:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faFgj-0001XY-N4 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 03:29:48 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46828 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 1faFc9-0005M2-8d; Tue, 03 Jul 2018 03:20:41 -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 A6E433466E; Tue, 3 Jul 2018 07:20:40 +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 BA72F1C5B8; Tue, 3 Jul 2018 07:20:38 +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:50 +0200 Message-Id: <1530602398-16127-8-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.2]); Tue, 03 Jul 2018 07:20:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Tue, 03 Jul 2018 07:20:40 +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 07/15] 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: 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 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 --- 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 | 68 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 1 deletion(-) -- 2.5.5 diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 834d45c..28fe8f3 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -152,3 +152,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 6fefb78..7190962 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, \ @@ -1785,6 +1787,53 @@ 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 (is_nvdimm) { + error_setg(errp, "nvdimm is not yet supported"); + return; + } +} + +static void virt_memory_plug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + PCDIMMDevice *dimm = PC_DIMM(dev); + PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm); + MemoryRegion *mr = ddc->get_memory_region(dimm, &error_abort); + Error *local_err = NULL; + uint64_t align; + + if (memory_region_get_alignment(mr)) { + align = memory_region_get_alignment(mr); + } else { + /* by default we align on 64KB page size */ + align = SZ_64K; + } + + pc_dimm_plug(dev, MACHINE(hotplug_dev), align, &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) { @@ -1796,12 +1845,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); } @@ -1861,7 +1925,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 Tue Jul 3 07:19:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 140913 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp836735ljj; Tue, 3 Jul 2018 00:29:41 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe+mnmq909S/yCKc3am12aFdnHGe3YVpn+uXXUSYNrCJ1W92iZUKxb0cAORE1IFbA0T0vmM X-Received: by 2002:ac8:30cd:: with SMTP id w13-v6mr25006894qta.247.1530602981471; Tue, 03 Jul 2018 00:29:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530602981; cv=none; d=google.com; s=arc-20160816; b=NQq5xyNtQ77yPgCSxkLLST9mwBeV2VQYVC8oIgFolyCz7jICzV49jBw2LQ/kkxSl7T V+HMY0r85vVEN/ucIkkl/qZ2drgpi4UwWzmOxUPJSoJErO0dmQTDbIQ+czqI3VZGgkrL NPRV1UX18k03qWqqAWDpEci+NG1/7vxQzUj+Sg8vsNOg63KRDiio2m9wIGxUvjeIw40d au+4YOv5NRmbHq0pBOSZcTjerx6OemXNzkHa6eK4GNW5Ps8STl9UaSgQOCIFmpPDXqua 0XXw+k25gsPz6Hm2k2iGSBxrcF89KCO3oi5lujQv73UOQ1kthyqdm3WEot1ic0Y0qzRW ATbQ== 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=l1g3Y+1XwgMXEROVumnZpRwUkXymqyujlkJUgvD1erw=; b=SJ+uLv7YKKbghVWM01LlADMm4q7Qh1jwFb8buuN6JfXUvaleeOaQQlVEy5CeAumi+V SUbGzZz7gfRz22nxMMUxW3Nsbnky6G7ZGOw9MVShDa5X0jHZ7MKuuOni/9XWT7Q9xZL9 0VLsH2BgT7m4FyHz5xYR7lXZzN9KpPmBZ+n8WBRA7+Y476QdYHTAmllVmX5Di7ru9BJ+ BtJKlHOSPmEW3Ri/ib1qHQZiysqNG4i6rDASzWDB+rcU0lU/7wr1Xl/08GZbUd9b4lLZ Ex0EdK9OczMsYVJkeX4PVqELJOGnvLrEr4Pog5YwSAmsboGpY8TLNVki+C2Q6DSp1kYW sKmQ== 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 o72-v6si494317qvo.135.2018.07.03.00.29.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 00:29:41 -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]:38499 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faFkr-00059i-10 for patch@linaro.org; Tue, 03 Jul 2018 03:29:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faFfO-0003ZD-UO for qemu-devel@nongnu.org; Tue, 03 Jul 2018 03:28:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faFeK-0007Tb-Qu for qemu-devel@nongnu.org; Tue, 03 Jul 2018 03:24:02 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:35324 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 1faFcB-0005NZ-Rj; Tue, 03 Jul 2018 03:20:44 -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 D373A8182D38; Tue, 3 Jul 2018 07:20:42 +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 E108C1C5B5; Tue, 3 Jul 2018 07:20:40 +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:51 +0200 Message-Id: <1530602398-16127-9-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.8]); Tue, 03 Jul 2018 07:20:42 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 03 Jul 2018 07:20:42 +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 08/15] 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: 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 We introduce an helper to create a memory node. Signed-off-by: Eric Auger Signed-off-by: Shameer Kolothum --- v1 -> v2: - nop of existing /memory nodes was already handled --- hw/arm/boot.c | 54 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 20 deletions(-) -- 2.5.5 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index e09201c..5243a25 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 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"); From patchwork Tue Jul 3 07:19:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 140914 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp839426ljj; Tue, 3 Jul 2018 00:32:38 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfJtYDMiXe5MrF95Kpql6AqUuc6ZKRqM1JGoI0feyjaeGfNmlKJ3tM7VkjvKISZL8qqTXTb X-Received: by 2002:a0c:d158:: with SMTP id c24-v6mr25097307qvh.142.1530603158556; Tue, 03 Jul 2018 00:32:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530603158; cv=none; d=google.com; s=arc-20160816; b=CqDbyTjjZqTI2joZa0tpzbSL0B5DM+vo/kUaPOd5FPKjbFYSb6twwQnxSW+8Qs6KfB W1lUCaR6ynV2v3asYDkuNEiHtX0sj8pXBO8hTAU+eQDVVopjOATTofKWkTI8IJ1v7110 uIQ4kVWHBs6FtN75S5OPnxkzjMTTg9qtq9gMW4bWNrjliyLLlKD8H7v/yfGp6V94Ghpn 39RmyDE0MOHabU/EaA6enSyYx6mEuEX9fQvi9ddjbr5powvFkpZHv0hyXfx2sN16KLOe J5nYWU2PFHWgsIqn4kTw5a3qNQKdfCk2IhOYrxh/6L5yQZjyCmv6S7R8UM56mhdEbJYo Vx7Q== 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=1VTreS/T42L93WyXoLIeQeV1Wkh13vDSF95jJXhi8QI=; b=MT95KmRzV2WCdWMtQMkwEqRWJ19/SnSwO9gDYhrTMuB8OqrkWSuPXlpy98MnfpRV8W Wj5tuOBNRY1j6+5YoscVv0DkaFHgJYw9rBnQlJ8WVaStYOoxf4iHypw2TDkOZExsrCfS nzT/0QyGUlL3nkyJWWpNUZfYoqOSerepcdVTXRenxBvO9ex1mmwq7qQlO1L0/wRfdJVm gqkL0FBXxIQJtb6SiaxGzTuHf3zjYkFnqWFxXf75qvq7Af80nChlxZF38ecRKPZwDNsg T8QWykeOmX3fWPuaEdNPffH+vz3NimXAqo5Pflsj00VFwAFBV59zhXgg3vQfK5SU9xVz FO4A== 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 e21-v6si502314qtp.63.2018.07.03.00.32.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 00:32:38 -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]:38527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faFnh-0006bX-Tn for patch@linaro.org; Tue, 03 Jul 2018 03:32:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faFk4-0005C3-9O for qemu-devel@nongnu.org; Tue, 03 Jul 2018 03:29:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faFgk-0001YQ-BH for qemu-devel@nongnu.org; Tue, 03 Jul 2018 03:28:52 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46852 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 1faFcH-0005TR-Vp; Tue, 03 Jul 2018 03:20:50 -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 5B6C97262D; Tue, 3 Jul 2018 07:20:49 +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 6B2DB1C5B8; Tue, 3 Jul 2018 07:20:47 +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:54 +0200 Message-Id: <1530602398-16127-12-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.2]); Tue, 03 Jul 2018 07:20:49 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Tue, 03 Jul 2018 07:20:49 +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 11/15] 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: 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 Generate Memory Affinity Structures for PC-DIMM ranges. Signed-off-by: Shameer Kolothum Signed-off-by: Eric Auger --- v1 -> v2: - build_srat_hotpluggable_memory movedc to aml-build --- hw/arm/virt-acpi-build.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.5.5 diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 6ea47e2..0915391 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -568,6 +568,10 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) mem_base += numa_info[i].node_mem; } + build_srat_hotpluggable_memory(table_data, + vms->bootinfo.device_memory_start, + vms->bootinfo.device_memory_size , 0); + build_header(linker, table_data, (void *)(table_data->data + srat_start), "SRAT", table_data->len - srat_start, 3, NULL, NULL); }