From patchwork Mon Nov 3 16:46:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 40046 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4DE9021894 for ; Mon, 3 Nov 2014 16:49:31 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id n15sf1153813lbi.10 for ; Mon, 03 Nov 2014 08:49:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=kJ5aW495ekK9NkmEsjmnMa/iHiwkAyjYg5065ALwLv8=; b=Lr2U+WupKJ0h9ej7V6onIoN5I5sXJP6vasCQvOHmPWQASLRwGjGcEhk45g22Pnalqp K4qLBBHglpRtc2CkhDHn1ndqRdspAF3xvBzEOXvpVALlUpjNtnvvNouaK5yNEkdPELBP gkxi3afAGlEuewPk8++tpN6k5ubM0iryeePNqP9L/ADjAZE+PHe4wR6AqFwRVx9+X5L0 KoISEhyOYDySwFRu6cc0nkdYu0jeed5nntonBY9Q0P1JPZS6+X7kDWu4QKO93WKcflmU pqZ+DOumiyYnTk3DfLXpDvvfaF8T5Y+Us3jayYKZmSOpj2pX6aIgODF0Akbi52yUYntJ EaPQ== X-Gm-Message-State: ALoCoQmHskIzl8wEutFC18pGz4fVLto52zk+8ssASjxT4NRfJQb1OrvP5KT0rAng5Z0zy7Opb1gc X-Received: by 10.112.142.36 with SMTP id rt4mr7533652lbb.3.1415033369875; Mon, 03 Nov 2014 08:49:29 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.6.36 with SMTP id cr4ls198816lad.41.gmail; Mon, 03 Nov 2014 08:49:29 -0800 (PST) X-Received: by 10.152.5.129 with SMTP id s1mr53269446las.59.1415033369705; Mon, 03 Nov 2014 08:49:29 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id um10si33142320lbb.117.2014.11.03.08.49.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Nov 2014 08:49:29 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id q1so9721038lam.24 for ; Mon, 03 Nov 2014 08:49:29 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr51970996lbc.34.1415033369258; Mon, 03 Nov 2014 08:49:29 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.141.34 with SMTP id rl2csp19914lbb; Mon, 3 Nov 2014 08:49:28 -0800 (PST) X-Received: by 10.221.65.136 with SMTP id xm8mr717194vcb.62.1415033367845; Mon, 03 Nov 2014 08:49:27 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id j12si10269006vck.72.2014.11.03.08.49.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 03 Nov 2014 08:49:27 -0800 (PST) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKnA-0000Zj-Eb; Mon, 03 Nov 2014 16:47:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKn9-0000YL-3I for xen-devel@lists.xen.org; Mon, 03 Nov 2014 16:47:43 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id F2/FE-24124-EA1B7545; Mon, 03 Nov 2014 16:47:42 +0000 X-Env-Sender: frediano.ziglio@huawei.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1415033258!10953183!1 X-Originating-IP: [119.145.14.64] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTE5LjE0NS4xNC42NCA9PiA4MDE5MQ==\n X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23383 invoked from network); 3 Nov 2014 16:47:41 -0000 Received: from szxga01-in.huawei.com (HELO szxga01-in.huawei.com) (119.145.14.64) by server-13.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 3 Nov 2014 16:47:41 -0000 Received: from 172.24.2.119 (EHLO szxeml424-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CDW69205; Tue, 04 Nov 2014 00:47:37 +0800 (CST) Received: from localhost.localdomain (10.47.77.41) by szxeml424-hub.china.huawei.com (10.82.67.163) with Microsoft SMTP Server id 14.3.158.1; Tue, 4 Nov 2014 00:47:27 +0800 From: Frediano Ziglio To: Ian Campbell , Stefano Stabellini , Tim Deegan , Julien Grall , Date: Mon, 3 Nov 2014 16:46:35 +0000 Message-ID: <1415033196-30529-7-git-send-email-frediano.ziglio@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415033196-30529-1-git-send-email-frediano.ziglio@huawei.com> References: <1415033196-30529-1-git-send-email-frediano.ziglio@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.47.77.41] X-CFilter-Loop: Reflected Cc: zoltan.kiss@huawei.com, xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH v2 6/7] xen/arm: Force domains to use normal GICv2 driver on Hip04 platform X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: frediano.ziglio@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Until vGIC support is not implemented and tested, this will prevent guest kernels to use their Hip04 driver, or crash when they don't have any. Signed-off-by: Frediano Ziglio --- xen/arch/arm/gic-v2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 411b104..cea9edc 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -639,6 +639,12 @@ static int gicv2_make_dt_node(const struct domain *d, return -FDT_ERR_XEN(ENOENT); } + if ( nr_gic_cpu_if == 16 ) + { + compatible = DT_COMPAT_GIC_CORTEX_A15; + len = strlen((char*) compatible) + 1; + } + res = fdt_begin_node(fdt, "interrupt-controller"); if ( res ) return res;