From patchwork Wed Jul 1 14:50:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 6704051 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 BB41F9F380 for ; Wed, 1 Jul 2015 14:56:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3C0D20649 for ; Wed, 1 Jul 2015 14:56:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 08FEF20648 for ; Wed, 1 Jul 2015 14:56:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754348AbbGAO4E (ORCPT ); Wed, 1 Jul 2015 10:56:04 -0400 Received: from mga03.intel.com ([134.134.136.65]:20195 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754052AbbGAOzw (ORCPT ); Wed, 1 Jul 2015 10:55:52 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 01 Jul 2015 07:55:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,386,1432623600"; d="scan'208";a="517239508" Received: from xiao.sh.intel.com ([10.239.159.86]) by FMSMGA003.fm.intel.com with ESMTP; 01 Jul 2015 07:55:50 -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 15/16] nvdimm: support NFIT_CMD_GET_CONFIG_DATA Date: Wed, 1 Jul 2015 22:50:31 +0800 Message-Id: <1435762232-15543-16-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 5 is used to get Namespace Label Data Signed-off-by: Xiao Guangrong --- hw/mem/pc-nvdimm.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/hw/mem/pc-nvdimm.c b/hw/mem/pc-nvdimm.c index 7e5446c..0498de3 100644 --- a/hw/mem/pc-nvdimm.c +++ b/hw/mem/pc-nvdimm.c @@ -423,6 +423,7 @@ struct dsm_buffer { uint32_t arg1; uint32_t arg2; union { + struct cmd_in_get_config_data cmd_config_get; struct cmd_in_set_config_data cmd_config_set; char arg3[PAGE_SIZE - 3 * sizeof(uint32_t) - 16 * sizeof(uint8_t)]; }; @@ -525,6 +526,35 @@ exit: return status; } +static uint32_t dsm_cmd_config_get(struct dsm_buffer *in, struct dsm_out *out) +{ + GSList *list = get_nvdimm_built_list(); + PCNVDIMMDevice *nvdimm = get_nvdimm_device_by_handle(list, in->handle); + struct cmd_in_get_config_data *cmd_in = &in->cmd_config_get; + uint32_t status = NFIT_STATUS_NON_EXISTING_MEM_DEV; + + if (!nvdimm) { + goto exit; + } + + nvdebug("Read Config: offset %#x length %#x.\n", cmd_in->offset, + cmd_in->length); + if (nvdimm->config_data_size < cmd_in->length + cmd_in->offset) { + nvdebug("position %#x is beyond config data (len = %#lx).\n", + cmd_in->length + cmd_in->offset, nvdimm->config_data_size); + status = NFIT_STATUS_INVALID_PARAS; + goto exit; + } + + status = NFIT_STATUS_SUCCESS; + memcpy(out->cmd_config_get.out_buf, nvdimm->config_data_addr + + cmd_in->offset, cmd_in->length); + +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; @@ -537,6 +567,9 @@ static void dsm_write_nvdimm(struct dsm_buffer *in, struct dsm_out *out) case NFIT_CMD_GET_CONFIG_SIZE: status = dsm_cmd_config_size(in, out); break; + case NFIT_CMD_GET_CONFIG_DATA: + status = dsm_cmd_config_get(in, out); + break; default: status = NFIT_STATUS_NOT_SUPPORTED; };