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, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong <guangrong.xiao@linux.intel.com> Subject: [PATCH 12/16] nvdimm: save arg3 for NVDIMM device _DSM method Date: Wed, 1 Jul 2015 22:50:28 +0800 [thread overview] Message-ID: <1435762232-15543-13-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1435762232-15543-1-git-send-email-guangrong.xiao@linux.intel.com> Check if the function (Arg2) has additional input info (arg3) and save the info if needed We only do the save on NVDIMM device since we are not going to support any function on root device Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/mem/pc-nvdimm.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/hw/mem/pc-nvdimm.c b/hw/mem/pc-nvdimm.c index 0e2a9d5..c0965ae 100644 --- a/hw/mem/pc-nvdimm.c +++ b/hw/mem/pc-nvdimm.c @@ -329,6 +329,26 @@ static void build_nfit_table(GSList *device_list, char *buf) } } +enum { + NFIT_CMD_IMPLEMENTED = 0, + + /* bus commands */ + NFIT_CMD_ARS_CAP = 1, + NFIT_CMD_ARS_START = 2, + NFIT_CMD_ARS_QUERY = 3, + + /* per-dimm commands */ + NFIT_CMD_SMART = 1, + NFIT_CMD_SMART_THRESHOLD = 2, + NFIT_CMD_DIMM_FLAGS = 3, + NFIT_CMD_GET_CONFIG_SIZE = 4, + NFIT_CMD_GET_CONFIG_DATA = 5, + NFIT_CMD_SET_CONFIG_DATA = 6, + NFIT_CMD_VENDOR_EFFECT_LOG_SIZE = 7, + NFIT_CMD_VENDOR_EFFECT_LOG = 8, + NFIT_CMD_VENDOR = 9, +}; + struct dsm_buffer { /* RAM page. */ uint32_t handle; @@ -433,6 +453,19 @@ exit: g_slist_free(list); } +static bool device_cmd_has_arg3[] = { + false, /* NFIT_CMD_IMPLEMENTED */ + false, /* NFIT_CMD_SMART */ + false, /* NFIT_CMD_SMART_THRESHOLD */ + false, /* NFIT_CMD_DIMM_FLAGS */ + false, /* NFIT_CMD_GET_CONFIG_SIZE */ + true, /* NFIT_CMD_GET_CONFIG_DATA */ + true, /* NFIT_CMD_SET_CONFIG_DATA */ + false, /* NFIT_CMD_VENDOR_EFFECT_LOG_SIZE */ + false, /* NFIT_CMD_VENDOR_EFFECT_LOG */ + false, /* NFIT_CMD_VENDOR */ +}; + #define BUILD_STA_METHOD(_dev_, _method_) \ do { \ _method_ = aml_method("_STA", 0); \ @@ -457,10 +490,20 @@ exit: static void build_nvdimm_devices(Aml *root_dev, GSList *list) { + Aml *has_arg3; + int i, cmd_nr; + + cmd_nr = ARRAY_SIZE(device_cmd_has_arg3); + has_arg3 = aml_package(cmd_nr); + for (i = 0; i < cmd_nr; i++) { + aml_append(has_arg3, aml_int(device_cmd_has_arg3[i])); + } + aml_append(root_dev, aml_name_decl("CAG3", has_arg3)); + for (; list; list = list->next) { PCNVDIMMDevice *nvdimm = list->data; uint32_t handle = nvdimm_index_to_handle(nvdimm->device_index); - Aml *dev, *method; + Aml *dev, *method, *ifctx; dev = aml_device("NVD%d", nvdimm->device_index); aml_append(dev, aml_name_decl("_ADR", aml_int(handle))); @@ -470,6 +513,34 @@ static void build_nvdimm_devices(Aml *root_dev, GSList *list) method = aml_method("_DSM", 4); { SAVE_ARG012_HANDLE(method, aml_int(handle)); + + /* Local5 = DeRefOf(Index(CAG3, Arg2)) */ + aml_append(method, + aml_store(aml_derefof(aml_index(aml_name("CAG3"), + aml_arg(2))), aml_local(5))); + /* if 0 < local5 */ + ifctx = aml_if(aml_lless(aml_int(0), aml_local(5))); + { + /* Local0 = Index(Arg3, 0) */ + aml_append(ifctx, aml_store(aml_index(aml_arg(3), aml_int(0)), + aml_local(0))); + /* Local1 = sizeof(Local0) */ + aml_append(ifctx, aml_store(aml_sizeof(aml_local(0)), + aml_local(1))); + /* Local2 = Local1 << 3 */ + aml_append(ifctx, aml_store(aml_shiftleft(aml_local(1), + aml_int(3)), aml_local(2))); + /* Local3 = DeRefOf(Local0) */ + aml_append(ifctx, aml_store(aml_derefof(aml_local(0)), + aml_local(3))); + /* CreateField(Local3, 0, local2, IBUF) */ + aml_append(ifctx, aml_create_field(aml_local(3), + aml_int(0), aml_local(2), "IBUF")); + /* ARG3 = IBUF */ + aml_append(ifctx, aml_store(aml_name("IBUF"), + aml_name("ARG3"))); + } + aml_append(method, ifctx); NOTIFY_AND_RETURN(method); } aml_append(dev, method); -- 2.1.0
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, rth@twiddle.net Subject: [Qemu-devel] [PATCH 12/16] nvdimm: save arg3 for NVDIMM device _DSM method Date: Wed, 1 Jul 2015 22:50:28 +0800 [thread overview] Message-ID: <1435762232-15543-13-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1435762232-15543-1-git-send-email-guangrong.xiao@linux.intel.com> Check if the function (Arg2) has additional input info (arg3) and save the info if needed We only do the save on NVDIMM device since we are not going to support any function on root device Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/mem/pc-nvdimm.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/hw/mem/pc-nvdimm.c b/hw/mem/pc-nvdimm.c index 0e2a9d5..c0965ae 100644 --- a/hw/mem/pc-nvdimm.c +++ b/hw/mem/pc-nvdimm.c @@ -329,6 +329,26 @@ static void build_nfit_table(GSList *device_list, char *buf) } } +enum { + NFIT_CMD_IMPLEMENTED = 0, + + /* bus commands */ + NFIT_CMD_ARS_CAP = 1, + NFIT_CMD_ARS_START = 2, + NFIT_CMD_ARS_QUERY = 3, + + /* per-dimm commands */ + NFIT_CMD_SMART = 1, + NFIT_CMD_SMART_THRESHOLD = 2, + NFIT_CMD_DIMM_FLAGS = 3, + NFIT_CMD_GET_CONFIG_SIZE = 4, + NFIT_CMD_GET_CONFIG_DATA = 5, + NFIT_CMD_SET_CONFIG_DATA = 6, + NFIT_CMD_VENDOR_EFFECT_LOG_SIZE = 7, + NFIT_CMD_VENDOR_EFFECT_LOG = 8, + NFIT_CMD_VENDOR = 9, +}; + struct dsm_buffer { /* RAM page. */ uint32_t handle; @@ -433,6 +453,19 @@ exit: g_slist_free(list); } +static bool device_cmd_has_arg3[] = { + false, /* NFIT_CMD_IMPLEMENTED */ + false, /* NFIT_CMD_SMART */ + false, /* NFIT_CMD_SMART_THRESHOLD */ + false, /* NFIT_CMD_DIMM_FLAGS */ + false, /* NFIT_CMD_GET_CONFIG_SIZE */ + true, /* NFIT_CMD_GET_CONFIG_DATA */ + true, /* NFIT_CMD_SET_CONFIG_DATA */ + false, /* NFIT_CMD_VENDOR_EFFECT_LOG_SIZE */ + false, /* NFIT_CMD_VENDOR_EFFECT_LOG */ + false, /* NFIT_CMD_VENDOR */ +}; + #define BUILD_STA_METHOD(_dev_, _method_) \ do { \ _method_ = aml_method("_STA", 0); \ @@ -457,10 +490,20 @@ exit: static void build_nvdimm_devices(Aml *root_dev, GSList *list) { + Aml *has_arg3; + int i, cmd_nr; + + cmd_nr = ARRAY_SIZE(device_cmd_has_arg3); + has_arg3 = aml_package(cmd_nr); + for (i = 0; i < cmd_nr; i++) { + aml_append(has_arg3, aml_int(device_cmd_has_arg3[i])); + } + aml_append(root_dev, aml_name_decl("CAG3", has_arg3)); + for (; list; list = list->next) { PCNVDIMMDevice *nvdimm = list->data; uint32_t handle = nvdimm_index_to_handle(nvdimm->device_index); - Aml *dev, *method; + Aml *dev, *method, *ifctx; dev = aml_device("NVD%d", nvdimm->device_index); aml_append(dev, aml_name_decl("_ADR", aml_int(handle))); @@ -470,6 +513,34 @@ static void build_nvdimm_devices(Aml *root_dev, GSList *list) method = aml_method("_DSM", 4); { SAVE_ARG012_HANDLE(method, aml_int(handle)); + + /* Local5 = DeRefOf(Index(CAG3, Arg2)) */ + aml_append(method, + aml_store(aml_derefof(aml_index(aml_name("CAG3"), + aml_arg(2))), aml_local(5))); + /* if 0 < local5 */ + ifctx = aml_if(aml_lless(aml_int(0), aml_local(5))); + { + /* Local0 = Index(Arg3, 0) */ + aml_append(ifctx, aml_store(aml_index(aml_arg(3), aml_int(0)), + aml_local(0))); + /* Local1 = sizeof(Local0) */ + aml_append(ifctx, aml_store(aml_sizeof(aml_local(0)), + aml_local(1))); + /* Local2 = Local1 << 3 */ + aml_append(ifctx, aml_store(aml_shiftleft(aml_local(1), + aml_int(3)), aml_local(2))); + /* Local3 = DeRefOf(Local0) */ + aml_append(ifctx, aml_store(aml_derefof(aml_local(0)), + aml_local(3))); + /* CreateField(Local3, 0, local2, IBUF) */ + aml_append(ifctx, aml_create_field(aml_local(3), + aml_int(0), aml_local(2), "IBUF")); + /* ARG3 = IBUF */ + aml_append(ifctx, aml_store(aml_name("IBUF"), + aml_name("ARG3"))); + } + aml_append(method, ifctx); NOTIFY_AND_RETURN(method); } aml_append(dev, method); -- 2.1.0
next prev parent reply other threads:[~2015-07-01 14:55 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-07-01 14:50 [PATCH 00/16] implement vNVDIMM Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 01/16] acpi: allow aml_operation_region() working on 64 bit offset Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 02/16] i386/acpi-build: allow SSDT to operate on 64 bit Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 03/16] acpi: add aml_derefof Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 04/16] acpi: add aml_sizeof Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 05/16] acpi: add aml_create_field Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 06/16] pc: implement NVDIMM device abstract Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 07/16] nvdimm: reserve address range for NVDIMM Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 08/16] nvdimm: init backend memory mapping and config data area Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 09/16] nvdimm: build ACPI NFIT table Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 10/16] nvdimm: init the address region used by _DSM method Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 11/16] nvdimm: build ACPI nvdimm devices Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` Xiao Guangrong [this message] 2015-07-01 14:50 ` [Qemu-devel] [PATCH 12/16] nvdimm: save arg3 for NVDIMM device _DSM method Xiao Guangrong 2015-07-01 14:50 ` [PATCH 13/16] nvdimm: support NFIT_CMD_IMPLEMENTED function Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 14/16] nvdimm: support NFIT_CMD_GET_CONFIG_SIZE function Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-02 9:23 ` Stefan Hajnoczi 2015-07-02 9:23 ` [Qemu-devel] " Stefan Hajnoczi 2015-07-02 18:02 ` Xiao Guangrong 2015-07-02 18:02 ` Xiao Guangrong 2015-07-01 14:50 ` [PATCH 15/16] nvdimm: support NFIT_CMD_GET_CONFIG_DATA Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 16/16] nvdimm: support NFIT_CMD_SET_CONFIG_DATA Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-02 6:17 ` [PATCH 00/16] implement vNVDIMM Michael S. Tsirkin 2015-07-02 6:17 ` [Qemu-devel] " Michael S. Tsirkin 2015-07-02 6:34 ` Xiao Guangrong 2015-07-02 6:34 ` [Qemu-devel] " Xiao Guangrong 2015-07-02 8:31 ` Stefan Hajnoczi 2015-07-02 8:31 ` Stefan Hajnoczi 2015-07-02 8:35 ` Michael S. Tsirkin 2015-07-02 8:35 ` Michael S. Tsirkin 2015-07-02 9:20 ` Stefan Hajnoczi 2015-07-02 9:20 ` Stefan Hajnoczi 2015-07-02 9:52 ` Paolo Bonzini 2015-07-02 9:52 ` Paolo Bonzini 2015-07-02 18:01 ` Xiao Guangrong 2015-07-02 18:01 ` [Qemu-devel] " Xiao Guangrong 2015-07-02 18:11 ` Paolo Bonzini 2015-07-02 18:11 ` Paolo Bonzini 2015-07-29 8:41 ` 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=1435762232-15543-13-git-send-email-guangrong.xiao@linux.intel.com \ --to=guangrong.xiao@linux.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.