From patchwork Fri Aug 14 14:52:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 7015741 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 B4080C05AD for ; Fri, 14 Aug 2015 14:59:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C0C5C203B0 for ; Fri, 14 Aug 2015 14:59:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF1BE207FB for ; Fri, 14 Aug 2015 14:59:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755453AbbHNO7B (ORCPT ); Fri, 14 Aug 2015 10:59:01 -0400 Received: from mga11.intel.com ([192.55.52.93]:20385 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755447AbbHNO65 (ORCPT ); Fri, 14 Aug 2015 10:58:57 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 14 Aug 2015 07:58:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,678,1432623600"; d="scan'208";a="748633464" Received: from xiao.sh.intel.com ([10.239.159.86]) by orsmga001.jf.intel.com with ESMTP; 14 Aug 2015 07:58:37 -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 14/18] nvdimm: support NFIT_CMD_IMPLEMENTED function Date: Fri, 14 Aug 2015 22:52:07 +0800 Message-Id: <1439563931-12352-15-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 __DSM is defined in ACPI 6.0: 9.14.1 _DSM (Device Specific Method) Function 0 is a query function. We do not support any function on root device and only 3 functions are support for NVDIMM device, NFIT_CMD_GET_CONFIG_SIZE, NFIT_CMD_GET_CONFIG_DATA and NFIT_CMD_SET_CONFIG_DATA, that means we currently only allow to access device's Label Namespace Signed-off-by: Xiao Guangrong --- hw/mem/nvdimm/acpi.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/hw/mem/nvdimm/acpi.c b/hw/mem/nvdimm/acpi.c index c773954..20aefce 100644 --- a/hw/mem/nvdimm/acpi.c +++ b/hw/mem/nvdimm/acpi.c @@ -31,6 +31,7 @@ #include "exec/address-spaces.h" #include "hw/acpi/aml-build.h" #include "hw/mem/pc-nvdimm.h" +#include "sysemu/sysemu.h" #include "internal.h" @@ -41,6 +42,22 @@ static void nfit_spa_uuid_pm(void *uuid) memcpy(uuid, &uuid_pm, sizeof(uuid_pm)); } +static bool dsm_is_root_uuid(uint8_t *uuid) +{ + uuid_le uuid_root = UUID_LE(0x2f10e7a4, 0x9e91, 0x11e4, 0x89, + 0xd3, 0x12, 0x3b, 0x93, 0xf7, 0x5c, 0xba); + + return !memcmp(uuid, &uuid_root, sizeof(uuid_root)); +} + +static bool dsm_is_dimm_uuid(uint8_t *uuid) +{ + uuid_le uuid_dimm = UUID_LE(0x4309ac30, 0x0d11, 0x11e4, 0x91, + 0x91, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66); + + return !memcmp(uuid, &uuid_dimm, sizeof(uuid_dimm)); +} + enum { NFIT_TABLE_SPA = 0, NFIT_TABLE_MEM = 1, @@ -162,6 +179,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; +} + static size_t get_nfit_total_size(int nr) { /* each nvdimm has 3 tables. */ @@ -286,6 +317,23 @@ enum { NFIT_CMD_VENDOR = 9, }; +enum { + NFIT_STATUS_SUCCESS = 0, + NFIT_STATUS_NOT_SUPPORTED = 1, + NFIT_STATUS_NON_EXISTING_MEM_DEV = 2, + NFIT_STATUS_INVALID_PARAS = 3, + NFIT_STATUS_VENDOR_SPECIFIC_ERROR = 4, +}; + +#define DSM_REVISION (1) + +/* do not support any command except NFIT_CMD_IMPLEMENTED on root. */ +#define ROOT_SUPPORT_CMD (1 << NFIT_CMD_IMPLEMENTED) +/* support NFIT_CMD_SET_CONFIG_DATA iif nvdimm->configdata is true. */ +#define DIMM_SUPPORT_CMD ((1 << NFIT_CMD_IMPLEMENTED) \ + | (1 << NFIT_CMD_GET_CONFIG_SIZE) \ + | (1 << NFIT_CMD_GET_CONFIG_DATA)) + struct dsm_buffer { /* RAM page. */ uint32_t handle; @@ -306,6 +354,18 @@ struct dsm_buffer { static ram_addr_t dsm_addr; static size_t dsm_size; +struct cmd_out_implemented { + uint64_t cmd_list; +}; + +struct dsm_out { + union { + uint32_t status; + struct cmd_out_implemented cmd_implemented; + uint8_t data[PAGE_SIZE]; + }; +}; + static uint64_t dsm_read(void *opaque, hwaddr addr, unsigned size) { @@ -314,10 +374,102 @@ static uint64_t dsm_read(void *opaque, hwaddr addr, return 0; } +static void dsm_write_root(struct dsm_buffer *in, struct dsm_out *out) +{ + uint32_t function = in->arg2; + + if (function == NFIT_CMD_IMPLEMENTED) { + out->cmd_implemented.cmd_list = cpu_to_le64(ROOT_SUPPORT_CMD); + return; + } + + out->status = cpu_to_le32(NFIT_STATUS_NOT_SUPPORTED); + nvdebug("Return status %#x.\n", out->status); +} + +static void dsm_write_nvdimm(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 function = in->arg2; + uint32_t status = NFIT_STATUS_NON_EXISTING_MEM_DEV; + uint64_t cmd_list; + + if (!nvdimm) { + goto set_status_free; + } + + switch (function) { + case NFIT_CMD_IMPLEMENTED: + cmd_list = DIMM_SUPPORT_CMD; + if (nvdimm->configdata) { + cmd_list |= 1 << NFIT_CMD_SET_CONFIG_DATA; + } + + out->cmd_implemented.cmd_list = cpu_to_le64(cmd_list); + goto free; + default: + status = NFIT_STATUS_NOT_SUPPORTED; + }; + + nvdebug("Return status %#x.\n", status); + +set_status_free: + out->status = cpu_to_le32(status); +free: + g_slist_free(list); +} + static void dsm_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { + struct MemoryRegion *dsm_ram_mr = opaque; + struct dsm_buffer *dsm; + struct dsm_out *out; + void *buf; + assert(val == NOTIFY_VALUE); + + buf = memory_region_get_ram_ptr(dsm_ram_mr); + dsm = buf; + out = buf; + + le32_to_cpus(&dsm->handle); + le32_to_cpus(&dsm->arg1); + le32_to_cpus(&dsm->arg2); + + nvdebug("Arg0 " UUID_FMT ".\n", dsm->arg0[0], dsm->arg0[1], dsm->arg0[2], + dsm->arg0[3], dsm->arg0[4], dsm->arg0[5], dsm->arg0[6], + dsm->arg0[7], dsm->arg0[8], dsm->arg0[9], dsm->arg0[10], + dsm->arg0[11], dsm->arg0[12], dsm->arg0[13], dsm->arg0[14], + dsm->arg0[15]); + nvdebug("Handler %#x, Arg1 %#x, Arg2 %#x.\n", dsm->handle, dsm->arg1, + dsm->arg2); + + if (dsm->arg1 != DSM_REVISION) { + nvdebug("Revision %#x is not supported, expect %#x.\n", + dsm->arg1, DSM_REVISION); + goto exit; + } + + if (!dsm->handle) { + if (!dsm_is_root_uuid(dsm->arg0)) { + nvdebug("Root UUID does not match.\n"); + goto exit; + } + + return dsm_write_root(dsm, out); + } + + if (!dsm_is_dimm_uuid(dsm->arg0)) { + nvdebug("DIMM UUID does not match.\n"); + goto exit; + } + + return dsm_write_nvdimm(dsm, out); + +exit: + out->status = cpu_to_le32(NFIT_STATUS_NOT_SUPPORTED); } static const MemoryRegionOps dsm_ops = {