[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 07/13] nvdimm acpi: check UUID
From: |
Xiao Guangrong |
Subject: |
[Qemu-devel] [PATCH v3 07/13] nvdimm acpi: check UUID |
Date: |
Tue, 7 Jun 2016 20:22:03 +0800 |
Check arg0 which indicates UUID to see if it is valid
Signed-off-by: Xiao Guangrong <address@hidden>
---
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
- [Qemu-devel] [PATCH v3 00/13] NVDIMM: introduce nvdimm label support, Xiao Guangrong, 2016/06/07
- [Qemu-devel] [PATCH v3 01/13] pc-dimm: introduce get_vmstate_memory_region callback, Xiao Guangrong, 2016/06/07
- [Qemu-devel] [PATCH v3 03/13] acpi: add aml_object_type, Xiao Guangrong, 2016/06/07
- [Qemu-devel] [PATCH v3 04/13] acpi: add aml_call5, Xiao Guangrong, 2016/06/07
- [Qemu-devel] [PATCH v3 02/13] nvdimm: support nvdimm label, Xiao Guangrong, 2016/06/07
- [Qemu-devel] [PATCH v3 06/13] nvdimm acpi: save arg3 of _DSM method, Xiao Guangrong, 2016/06/07
- [Qemu-devel] [PATCH v3 05/13] nvdimm acpi: set HDLE properly, Xiao Guangrong, 2016/06/07
- [Qemu-devel] [PATCH v3 07/13] nvdimm acpi: check UUID,
Xiao Guangrong <=
- [Qemu-devel] [PATCH v3 08/13] nvdimm acpi: abstract the operations for root & nvdimm devices, Xiao Guangrong, 2016/06/07
- [Qemu-devel] [PATCH v3 11/13] nvdimm acpi: support Get Namespace Label Data function, Xiao Guangrong, 2016/06/07
- [Qemu-devel] [PATCH v3 09/13] nvdimm acpi: check revision, Xiao Guangrong, 2016/06/07
- [Qemu-devel] [PATCH v3 10/13] nvdimm acpi: support Get Namespace Label Size function, Xiao Guangrong, 2016/06/07
- [Qemu-devel] [PATCH v3 12/13] nvdimm acpi: support Set Namespace Label Data function, Xiao Guangrong, 2016/06/07
- [Qemu-devel] [PATCH v3 13/13] docs: add NVDIMM ACPI documentation, Xiao Guangrong, 2016/06/07
- Re: [Qemu-devel] [PATCH v3 00/13] NVDIMM: introduce nvdimm label support, Stefan Hajnoczi, 2016/06/08