From patchwork Tue Nov 8 19:42:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 9418017 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 8EE0B60459 for ; Tue, 8 Nov 2016 19:44:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E00528ACC for ; Tue, 8 Nov 2016 19:44:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72B0C28B31; Tue, 8 Nov 2016 19:44:50 +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 1A07528B2C for ; Tue, 8 Nov 2016 19:44:50 +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 1c4CIF-0001sw-TK; Tue, 08 Nov 2016 19:42:51 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c4CIE-0001sT-Vc for xen-devel@lists.xenproject.org; Tue, 08 Nov 2016 19:42:51 +0000 Received: from [193.109.254.147] by server-7.bemta-6.messagelabs.com id 6E/BE-21485-ABA22285; Tue, 08 Nov 2016 19:42:50 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnkeJIrShJLcpLzFFi42I5NlG2Q3enllK EwY6dshbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bBST9YCk7IVExrWsfWwPhcrIuRi0NIYCqj RPujPSwQznYmiZ+TLzF1MXJysAkYSvx9sokNxBYRUJK4t2oyUJyDg1nAXWLjoSKQsLBAoMTkL z9ZQWwWAVWJvUtPMYPYvAJuEicXnwezJQTkJE4emwxWwwnUevTzSVaIXW2MEq/+z2aCKMqQmN czhxXC9pJYdOMSlK0mcfXcJuYJjHwLGBlWMWoUpxaVpRbpGlrqJRVlpmeU5CZm5ugaGpjp5aY WFyemp+YkJhXrJefnbmIEBgoDEOxg/LEs4BCjJAeTkiiv3BPFCCG+pPyUyozE4oz4otKc1OJD jDIcHEoSvA6aShFCgkWp6akVaZk5wJCFSUtw8CiJ8MqApHmLCxJzizPTIVKnGHU53ux6+YBJi CUvPy9VSpzXBaRIAKQoozQPbgQsfi4xykoJ8zICHSXEU5BalJtZgir/ilGcg1FJmDcdZApPZl 4J3KZXQEcwAR1RFaMAckRJIkJKqoFRg/WAVjfzjYkrlvTfWC8h4CSYxLg8+HOuRIr4x8VPbER u9Tl/mB+0879m64M3M04c7XPreqkmxbNFyPIsU8XSXcJ/eGLqHT7tftb7KkaM4brmo/PuMwWe fHHo12XaNcdOUp2F3U7ujIZw5gUplvlsC5cd65nHfNN06ioHjach/fFGK/70cn9SYinOSDTUY i4qTgQAefrmeJoCAAA= X-Env-Sender: sstabellini@kernel.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1478634168!60279848!1 X-Originating-IP: [198.145.29.136] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.0.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18959 invoked from network); 8 Nov 2016 19:42:49 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-8.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Nov 2016 19:42:49 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C07EB202FF; Tue, 8 Nov 2016 19:42:46 +0000 (UTC) Received: from sstabellini-ThinkPad-X260.hsd1.ca.comcast.net (96-82-76-110-static.hfc.comcastbusiness.net [96.82.76.110]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 842FF20328; Tue, 8 Nov 2016 19:42:45 +0000 (UTC) From: Stefano Stabellini To: xen-devel@lists.xenproject.org Date: Tue, 8 Nov 2016 11:42:43 -0800 Message-Id: <1478634163-27368-2-git-send-email-sstabellini@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1478634163-27368-1-git-send-email-sstabellini@kernel.org> References: <1478634163-27368-1-git-send-email-sstabellini@kernel.org> X-Virus-Scanned: ClamAV using ClamSMTP Cc: julien.grall@arm.com, sstabellini@kernel.org, wei.liu2@citrix.com Subject: [Xen-devel] [PATCH v3 2/2] Partially revert 21550029f709072aacf3b90edd574e7d3021b400 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 Commit 21550029f709072aacf3b90edd574e7d3021b400 removed the PLATFORM_QUIRK_GIC_64K_STRIDE quirk and introduced a way to automatically detect that the two GICC pages have a 64K stride. However the heuristic requires that the device tree for the platform reports a GICC size == 128K, which is not the case for some versions of XGene. Fix the issue by partially reverting 21550029f709072aacf3b90edd574e7d3021b400: - reintroduce PLATFORM_QUIRK_GIC_64K_STRIDE for XGene - force csize and vsize to SZ_128K if csize is initially 4K and if PLATFORM_QUIRK_GIC_64K_STRIDE Also add a warning in case GICC is SZ_128K but not aliased. Signed-off-by: Stefano Stabellini Release-acked-by: Wei Liu Acked-by: Julien Grall --- Changes in v3: - add a warning when enabling the quirk - update comment to match the new behavior of the quirk Changes in v2: - only set csize to SZ_128K if it is initially SZ_4K - set vsize to match - add warning if gicc is SZ_128K and not aliased --- xen/arch/arm/gic-v2.c | 12 ++++++++++-- xen/arch/arm/platforms/xgene-storm.c | 6 ++++++ xen/include/asm-arm/platform.h | 7 +++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 9bd9d0b..bca6d27 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -965,7 +965,12 @@ static void __init gicv2_dt_init(void) printk(XENLOG_WARNING "GICv2: WARNING: " "The GICC size is too small: %#"PRIx64" expected %#x\n", csize, SZ_8K); - csize = SZ_8K; + if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) + { + printk(XENLOG_WARNING "GICv2: enable platform quirk: 64K stride\n"); + vsize = csize = SZ_128K; + } else + csize = SZ_8K; } /* @@ -1189,7 +1194,10 @@ static int __init gicv2_init(void) printk(XENLOG_WARNING "GICv2: Adjusting CPU interface base to %#"PRIx64"\n", cbase + aliased_offset); - } + } else if ( csize == SZ_128K ) + printk(XENLOG_WARNING + "GICv2: GICC size=%lu but not aliased\n", + csize); gicv2.map_hbase = ioremap_nocache(hbase, PAGE_SIZE); if ( !gicv2.map_hbase ) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 686b19b..c795a95 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -67,6 +67,11 @@ static void __init xgene_check_pirq_eoi(void) "Please upgrade your firmware to the latest version"); } +static uint32_t xgene_storm_quirks(void) +{ + return PLATFORM_QUIRK_GIC_64K_STRIDE; +} + static void xgene_storm_reset(void) { void __iomem *addr; @@ -116,6 +121,7 @@ PLATFORM_START(xgene_storm, "APM X-GENE STORM") .compatible = xgene_storm_dt_compat, .init = xgene_storm_init, .reset = xgene_storm_reset, + .quirks = xgene_storm_quirks, PLATFORM_END /* diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index c6e5010..08010ba 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -39,6 +39,13 @@ struct platform_desc { const struct dt_device_match *blacklist_dev; }; +/* + * Quirk for platforms where device tree incorrectly reports 4K GICC + * size, but actually the two GICC register ranges are placed at 64K + * stride. + */ +#define PLATFORM_QUIRK_GIC_64K_STRIDE (1 << 0) + void __init platform_init(void); int __init platform_init_time(void); int __init platform_specific_mapping(struct domain *d);