From: Xiao Guangrong <guangrong.xiao@linux.intel.com> To: pbonzini@redhat.com, imammedo@redhat.com Cc: gleb@kernel.org, mtosatti@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, ehabkost@redhat.com, dan.j.williams@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong <guangrong.xiao@linux.intel.com> Subject: [PATCH 05/14] nvdimm acpi: clean up nvdimm_build_acpi Date: Mon, 7 Nov 2016 19:13:40 +0800 [thread overview] Message-ID: <1478517229-140028-6-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1478517229-140028-1-git-send-email-guangrong.xiao@linux.intel.com> To make the code more clearer, we 1) check ram_slots first, and build ssdt & nfit only when it is available 2) use nvdimm_get_plugged_device_list() to check if there is nvdimm device plugged Suggested-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/acpi/nvdimm.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 5156565..65eb6c9 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -392,12 +392,6 @@ static void nvdimm_build_nfit(AcpiNVDIMMState *state, GArray *table_offsets, NvdimmFitBuffer *fit_buf = &state->fit_buf; unsigned int header; - - /* NVDIMM device is not plugged? */ - if (!fit_buf->fit->len) { - return; - } - acpi_add_table(table_offsets, table_data); /* NFIT header. */ @@ -1275,14 +1269,22 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, BIOSLinker *linker, AcpiNVDIMMState *state, uint32_t ram_slots) { - nvdimm_build_nfit(state, table_offsets, table_data, linker); + GSList *device_list; - /* - * NVDIMM device is allowed to be plugged only if there is available - * slot. - */ - if (ram_slots) { - nvdimm_build_ssdt(table_offsets, table_data, linker, state->dsm_mem, - ram_slots); + /* no nvdimm device can be plugged. */ + if (!ram_slots) { + return; } + + nvdimm_build_ssdt(table_offsets, table_data, linker, state->dsm_mem, + ram_slots); + + device_list = nvdimm_get_plugged_device_list(); + /* no NVDIMM device is plugged. */ + if (!device_list) { + return; + } + + nvdimm_build_nfit(state, table_offsets, table_data, linker); + g_slist_free(device_list); } -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Xiao Guangrong <guangrong.xiao@linux.intel.com> To: pbonzini@redhat.com, imammedo@redhat.com Cc: gleb@kernel.org, mtosatti@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, ehabkost@redhat.com, dan.j.williams@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong <guangrong.xiao@linux.intel.com> Subject: [Qemu-devel] [PATCH 05/14] nvdimm acpi: clean up nvdimm_build_acpi Date: Mon, 7 Nov 2016 19:13:40 +0800 [thread overview] Message-ID: <1478517229-140028-6-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1478517229-140028-1-git-send-email-guangrong.xiao@linux.intel.com> To make the code more clearer, we 1) check ram_slots first, and build ssdt & nfit only when it is available 2) use nvdimm_get_plugged_device_list() to check if there is nvdimm device plugged Suggested-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/acpi/nvdimm.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 5156565..65eb6c9 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -392,12 +392,6 @@ static void nvdimm_build_nfit(AcpiNVDIMMState *state, GArray *table_offsets, NvdimmFitBuffer *fit_buf = &state->fit_buf; unsigned int header; - - /* NVDIMM device is not plugged? */ - if (!fit_buf->fit->len) { - return; - } - acpi_add_table(table_offsets, table_data); /* NFIT header. */ @@ -1275,14 +1269,22 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, BIOSLinker *linker, AcpiNVDIMMState *state, uint32_t ram_slots) { - nvdimm_build_nfit(state, table_offsets, table_data, linker); + GSList *device_list; - /* - * NVDIMM device is allowed to be plugged only if there is available - * slot. - */ - if (ram_slots) { - nvdimm_build_ssdt(table_offsets, table_data, linker, state->dsm_mem, - ram_slots); + /* no nvdimm device can be plugged. */ + if (!ram_slots) { + return; } + + nvdimm_build_ssdt(table_offsets, table_data, linker, state->dsm_mem, + ram_slots); + + device_list = nvdimm_get_plugged_device_list(); + /* no NVDIMM device is plugged. */ + if (!device_list) { + return; + } + + nvdimm_build_nfit(state, table_offsets, table_data, linker); + g_slist_free(device_list); } -- 1.8.3.1
next prev parent reply other threads:[~2016-11-07 11:29 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-07 11:13 [PATCH 00/14] improve nvdimm hotplug Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 11:13 ` [PATCH 01/14] qdev: hotplug: drop HotplugHandler.post_plug callback Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 15:30 ` Stefan Hajnoczi 2016-11-07 15:30 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:37 ` Igor Mammedov 2016-11-09 16:37 ` [Qemu-devel] " Igor Mammedov 2016-11-07 11:13 ` [PATCH 02/14] nvdimm acpi: drop the lock of fit buffer Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 15:30 ` Stefan Hajnoczi 2016-11-07 15:30 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:38 ` Igor Mammedov 2016-11-09 16:38 ` [Qemu-devel] " Igor Mammedov 2016-11-07 11:13 ` [PATCH 03/14] pc: memhp: move nvdimm hotplug out of memory hotplug Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 15:31 ` Stefan Hajnoczi 2016-11-07 15:31 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:38 ` Igor Mammedov 2016-11-09 16:38 ` [Qemu-devel] " Igor Mammedov 2016-11-07 11:13 ` [PATCH 04/14] pc: memhp: stop handling nvdimm hotplug in pc_dimm_unplug Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 15:32 ` Stefan Hajnoczi 2016-11-07 15:32 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:38 ` Igor Mammedov 2016-11-09 16:38 ` [Qemu-devel] " Igor Mammedov 2016-11-07 11:13 ` Xiao Guangrong [this message] 2016-11-07 11:13 ` [Qemu-devel] [PATCH 05/14] nvdimm acpi: clean up nvdimm_build_acpi Xiao Guangrong 2016-11-07 15:32 ` Stefan Hajnoczi 2016-11-07 15:32 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:39 ` Igor Mammedov 2016-11-09 16:39 ` [Qemu-devel] " Igor Mammedov 2016-11-07 11:13 ` [PATCH 06/14] docs: improve the doc of Read FIT method Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 15:32 ` Stefan Hajnoczi 2016-11-07 15:32 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:39 ` Igor Mammedov 2016-11-09 16:39 ` [Qemu-devel] " Igor Mammedov 2016-11-07 11:13 ` [PATCH 07/14] nvdimm acpi: rename nvdimm_plugged_device_list Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 15:33 ` Stefan Hajnoczi 2016-11-07 15:33 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:39 ` Igor Mammedov 2016-11-09 16:39 ` [Qemu-devel] " Igor Mammedov 2016-11-07 11:13 ` [PATCH 08/14] nvdimm acpi: cleanup nvdimm_build_fit Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 15:33 ` Stefan Hajnoczi 2016-11-07 15:33 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:40 ` Igor Mammedov 2016-11-09 16:40 ` [Qemu-devel] " Igor Mammedov 2016-11-07 11:13 ` [PATCH 09/14] nvdimm acpi: rename nvdimm_acpi_hotplug Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 15:33 ` Stefan Hajnoczi 2016-11-07 15:33 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:40 ` Igor Mammedov 2016-11-09 16:40 ` [Qemu-devel] " Igor Mammedov 2016-11-07 11:13 ` [PATCH 10/14] nvdimm acpi: define DSM return codes Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 15:34 ` Stefan Hajnoczi 2016-11-07 15:34 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:40 ` Igor Mammedov 2016-11-09 16:40 ` [Qemu-devel] " Igor Mammedov 2016-11-07 11:13 ` [PATCH 11/14] nvdimm acpi: fix two comments Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 15:34 ` Stefan Hajnoczi 2016-11-07 15:34 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:41 ` Igor Mammedov 2016-11-09 16:41 ` [Qemu-devel] " Igor Mammedov 2016-11-07 11:13 ` [PATCH 12/14] nvdimm acpi: rename nvdimm_dsm_reserved_root Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 15:34 ` Stefan Hajnoczi 2016-11-07 15:34 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:41 ` Igor Mammedov 2016-11-09 16:41 ` [Qemu-devel] " Igor Mammedov 2016-11-07 11:13 ` [PATCH 13/14] nvdimm acpi: use aml_name_decl to define named object Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 15:34 ` Stefan Hajnoczi 2016-11-07 15:34 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:41 ` Igor Mammedov 2016-11-09 16:41 ` [Qemu-devel] " Igor Mammedov 2016-11-07 11:13 ` [PATCH 14/14] nvdimm acpi: introduce NVDIMM_DSM_MEMORY_SIZE Xiao Guangrong 2016-11-07 11:13 ` [Qemu-devel] " Xiao Guangrong 2016-11-07 15:35 ` Stefan Hajnoczi 2016-11-07 15:35 ` [Qemu-devel] " Stefan Hajnoczi 2016-11-09 16:41 ` Igor Mammedov 2016-11-09 16:41 ` [Qemu-devel] " Igor Mammedov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1478517229-140028-6-git-send-email-guangrong.xiao@linux.intel.com \ --to=guangrong.xiao@linux.intel.com \ --cc=dan.j.williams@intel.com \ --cc=ehabkost@redhat.com \ --cc=gleb@kernel.org \ --cc=imammedo@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ --cc=stefanha@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.