From patchwork Mon Nov 2 09:13:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 7535061 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CB81DBEEA4 for ; Mon, 2 Nov 2015 09:21:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D8FB2205E9 for ; Mon, 2 Nov 2015 09:21:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE25B2052C for ; Mon, 2 Nov 2015 09:21:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753395AbbKBJVQ (ORCPT ); Mon, 2 Nov 2015 04:21:16 -0500 Received: from mga02.intel.com ([134.134.136.20]:55106 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753483AbbKBJUy (ORCPT ); Mon, 2 Nov 2015 04:20:54 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 02 Nov 2015 01:20:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,234,1444719600"; d="scan'208";a="840963487" Received: from xiaoreal1.sh.intel.com (HELO xiaoreal1.sh.intel.com.sh.intel.com) ([10.239.48.79]) by fmsmga002.fm.intel.com with ESMTP; 02 Nov 2015 01:20:17 -0800 From: Xiao Guangrong 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, vsementsov@virtuozzo.com, eblake@redhat.com, Xiao Guangrong Subject: [PATCH v7 30/35] nvdimm acpi: support Get Namespace Label Size function Date: Mon, 2 Nov 2015 17:13:32 +0800 Message-Id: <1446455617-129562-31-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1446455617-129562-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1446455617-129562-1-git-send-email-guangrong.xiao@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Function 4 is used to get Namespace label size Reviewed-by: Stefan Hajnoczi Signed-off-by: Xiao Guangrong --- hw/acpi/nvdimm.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 3895ad8..cdc361c 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -407,15 +407,48 @@ enum { NVDIMM_DSM_DEV_STATUS_VENDOR_SPECIFIC_ERROR = 4, }; +struct NvdimmFuncInGetLabelData { + uint32_t offset; /* the offset in the namespace label data area. */ + uint32_t length; /* the size of data is to be read via the function. */ +} QEMU_PACKED; +typedef struct NvdimmFuncInGetLabelData NvdimmFuncInGetLabelData; + +struct NvdimmFuncInSetLabelData { + uint32_t offset; /* the offset in the namespace label data area. */ + uint32_t length; /* the size of data is to be written via the function. */ + uint8_t in_buf[0]; /* the data written to label data area. */ +} QEMU_PACKED; +typedef struct NvdimmFuncInSetLabelData NvdimmFuncInSetLabelData; + struct NvdimmDsmIn { uint32_t handle; uint32_t revision; uint32_t function; /* the remaining size in the page is used by arg3. */ - uint8_t arg3[0]; + union { + uint8_t arg3[0]; + NvdimmFuncInSetLabelData func_set_label_data; + }; } QEMU_PACKED; typedef struct NvdimmDsmIn NvdimmDsmIn; +struct NvdimmFuncOutLabelSize { + uint32_t status; /* return status code. */ + uint32_t label_size; /* the size of label data area. */ + /* + * Maximum size of the namespace label data length supported by + * the platform in Get/Set Namespace Label Data functions. + */ + uint32_t max_xfer; +} QEMU_PACKED; +typedef struct NvdimmFuncOutLabelSize NvdimmFuncOutLabelSize; + +struct NvdimmFuncOutGetLabelData { + uint32_t status; /*return status code. */ + uint8_t out_buf[0]; /* the data got via Get Namesapce Label function. */ +} QEMU_PACKED; +typedef struct NvdimmFuncOutGetLabelData NvdimmFuncOutGetLabelData; + static void nvdimm_dsm_write_status(GArray *out, uint32_t status) { status = cpu_to_le32(status); @@ -445,6 +478,55 @@ static void nvdimm_dsm_root(NvdimmDsmIn *in, GArray *out) nvdimm_dsm_write_status(out, status); } +/* + * the max transfer size is the max size transferred by both a + * 'Get Namespace Label Data' function and a 'Set Namespace Label Data' + * function. + */ +static uint32_t nvdimm_get_max_xfer_label_size(void) +{ + NvdimmDsmIn *in; + uint32_t max_get_size, max_set_size, dsm_memory_size = TARGET_PAGE_SIZE; + + /* + * the max data ACPI can read one time which is transferred by + * the response of 'Get Namespace Label Data' function. + */ + max_get_size = dsm_memory_size - sizeof(NvdimmFuncOutGetLabelData); + + /* + * the max data ACPI can write one time which is transferred by + * 'Set Namespace Label Data' function. + */ + max_set_size = dsm_memory_size - offsetof(NvdimmDsmIn, arg3) - + sizeof(in->func_set_label_data); + + return MIN(max_get_size, max_set_size); +} + +/* + * DSM Spec Rev1 4.4 Get Namespace Label Size (Function Index 4). + * + * It gets the size of Namespace Label data area and the max data size + * that Get/Set Namespace Label Data functions can transfer. + */ +static void nvdimm_dsm_func_label_size(NVDIMMDevice *nvdimm, GArray *out) +{ + NvdimmFuncOutLabelSize func_label_size; + uint32_t label_size, mxfer; + + label_size = nvdimm->label_size; + mxfer = nvdimm_get_max_xfer_label_size(); + + nvdimm_debug("label_size %#x, max_xfer %#x.\n", label_size, mxfer); + + func_label_size.status = cpu_to_le32(NVDIMM_DSM_STATUS_SUCCESS); + func_label_size.label_size = cpu_to_le32(label_size); + func_label_size.max_xfer = cpu_to_le32(mxfer); + + g_array_append_vals(out, &func_label_size, sizeof(func_label_size)); +} + static void nvdimm_dsm_device(NvdimmDsmIn *in, GArray *out) { GSList *list = nvdimm_get_plugged_device_list(); @@ -469,6 +551,9 @@ static void nvdimm_dsm_device(NvdimmDsmIn *in, GArray *out) 1 << 6 /* Set Namespace Label Data */); build_append_int_noprefix(out, cmd_list, sizeof(cmd_list)); goto free; + case 0x4 /* Get Namespace Label Size */: + nvdimm_dsm_func_label_size(nvdimm, out); + goto free; default: status = NVDIMM_DSM_STATUS_NOT_SUPPORTED; };