From: Xiao Guangrong <guangrong.xiao@linux.intel.com> To: mst@redhat.com Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong <guangrong.xiao@linux.intel.com> Subject: [PATCH v5 07/13] nvdimm acpi: check UUID Date: Fri, 17 Jun 2016 19:08:10 +0800 [thread overview] Message-ID: <1466161696-99298-8-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1466161696-99298-1-git-send-email-guangrong.xiao@linux.intel.com> Check arg0 which indicates UUID to see if it is valid Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- hw/acpi/nvdimm.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 95504e9..b01f2c6 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -487,19 +487,39 @@ void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io, static void nvdimm_build_common_dsm(Aml *dev) { - Aml *method, *ifctx, *function, *dsm_mem, *unpatched, *result_size; + Aml *method, *ifctx, *function, *handle, *uuid, *dsm_mem, *result_size; + Aml *elsectx, *unsupport, *unpatched, *expected_uuid, *uuid_invalid; Aml *pckg, *pckg_index, *pckg_buf; uint8_t byte_list[1]; method = aml_method(NVDIMM_COMMON_DSM, 5, AML_SERIALIZED); + uuid = aml_arg(0); function = aml_arg(2); + handle = aml_arg(4); dsm_mem = aml_name(NVDIMM_ACPI_MEM_ADDR); /* * do not support any method if DSM memory address has not been * patched. */ - unpatched = aml_if(aml_equal(dsm_mem, aml_int(0x0))); + unpatched = aml_equal(dsm_mem, aml_int(0x0)); + + expected_uuid = aml_local(0); + + ifctx = aml_if(aml_equal(handle, aml_int(0x0))); + aml_append(ifctx, aml_store( + aml_touuid("2F10E7A4-9E91-11E4-89D3-123B93F75CBA") + /* UUID for NVDIMM Root Device */, expected_uuid)); + aml_append(method, ifctx); + elsectx = aml_else(); + aml_append(elsectx, aml_store( + aml_touuid("4309AC30-0D11-11E4-9191-0800200C9A66") + /* UUID for NVDIMM Devices */, expected_uuid)); + aml_append(method, elsectx); + + uuid_invalid = aml_lnot(aml_equal(uuid, expected_uuid)); + + unsupport = aml_if(aml_or(unpatched, uuid_invalid, NULL)); /* * function 0 is called to inquire what functions are supported by @@ -508,19 +528,19 @@ static void nvdimm_build_common_dsm(Aml *dev) ifctx = aml_if(aml_equal(function, aml_int(0))); byte_list[0] = 0 /* No function Supported */; aml_append(ifctx, aml_return(aml_buffer(1, byte_list))); - aml_append(unpatched, ifctx); + aml_append(unsupport, ifctx); /* No function is supported yet. */ byte_list[0] = 1 /* Not Supported */; - aml_append(unpatched, aml_return(aml_buffer(1, byte_list))); - aml_append(method, unpatched); + aml_append(unsupport, aml_return(aml_buffer(1, byte_list))); + aml_append(method, unsupport); /* * The HDLE indicates the DSM function is issued from which device, * it reserves 0 for root device and is the handle for NVDIMM devices. * See the comments in nvdimm_slot_to_handle(). */ - aml_append(method, aml_store(aml_arg(4), aml_name("HDLE"))); + aml_append(method, aml_store(handle, aml_name("HDLE"))); aml_append(method, aml_store(aml_arg(1), aml_name("REVS"))); aml_append(method, aml_store(aml_arg(2), aml_name("FUNC"))); -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Xiao Guangrong <guangrong.xiao@linux.intel.com> To: mst@redhat.com Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong <guangrong.xiao@linux.intel.com> Subject: [Qemu-devel] [PATCH v5 07/13] nvdimm acpi: check UUID Date: Fri, 17 Jun 2016 19:08:10 +0800 [thread overview] Message-ID: <1466161696-99298-8-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1466161696-99298-1-git-send-email-guangrong.xiao@linux.intel.com> Check arg0 which indicates UUID to see if it is valid Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- hw/acpi/nvdimm.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 95504e9..b01f2c6 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -487,19 +487,39 @@ void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io, static void nvdimm_build_common_dsm(Aml *dev) { - Aml *method, *ifctx, *function, *dsm_mem, *unpatched, *result_size; + Aml *method, *ifctx, *function, *handle, *uuid, *dsm_mem, *result_size; + Aml *elsectx, *unsupport, *unpatched, *expected_uuid, *uuid_invalid; Aml *pckg, *pckg_index, *pckg_buf; uint8_t byte_list[1]; method = aml_method(NVDIMM_COMMON_DSM, 5, AML_SERIALIZED); + uuid = aml_arg(0); function = aml_arg(2); + handle = aml_arg(4); dsm_mem = aml_name(NVDIMM_ACPI_MEM_ADDR); /* * do not support any method if DSM memory address has not been * patched. */ - unpatched = aml_if(aml_equal(dsm_mem, aml_int(0x0))); + unpatched = aml_equal(dsm_mem, aml_int(0x0)); + + expected_uuid = aml_local(0); + + ifctx = aml_if(aml_equal(handle, aml_int(0x0))); + aml_append(ifctx, aml_store( + aml_touuid("2F10E7A4-9E91-11E4-89D3-123B93F75CBA") + /* UUID for NVDIMM Root Device */, expected_uuid)); + aml_append(method, ifctx); + elsectx = aml_else(); + aml_append(elsectx, aml_store( + aml_touuid("4309AC30-0D11-11E4-9191-0800200C9A66") + /* UUID for NVDIMM Devices */, expected_uuid)); + aml_append(method, elsectx); + + uuid_invalid = aml_lnot(aml_equal(uuid, expected_uuid)); + + unsupport = aml_if(aml_or(unpatched, uuid_invalid, NULL)); /* * function 0 is called to inquire what functions are supported by @@ -508,19 +528,19 @@ static void nvdimm_build_common_dsm(Aml *dev) ifctx = aml_if(aml_equal(function, aml_int(0))); byte_list[0] = 0 /* No function Supported */; aml_append(ifctx, aml_return(aml_buffer(1, byte_list))); - aml_append(unpatched, ifctx); + aml_append(unsupport, ifctx); /* No function is supported yet. */ byte_list[0] = 1 /* Not Supported */; - aml_append(unpatched, aml_return(aml_buffer(1, byte_list))); - aml_append(method, unpatched); + aml_append(unsupport, aml_return(aml_buffer(1, byte_list))); + aml_append(method, unsupport); /* * The HDLE indicates the DSM function is issued from which device, * it reserves 0 for root device and is the handle for NVDIMM devices. * See the comments in nvdimm_slot_to_handle(). */ - aml_append(method, aml_store(aml_arg(4), aml_name("HDLE"))); + aml_append(method, aml_store(handle, aml_name("HDLE"))); aml_append(method, aml_store(aml_arg(1), aml_name("REVS"))); aml_append(method, aml_store(aml_arg(2), aml_name("FUNC"))); -- 1.8.3.1
next prev parent reply other threads:[~2016-06-17 11:19 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-17 11:08 [PATCH v5 00/13] NVDIMM: introduce nvdimm label support Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " Xiao Guangrong 2016-06-17 11:08 ` [PATCH v5 01/13] pc-dimm: introduce get_vmstate_memory_region callback Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " Xiao Guangrong 2016-06-17 11:08 ` [PATCH v5 02/13] nvdimm: support nvdimm label Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " Xiao Guangrong 2016-06-17 11:08 ` [PATCH v5 03/13] acpi: add aml_object_type Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " Xiao Guangrong 2016-06-17 11:08 ` [PATCH v5 04/13] acpi: add aml_call5 Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " Xiao Guangrong 2016-06-17 11:08 ` [PATCH v5 05/13] nvdimm acpi: set HDLE properly Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " Xiao Guangrong 2016-06-17 11:08 ` [PATCH v5 06/13] nvdimm acpi: save arg3 of _DSM method Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " Xiao Guangrong 2016-06-17 11:08 ` Xiao Guangrong [this message] 2016-06-17 11:08 ` [Qemu-devel] [PATCH v5 07/13] nvdimm acpi: check UUID Xiao Guangrong 2016-06-17 11:08 ` [PATCH v5 08/13] nvdimm acpi: abstract the operations for root & nvdimm devices Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " Xiao Guangrong 2016-06-17 11:08 ` [PATCH v5 09/13] nvdimm acpi: check revision Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " Xiao Guangrong 2016-06-17 11:08 ` [PATCH v5 10/13] nvdimm acpi: support Get Namespace Label Size function Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " Xiao Guangrong 2016-06-17 11:08 ` [PATCH v5 11/13] nvdimm acpi: support Get Namespace Label Data function Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " Xiao Guangrong 2016-06-17 11:08 ` [PATCH v5 12/13] nvdimm acpi: support Set " Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " Xiao Guangrong 2016-06-17 11:08 ` [PATCH v5 13/13] docs: add NVDIMM ACPI documentation Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " Xiao Guangrong 2016-06-22 19:19 ` [Qemu-devel] [PATCH v5 00/13] NVDIMM: introduce nvdimm label support Stefan Hajnoczi 2016-06-22 22:10 ` Michael S. Tsirkin 2016-06-23 8:22 ` Stefan Hajnoczi
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=1466161696-99298-8-git-send-email-guangrong.xiao@linux.intel.com \ --to=guangrong.xiao@linux.intel.com \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=qemu-devel@nongnu.org \ /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.