From patchwork Thu Jun 29 05:50:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9816563 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 4FE43603F2 for ; Thu, 29 Jun 2017 12:00:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0ACC12853A for ; Thu, 29 Jun 2017 12:00:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0002F286CC; Thu, 29 Jun 2017 12:00:35 +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=-2.2 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2FBD928716 for ; Thu, 29 Jun 2017 12:00:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQY5F-0006A6-En; Thu, 29 Jun 2017 11:58:05 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQY5E-00068A-Bn for xen-devel@lists.xen.org; Thu, 29 Jun 2017 11:58:04 +0000 Received: from [85.158.143.35] by server-7.bemta-6.messagelabs.com id 9D/E5-03557-B4BE4595; Thu, 29 Jun 2017 11:58:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsVywNykWNf7dUi kwZepHBZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8a73T2sBTeUK2adsG1gvCDTxcjJISQwjVHi 9GsNEFtCgFfiyLIZrBB2gETP/FnsXYxcQDXtjBKz5t1gBkmwCahLnFg8kRHEFhGQlrj2+TKYz Sywj1HizXNVEFtYIExi59ErYHEWAVWJKYvfsYPYvAIuEm3HpjNBLFCQmPLwPdhMTgFXiYabW9 ggDnKR+NSzk3kCI+8CRoZVjBrFqUVlqUW6hhZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV 6yfm5mxiBwcAABDsYb24MOMQoycGkJMpr+DwkUogvKT+lMiOxOCO+qDQntfgQowwHh5IE7+mX QDnBotT01Iq0zBxgWMKkJTh4lER4+0BaeYsLEnOLM9MhUqcYFaXEebleASUEQBIZpXlwbbBYu MQoKyXMywh0iBBPQWpRbmYJqvwrRnEORiVh3qcg23ky80rgpr8CWswEtFh4BtjikkSElFQDI2 dx7vstJ7yWTTn+5Znf4qiAP2ovGoUjJloINRhZ1s2zWfPb/VzjGq4jJT9feistEl7RXZQac1l YW6RDNKnse/g/fuPz7y5ZzduUuY330tGNzCe2pF/cEeX/h9Fec/HU2dM53Vy3COYskefe8Cv4 ba+wSCrDh1f/68xepszatzFSYPGdFYIPBZRYijMSDbWYi4oTAQGNwKeAAgAA X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1498737473!47847778!3 X-Originating-IP: [192.55.52.115] X-SpamReason: No, hits=1.3 required=7.0 tests=BODY_RANDOM_LONG, DATE_IN_PAST_06_12 X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57954 invoked from network); 29 Jun 2017 11:58:02 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by server-6.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 29 Jun 2017 11:58:02 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jun 2017 04:58:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.40,280,1496127600"; d="scan'208"; a="1146053316" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.74]) by orsmga001.jf.intel.com with ESMTP; 29 Jun 2017 04:58:00 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Thu, 29 Jun 2017 01:50:40 -0400 Message-Id: <1498715457-16565-9-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1498715457-16565-1-git-send-email-tianyu.lan@intel.com> References: <1498715457-16565-1-git-send-email-tianyu.lan@intel.com> Cc: Lan Tianyu , kevin.tian@intel.com, wei.liu2@citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, jbeulich@suse.com, Chao Gao Subject: [Xen-devel] [PATCH 8/25] Tools/libacpi: Add new fields in acpi_config to build DMAR table X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Chao Gao The BIOS reports the remapping hardware units in a platform to system software through the DMA Remapping Reporting (DMAR) ACPI table. To build DMAR table during domain construction, two fields are added to struct acpi_config. One is dmar_flag which indicates whether interrupt remapping is supported and whether enabling X2APIC mode is premitted. The other is the base address of remapping hardware register-set for a remapping unit. Also, a function construct_dmar() is added to build DMAR table according the two fields. Signed-off-by: Chao Gao Signed-off-by: Lan Tianyu --- tools/libacpi/build.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/libacpi/libacpi.h | 11 ++++++++++ 2 files changed, 64 insertions(+) diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index f9881c9..d5bedfd 100644 --- a/tools/libacpi/build.c +++ b/tools/libacpi/build.c @@ -28,6 +28,10 @@ #define ACPI_MAX_SECONDARY_TABLES 16 +#define VTD_HOST_ADDRESS_WIDTH 39 +#define I440_PSEUDO_BUS_PLATFORM 0xff +#define I440_PSEUDO_DEVFN_IOAPIC 0x0 + #define align16(sz) (((sz) + 15) & ~15) #define fixed_strcpy(d, s) strncpy((d), (s), sizeof(d)) @@ -303,6 +307,55 @@ static struct acpi_20_slit *construct_slit(struct acpi_ctxt *ctxt, return slit; } +struct acpi_dmar *construct_dmar(struct acpi_ctxt *ctxt, + const struct acpi_config *config) +{ + struct acpi_dmar *dmar; + struct acpi_dmar_hardware_unit *drhd; + struct dmar_device_scope *scope; + unsigned int size; + unsigned int ioapic_scope_size = sizeof(*scope) + sizeof(scope->path[0]); + + size = sizeof(*dmar) + sizeof(*drhd) + ioapic_scope_size; + + dmar = ctxt->mem_ops.alloc(ctxt, size, 16); + if ( !dmar ) + return NULL; + + memset(dmar, 0, size); + dmar->header.signature = ACPI_2_0_DMAR_SIGNATURE; + dmar->header.revision = ACPI_2_0_DMAR_REVISION; + dmar->header.length = size; + fixed_strcpy(dmar->header.oem_id, ACPI_OEM_ID); + fixed_strcpy(dmar->header.oem_table_id, ACPI_OEM_TABLE_ID); + dmar->header.oem_revision = ACPI_OEM_REVISION; + dmar->header.creator_id = ACPI_CREATOR_ID; + dmar->header.creator_revision = ACPI_CREATOR_REVISION; + dmar->host_address_width = VTD_HOST_ADDRESS_WIDTH - 1; + dmar->flags = config->dmar_flag & (DMAR_INTR_REMAP|DMAR_X2APIC_OPT_OUT); + + drhd = (struct acpi_dmar_hardware_unit *)((void*)dmar + sizeof(*dmar)); + drhd->type = ACPI_DMAR_TYPE_HARDWARE_UNIT; + drhd->length = sizeof(*drhd) + ioapic_scope_size; + drhd->flags = ACPI_DMAR_INCLUDE_PCI_ALL; + drhd->pci_segment = 0; + drhd->address = config->viommu_base_addr; + + scope = &drhd->scope[0]; + scope->type = ACPI_DMAR_DEVICE_SCOPE_IOAPIC; + scope->length = ioapic_scope_size; + /* + * This field provides the I/O APICID as provided in the I/O APIC structure + * in the ACPI MADT (Multiple APIC Descriptor Table). + */ + scope->enumeration_id = 1; + scope->bus = I440_PSEUDO_BUS_PLATFORM; + scope->path[0] = I440_PSEUDO_DEVFN_IOAPIC; + + set_checksum(dmar, offsetof(struct acpi_header, checksum), size); + return dmar; +} + static int construct_passthrough_tables(struct acpi_ctxt *ctxt, unsigned long *table_ptrs, int nr_tables, diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h index 2ed1ecf..6a4e1cf 100644 --- a/tools/libacpi/libacpi.h +++ b/tools/libacpi/libacpi.h @@ -20,6 +20,8 @@ #ifndef __LIBACPI_H__ #define __LIBACPI_H__ +#include "acpi2_0.h" + #define ACPI_HAS_COM1 (1<<0) #define ACPI_HAS_COM2 (1<<1) #define ACPI_HAS_LPT1 (1<<2) @@ -36,6 +38,7 @@ #define ACPI_HAS_8042 (1<<13) #define ACPI_HAS_CMOS_RTC (1<<14) #define ACPI_HAS_SSDT_LAPTOP_SLATE (1<<15) +#define ACPI_HAS_DMAR (1<<16) struct xen_vmemrange; struct acpi_numa { @@ -96,8 +99,16 @@ struct acpi_config { uint32_t ioapic_base_address; uint16_t pci_isa_irq_mask; uint8_t ioapic_id; + + /* dmar info */ + uint8_t dmar_flag; + uint64_t viommu_base_addr; }; +#define DMAR_INTR_REMAP 0x1 +#define DMAR_X2APIC_OPT_OUT 0x2 +struct acpi_dmar *construct_dmar(struct acpi_ctxt *ctxt, + const struct acpi_config *config); int acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config); #endif /* __LIBACPI_H__ */