From nobody Thu May 16 01:07:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1590683011; cv=none; d=zohomail.com; s=zohoarc; b=Hw6LrNaloDDFZx+iVSQUGWJSVlW0DtXWLyz5wAvBNUH+eOLAElKK8yTQUB7LPmQ9bzuxqWmNSUEuZoHmjiLGFRm4BoxM+s4D5p0bF97cB6SDyhdmOli/vEZ4WPpOIcL1qNo49qheXh7uan2Kk2jfMB99lZcn3CCTW8Hjnr2l9oU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590683011; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2RlkPPoBT3MilVXigNHGGmsT37zooxPnGvL7UIGiEOU=; b=WBr4kLcPgZJOTEdPaj38tnhfVBtJvVAmGSyiZg8gzSXFj79azcypW0zI4r2tuGXPyyRyXNFl5NejtmmtKA6lP0AAoVSPS8pAgalVHbGEaODOA8p2qDiD/SV5xxNZUf8Zma+F2tweifnc5mYkOUtAc267uy2xS6YE7PWzlsNStDg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590683011600940.6728532145944; Thu, 28 May 2020 09:23:31 -0700 (PDT) Received: from localhost ([::1]:54516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeLJa-0004Cm-4e for importer@patchew.org; Thu, 28 May 2020 12:23:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeLGo-0000av-LP for qemu-devel@nongnu.org; Thu, 28 May 2020 12:20:40 -0400 Received: from mga11.intel.com ([192.55.52.93]:35633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeLGl-0000zC-DR for qemu-devel@nongnu.org; Thu, 28 May 2020 12:20:37 -0400 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2020 09:20:30 -0700 Received: from vverma7-mobl4.lm.intel.com ([10.251.139.189]) by orsmga006.jf.intel.com with ESMTP; 28 May 2020 09:20:29 -0700 IronPort-SDR: j8ZfTHyRLP3p/VoR5RRrtqPlE9ACGcAbadZ/b/EABdMr2tRLgSwqOGJ8d+jZGxGEXXexMgNSLA ygYEPumWpN+A== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: x/swKN3hSmD32SFeNwZDjVLz+puMBpgvydbffcRFNF2ikv2HzajuFTX85LVrJSc7RwKlqxL5bO 9RGwG8BDKLGA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,445,1583222400"; d="scan'208";a="270903771" From: Vishal Verma To: Subject: [PATCH v3 1/3] diffs-allowed: add the SRAT AML to diffs-allowed Date: Thu, 28 May 2020 10:20:09 -0600 Message-Id: <20200528162011.16258-2-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200528162011.16258-1-vishal.l.verma@intel.com> References: <20200528162011.16258-1-vishal.l.verma@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.93; envelope-from=vishal.l.verma@intel.com; helo=mga11.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/28 12:20:29 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Xiao Guangrong , "Michael S. Tsirkin" , jingqi.liu@intel.com, Dave Hansen , Eduardo Habkost , Vishal Verma , Paolo Bonzini , Igor Mammedov , Dan Williams , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" In anticipation of a change to the SRAT generation in qemu, add the AML file to diffs-allowed. Signed-off-by: Vishal Verma --- tests/qtest/bios-tables-test-allowed-diff.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..83d3ea5032 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,2 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/SRAT.dimmpxm", --=20 2.26.2 From nobody Thu May 16 01:07:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1590682922; cv=none; d=zohomail.com; s=zohoarc; b=R/pXSnbWyobNsjxz/x0leCEEod792obEELPUizygLtOmJ+d4NaA1BOmP+MieRVbO2lsaCEzO3Rpkalv+YBFGZ6pnUJO9RkNmRlUwJIrj53PkF8qnZgOwjlYFF3yPjK1/I+2nkxQ91USFDjrCCnd4jmelQ99BRhkAhsxGDVbsx/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590682922; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=N4s1quHsr225pknHtfQtecOeIWn9Lczlhu51ia8T9Js=; b=RF0Ez5KoTGLN3C/TzApzxIMaeVXQt7HGU+jvPTTU1fXnAFrAmvYtsgVwpltrVrnd+yv50vZZYlf2jok5Rzyesi+tXFOpnOPYkShO1J+xvpGV0R5G41Ntllh4Z/tDx7E5ESDdEeOlfveQe0drPowPOKJeZeQAt0wui5Qy/Yjrkpg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590682922182862.9305544478873; Thu, 28 May 2020 09:22:02 -0700 (PDT) Received: from localhost ([::1]:50286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeLI8-0002SJ-Qp for importer@patchew.org; Thu, 28 May 2020 12:22:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeLGn-0000aN-Ej for qemu-devel@nongnu.org; Thu, 28 May 2020 12:20:38 -0400 Received: from mga11.intel.com ([192.55.52.93]:35636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeLGl-00010J-8N for qemu-devel@nongnu.org; Thu, 28 May 2020 12:20:36 -0400 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2020 09:20:31 -0700 Received: from vverma7-mobl4.lm.intel.com ([10.251.139.189]) by orsmga006.jf.intel.com with ESMTP; 28 May 2020 09:20:30 -0700 IronPort-SDR: LE49tBhrR3VNS58wCAC6FS62kTuey49EA+IrEcrOTdLMRVNHq8wvu02C2eb3UEFQLlIDiob3d/ IGSsQsGcSG6w== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: yYLET34s3sxPaUAuMwRNwrhpMgK/deCcQI8ccUxSYd9wzu06M6E8hLbrgSSeAC8M0NKI8wWG+/ LKUVOK/grj6A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,445,1583222400"; d="scan'208";a="270903778" From: Vishal Verma To: Subject: [PATCH v3 2/3] hw/acpi-build: account for NVDIMM numa nodes in SRAT Date: Thu, 28 May 2020 10:20:10 -0600 Message-Id: <20200528162011.16258-3-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200528162011.16258-1-vishal.l.verma@intel.com> References: <20200528162011.16258-1-vishal.l.verma@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.93; envelope-from=vishal.l.verma@intel.com; helo=mga11.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/28 12:20:29 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Xiao Guangrong , "Michael S. Tsirkin" , jingqi.liu@intel.com, Dave Hansen , Eduardo Habkost , Vishal Verma , Paolo Bonzini , Igor Mammedov , Dan Williams , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" NVDIMMs can belong to their own proximity domains, as described by the NFIT. In such cases, the SRAT needs to have Memory Affinity structures in the SRAT for these NVDIMMs, otherwise Linux doesn't populate node data structures properly during NUMA initialization. See the following for an example failure case. https://lore.kernel.org/linux-nvdimm/20200416225438.15208-1-vishal.l.verma@= intel.com/ Fix this by adding device address range and node information from NVDIMMs to the SRAT in build_srat(). The relevant command line options to exercise this are below. Nodes 0-1 contain CPUs and regular memory, and nodes 2-3 are the NVDIMM address space. -numa node,nodeid=3D0,mem=3D2048M, -numa node,nodeid=3D1,mem=3D2048M, -numa node,nodeid=3D2,mem=3D0, -object memory-backend-file,id=3Dnvmem0,share,mem-path=3Dnvdimm-0,size=3D= 16384M,align=3D128M -device nvdimm,memdev=3Dnvmem0,id=3Dnv0,label-size=3D2M,node=3D2 -numa node,nodeid=3D3,mem=3D0, -object memory-backend-file,id=3Dnvmem1,share,mem-path=3Dnvdimm-1,size=3D= 16384M,align=3D128M -device nvdimm,memdev=3Dnvmem1,id=3Dnv1,label-size=3D2M,node=3D3 Cc: Jingqi Liu Cc: Michael S. Tsirkin Reviewed-by: Jingqi Liu Signed-off-by: Vishal Verma --- hw/acpi/nvdimm.c | 23 +++++++++++++++++++++++ hw/i386/acpi-build.c | 5 +++++ include/hw/mem/nvdimm.h | 1 + 3 files changed, 29 insertions(+) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 9316d12b70..8f7cc16add 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -28,6 +28,7 @@ =20 #include "qemu/osdep.h" #include "qemu/uuid.h" +#include "qapi/error.h" #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/bios-linker-loader.h" @@ -1334,6 +1335,28 @@ static void nvdimm_build_ssdt(GArray *table_offsets,= GArray *table_data, free_aml_allocator(); } =20 +void nvdimm_build_srat(GArray *table_data) +{ + GSList *device_list =3D nvdimm_get_device_list(); + + for (; device_list; device_list =3D device_list->next) { + AcpiSratMemoryAffinity *numamem =3D NULL; + DeviceState *dev =3D device_list->data; + Object *obj =3D OBJECT(dev); + uint64_t addr, size; + int node; + + node =3D object_property_get_int(obj, PC_DIMM_NODE_PROP, &error_ab= ort); + addr =3D object_property_get_uint(obj, PC_DIMM_ADDR_PROP, &error_a= bort); + size =3D object_property_get_uint(obj, PC_DIMM_SIZE_PROP, &error_a= bort); + + numamem =3D acpi_data_push(table_data, sizeof *numamem); + build_srat_memory(numamem, addr, size, node, + MEM_AFFINITY_ENABLED | MEM_AFFINITY_NON_VOLATILE= ); + } + g_slist_free(device_list); +} + void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, BIOSLinker *linker, NVDIMMState *state, uint32_t ram_slots) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 2e15f6848e..d996525e2c 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2428,6 +2428,11 @@ build_srat(GArray *table_data, BIOSLinker *linker, M= achineState *machine) MEM_AFFINITY_ENABLED); } } + + if (machine->nvdimms_state->is_enabled) { + nvdimm_build_srat(table_data); + } + slots =3D (table_data->len - numa_start) / sizeof *numamem; for (; slots < pcms->numa_nodes + 2; slots++) { numamem =3D acpi_data_push(table_data, sizeof *numamem); diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h index a3c08955e8..b67a1aedf6 100644 --- a/include/hw/mem/nvdimm.h +++ b/include/hw/mem/nvdimm.h @@ -155,6 +155,7 @@ typedef struct NVDIMMState NVDIMMState; void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io, struct AcpiGenericAddress dsm_io, FWCfgState *fw_cfg, Object *owner); +void nvdimm_build_srat(GArray *table_data); void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, BIOSLinker *linker, NVDIMMState *state, uint32_t ram_slots); --=20 2.26.2 From nobody Thu May 16 01:07:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1590683013; cv=none; d=zohomail.com; s=zohoarc; b=nVeac/XfEkxrqXBwbSAPPp6XRo8G9+7sMhp/ftuHpyMEAJuFoRWi4SVStbJmjPy5kqxbLUq9phb3a3s1pyvTv5dHYwgw05wOwa/WrdKC7ol6CvZ+dKO/U31o39A+ymYvbxKyAyaVtN+E71PitmdBnfJ//LoDQxFkBEpIufng14M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590683013; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0u6vwWu/sIJ1PUqoXG2wgwMRiHmmjeuMPBKokoeaEK4=; b=TnjrCKGvHVdRVpE9pJVibLKDggStca5KPjnL7tmANV7sJBG8t8YEE2g5AuigKgjH37b9s7n6VMbHLzzBXH/3gJ3jZPbGRUrsNMpg/GsEHtLnyKywo/esKih0rq+0X8HV+Tw0SKM3AAKtTkVUH6oX+pn8CDZ2W81fRREfcyAjDLE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590683013191688.533617997874; Thu, 28 May 2020 09:23:33 -0700 (PDT) Received: from localhost ([::1]:54610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeLJb-0004GG-Ub for importer@patchew.org; Thu, 28 May 2020 12:23:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeLGo-0000ay-Ni for qemu-devel@nongnu.org; Thu, 28 May 2020 12:20:40 -0400 Received: from mga11.intel.com ([192.55.52.93]:35636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeLGn-00010J-6Y for qemu-devel@nongnu.org; Thu, 28 May 2020 12:20:38 -0400 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2020 09:20:32 -0700 Received: from vverma7-mobl4.lm.intel.com ([10.251.139.189]) by orsmga006.jf.intel.com with ESMTP; 28 May 2020 09:20:31 -0700 IronPort-SDR: BvME6kfgkO5R/KvlW3gpqmg0MZWYdZHHXSL+9EQTGc1xmpbJ5yv//kMzyrXUIMNDWQDKxRY4t5 /TgRDifFQ+Ag== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: QARvJ+XIxoDrn6Op4HgKYOq6pnIMwnSCoTlNi+9yCLPQJElRq6lqq8rIwui1xau7bfvmG4izwF dbVW6Eu1iitw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,445,1583222400"; d="scan'208";a="270903783" From: Vishal Verma To: Subject: [PATCH v3 3/3] tests/acpi: update expected SRAT files Date: Thu, 28 May 2020 10:20:11 -0600 Message-Id: <20200528162011.16258-4-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200528162011.16258-1-vishal.l.verma@intel.com> References: <20200528162011.16258-1-vishal.l.verma@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.93; envelope-from=vishal.l.verma@intel.com; helo=mga11.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/28 12:20:29 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Xiao Guangrong , "Michael S. Tsirkin" , jingqi.liu@intel.com, Dave Hansen , Eduardo Habkost , Vishal Verma , Paolo Bonzini , Igor Mammedov , Dan Williams , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Update the expected SRAT files for the change to account for NVDIMM numa nodes in the SRAT. AML Diff: --- /tmp/asl-V49YJ0.dsl 2020-04-27 18:50:52.680043327 -0600 +++ /tmp/asl-48AZJ0.dsl 2020-04-27 18:50:52.679043344 -0600 @@ -3,7 +3,7 @@ * AML/ASL+ Disassembler version 20190509 (64-bit version) * Copyright (c) 2000 - 2019 Intel Corporation * - * Disassembly of tests/data/acpi/pc/SRAT.dimmpxm, Mon Apr 27 18:50:52 2= 020 + * Disassembly of /tmp/aml-U3BZJ0, Mon Apr 27 18:50:52 2020 * * ACPI Data Table [SRAT] * @@ -13,7 +13,7 @@ [000h 0000 4] Signature : "SRAT" [System Resourc= e Affinity Table] [004h 0004 4] Table Length : 00000188 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 80 +[009h 0009 1] Checksum : 68 [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPCSRAT" [018h 0024 4] Oem Revision : 00000001 @@ -140,15 +140,15 @@ [138h 0312 1] Subtable Type : 01 [Memory Affinity] [139h 0313 1] Length : 28 -[13Ah 0314 4] Proximity Domain : 00000000 +[13Ah 0314 4] Proximity Domain : 00000002 [13Eh 0318 2] Reserved1 : 0000 -[140h 0320 8] Base Address : 0000000000000000 -[148h 0328 8] Address Length : 0000000000000000 +[140h 0320 8] Base Address : 0000000108000000 +[148h 0328 8] Address Length : 0000000008000000 [150h 0336 4] Reserved2 : 00000000 -[154h 0340 4] Flags (decoded below) : 00000000 - Enabled : 0 +[154h 0340 4] Flags (decoded below) : 00000005 + Enabled : 1 Hot Pluggable : 0 - Non-Volatile : 0 + Non-Volatile : 1 [158h 0344 8] Reserved3 : 0000000000000000 [160h 0352 1] Subtable Type : 01 [Memory Affinity] @@ -167,7 +167,7 @@ Raw Table Data: Length 392 (0x188) - 0000: 53 52 41 54 88 01 00 00 01 80 42 4F 43 48 53 20 // SRAT......= BOCHS + 0000: 53 52 41 54 88 01 00 00 01 68 42 4F 43 48 53 20 // SRAT.....h= BOCHS 0010: 42 58 50 43 53 52 41 54 01 00 00 00 42 58 50 43 // BXPCSRAT..= ..BXPC 0020: 01 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 // ..........= ...... 0030: 00 10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 // ..........= ...... @@ -186,9 +186,9 @@ 0100: 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 // ..........= ...... 0110: 01 28 03 00 00 00 00 00 00 00 00 06 00 00 00 00 // .(........= ...... 0120: 00 00 00 02 00 00 00 00 00 00 00 00 01 00 00 00 // ..........= ...... - 0130: 00 00 00 00 00 00 00 00 01 28 00 00 00 00 00 00 // .........(= ...... - 0140: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ..........= ...... - 0150: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ..........= ...... + 0130: 00 00 00 00 00 00 00 00 01 28 02 00 00 00 00 00 // .........(= ...... + 0140: 00 00 00 08 01 00 00 00 00 00 00 08 00 00 00 00 // ..........= ...... + 0150: 00 00 00 00 05 00 00 00 00 00 00 00 00 00 00 00 // ..........= ...... 0160: 01 28 03 00 00 00 00 00 00 00 00 00 01 00 00 00 // .(........= ...... 0170: 00 00 00 F8 00 00 00 00 00 00 00 00 03 00 00 00 // ..........= ...... 0180: 00 00 00 00 00 00 00 00 // ........ Signed-off-by: Vishal Verma --- tests/data/acpi/pc/SRAT.dimmpxm | Bin 392 -> 392 bytes tests/data/acpi/q35/SRAT.dimmpxm | Bin 392 -> 392 bytes tests/qtest/bios-tables-test-allowed-diff.h | 1 - 3 files changed, 1 deletion(-) diff --git a/tests/data/acpi/pc/SRAT.dimmpxm b/tests/data/acpi/pc/SRAT.dimm= pxm index f5c0267ea24bb404b6b4e687390140378fbdc3f1..5a13c61b9041c6045c29643bf93= a111fb1c0c76a 100644 GIT binary patch delta 51 scmeBR?qKE$4ss0XU}Rum%-G0fz$nec00kUCF%aN@Pz(&LlS3Je0lmQmhyVZp delta 51 icmeBR?qKE$4ss0XU}RumY}m+Uz$ndt8%z#mGzI{_tp$hx diff --git a/tests/data/acpi/q35/SRAT.dimmpxm b/tests/data/acpi/q35/SRAT.di= mmpxm index f5c0267ea24bb404b6b4e687390140378fbdc3f1..5a13c61b9041c6045c29643bf93= a111fb1c0c76a 100644 GIT binary patch delta 51 scmeBR?qKE$4ss0XU}Rum%-G0fz$nec00kUCF%aN@Pz(&LlS3Je0lmQmhyVZp delta 51 icmeBR?qKE$4ss0XU}RumY}m+Uz$ndt8%z#mGzI{_tp$hx diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index 83d3ea5032..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,2 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/pc/SRAT.dimmpxm", --=20 2.26.2