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: 490213 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 908A51401AB for ; Thu, 2 Jul 2015 01:06:51 +1000 (AEST) Received: from localhost ([::1]:59492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAJb7-0008AI-FR for incoming@patchwork.ozlabs.org; Wed, 01 Jul 2015 11:06:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAJQY-0006G5-FG for qemu-devel@nongnu.org; Wed, 01 Jul 2015 10:55:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAJQW-0004qE-Jy for qemu-devel@nongnu.org; Wed, 01 Jul 2015 10:55:54 -0400 Received: from mga11.intel.com ([192.55.52.93]:65470) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAJQW-0004RQ-DH for qemu-devel@nongnu.org; Wed, 01 Jul 2015 10:55:52 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.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 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> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 Cc: Xiao Guangrong , ehabkost@redhat.com, kvm@vger.kernel.org, mst@redhat.com, gleb@kernel.org, mtosatti@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, rth@twiddle.net Subject: [Qemu-devel] [PATCH 15/16] nvdimm: support NFIT_CMD_GET_CONFIG_DATA X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; };