From nobody Sun Nov 9 14:46:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=linux.intel.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155125418261156.45503157317182; Tue, 26 Feb 2019 23:56:22 -0800 (PST) Received: from localhost ([127.0.0.1]:39815 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyu4c-0001K6-9c for importer@patchew.org; Wed, 27 Feb 2019 02:56:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyu0d-0006r7-8X for qemu-devel@nongnu.org; Wed, 27 Feb 2019 02:52:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyu0c-0004ow-4Y for qemu-devel@nongnu.org; Wed, 27 Feb 2019 02:52:07 -0500 Received: from mga09.intel.com ([134.134.136.24]:39876) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyu0b-0004jB-NL for qemu-devel@nongnu.org; Wed, 27 Feb 2019 02:52:05 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Feb 2019 23:51:57 -0800 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga001.fm.intel.com with ESMTP; 26 Feb 2019 23:51:56 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,418,1544515200"; d="scan'208,223";a="150364894" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 27 Feb 2019 15:50:58 +0800 Message-Id: <20190227075101.6263-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190227075101.6263-1-richardw.yang@linux.intel.com> References: <20190227075101.6263-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Subject: [Qemu-devel] [PATCH 1/4] nvdimm: fix typo in nvdimm_build_nvdimm_devices argument 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: imammedo@redhat.com, Wei Yang , xiaoguangrong.eric@gmail.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From dsm_dma_arrea to dsm_dma_area. Signed-off-by: Wei Yang Reviewed-by: Igor Mammedov --- hw/acpi/nvdimm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index e53b2cb681..39af8cdba8 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -1260,7 +1260,7 @@ static void nvdimm_build_nvdimm_devices(Aml *root_dev= , uint32_t ram_slots) } =20 static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data, - BIOSLinker *linker, GArray *dsm_dma_arrea, + BIOSLinker *linker, GArray *dsm_dma_area, uint32_t ram_slots) { Aml *ssdt, *sb_scope, *dev; @@ -1307,7 +1307,7 @@ static void nvdimm_build_ssdt(GArray *table_offsets, = GArray *table_data, NVDIMM_ACPI_MEM_ADDR); =20 bios_linker_loader_alloc(linker, - NVDIMM_DSM_MEM_FILE, dsm_dma_arrea, + NVDIMM_DSM_MEM_FILE, dsm_dma_area, sizeof(NvdimmDsmIn), false /* high memory */); bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, mem_addr_offset, sizeof(uint32_t), --=20 2.19.1 From nobody Sun Nov 9 14:46:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=linux.intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551254059832751.5682539719246; Tue, 26 Feb 2019 23:54:19 -0800 (PST) Received: from localhost ([127.0.0.1]:39762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyu2b-00080B-Cg for importer@patchew.org; Wed, 27 Feb 2019 02:54:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyu0d-0006r5-5E for qemu-devel@nongnu.org; Wed, 27 Feb 2019 02:52:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyu0c-0004od-3P for qemu-devel@nongnu.org; Wed, 27 Feb 2019 02:52:07 -0500 Received: from mga09.intel.com ([134.134.136.24]:39878) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyu0b-0004jf-NF for qemu-devel@nongnu.org; Wed, 27 Feb 2019 02:52:05 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Feb 2019 23:51:59 -0800 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga001.fm.intel.com with ESMTP; 26 Feb 2019 23:51:58 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,418,1544515200"; d="scan'208";a="150364898" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 27 Feb 2019 15:50:59 +0800 Message-Id: <20190227075101.6263-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190227075101.6263-1-richardw.yang@linux.intel.com> References: <20190227075101.6263-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Subject: [Qemu-devel] [PATCH 2/4] nvdimm: use *function* directly instead of allocating it again 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: imammedo@redhat.com, Wei Yang , xiaoguangrong.eric@gmail.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" At the beginning or nvdimm_build_common_dsm(), variable *function* is already allocated for Arg2. This patch reuse variable *function* instead of allocating it again. Signed-off-by: Wei Yang Reviewed-by: Igor Mammedov --- hw/acpi/nvdimm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 39af8cdba8..e63a1ef15d 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -1086,7 +1086,7 @@ static void nvdimm_build_common_dsm(Aml *dev) */ aml_append(method, aml_store(handle, aml_name(NVDIMM_DSM_HANDLE))); aml_append(method, aml_store(aml_arg(1), aml_name(NVDIMM_DSM_REVISION)= )); - aml_append(method, aml_store(aml_arg(2), aml_name(NVDIMM_DSM_FUNCTION)= )); + aml_append(method, aml_store(function, aml_name(NVDIMM_DSM_FUNCTION))); =20 /* * The fourth parameter (Arg3) of _DSM is a package which contains --=20 2.19.1 From nobody Sun Nov 9 14:46:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=linux.intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551254083157654.9472528624023; Tue, 26 Feb 2019 23:54:43 -0800 (PST) Received: from localhost ([127.0.0.1]:39766 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyu36-0008Nw-4j for importer@patchew.org; Wed, 27 Feb 2019 02:54:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyu0d-0006r8-8n for qemu-devel@nongnu.org; Wed, 27 Feb 2019 02:52:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyu0c-0004p0-5a for qemu-devel@nongnu.org; Wed, 27 Feb 2019 02:52:07 -0500 Received: from mga09.intel.com ([134.134.136.24]:39881) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyu0b-0004kb-NK for qemu-devel@nongnu.org; Wed, 27 Feb 2019 02:52:05 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Feb 2019 23:52:00 -0800 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga001.fm.intel.com with ESMTP; 26 Feb 2019 23:51:59 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,418,1544515200"; d="scan'208";a="150364900" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 27 Feb 2019 15:51:00 +0800 Message-Id: <20190227075101.6263-4-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190227075101.6263-1-richardw.yang@linux.intel.com> References: <20190227075101.6263-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Subject: [Qemu-devel] [PATCH 3/4] nvdimm: use NVDIMM_ACPI_IO_LEN for the proper IO size 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: imammedo@redhat.com, Wei Yang , xiaoguangrong.eric@gmail.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The IO range is defined to 4 bytes with NVDIMM_ACPI_IO_LEN, so it is more proper to use this macro instead of calculating it by sizeof. Signed-off-by: Wei Yang Reviewed-by: Igor Mammedov --- hw/acpi/nvdimm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index e63a1ef15d..2457c1aa44 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -992,7 +992,7 @@ static void nvdimm_build_common_dsm(Aml *dev) field =3D aml_field(NVDIMM_DSM_IOPORT, AML_DWORD_ACC, AML_NOLOCK, AML_PRESERVE); aml_append(field, aml_named_field(NVDIMM_DSM_NOTIFY, - sizeof(uint32_t) * BITS_PER_BYTE)); + NVDIMM_ACPI_IO_LEN * BITS_PER_BYTE)); aml_append(method, field); =20 /* --=20 2.19.1 From nobody Sun Nov 9 14:46:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=linux.intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551254059389896.9422346841474; Tue, 26 Feb 2019 23:54:19 -0800 (PST) Received: from localhost ([127.0.0.1]:39764 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyu2i-00081B-BC for importer@patchew.org; Wed, 27 Feb 2019 02:54:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyu0e-0006rB-Qa for qemu-devel@nongnu.org; Wed, 27 Feb 2019 02:52:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyu0c-0004pK-PB for qemu-devel@nongnu.org; Wed, 27 Feb 2019 02:52:07 -0500 Received: from mga09.intel.com ([134.134.136.24]:39878) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyu0c-0004jf-E8 for qemu-devel@nongnu.org; Wed, 27 Feb 2019 02:52:06 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Feb 2019 23:52:02 -0800 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga001.fm.intel.com with ESMTP; 26 Feb 2019 23:52:01 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,418,1544515200"; d="scan'208";a="150364910" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 27 Feb 2019 15:51:01 +0800 Message-Id: <20190227075101.6263-5-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190227075101.6263-1-richardw.yang@linux.intel.com> References: <20190227075101.6263-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Subject: [Qemu-devel] [PATCH 4/4] nvdimm: build FIT in nvdimm_build_acpi 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: imammedo@redhat.com, Wei Yang , xiaoguangrong.eric@gmail.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Currently we initialize nvdimm device like below: device_set_realized dc->realize nvdimm_plug nvdimm_build_fit_buffer acpi_build nvdimm_build_acpi This shows nvdimm's acpi stuff is prepared in two places: * device plug stage * acpi_build stage It would be more proper to build fit buffer in nvdimm_build_acpi, which consolidate all acpi related initialization together. This patch moves FIT build in nvdimm_build_acpi. Signed-off-by: Wei Yang --- hw/acpi/nvdimm.c | 6 +----- hw/i386/pc.c | 5 ----- include/hw/mem/nvdimm.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 2457c1aa44..6fc0c65ee0 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -425,11 +425,6 @@ static void nvdimm_build_fit_buffer(AcpiNVDIMMState *s= tate) fit_buf->dirty =3D true; } =20 -void nvdimm_plug(AcpiNVDIMMState *state) -{ - nvdimm_build_fit_buffer(state); -} - static void nvdimm_build_nfit(AcpiNVDIMMState *state, GArray *table_offset= s, GArray *table_data, BIOSLinker *linker) { @@ -1338,6 +1333,7 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray = *table_data, return; } =20 + nvdimm_build_fit_buffer(state); nvdimm_build_nfit(state, table_offsets, table_data, linker); g_slist_free(device_list); } diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 64d9e756fa..686b610c50 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2099,17 +2099,12 @@ static void pc_memory_plug(HotplugHandler *hotplug_= dev, { Error *local_err =3D NULL; PCMachineState *pcms =3D PC_MACHINE(hotplug_dev); - bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); =20 pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms), &local_err); if (local_err) { goto out; } =20 - if (is_nvdimm) { - nvdimm_plug(&pcms->acpi_nvdimm_state); - } - hotplug_handler_plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &error_abor= t); out: error_propagate(errp, local_err); diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h index c5c9b3c7f8..30869b4834 100644 --- a/include/hw/mem/nvdimm.h +++ b/include/hw/mem/nvdimm.h @@ -148,6 +148,5 @@ void nvdimm_init_acpi_state(AcpiNVDIMMState *state, Mem= oryRegion *io, void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, BIOSLinker *linker, AcpiNVDIMMState *state, uint32_t ram_slots); -void nvdimm_plug(AcpiNVDIMMState *state); void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev); #endif --=20 2.19.1