From patchwork Sun May 22 10:21:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Kiarie X-Patchwork-Id: 9130895 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5858060761 for ; Sun, 22 May 2016 10:25:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6C2B28192 for ; Sun, 22 May 2016 10:25:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B668281A7; Sun, 22 May 2016 10:25:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7ADEF28192 for ; Sun, 22 May 2016 10:25:16 +0000 (UTC) Received: from localhost ([::1]:42675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4QZP-0003Pe-7a for patchwork-qemu-devel@patchwork.kernel.org; Sun, 22 May 2016 06:25:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4QWy-0001Ez-Sk for qemu-devel@nongnu.org; Sun, 22 May 2016 06:22:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b4QWn-0000YI-PW for qemu-devel@nongnu.org; Sun, 22 May 2016 06:22:39 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33773) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4QWm-0000YE-Oj for qemu-devel@nongnu.org; Sun, 22 May 2016 06:22:33 -0400 Received: by mail-wm0-x242.google.com with SMTP id 67so7538784wmg.0 for ; Sun, 22 May 2016 03:22:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fDdp0v/6JbDLEdbn7Ivt+cYist2xXle8zUqfZKub2gc=; b=Z94BykuCwVjCqRosJa5KtMPvoqnvj+sZVz0nwjAc8MVeE23m0LVdsYgCuI2yzkdLK/ rI6inOxT09bMyEKCyFn5Vs1qKZcfc17xVAjlgnAUpGm+brsd98BySj/VWDn+RnJApCSP XmY+23pamC4ppVCcmFRSBqFSNrtv8VUEh2ANjnNxfRJpjZ2wIV4oDLD/Kd+mNcCd3BjJ 6byCZxj7ggzMxIpMMZa3Dpx2vLZCjBhNpBSTijJY08t0LZDL099BD12csqquPt/YQdmT tZEvS22S/DSeLUk9l5Ot6OrLM1f84PM1u3c7Hq/EQqiS7xNoNxR8ZKKRDlmimiVzhFhd a7hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fDdp0v/6JbDLEdbn7Ivt+cYist2xXle8zUqfZKub2gc=; b=A3IhI+oZwncHabf+Kc5GtSYfc+e0oYMFaIDF5vrJATy1zBurtqIdbkynNcJc7h0OVM MQK2REiTrwVgWQSfbUl+XvekV+g/xF5RvOZwstL5oL5bQUgmHhPRiSP23iRBo5NGdon7 VVHIQvWQpFdTOgSNObZaSGqiUUFdYQIhRvnjUM+s3qYXUZhlPDTNyFexYRjVA0SYK3Ki k1q5W8/wTX2mS0IRAcsLpK7Ntn0bfax9bCXKlDSEUQjhaQWrxD1bdtkmu5N37PPkv/zY bcl5105fCRxePbyfn4J7Y4xs7DAt2xL9l1syBzX0IWlWk2LZ9vaJmIGOiMHkKiJTwvtG wM9A== X-Gm-Message-State: AOPr4FVPY36BC/PpQEGdqNN0kx2LO27kHXrBQ8hpRhOm0dBySBlRX3HvmHz+n7BF34XYgQ== X-Received: by 10.28.45.200 with SMTP id t191mr11533081wmt.40.1463912552112; Sun, 22 May 2016 03:22:32 -0700 (PDT) Received: from debian.flybox.orange ([154.122.6.169]) by smtp.googlemail.com with ESMTPSA id u4sm29189515wjz.4.2016.05.22.03.22.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 May 2016 03:22:31 -0700 (PDT) From: David Kiarie To: qemu-devel@nongnu.org Date: Sun, 22 May 2016 13:21:52 +0300 Message-Id: <1463912514-12658-3-git-send-email-davidkiarie4@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1463912514-12658-1-git-send-email-davidkiarie4@gmail.com> References: <1463912514-12658-1-git-send-email-davidkiarie4@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [V11 2/4] hw/i386: ACPI IVRS table X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mst@redhat.com, peterx@redhat.com, valentine.sinitsyn@gmail.com, jan.kiszka@web.de, marcel@redhat.com, David Kiarie Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add IVRS table for AMD IOMMU. Generate IVRS or DMAR depending on emulated IOMMU. Signed-off-by: David Kiarie --- hw/acpi/aml-build.c | 2 +- hw/i386/acpi-build.c | 93 +++++++++++++++++++++++++++++++++++++++------ include/hw/acpi/acpi-defs.h | 13 +++++++ include/hw/acpi/aml-build.h | 1 + include/hw/boards.h | 6 +++ 5 files changed, 103 insertions(+), 12 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index cedb74e..8d4bd01 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -227,7 +227,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/i386/acpi-build.c b/hw/i386/acpi-build.c index 279f0d7..b0ee01b 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -52,6 +52,7 @@ #include "hw/pci/pci_bus.h" #include "hw/pci-host/q35.h" #include "hw/i386/intel_iommu.h" +#include "hw/i386/amd_iommu.h" #include "hw/timer/hpet.h" #include "hw/acpi/aml-build.h" @@ -59,6 +60,8 @@ #include "qapi/qmp/qint.h" #include "qom/qom-qobject.h" +#include "hw/boards.h" + /* These are used to size the ACPI tables for -M pc-i440fx-1.7 and * -M pc-i440fx-2.0. Even if the actual amount of AML generated grows * a little bit, there should be plenty of free space since the DSDT @@ -2577,6 +2580,77 @@ build_dmar_q35(GArray *table_data, GArray *linker) "DMAR", table_data->len - dmar_start, 1, NULL, NULL); } +static void +build_amd_iommu(GArray *table_data, GArray *linker) +{ + int iommu_start = table_data->len; + bool iommu_ambig; + + /* IVRS definition - table header has an extra 2-byte field */ + acpi_data_push(table_data, (sizeof(AcpiTableHeader))); + /* common virtualization information */ + build_append_int_noprefix(table_data, AMD_IOMMU_HOST_ADDRESS_WIDTH << 8, 4); + /* reserved */ + build_append_int_noprefix(table_data, 0, 8); + + AMDVIState *s = (AMDVIState *)object_resolve_path_type("", + TYPE_AMD_IOMMU_DEVICE, &iommu_ambig); + + /* IVDB definition - type 10h */ + if (!iommu_ambig) { + /* IVHD definition - type 10h */ + build_append_int_noprefix(table_data, 0x10, 1); + /* virtualization flags */ + build_append_int_noprefix(table_data, (IVHD_HT_TUNEN | + IVHD_PPRSUP | IVHD_IOTLBSUP | IVHD_PREFSUP), 1); + /* ivhd length */ + build_append_int_noprefix(table_data, 0x20, 2); + /* iommu device id */ + build_append_int_noprefix(table_data, PCI_DEVICE_ID_RD890_IOMMU, 2); + /* offset of capability registers */ + build_append_int_noprefix(table_data, s->capab_offset, 2); + /* mmio base register */ + build_append_int_noprefix(table_data, s->mmio.addr, 8); + /* pci segment */ + build_append_int_noprefix(table_data, 0, 2); + /* interrupt numbers */ + build_append_int_noprefix(table_data, 0, 2); + /* feature reporting */ + build_append_int_noprefix(table_data, (IVHD_EFR_GTSUP | + IVHD_EFR_HATS | IVHD_EFR_GATS), 4); + /* Add device flags here + * These are 4-byte device entries currently reporting the range of + * devices 00h - ffffh; all devices + * Device setting affecting all devices should be made here + * + * Refer to + * (http://developer.amd.com/wordpress/media/2012/10/488821.pdf) + * Table 95 + */ + /* start of device range, 4-byte entries */ + build_append_int_noprefix(table_data, 0x00000003, 4); + /* end of device range */ + build_append_int_noprefix(table_data, 0x00ffff04, 4); + } + + build_header(linker, table_data, (void *)(table_data->data + iommu_start), + "IVRS", table_data->len - iommu_start, 1, NULL, NULL); +} + +static IommuType has_iommu(void) +{ + bool ambiguous; + + if (object_resolve_path_type("", TYPE_AMD_IOMMU_DEVICE, &ambiguous) + && !ambiguous) + return TYPE_AMD; + else if (object_resolve_path_type("", TYPE_INTEL_IOMMU_DEVICE, &ambiguous) + && !ambiguous) + return TYPE_INTEL; + else + return TYPE_NONE; +} + static GArray * build_rsdp(GArray *rsdp_table, GArray *linker, unsigned rsdt) { @@ -2635,16 +2709,6 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg) return true; } -static bool acpi_has_iommu(void) -{ - bool ambiguous; - Object *intel_iommu; - - intel_iommu = object_resolve_path_type("", TYPE_INTEL_IOMMU_DEVICE, - &ambiguous); - return intel_iommu && !ambiguous; -} - static void acpi_build(AcpiBuildTables *tables, MachineState *machine) { @@ -2657,6 +2721,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) AcpiMcfgInfo mcfg; PcPciInfo pci; uint8_t *u; + IommuType IOMMUType = has_iommu(); size_t aml_len = 0; GArray *tables_blob = tables->table_data; AcpiSlicOem slic_oem = { .id = NULL, .table_id = NULL }; @@ -2722,7 +2787,13 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) acpi_add_table(table_offsets, tables_blob); build_mcfg_q35(tables_blob, tables->linker, &mcfg); } - if (acpi_has_iommu()) { + + if (IOMMUType == TYPE_AMD) { + acpi_add_table(table_offsets, tables_blob); + build_amd_iommu(tables_blob, tables->linker); + } + + if (IOMMUType == TYPE_INTEL) { acpi_add_table(table_offsets, tables_blob); build_dmar_q35(tables_blob, tables->linker); } diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h index 850a962..3de7f82 100644 --- a/include/hw/acpi/acpi-defs.h +++ b/include/hw/acpi/acpi-defs.h @@ -583,4 +583,17 @@ typedef struct AcpiDmarHardwareUnit AcpiDmarHardwareUnit; /* Masks for Flags field above */ #define ACPI_DMAR_INCLUDE_PCI_ALL 1 +/* IVRS constants */ +#define AMD_IOMMU_HOST_ADDRESS_WIDTH 40UL + +/* flags in the IVHD headers */ +#define IVHD_HT_TUNEN (1UL << 0) /* recommended setting for HtTunEn */ +#define IVHD_IOTLBSUP (1UL << 4) /* remote IOTLB support */ +#define IVHD_PREFSUP (1UL << 6) /* page prefetch support */ +#define IVHD_PPRSUP (1UL << 7) /* peripheral page service support */ + +#define IVHD_EFR_HATS 48 /* host address translation size */ +#define IVHD_EFR_GATS 48 /* guest address translation size */ +#define IVHD_EFR_GTSUP (1UL << 2) /* guest translation support */ + #endif diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 7eb51c7..b7b9c8a 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -362,6 +362,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/boards.h b/include/hw/boards.h index 8d4fe56..dbe6745 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -61,6 +61,12 @@ typedef struct { CPUArchId cpus[0]; } CPUArchIdList; +typedef enum IommuType { + TYPE_AMD, + TYPE_INTEL, + TYPE_NONE +} IommuType; + /** * MachineClass: * @get_hotplug_handler: this function is called during bus-less