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 12/13] nvdimm acpi: support Set Namespace Label Data function Date: Fri, 17 Jun 2016 19:08:15 +0800 [thread overview] Message-ID: <1466161696-99298-13-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1466161696-99298-1-git-send-email-guangrong.xiao@linux.intel.com> Function 6 is used to set Namespace Label Data Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> 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 | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 4c29268..74ce708 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -463,6 +463,8 @@ struct NvdimmFuncSetLabelDataIn { uint8_t in_buf[0]; /* the data written to label data area. */ } QEMU_PACKED; typedef struct NvdimmFuncSetLabelDataIn NvdimmFuncSetLabelDataIn; +QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncSetLabelDataIn) + + offsetof(NvdimmDsmIn, arg3) > 4096); static void nvdimm_dsm_function0(uint32_t supported_func, hwaddr dsm_mem_addr) @@ -616,6 +618,39 @@ static void nvdimm_dsm_get_label_data(NVDIMMDevice *nvdimm, NvdimmDsmIn *in, g_free(get_label_data_out); } +/* + * DSM Spec Rev1 4.6 Set Namespace Label Data (Function Index 6). + */ +static void nvdimm_dsm_set_label_data(NVDIMMDevice *nvdimm, NvdimmDsmIn *in, + hwaddr dsm_mem_addr) +{ + NVDIMMClass *nvc = NVDIMM_GET_CLASS(nvdimm); + NvdimmFuncSetLabelDataIn *set_label_data; + uint32_t status; + + set_label_data = (NvdimmFuncSetLabelDataIn *)in->arg3; + + le32_to_cpus(&set_label_data->offset); + le32_to_cpus(&set_label_data->length); + + nvdimm_debug("Write Label Data: offset %#x length %#x.\n", + set_label_data->offset, set_label_data->length); + + status = nvdimm_rw_label_data_check(nvdimm, set_label_data->offset, + set_label_data->length); + if (status != 0 /* Success */) { + nvdimm_dsm_no_payload(status, dsm_mem_addr); + return; + } + + assert(sizeof(*in) + sizeof(*set_label_data) + set_label_data->length <= + 4096); + + nvc->write_label_data(nvdimm, set_label_data->in_buf, + set_label_data->length, set_label_data->offset); + nvdimm_dsm_no_payload(0 /* Success */, dsm_mem_addr); +} + static void nvdimm_dsm_device(NvdimmDsmIn *in, hwaddr dsm_mem_addr) { NVDIMMDevice *nvdimm = nvdimm_get_device_by_handle(in->handle); @@ -629,7 +664,8 @@ static void nvdimm_dsm_device(NvdimmDsmIn *in, hwaddr dsm_mem_addr) support for any functions other than function 0. */ | 1 << 4 /* Get Namespace Label Size */ | - 1 << 5 /* Get Namespace Label Data */; + 1 << 5 /* Get Namespace Label Data */ | + 1 << 6 /* Set Namespace Label Data */; } nvdimm_dsm_function0(supported_func, dsm_mem_addr); return; @@ -655,6 +691,12 @@ static void nvdimm_dsm_device(NvdimmDsmIn *in, hwaddr dsm_mem_addr) return; } break; + case 0x6 /* Set Namespace Label Data */: + if (nvdimm->label_size) { + nvdimm_dsm_set_label_data(nvdimm, in, dsm_mem_addr); + return; + } + break; } nvdimm_dsm_no_payload(1 /* Not Supported */, dsm_mem_addr); -- 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 12/13] nvdimm acpi: support Set Namespace Label Data function Date: Fri, 17 Jun 2016 19:08:15 +0800 [thread overview] Message-ID: <1466161696-99298-13-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1466161696-99298-1-git-send-email-guangrong.xiao@linux.intel.com> Function 6 is used to set Namespace Label Data Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> 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 | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 4c29268..74ce708 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -463,6 +463,8 @@ struct NvdimmFuncSetLabelDataIn { uint8_t in_buf[0]; /* the data written to label data area. */ } QEMU_PACKED; typedef struct NvdimmFuncSetLabelDataIn NvdimmFuncSetLabelDataIn; +QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncSetLabelDataIn) + + offsetof(NvdimmDsmIn, arg3) > 4096); static void nvdimm_dsm_function0(uint32_t supported_func, hwaddr dsm_mem_addr) @@ -616,6 +618,39 @@ static void nvdimm_dsm_get_label_data(NVDIMMDevice *nvdimm, NvdimmDsmIn *in, g_free(get_label_data_out); } +/* + * DSM Spec Rev1 4.6 Set Namespace Label Data (Function Index 6). + */ +static void nvdimm_dsm_set_label_data(NVDIMMDevice *nvdimm, NvdimmDsmIn *in, + hwaddr dsm_mem_addr) +{ + NVDIMMClass *nvc = NVDIMM_GET_CLASS(nvdimm); + NvdimmFuncSetLabelDataIn *set_label_data; + uint32_t status; + + set_label_data = (NvdimmFuncSetLabelDataIn *)in->arg3; + + le32_to_cpus(&set_label_data->offset); + le32_to_cpus(&set_label_data->length); + + nvdimm_debug("Write Label Data: offset %#x length %#x.\n", + set_label_data->offset, set_label_data->length); + + status = nvdimm_rw_label_data_check(nvdimm, set_label_data->offset, + set_label_data->length); + if (status != 0 /* Success */) { + nvdimm_dsm_no_payload(status, dsm_mem_addr); + return; + } + + assert(sizeof(*in) + sizeof(*set_label_data) + set_label_data->length <= + 4096); + + nvc->write_label_data(nvdimm, set_label_data->in_buf, + set_label_data->length, set_label_data->offset); + nvdimm_dsm_no_payload(0 /* Success */, dsm_mem_addr); +} + static void nvdimm_dsm_device(NvdimmDsmIn *in, hwaddr dsm_mem_addr) { NVDIMMDevice *nvdimm = nvdimm_get_device_by_handle(in->handle); @@ -629,7 +664,8 @@ static void nvdimm_dsm_device(NvdimmDsmIn *in, hwaddr dsm_mem_addr) support for any functions other than function 0. */ | 1 << 4 /* Get Namespace Label Size */ | - 1 << 5 /* Get Namespace Label Data */; + 1 << 5 /* Get Namespace Label Data */ | + 1 << 6 /* Set Namespace Label Data */; } nvdimm_dsm_function0(supported_func, dsm_mem_addr); return; @@ -655,6 +691,12 @@ static void nvdimm_dsm_device(NvdimmDsmIn *in, hwaddr dsm_mem_addr) return; } break; + case 0x6 /* Set Namespace Label Data */: + if (nvdimm->label_size) { + nvdimm_dsm_set_label_data(nvdimm, in, dsm_mem_addr); + return; + } + break; } nvdimm_dsm_no_payload(1 /* Not Supported */, dsm_mem_addr); -- 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 ` [PATCH v5 07/13] nvdimm acpi: check UUID Xiao Guangrong 2016-06-17 11:08 ` [Qemu-devel] " 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 ` Xiao Guangrong [this message] 2016-06-17 11:08 ` [Qemu-devel] [PATCH v5 12/13] nvdimm acpi: support Set " 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-13-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.