From patchwork Wed Jul 1 14:50:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 6704041 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 191499F46B for ; Wed, 1 Jul 2015 14:56:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2BF7020648 for ; Wed, 1 Jul 2015 14:56:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 387812064C for ; Wed, 1 Jul 2015 14:56:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754050AbbGAOz5 (ORCPT ); Wed, 1 Jul 2015 10:55:57 -0400 Received: from mga03.intel.com ([134.134.136.65]:42802 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754091AbbGAOzu (ORCPT ); Wed, 1 Jul 2015 10:55:50 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 01 Jul 2015 07:55:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,386,1432623600"; d="scan'208";a="517239490" Received: from xiao.sh.intel.com ([10.239.159.86]) by FMSMGA003.fm.intel.com with ESMTP; 01 Jul 2015 07:55:47 -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 14/16] nvdimm: support NFIT_CMD_GET_CONFIG_SIZE function Date: Wed, 1 Jul 2015 22:50:30 +0800 Message-Id: <1435762232-15543-15-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1435762232-15543-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1435762232-15543-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.5 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/pc-nvdimm.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/hw/mem/pc-nvdimm.c b/hw/mem/pc-nvdimm.c index b586bf7..7e5446c 100644 --- a/hw/mem/pc-nvdimm.c +++ b/hw/mem/pc-nvdimm.c @@ -127,6 +127,20 @@ static uint32_t nvdimm_index_to_handle(int index) return index + 1; } +static PCNVDIMMDevice +*get_nvdimm_device_by_handle(GSList *list, uint32_t handle) +{ + for (; list; list = list->next) { + PCNVDIMMDevice *nvdimm = list->data; + + if (nvdimm_index_to_handle(nvdimm->device_index) == handle) { + return nvdimm; + } + } + + return NULL; +} + typedef struct { uint8_t b[16]; } uuid_le; @@ -391,6 +405,17 @@ enum { | (1 << NFIT_CMD_GET_CONFIG_DATA) \ | (1 << NFIT_CMD_SET_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; @@ -398,6 +423,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)]; }; @@ -412,10 +438,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]; }; }; @@ -441,6 +480,51 @@ 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(struct dsm_buffer *in, struct dsm_out *out) +{ + GSList *list = get_nvdimm_built_list(); + PCNVDIMMDevice *nvdimm = get_nvdimm_device_by_handle(list, in->handle); + uint32_t status = NFIT_STATUS_NON_EXISTING_MEM_DEV; + + if (!nvdimm) { + goto exit; + } + + status = NFIT_STATUS_SUCCESS; + out->cmd_config_size.config_size = nvdimm->config_data_size; + out->cmd_config_size.max_xfer = max_xfer_config_size(); + nvdebug("%s config_size %#x, max_xfer %#x.\n", __func__, + out->cmd_config_size.config_size, out->cmd_config_size.max_xfer); +exit: + g_slist_free(list); + return status; +} + static void dsm_write_nvdimm(struct dsm_buffer *in, struct dsm_out *out) { uint32_t function = in->arg2; @@ -450,6 +534,9 @@ static void dsm_write_nvdimm(struct dsm_buffer *in, struct dsm_out *out) case NFIT_CMD_IMPLEMENTED: out->cmd_implemented.cmd_list = DIMM_SUPPORT_CMD; return; + case NFIT_CMD_GET_CONFIG_SIZE: + status = dsm_cmd_config_size(in, out); + break; default: status = NFIT_STATUS_NOT_SUPPORTED; };