From patchwork Mon Jan 4 18:52:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 7950401 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 809E4BEEE5 for ; Mon, 4 Jan 2016 18:59:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7E1E020131 for ; Mon, 4 Jan 2016 18:59:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 58F2320340 for ; Mon, 4 Jan 2016 18:59:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752486AbcADS7f (ORCPT ); Mon, 4 Jan 2016 13:59:35 -0500 Received: from mga03.intel.com ([134.134.136.65]:39350 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752346AbcADS71 (ORCPT ); Mon, 4 Jan 2016 13:59:27 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 04 Jan 2016 10:59:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,521,1444719600"; d="scan'208";a="853359750" Received: from xiaoreal1.sh.intel.com (HELO xiaoreal1.sh.intel.com.sh.intel.com) ([10.239.48.79]) by orsmga001.jf.intel.com with ESMTP; 04 Jan 2016 10:59:26 -0800 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, dan.j.williams@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong Subject: [PATCH 6/6] nvdimm acpi: emulate dsm method Date: Tue, 5 Jan 2016 02:52:08 +0800 Message-Id: <1451933528-133684-7-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1451933528-133684-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1451933528-133684-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=-6.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 Emulate dsm method after IO VM-exit Currently, we only introduce the framework and no function is actually supported Signed-off-by: Xiao Guangrong --- hw/acpi/aml-build.c | 2 +- hw/acpi/nvdimm.c | 83 ++++++++++++++++++++++++++++++++++++++++++++- include/hw/acpi/aml-build.h | 1 + include/hw/mem/nvdimm.h | 17 ++++++++++ 4 files changed, 101 insertions(+), 2 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index e65171f..5a7644a 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -231,7 +231,7 @@ static void build_extop_package(GArray *package, uint8_t op) build_prepend_byte(package, 0x5B); /* ExtOpPrefix */ } -static void build_append_int_noprefix(GArray *table, uint64_t value, int size) +void build_append_int_noprefix(GArray *table, uint64_t value, int size) { int i; diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index dfccbc0..7be9857 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -390,12 +390,80 @@ typedef struct NvdimmDsmOut NvdimmDsmOut; static uint64_t nvdimm_dsm_read(void *opaque, hwaddr addr, unsigned size) { + fprintf(stderr, "BUG: we never read _DSM IO Port.\n"); return 0; } static void nvdimm_dsm_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { + AcpiNVDIMMState *state = opaque; + NvdimmDsmIn *in; + hwaddr dsm_mem_addr; + GArray *out; + uint32_t buf_size; + + nvdimm_debug("write address %#lx value %#lx.\n", addr, val); + + if (size != sizeof(uint32_t)) { + fprintf(stderr, "BUG: invalid IO bit width %#x.\n", size); + return; + } + + switch (addr) { + case 0: + state->low_dsm_mem_addr = val; + return; + case sizeof(uint32_t): + state->high_dsm_mem_addr = val; + break; + default: + fprintf(stderr, "BUG: IO access address %#lx is not dword" + " aligned.\n", addr); + return; + }; + + dsm_mem_addr = state->low_dsm_mem_addr; + dsm_mem_addr |= (hwaddr)state->high_dsm_mem_addr << (sizeof(uint32_t) * + BITS_PER_BYTE); + nvdimm_debug("dsm address %#lx\n", dsm_mem_addr); + + /* + * The DSM memory is mapped to guest address space so an evil guest + * can change its content while we are doing DSM emulation. Avoid + * this by copying DSM memory to QEMU local memory. + */ + in = g_malloc(TARGET_PAGE_SIZE); + cpu_physical_memory_read(dsm_mem_addr, in, TARGET_PAGE_SIZE); + + le32_to_cpus(&in->revision); + le32_to_cpus(&in->function); + le32_to_cpus(&in->handle); + + nvdimm_debug("Revision %#x Handler %#x Function %#x.\n", in->revision, + in->handle, in->function); + + out = g_array_new(false, true /* clear */, 1); + + /* + * function 0 is called to inquire what functions are supported by + * OSPM + */ + if (in->function == 0) { + build_append_int_noprefix(out, 0 /* No function Supported */, + sizeof(uint8_t)); + } else { + /* No function is supported yet. */ + build_append_int_noprefix(out, 1 /* Not Supported */, + sizeof(uint8_t)); + } + + buf_size = cpu_to_le32(out->len); + cpu_physical_memory_write(dsm_mem_addr, &buf_size, sizeof(buf_size)); + cpu_physical_memory_write(dsm_mem_addr + sizeof(buf_size), out->data, + out->len); + g_free(in); + g_array_free(out, true); } static const MemoryRegionOps nvdimm_dsm_ops = { @@ -408,6 +476,17 @@ static const MemoryRegionOps nvdimm_dsm_ops = { }, }; +static const VMStateDescription nvdimm_acpi_vmstate = { + .name = "nvdimm_acpi_vmstate", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT32(low_dsm_mem_addr, AcpiNVDIMMState), + VMSTATE_UINT32(high_dsm_mem_addr, AcpiNVDIMMState), + VMSTATE_END_OF_LIST() + }, +}; + void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io, FWCfgState *fw_cfg, Object *owner) { @@ -419,6 +498,8 @@ void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io, acpi_data_push(state->dsm_mem, TARGET_PAGE_SIZE); fw_cfg_add_file(fw_cfg, NVDIMM_DSM_MEM_FILE, state->dsm_mem->data, state->dsm_mem->len); + + vmstate_register(NULL, 0, &nvdimm_acpi_vmstate, state); } #define NVDIMM_GET_DSM_MEM "MEMA" @@ -430,7 +511,7 @@ static void nvdimm_build_common_dsm(Aml *dev) Aml *result_size, *dsm_mem; uint8_t byte_list[1]; - method = aml_method(NVDIMM_COMMON_DSM, 4, AML_NOTSERIALIZED); + method = aml_method(NVDIMM_COMMON_DSM, 4, AML_SERIALIZED); function = aml_arg(2); dsm_mem = aml_arg(3); diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 6c1816e..2fa8daa 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -354,6 +354,7 @@ Aml *aml_derefof(Aml *arg); Aml *aml_sizeof(Aml *arg); Aml *aml_concatenate(Aml *source1, Aml *source2, Aml *target); +void build_append_int_noprefix(GArray *table, uint64_t value, int size); void build_header(GArray *linker, GArray *table_data, AcpiTableHeader *h, const char *sig, int len, uint8_t rev, diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h index d908d6a..5f312a1 100644 --- a/include/hw/mem/nvdimm.h +++ b/include/hw/mem/nvdimm.h @@ -25,6 +25,14 @@ #include "hw/mem/pc-dimm.h" +#define NVDIMM_DEBUG 0 +#define nvdimm_debug(fmt, ...) \ + do { \ + if (NVDIMM_DEBUG) { \ + fprintf(stderr, "nvdimm: " fmt, ## __VA_ARGS__); \ + } \ + } while (0) + #define TYPE_NVDIMM "nvdimm" #define NVDIMM_DSM_MEM_FILE "etc/acpi/nvdimm-mem" @@ -38,12 +46,21 @@ * @is_enabled: detect if NVDIMM support is enabled. * * @dsm_mem: the data of the fw_cfg file NVDIMM_DSM_MEM_FILE. + * + * The dsm memory is allocated by BIOS and patched into ACPI binary code. + * @low_dsm_mem_addr: the low 32 bits of DSM memory. + * @high_dsm_mem_addr: the high 32 bits of DSM memory. + * * @io_mr: the IO region used by OSPM to transfer control to QEMU. */ struct AcpiNVDIMMState { bool is_enabled; GArray *dsm_mem; + + uint32_t low_dsm_mem_addr; + uint32_t high_dsm_mem_addr; + MemoryRegion io_mr; }; typedef struct AcpiNVDIMMState AcpiNVDIMMState;