[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/15] nvdimm acpi: set HDLE properly
From: |
Xiao Guangrong |
Subject: |
[Qemu-devel] [PATCH 07/15] nvdimm acpi: set HDLE properly |
Date: |
Thu, 17 Mar 2016 16:32:53 +0800 |
Now we pass HDLE to Qemu properly, use 0 for root device and use the
handle for nvdimm devices
Signed-off-by: Xiao Guangrong <address@hidden>
---
hw/acpi/nvdimm.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 9531340..586c02a 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -488,7 +488,7 @@ static void nvdimm_build_common_dsm(Aml *dev)
Aml *method, *ifctx, *function, *dsm_mem, *unpatched, *result_size;
uint8_t byte_list[1];
- method = aml_method(NVDIMM_COMMON_DSM, 4, AML_SERIALIZED);
+ method = aml_method(NVDIMM_COMMON_DSM, 5, AML_SERIALIZED);
function = aml_arg(2);
dsm_mem = aml_name(NVDIMM_ACPI_MEM_ADDR);
@@ -514,11 +514,10 @@ static void nvdimm_build_common_dsm(Aml *dev)
/*
* The HDLE indicates the DSM function is issued from which device,
- * it is not used at this time as no function is supported yet.
- * Currently we make it always be 0 for all the devices and will set
- * the appropriate value once real function is implemented.
+ * 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_int(0x0), aml_name("HDLE")));
+ aml_append(method, aml_store(aml_arg(4), 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")));
@@ -540,13 +539,14 @@ static void nvdimm_build_common_dsm(Aml *dev)
aml_append(dev, method);
}
-static void nvdimm_build_device_dsm(Aml *dev)
+static void nvdimm_build_device_dsm(Aml *dev, uint32_t handle)
{
Aml *method;
method = aml_method("_DSM", 4, AML_NOTSERIALIZED);
- aml_append(method, aml_return(aml_call4(NVDIMM_COMMON_DSM, aml_arg(0),
- aml_arg(1), aml_arg(2), aml_arg(3))));
+ aml_append(method, aml_return(aml_call5(NVDIMM_COMMON_DSM, aml_arg(0),
+ aml_arg(1), aml_arg(2), aml_arg(3),
+ aml_int(handle))));
aml_append(dev, method);
}
@@ -571,7 +571,7 @@ static void nvdimm_build_nvdimm_devices(GSList
*device_list, Aml *root_dev)
*/
aml_append(nvdimm_dev, aml_name_decl("_ADR", aml_int(handle)));
- nvdimm_build_device_dsm(nvdimm_dev);
+ nvdimm_build_device_dsm(nvdimm_dev, handle);
aml_append(root_dev, nvdimm_dev);
}
}
@@ -664,7 +664,9 @@ static void nvdimm_build_ssdt(GSList *device_list, GArray
*table_offsets,
aml_append(dev, field);
nvdimm_build_common_dsm(dev);
- nvdimm_build_device_dsm(dev);
+
+ /* 0 is reserved for root device. */
+ nvdimm_build_device_dsm(dev, 0);
nvdimm_build_nvdimm_devices(device_list, dev);
--
1.8.3.1
- [Qemu-devel] [PATCH 00/15] NVDIMM: introduce nvdimm label support, Xiao Guangrong, 2016/03/17
- [Qemu-devel] [PATCH 01/15] pc-dimm: get memory region from ->get_memory_region(), Xiao Guangrong, 2016/03/17
- [Qemu-devel] [PATCH 02/15] pc-dimm: introduce realize callback, Xiao Guangrong, 2016/03/17
- [Qemu-devel] [PATCH 05/15] acpi: add aml_object_type, Xiao Guangrong, 2016/03/17
- [Qemu-devel] [PATCH 03/15] pc-dimm: keep the state of the whole backend memory, Xiao Guangrong, 2016/03/17
- [Qemu-devel] [PATCH 04/15] nvdimm: support nvdimm label, Xiao Guangrong, 2016/03/17
- [Qemu-devel] [PATCH 06/15] acpi: add aml_call5, Xiao Guangrong, 2016/03/17
- [Qemu-devel] [PATCH 07/15] nvdimm acpi: set HDLE properly,
Xiao Guangrong <=
- [Qemu-devel] [PATCH 08/15] nvdimm acpi: save arg3 of _DSM method, Xiao Guangrong, 2016/03/17
- [Qemu-devel] [PATCH 10/15] nvdimm acpi: abstract the operations for root device and nvdimm devices, Xiao Guangrong, 2016/03/17
- [Qemu-devel] [PATCH 09/15] nvdimm acpi: check UUID, Xiao Guangrong, 2016/03/17
- [Qemu-devel] [PATCH 11/15] nvdimm acpi: check revision, Xiao Guangrong, 2016/03/17
- [Qemu-devel] [PATCH 13/15] nvdimm acpi: support Get Namespace Label Data function, Xiao Guangrong, 2016/03/17
- [Qemu-devel] [PATCH 12/15] nvdimm acpi: support Get Namespace Label Size function, Xiao Guangrong, 2016/03/17