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 07/15] nvdimm acpi: set HDLE properly Date: Thu, 17 Mar 2016 16:32:53 +0800 [thread overview] Message-ID: <1458203581-59143-8-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1458203581-59143-1-git-send-email-guangrong.xiao@linux.intel.com> Now we pass HDLE to Qemu properly, use 0 for root device and use the handle for nvdimm devices Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Xiao Guangrong <guangrong.xiao@linux.intel.com> To: pbonzini@redhat.com, imammedo@redhat.com Cc: Xiao Guangrong <guangrong.xiao@linux.intel.com>, ehabkost@redhat.com, kvm@vger.kernel.org, mst@redhat.com, gleb@kernel.org, mtosatti@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, dan.j.williams@intel.com, rth@twiddle.net Subject: [Qemu-devel] [PATCH 07/15] nvdimm acpi: set HDLE properly Date: Thu, 17 Mar 2016 16:32:53 +0800 [thread overview] Message-ID: <1458203581-59143-8-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1458203581-59143-1-git-send-email-guangrong.xiao@linux.intel.com> Now we pass HDLE to Qemu properly, use 0 for root device and use the handle for nvdimm devices Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- 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
next prev parent reply other threads:[~2016-03-17 8:33 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-03-17 8:32 [PATCH 00/15] NVDIMM: introduce nvdimm label support Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 01/15] pc-dimm: get memory region from ->get_memory_region() Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 02/15] pc-dimm: introduce realize callback Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 03/15] pc-dimm: keep the state of the whole backend memory Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 04/15] nvdimm: support nvdimm label Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 10:28 ` Stefan Hajnoczi 2016-03-17 10:28 ` [Qemu-devel] " Stefan Hajnoczi 2016-03-23 3:40 ` Xiao Guangrong 2016-03-23 3:40 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 05/15] acpi: add aml_object_type Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 06/15] acpi: add aml_call5 Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` Xiao Guangrong [this message] 2016-03-17 8:32 ` [Qemu-devel] [PATCH 07/15] nvdimm acpi: set HDLE properly Xiao Guangrong 2016-03-17 8:32 ` [PATCH 08/15] nvdimm acpi: save arg3 of _DSM method Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 09/15] nvdimm acpi: check UUID Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 10/15] nvdimm acpi: abstract the operations for root device and nvdimm devices Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 10:35 ` Stefan Hajnoczi 2016-03-17 10:35 ` [Qemu-devel] " Stefan Hajnoczi 2016-03-23 3:43 ` Xiao Guangrong 2016-03-23 3:43 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 11/15] nvdimm acpi: check revision Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 12/15] nvdimm acpi: support Get Namespace Label Size function Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 10:58 ` Stefan Hajnoczi 2016-03-17 10:58 ` [Qemu-devel] " Stefan Hajnoczi 2016-03-23 3:46 ` Xiao Guangrong 2016-03-23 3:46 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 13/15] nvdimm acpi: support Get Namespace Label Data function Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:33 ` [PATCH 14/15] nvdimm acpi: support Set " Xiao Guangrong 2016-03-17 8:33 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:33 ` [PATCH 15/15] docs: add NVDIMM ACPI documentation Xiao Guangrong 2016-03-17 8:33 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 10:04 ` [PATCH 00/15] NVDIMM: introduce nvdimm label support Stefan Hajnoczi 2016-03-17 10:04 ` [Qemu-devel] " Stefan Hajnoczi 2016-03-22 15:37 ` Dan Williams 2016-03-22 15:37 ` [Qemu-devel] " Dan Williams 2016-03-22 20:30 ` Stefan Hajnoczi 2016-03-22 20:30 ` [Qemu-devel] " Stefan Hajnoczi 2016-03-23 2:46 ` Xiao Guangrong 2016-03-23 2:46 ` [Qemu-devel] " Xiao Guangrong 2016-03-23 16:48 ` Stefan Hajnoczi 2016-03-23 16:48 ` [Qemu-devel] " Stefan Hajnoczi 2016-03-22 11:17 ` Michael S. Tsirkin 2016-03-22 11:17 ` [Qemu-devel] " Michael S. Tsirkin 2016-03-23 3:47 ` Xiao Guangrong 2016-03-23 3:47 ` [Qemu-devel] " Xiao Guangrong
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=1458203581-59143-8-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.