From patchwork Fri Aug 14 14:52:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 7015781 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 C4E42C05AC for ; Fri, 14 Aug 2015 14:59:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1833206EA for ; Fri, 14 Aug 2015 14:59:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17395203B0 for ; Fri, 14 Aug 2015 14:59:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932121AbbHNO7E (ORCPT ); Fri, 14 Aug 2015 10:59:04 -0400 Received: from mga14.intel.com ([192.55.52.115]:11110 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755456AbbHNO7C (ORCPT ); Fri, 14 Aug 2015 10:59:02 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 14 Aug 2015 07:59:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,678,1432623600"; d="scan'208";a="748633480" Received: from xiao.sh.intel.com ([10.239.159.86]) by orsmga001.jf.intel.com with ESMTP; 14 Aug 2015 07:58:39 -0700 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, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong Subject: [PATCH v2 15/18] nvdimm: support NFIT_CMD_GET_CONFIG_SIZE function Date: Fri, 14 Aug 2015 22:52:08 +0800 Message-Id: <1439563931-12352-16-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1439563931-12352-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1439563931-12352-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=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 lable size Signed-off-by: Xiao Guangrong --- hw/mem/nvdimm/acpi.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/hw/mem/nvdimm/acpi.c b/hw/mem/nvdimm/acpi.c index 20aefce..0a5f2c2 100644 --- a/hw/mem/nvdimm/acpi.c +++ b/hw/mem/nvdimm/acpi.c @@ -334,6 +334,17 @@ enum { | (1 << NFIT_CMD_GET_CONFIG_SIZE) \ | (1 << NFIT_CMD_GET_CONFIG_DATA)) +struct cmd_in_get_config_data { + uint32_t offset; + uint32_t length; +} QEMU_PACKED; + +struct cmd_in_set_config_data { + uint32_t offset; + uint32_t length; + uint8_t in_buf[0]; +} QEMU_PACKED; + struct dsm_buffer { /* RAM page. */ uint32_t handle; @@ -341,6 +352,7 @@ struct dsm_buffer { uint32_t arg1; uint32_t arg2; union { + struct cmd_in_set_config_data cmd_config_set; char arg3[PAGE_SIZE - 3 * sizeof(uint32_t) - 16 * sizeof(uint8_t)]; }; @@ -358,10 +370,23 @@ struct cmd_out_implemented { uint64_t cmd_list; }; +struct cmd_out_get_config_size { + uint32_t status; + uint32_t config_size; + uint32_t max_xfer; +} QEMU_PACKED; + +struct cmd_out_get_config_data { + uint32_t status; + uint8_t out_buf[0]; +} QEMU_PACKED; + struct dsm_out { union { uint32_t status; struct cmd_out_implemented cmd_implemented; + struct cmd_out_get_config_size cmd_config_size; + struct cmd_out_get_config_data cmd_config_get; uint8_t data[PAGE_SIZE]; }; }; @@ -387,6 +412,48 @@ static void dsm_write_root(struct dsm_buffer *in, struct dsm_out *out) nvdebug("Return status %#x.\n", out->status); } +/* + * the max transfer size is the max size transfered by both a + * NFIT_CMD_GET_CONFIG_DATA and a NFIT_CMD_SET_CONFIG_DATA + * command. + */ +static uint32_t max_xfer_config_size(void) +{ + struct dsm_buffer *in; + struct dsm_out *out; + uint32_t max_get_size, max_set_size; + + /* + * the max data ACPI can read one time which is transfered by + * the response of NFIT_CMD_GET_CONFIG_DATA. + */ + max_get_size = sizeof(out->data) - sizeof(out->cmd_config_get); + + /* + * the max data ACPI can write one time which is transfered by + * NFIT_CMD_SET_CONFIG_DATA + */ + max_set_size = sizeof(in->arg3) - sizeof(in->cmd_config_set); + return MIN(max_get_size, max_set_size); +} + +static uint32_t +dsm_cmd_config_size(PCNVDIMMDevice *nvdimm, struct dsm_buffer *in, + struct dsm_out *out) +{ + uint32_t config_size, mxfer; + + config_size = nvdimm->config_data_size; + mxfer = max_xfer_config_size(); + + out->cmd_config_size.config_size = cpu_to_le32(config_size); + out->cmd_config_size.max_xfer = cpu_to_le32(mxfer); + nvdebug("%s config_size %#x, max_xfer %#x.\n", __func__, config_size, + mxfer); + + return NFIT_STATUS_SUCCESS; +} + static void dsm_write_nvdimm(struct dsm_buffer *in, struct dsm_out *out) { GSList *list = get_nvdimm_built_list(); @@ -408,6 +475,9 @@ static void dsm_write_nvdimm(struct dsm_buffer *in, struct dsm_out *out) out->cmd_implemented.cmd_list = cpu_to_le64(cmd_list); goto free; + case NFIT_CMD_GET_CONFIG_SIZE: + status = dsm_cmd_config_size(nvdimm, in, out); + break; default: status = NFIT_STATUS_NOT_SUPPORTED; };