From patchwork Wed Jul 1 14:50:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 6704001 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 B16199F380 for ; Wed, 1 Jul 2015 14:55:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74B6320649 for ; Wed, 1 Jul 2015 14:55:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84A0E20657 for ; Wed, 1 Jul 2015 14:55:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754122AbbGAOzq (ORCPT ); Wed, 1 Jul 2015 10:55:46 -0400 Received: from mga03.intel.com ([134.134.136.65]:21378 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753992AbbGAOzk (ORCPT ); Wed, 1 Jul 2015 10:55:40 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 01 Jul 2015 07:55:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,386,1432623600"; d="scan'208";a="517239379" Received: from xiao.sh.intel.com ([10.239.159.86]) by FMSMGA003.fm.intel.com with ESMTP; 01 Jul 2015 07:55: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 09/16] nvdimm: build ACPI NFIT table Date: Wed, 1 Jul 2015 22:50:25 +0800 Message-Id: <1435762232-15543-10-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 NFIT is defined in ACPI 6.0: 5.2.25 NVDIMM Firmware Interface Table (NFIT) Currently, we only support PMEM mode. Each device has 3 tables: - SPA table, define the PMEM region info - MEM DEV table, it has the @handle which is used to associate specified ACPI NVDIMM device we will introduce in later patch. Also we can happily ignored the memory device's interleave, the real nvdimm hardware access is hidden behind host - DCR table, it defines Vendor ID used to associate specified vendor nvdimm driver. Since we only implement PMEM mode this time, Command window and Data window are not needed Signed-off-by: Xiao Guangrong --- hw/i386/acpi-build.c | 3 + hw/mem/pc-nvdimm.c | 286 +++++++++++++++++++++++++++++++++++++++++++++ include/hw/mem/pc-nvdimm.h | 8 ++ 3 files changed, 297 insertions(+) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 6a1ab09..80c21be 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -39,6 +39,7 @@ #include "hw/loader.h" #include "hw/isa/isa.h" #include "hw/acpi/memory_hotplug.h" +#include "hw/mem/pc-nvdimm.h" #include "sysemu/tpm.h" #include "hw/acpi/tpm.h" #include "sysemu/tpm_backend.h" @@ -1741,6 +1742,8 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) build_dmar_q35(tables_blob, tables->linker); } + pc_nvdimm_build_nfit_table(table_offsets, tables_blob, tables->linker); + /* Add tables supplied by user (if any) */ for (u = acpi_table_first(); u; u = acpi_table_next(u)) { unsigned len = acpi_table_len(u); diff --git a/hw/mem/pc-nvdimm.c b/hw/mem/pc-nvdimm.c index 9531935..e7cff29 100644 --- a/hw/mem/pc-nvdimm.c +++ b/hw/mem/pc-nvdimm.c @@ -27,10 +27,12 @@ #include #include "exec/address-spaces.h" +#include "hw/acpi/aml-build.h" #include "hw/mem/pc-nvdimm.h" #define PAGE_SIZE (1UL << 12) +#define MAX_NVDIMM_NUMBER (10) #define MIN_CONFIG_DATA_SIZE (128 << 10) static struct nvdimms_info { @@ -65,6 +67,290 @@ static uint32_t new_device_index(void) return nvdimms_info.device_index++; } +static int pc_nvdimm_built_list(Object *obj, void *opaque) +{ + GSList **list = opaque; + + if (object_dynamic_cast(obj, TYPE_PC_NVDIMM)) { + PCNVDIMMDevice *nvdimm = PC_NVDIMM(obj); + + /* only realized NVDIMMs matter */ + if (memory_region_size(&nvdimm->mr)) { + *list = g_slist_append(*list, nvdimm); + } + } + + object_child_foreach(obj, pc_nvdimm_built_list, opaque); + return 0; +} + +static GSList *get_nvdimm_built_list(void) +{ + GSList *list = NULL; + + object_child_foreach(qdev_get_machine(), pc_nvdimm_built_list, &list); + return list; +} + +static int get_nvdimm_device_number(GSList *list) +{ + int nr = 0; + + for (; list; list = list->next) { + nr++; + } + + return nr; +} + +static uint32_t nvdimm_index_to_sn(int index) +{ + return 0x123456 + index; +} + +static uint32_t nvdimm_index_to_handle(int index) +{ + return index + 1; +} + +typedef struct { + uint8_t b[16]; +} uuid_le; + +#define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ +((uuid_le) \ +{ { (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \ + (b) & 0xff, ((b) >> 8) & 0xff, (c) & 0xff, ((c) >> 8) & 0xff, \ + (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) } }) + +static void nfit_spa_uuid_pm(void *uuid) +{ + uuid_le uuid_pm = UUID_LE(0x66f0d379, 0xb4f3, 0x4074, 0xac, 0x43, 0x0d, + 0x33, 0x18, 0xb7, 0x8c, 0xdb); + memcpy(uuid, &uuid_pm, sizeof(uuid_pm)); +} + +enum { + NFIT_TABLE_SPA = 0, + NFIT_TABLE_MEM = 1, + NFIT_TABLE_IDT = 2, + NFIT_TABLE_SMBIOS = 3, + NFIT_TABLE_DCR = 4, + NFIT_TABLE_BDW = 5, + NFIT_TABLE_FLUSH = 6, +}; + +enum { + EFI_MEMORY_UC = 0x1ULL, + EFI_MEMORY_WC = 0x2ULL, + EFI_MEMORY_WT = 0x4ULL, + EFI_MEMORY_WB = 0x8ULL, + EFI_MEMORY_UCE = 0x10ULL, + EFI_MEMORY_WP = 0x1000ULL, + EFI_MEMORY_RP = 0x2000ULL, + EFI_MEMORY_XP = 0x4000ULL, + EFI_MEMORY_NV = 0x8000ULL, + EFI_MEMORY_MORE_RELIABLE = 0x10000ULL, +}; + +/* + * struct nfit - Nvdimm Firmware Interface Table + * @signature: "NFIT" + */ +struct nfit { + ACPI_TABLE_HEADER_DEF + uint32_t reserved; +} QEMU_PACKED; + +/* + * struct nfit_spa - System Physical Address Range Structure + */ +struct nfit_spa { + uint16_t type; + uint16_t length; + uint16_t spa_index; + uint16_t flags; + uint32_t reserved; + uint32_t proximity_domain; + uint8_t type_uuid[16]; + uint64_t spa_base; + uint64_t spa_length; + uint64_t mem_attr; +} QEMU_PACKED; + +/* + * struct nfit_memdev - Memory Device to SPA Map Structure + */ +struct nfit_memdev { + uint16_t type; + uint16_t length; + uint32_t nfit_handle; + uint16_t phys_id; + uint16_t region_id; + uint16_t spa_index; + uint16_t dcr_index; + uint64_t region_len; + uint64_t region_spa_offset; + uint64_t region_dpa; + uint16_t idt_index; + uint16_t interleave_ways; + uint16_t flags; + uint16_t reserved; +} QEMU_PACKED; + +/* + * struct nfit_dcr - NVDIMM Control Region Structure + */ +struct nfit_dcr { + uint16_t type; + uint16_t length; + uint16_t dcr_index; + uint16_t vendor_id; + uint16_t device_id; + uint16_t revision_id; + uint16_t sub_vendor_id; + uint16_t sub_device_id; + uint16_t sub_revision_id; + uint8_t reserved[6]; + uint32_t serial_number; + uint16_t fic; + uint16_t num_bcw; + uint64_t bcw_size; + uint64_t cmd_offset; + uint64_t cmd_size; + uint64_t status_offset; + uint64_t status_size; + uint16_t flags; + uint8_t reserved2[6]; +} QEMU_PACK; + +#define REVSISON_ID 1 +#define NFIT_FIC1 0x201 + +static size_t get_nfit_total_size(int nr) +{ + /* each nvdimm has 3 tables. */ + return sizeof(struct nfit) + nr * (sizeof(struct nfit_spa) + + sizeof(struct nfit_memdev) + sizeof(struct nfit_dcr)); +} + +static int build_spa_table(void *buf, PCNVDIMMDevice *nvdimm, int spa_index) +{ + struct nfit_spa *nfit_spa; + uint64_t addr = object_property_get_int(OBJECT(&nvdimm->mr), "addr", NULL); + + nfit_spa = (struct nfit_spa *)buf; + + /* + * nfit_spa->flags is set to zero so that proximity_domain + * info is ignored. + */ + nfit_spa->type = cpu_to_le16(NFIT_TABLE_SPA); + nfit_spa->length = cpu_to_le16(sizeof(*nfit_spa)); + nfit_spa_uuid_pm(&nfit_spa->type_uuid); + nfit_spa->spa_index = cpu_to_le16(spa_index); + nfit_spa->spa_base = cpu_to_le64(addr); + nfit_spa->spa_length = cpu_to_le64(memory_region_size(&nvdimm->mr)); + nfit_spa->mem_attr = cpu_to_le64(EFI_MEMORY_WB | EFI_MEMORY_NV); + + return sizeof(*nfit_spa); +} + +static int build_memdev_table(void *buf, PCNVDIMMDevice *nvdimm, + int spa_index, int dcr_index) +{ + struct nfit_memdev *nfit_memdev; + uint64_t addr = object_property_get_int(OBJECT(&nvdimm->mr), "addr", NULL); + uint32_t handle = nvdimm_index_to_handle(nvdimm->device_index); + + nfit_memdev = (struct nfit_memdev *)buf; + nfit_memdev->type = cpu_to_le16(NFIT_TABLE_MEM); + nfit_memdev->length = cpu_to_le16(sizeof(*nfit_memdev)); + nfit_memdev->nfit_handle = cpu_to_le32(handle); + /* point to nfit_spa. */ + nfit_memdev->spa_index = cpu_to_le16(spa_index); + /* point to nfit_dcr. */ + nfit_memdev->dcr_index = cpu_to_le16(dcr_index); + nfit_memdev->region_len = cpu_to_le64(memory_region_size(&nvdimm->mr)); + nfit_memdev->region_dpa = cpu_to_le64(addr); + /* Only one interleave for pmem. */ + nfit_memdev->interleave_ways = cpu_to_le16(1); + + return sizeof(*nfit_memdev); +} + +static int build_dcr_table(void *buf, PCNVDIMMDevice *nvdimm, int dcr_index) +{ + struct nfit_dcr *nfit_dcr; + uint32_t sn = nvdimm_index_to_sn(nvdimm->device_index); + + nfit_dcr = (struct nfit_dcr *)buf; + nfit_dcr->type = cpu_to_le16(NFIT_TABLE_DCR); + nfit_dcr->length = cpu_to_le16(sizeof(*nfit_dcr)); + nfit_dcr->dcr_index = cpu_to_le16(dcr_index); + nfit_dcr->vendor_id = cpu_to_le16(0x8086); + nfit_dcr->device_id = cpu_to_le16(1); + nfit_dcr->revision_id = cpu_to_le16(REVSISON_ID); + nfit_dcr->serial_number = cpu_to_le32(sn); + nfit_dcr->fic = cpu_to_le16(NFIT_FIC1); + + return sizeof(*nfit_dcr); +} + +static void build_nfit_table(GSList *device_list, char *buf) +{ + int index = 0; + + buf += sizeof(struct nfit); + + for (; device_list; device_list = device_list->next) { + PCNVDIMMDevice *nvdimm = device_list->data; + int spa_index, dcr_index; + + spa_index = ++index; + dcr_index = ++index; + + /* build System Physical Address Range Description Table. */ + buf += build_spa_table(buf, nvdimm, spa_index); + + /* + * build Memory Device to System Physical Address Range Mapping + * Table. + */ + buf += build_memdev_table(buf, nvdimm, spa_index, dcr_index); + + /* build Control Region Descriptor Table. */ + buf += build_dcr_table(buf, nvdimm, dcr_index); + } +} + +void pc_nvdimm_build_nfit_table(GArray *table_offsets, GArray *table_data, + GArray *linker) +{ + GSList *list = get_nvdimm_built_list(); + size_t total; + char *buf; + int nfit_start, nr; + + nr = get_nvdimm_device_number(list); + total = get_nfit_total_size(nr); + + if (nr <= 0 || nr > MAX_NVDIMM_NUMBER) { + goto exit; + } + + nfit_start = table_data->len; + acpi_add_table(table_offsets, table_data); + + buf = acpi_data_push(table_data, total); + build_nfit_table(list, buf); + + build_header(linker, table_data, (void *)(table_data->data + nfit_start), + "NFIT", table_data->len - nfit_start, 1); +exit: + g_slist_free(list); +} + static char *get_file(Object *obj, Error **errp) { PCNVDIMMDevice *nvdimm = PC_NVDIMM(obj); diff --git a/include/hw/mem/pc-nvdimm.h b/include/hw/mem/pc-nvdimm.h index e743ed1..74d989b 100644 --- a/include/hw/mem/pc-nvdimm.h +++ b/include/hw/mem/pc-nvdimm.h @@ -34,9 +34,17 @@ typedef struct PCNVDIMMDevice { OBJECT_CHECK(PCNVDIMMDevice, (obj), TYPE_PC_NVDIMM) void pc_nvdimm_reserve_range(ram_addr_t offset); +void pc_nvdimm_build_nfit_table(GArray *table_offsets, GArray *table_data, + GArray *linker); #else /* !CONFIG_LINUX */ static inline void pc_nvdimm_reserve_range(ram_addr_t offset) { } + +static inline void +pc_nvdimm_build_nfit_table(GArray *table_offsets, GArray *table_data, + GArray *linker) +{ +} #endif #endif