From patchwork Thu Mar 16 11:20:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9627919 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 D65CA6048C for ; Thu, 16 Mar 2017 11:20:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA5D9285B5 for ; Thu, 16 Mar 2017 11:20:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDC5828628; Thu, 16 Mar 2017 11:20: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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 20A42285B5 for ; Thu, 16 Mar 2017 11:20:35 +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 1coTQj-0007Vh-MR; Thu, 16 Mar 2017 11:18:53 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coTQi-0007V0-GG for xen-devel@lists.xenproject.org; Thu, 16 Mar 2017 11:18:52 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id A6/D0-25093-B947AC85; Thu, 16 Mar 2017 11:18:51 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsVysyfVTXdWyak Ig287hSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozWuR1sBaeNKvqeTWdqYDyn0cXIxSEksJlR ovPKDlYIZzmjxPWOR+xdjJwcbAK6EjtuvmYGsUUEQiXm/HwEZjMLVEpc/LCfDcQWFgiX+LzuH licRUBV4sCGxSwgNq+AtcTTX1/A4hICchIN5++D2ZwCNhIdJ/eA9QoB1Xw++pl9AiP3AkaGVY waxalFZalFukZmeklFmekZJbmJmTm6hgZmermpxcWJ6ak5iUnFesn5uZsYgR5mAIIdjGcWBB5 ilORgUhLl/f3lUIQQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCd5/3IcjhASLUtNTK9Iyc4ChBpOW 4OBREuF9CZLmLS5IzC3OTIdInWLU5Vj0b/cbJiGWvPy8VClxXjseoCIBkKKM0jy4EbCwv8QoK yXMywh0lBBPQWpRbmYJqvwrRnEORiVhXjaQKTyZeSVwm14BHcEEdMQ0voMgR5QkIqSkGhinMv t++dzgYbMjL3rxllP3lVT4rizaenVhFTuX1JqejbZy0eX2+kwPpG5/EXgj8Hhqm+K3bEfLCpe +shfRs785HzYqm3BzBZvZ68B8KfnM7Sc/7Z9au0ww4LXJyxtcfcYvDNS/LFedrtordrf/j4Xa LvcHU70VH+zOflhQ1dBrNmGZw47yrK9KLMUZiYZazEXFiQASMjUfdgIAAA== X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1489663129!92252937!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37180 invoked from network); 16 Mar 2017 11:18:49 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-6.tower-27.messagelabs.com with SMTP; 16 Mar 2017 11:18:49 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6A6C1150C; Thu, 16 Mar 2017 04:18:49 -0700 (PDT) Received: from e104803-lin.lan (unknown [10.1.207.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 64C873F5C9; Thu, 16 Mar 2017 04:18:48 -0700 (PDT) From: Andre Przywara To: Stefano Stabellini , Julien Grall Date: Thu, 16 Mar 2017 11:20:04 +0000 Message-Id: <20170316112030.20419-2-andre.przywara@arm.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170316112030.20419-1-andre.przywara@arm.com> References: <20170316112030.20419-1-andre.przywara@arm.com> Cc: xen-devel@lists.xenproject.org, Shanker Donthineni , Vijay Kilari Subject: [Xen-devel] [PATCH v2 01/27] ARM: GICv3 ITS: parse and store ITS subnodes from hardware DT 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 Parse the DT GIC subnodes to find every ITS MSI controller the hardware offers. Store that information in a list to both propagate all of them later to Dom0, but also to be able to iterate over all ITSes. This introduces an ITS Kconfig option. Signed-off-by: Andre Przywara --- xen/arch/arm/Kconfig | 4 +++ xen/arch/arm/Makefile | 1 + xen/arch/arm/gic-v3-its.c | 73 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/gic-v3.c | 10 +++--- xen/include/asm-arm/gic_v3_its.h | 67 ++++++++++++++++++++++++++++++++++++ 5 files changed, 151 insertions(+), 4 deletions(-) create mode 100644 xen/arch/arm/gic-v3-its.c create mode 100644 xen/include/asm-arm/gic_v3_its.h diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 2e023d1..bf64c61 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -45,6 +45,10 @@ config ACPI config HAS_GICV3 bool +config HAS_ITS + bool "GICv3 ITS MSI controller support" + depends on HAS_GICV3 + endmenu menu "ARM errata workaround via the alternative framework" diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 7afb8a3..54860e0 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -18,6 +18,7 @@ obj-$(EARLY_PRINTK) += early_printk.o obj-y += gic.o obj-y += gic-v2.o obj-$(CONFIG_HAS_GICV3) += gic-v3.o +obj-$(CONFIG_HAS_ITS) += gic-v3-its.o obj-y += guestcopy.o obj-y += hvm.o obj-y += io.o diff --git a/xen/arch/arm/gic-v3-its.c b/xen/arch/arm/gic-v3-its.c new file mode 100644 index 0000000..4056e5b --- /dev/null +++ b/xen/arch/arm/gic-v3-its.c @@ -0,0 +1,73 @@ +/* + * xen/arch/arm/gic-v3-its.c + * + * ARM GICv3 Interrupt Translation Service (ITS) support + * + * Copyright (C) 2016,2017 - ARM Ltd + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; under version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; If not, see . + */ + +#include +#include +#include + +LIST_HEAD(host_its_list); + +bool gicv3_its_host_has_its(void) +{ + return !list_empty(&host_its_list); +} + +/* Scan the DT for any ITS nodes and create a list of host ITSes out of it. */ +void gicv3_its_dt_init(const struct dt_device_node *node) +{ + const struct dt_device_node *its = NULL; + struct host_its *its_data; + + /* + * Check for ITS MSI subnodes. If any, add the ITS register + * frames to the ITS list. + */ + dt_for_each_child_node(node, its) + { + uint64_t addr, size; + + if ( !dt_device_is_compatible(its, "arm,gic-v3-its") ) + continue; + + if ( dt_device_get_address(its, 0, &addr, &size) ) + panic("GICv3: Cannot find a valid ITS frame address"); + + its_data = xzalloc(struct host_its); + if ( !its_data ) + panic("GICv3: Cannot allocate memory for ITS frame"); + + its_data->addr = addr; + its_data->size = size; + its_data->dt_node = its; + + printk("GICv3: Found ITS @0x%lx\n", addr); + + list_add_tail(&its_data->entry, &host_its_list); + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 955591b..1512521 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -1228,11 +1229,12 @@ static void __init gicv3_dt_init(void) */ res = dt_device_get_address(node, 1 + gicv3.rdist_count, &cbase, &csize); - if ( res ) - return; + if ( !res ) + dt_device_get_address(node, 1 + gicv3.rdist_count + 2, + &vbase, &vsize); - dt_device_get_address(node, 1 + gicv3.rdist_count + 2, - &vbase, &vsize); + /* Check for ITS child nodes and build the host ITS list accordingly. */ + gicv3_its_dt_init(node); } static int gicv3_iomem_deny_access(const struct domain *d) diff --git a/xen/include/asm-arm/gic_v3_its.h b/xen/include/asm-arm/gic_v3_its.h new file mode 100644 index 0000000..765a655 --- /dev/null +++ b/xen/include/asm-arm/gic_v3_its.h @@ -0,0 +1,67 @@ +/* + * ARM GICv3 ITS support + * + * Andre Przywara + * Copyright (c) 2016,2017 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; under version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; If not, see . + */ + +#ifndef __ASM_ARM_ITS_H__ +#define __ASM_ARM_ITS_H__ + +#include + +/* data structure for each hardware ITS */ +struct host_its { + struct list_head entry; + const struct dt_device_node *dt_node; + paddr_t addr; + paddr_t size; +}; + + +#ifdef CONFIG_HAS_ITS + +extern struct list_head host_its_list; + +/* Parse the host DT and pick up all host ITSes. */ +void gicv3_its_dt_init(const struct dt_device_node *node); + +bool gicv3_its_host_has_its(void); + +#else + +static LIST_HEAD(host_its_list); + +static inline void gicv3_its_dt_init(const struct dt_device_node *node) +{ +} + +static inline bool gicv3_its_host_has_its(void) +{ + return false; +} + +#endif /* CONFIG_HAS_ITS */ + +#endif + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */