From patchwork Fri Aug 14 14:52:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 7015761 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 0EA929F344 for ; Fri, 14 Aug 2015 14:59:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3D0D1207DC for ; Fri, 14 Aug 2015 14:59:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4AF23203B0 for ; Fri, 14 Aug 2015 14:59:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932140AbbHNO7F (ORCPT ); Fri, 14 Aug 2015 10:59:05 -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 S1755447AbbHNO7B (ORCPT ); Fri, 14 Aug 2015 10:59:01 -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="748633537" Received: from xiao.sh.intel.com ([10.239.159.86]) by orsmga001.jf.intel.com with ESMTP; 14 Aug 2015 07:58:43 -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 17/18] nvdimm: support NFIT_CMD_SET_CONFIG_DATA Date: Fri, 14 Aug 2015 22:52:10 +0800 Message-Id: <1439563931-12352-18-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 6 is used to set Namespace Label Data Signed-off-by: Xiao Guangrong --- hw/mem/nvdimm/acpi.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/hw/mem/nvdimm/acpi.c b/hw/mem/nvdimm/acpi.c index 517d710..283228d 100644 --- a/hw/mem/nvdimm/acpi.c +++ b/hw/mem/nvdimm/acpi.c @@ -382,12 +382,17 @@ struct cmd_out_get_config_data { uint8_t out_buf[0]; } QEMU_PACKED; +struct cmd_out_set_config_data { + uint32_t status; +} 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; + struct cmd_out_set_config_data cmd_config_set; uint8_t data[PAGE_SIZE]; }; }; @@ -483,6 +488,38 @@ exit: return status; } +static uint32_t +dsm_cmd_config_set(PCNVDIMMDevice *nvdimm, struct dsm_buffer *in, + struct dsm_out *out) +{ + struct cmd_in_set_config_data *cmd_in = &in->cmd_config_set; + uint32_t status; + + if (!nvdimm->configdata) { + status = NFIT_STATUS_NOT_SUPPORTED; + goto exit; + } + + le32_to_cpus(&cmd_in->length); + le32_to_cpus(&cmd_in->offset); + + nvdebug("Write 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(nvdimm->config_data_addr + cmd_in->offset, cmd_in->in_buf, + 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(); @@ -510,6 +547,9 @@ static void dsm_write_nvdimm(struct dsm_buffer *in, struct dsm_out *out) case NFIT_CMD_GET_CONFIG_DATA: status = dsm_cmd_config_get(nvdimm, in, out); break; + case NFIT_CMD_SET_CONFIG_DATA: + status = dsm_cmd_config_set(nvdimm, in, out); + break; default: status = NFIT_STATUS_NOT_SUPPORTED; };