From patchwork Wed Feb 20 22:39:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 158847 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5487996jaa; Wed, 20 Feb 2019 14:58:06 -0800 (PST) X-Google-Smtp-Source: AHgI3IbrKjxpt4GJ9cpXpTOR+MQnYI0Ow2m5NgzqhViOaDyOJjRZ31Hb49tNvGhqAn/p30Mglz9T X-Received: by 2002:a25:701:: with SMTP id 1mr30340232ybh.245.1550703485986; Wed, 20 Feb 2019 14:58:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550703485; cv=none; d=google.com; s=arc-20160816; b=wQ2KHMNyghnEskQoU5lELNPIWIBHKbaBhvkKPfBCdobLXcF6fzATs77fMihi35ia8I rr28S7mds/49wnzID3jiO6X/5tSZmztwcwQ32aFq+0DsKYyQgj7E6QQj9Tozse7DXXZt 80ipxRVjKBc1WJC++VeEnC1mSkzP3sipOgmNqnOHDzUyFbZIHBWNCJMyjU/TA9sWa6Zv WAtqC7vwPcV3K2GKctBOT6c9akvF/WVgW7Wz+2mFGKSbWv/HiLqTqekWTmviuMk8j5IA wiTwnC9UGnIxXPaLFn4H718Nqbd5OJp2lz6RlGD3lVlZLPTgz++r0R/JWaq/WFRtWb9o 4/oA== 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=KHDm4yY4SX73AeaEEuX3TPo3LcN5BJ8W2PH6R2XsBUo=; b=Mxko3JCTsenPve6GU7nj+8hm2Wj4RP5xGyjeZSCBpTlvWmaOi8b0YTTgHWjIMBnf32 Jrqse3eMf5XoVP1arapwm9Hj4Qvs1Hjv6GbDVeOO6D41MCYBUJivfdtGEoOrE2xwe3Ye bTlEU6JdlHnFOVMXBmxMfPNcQwjnjVv3VUZc/dBx3fhE8ebvvF6MUXGcrW8PH/fmt2Cb Dm/5fuZrRne3AXY4CRYymwD+PTnBgMyl2W6HXB1m5Xsqe3OWuCseDN37gXchQ40X8Ucd 0seBSf/VL4jCZTJRZ/cY/VO9sfe1qW5ZtbFAtIN8LgN7hUHMuW6zTcCTnAzz7lTj+U1I xRJg== 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 w201si5198229ywa.240.2019.02.20.14.58.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 20 Feb 2019 14:58:05 -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]:50200 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwaoX-0000GT-H1 for patch@linaro.org; Wed, 20 Feb 2019 17:58:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwaY7-0004No-Ve for qemu-devel@nongnu.org; Wed, 20 Feb 2019 17:41:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwaY5-0000SE-TT for qemu-devel@nongnu.org; Wed, 20 Feb 2019 17:41:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59186) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gwaY1-0000H7-Mc; Wed, 20 Feb 2019 17:41:02 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C2EF1307D8BE; Wed, 20 Feb 2019 22:40:57 +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 2F71E5D6AA; Wed, 20 Feb 2019 22:40:54 +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, 20 Feb 2019 23:39:58 +0100 Message-Id: <20190220224003.4420-13-eric.auger@redhat.com> In-Reply-To: <20190220224003.4420-1-eric.auger@redhat.com> References: <20190220224003.4420-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 20 Feb 2019 22:40:57 +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 v7 12/17] 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, david@gibson.dropbear.id.au 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 Reviewed-by: Igor Mammedov --- v6 -> v7: - add Igor's R-b v5 -> v6: - fix mingw compil issue v4 -> v5: - Align to x86 code and especially "pc: acpi: revert back to 1 SRAT entry for hotpluggable area" 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 | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.20.1 diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 829d2f0035..781eafaf5e 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -516,6 +516,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; @@ -541,6 +542,14 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } + if (ms->device_memory) { + numamem = acpi_data_push(table_data, sizeof *numamem); + build_srat_memory(numamem, ms->device_memory->base, + memory_region_size(&ms->device_memory->mr), + nb_numa_nodes - 1, + MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED); + } + build_header(linker, table_data, (void *)(table_data->data + srat_start), "SRAT", table_data->len - srat_start, 3, NULL, NULL); }