From patchwork Wed Jul 1 14:50:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 6704021 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 93B119F46B for ; Wed, 1 Jul 2015 14:55:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2ED420648 for ; Wed, 1 Jul 2015 14:55:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E66BC2064C for ; Wed, 1 Jul 2015 14:55:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754107AbbGAOzt (ORCPT ); Wed, 1 Jul 2015 10:55:49 -0400 Received: from mga03.intel.com ([134.134.136.65]:7903 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750935AbbGAOzm (ORCPT ); Wed, 1 Jul 2015 10:55:42 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 01 Jul 2015 07:55:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,386,1432623600"; d="scan'208";a="517239407" Received: from xiao.sh.intel.com ([10.239.159.86]) by FMSMGA003.fm.intel.com with ESMTP; 01 Jul 2015 07:55:39 -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 10/16] nvdimm: init the address region used by _DSM method Date: Wed, 1 Jul 2015 22:50:26 +0800 Message-Id: <1435762232-15543-11-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 This memory range is used to transfer data between ACPI in guest and Qemu, it occupies two pages: - one is RAM-based used to save the input info of _DSM method and Qemu reuse it store output info - another one is MMIO-based, ACPI write data to this page to transfer the control to Qemu Signed-off-by: Xiao Guangrong --- hw/mem/pc-nvdimm.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/hw/mem/pc-nvdimm.c b/hw/mem/pc-nvdimm.c index e7cff29..4c290cb 100644 --- a/hw/mem/pc-nvdimm.c +++ b/hw/mem/pc-nvdimm.c @@ -37,6 +37,10 @@ static struct nvdimms_info { ram_addr_t current_addr; + + ram_addr_t dsm_addr; + int dsm_size; + int device_index; } nvdimms_info; @@ -324,14 +328,88 @@ static void build_nfit_table(GSList *device_list, char *buf) } } +struct dsm_buffer { + /* RAM page. */ + uint32_t handle; + uint8_t arg0[16]; + uint32_t arg1; + uint32_t arg2; + union { + char arg3[PAGE_SIZE - 3 * sizeof(uint32_t) - 16 * sizeof(uint8_t)]; + }; + + /* MMIO page. */ + union { + uint32_t notify; + char pedding[PAGE_SIZE]; + }; +}; + +static uint64_t dsm_read(void *opaque, hwaddr addr, + unsigned size) +{ + return 0; +} + +static void dsm_write(void *opaque, hwaddr addr, + uint64_t val, unsigned size) +{ +} + +static const MemoryRegionOps dsm_ops = { + .read = dsm_read, + .write = dsm_write, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + +static int build_dsm_buffer(void) +{ + MemoryRegion *dsm_ram_mr, *dsm_mmio_mr; + ram_addr_t addr;; + + QEMU_BUILD_BUG_ON(PAGE_SIZE * 2 != sizeof(struct dsm_buffer)); + + /* DSM buffer has already been built. */ + if (nvdimms_info.dsm_addr) { + return 0; + } + + addr = reserved_range_push(2 * PAGE_SIZE); + if (!addr) { + return -1; + } + + nvdimms_info.dsm_addr = addr; + nvdimms_info.dsm_size = PAGE_SIZE * 2; + + dsm_ram_mr = g_new(MemoryRegion, 1); + memory_region_init_ram(dsm_ram_mr, NULL, "dsm_ram", PAGE_SIZE, + &error_abort); + vmstate_register_ram_global(dsm_ram_mr); + memory_region_add_subregion(get_system_memory(), addr, dsm_ram_mr); + + dsm_mmio_mr = g_new(MemoryRegion, 1); + memory_region_init_io(dsm_mmio_mr, NULL, &dsm_ops, dsm_ram_mr, + "dsm_mmio", PAGE_SIZE); + memory_region_add_subregion(get_system_memory(), addr + PAGE_SIZE, + dsm_mmio_mr); + return 0; +} + void pc_nvdimm_build_nfit_table(GArray *table_offsets, GArray *table_data, GArray *linker) { - GSList *list = get_nvdimm_built_list(); + GSList *list; size_t total; char *buf; int nfit_start, nr; + if (build_dsm_buffer()) { + fprintf(stderr, "do not have enough space for DSM buffer.\n"); + return; + } + + list = get_nvdimm_built_list(); nr = get_nvdimm_device_number(list); total = get_nfit_total_size(nr);