From patchwork Fri Aug 14 14:52:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 7015751 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 502F5C05AC for ; Fri, 14 Aug 2015 14:59:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 637B2207F9 for ; Fri, 14 Aug 2015 14:59:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 86455207DC for ; Fri, 14 Aug 2015 14:59:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755456AbbHNO7G (ORCPT ); Fri, 14 Aug 2015 10:59:06 -0400 Received: from mga14.intel.com ([192.55.52.115]:48468 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755364AbbHNO7A (ORCPT ); Fri, 14 Aug 2015 10:59:00 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 14 Aug 2015 07:59:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,678,1432623600"; d="scan'208";a="748633514" Received: from xiao.sh.intel.com ([10.239.159.86]) by orsmga001.jf.intel.com with ESMTP; 14 Aug 2015 07:58:41 -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 16/18] nvdimm: support NFIT_CMD_GET_CONFIG_DATA Date: Fri, 14 Aug 2015 22:52:09 +0800 Message-Id: <1439563931-12352-17-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 5 is used to get Namespace Label Data Signed-off-by: Xiao Guangrong --- hw/mem/nvdimm/acpi.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/hw/mem/nvdimm/acpi.c b/hw/mem/nvdimm/acpi.c index 0a5f2c2..517d710 100644 --- a/hw/mem/nvdimm/acpi.c +++ b/hw/mem/nvdimm/acpi.c @@ -352,6 +352,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)]; }; @@ -454,6 +455,34 @@ dsm_cmd_config_size(PCNVDIMMDevice *nvdimm, struct dsm_buffer *in, return NFIT_STATUS_SUCCESS; } +static uint32_t +dsm_cmd_config_get(PCNVDIMMDevice *nvdimm, struct dsm_buffer *in, + struct dsm_out *out) +{ + struct cmd_in_get_config_data *cmd_in = &in->cmd_config_get; + uint32_t status; + + le32_to_cpus(&cmd_in->length); + le32_to_cpus(&cmd_in->offset); + + 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: + return status; +} + static void dsm_write_nvdimm(struct dsm_buffer *in, struct dsm_out *out) { GSList *list = get_nvdimm_built_list(); @@ -478,6 +507,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(nvdimm, in, out); break; + case NFIT_CMD_GET_CONFIG_DATA: + status = dsm_cmd_config_get(nvdimm, in, out); + break; default: status = NFIT_STATUS_NOT_SUPPORTED; };