From patchwork Fri Mar 21 13:05:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 26836 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 419F120143 for ; Fri, 21 Mar 2014 13:07:08 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id bj1sf5758197pad.7 for ; Fri, 21 Mar 2014 06:07:07 -0700 (PDT) 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:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=s3MbhMoa6MZhm513lg4tUTZGycaeVs45VHSorG4yaRA=; b=gOoz4hDpayXlFA9/4uTPZPMExiyQqRMw4glEs/xla7Ny+DhNg2iOUagz6n1kfYbVSP SrK8TQp2Hb6a5tiJuNQArxO4iQWIWv1hpJX1MK7CkUiQORRTQaFe9Nlu01vxg8sApN97 cqbs2XQxjaWnx1JnFjhKXyzW1rgnAaGFX4Zf12ekTSeHRzzpRhO8lyH2ZyTVh8PNBeb0 kzRvGdDji35OuAamceRslz4gFn4f2C22EjBWyGLqu2Vih//kbLVXq71ucqbRLHsOdC/i mK9hyfpoCg3BSuCnb4QsEpAV5kCcS6IOzF2mXdDKS4paipcEGBHV8x4HdDxkFk5AzQM4 J3Ug== X-Gm-Message-State: ALoCoQkfpV5aTA9OxJ5yJq8QqjPdiBNhOYOdXx95UbmMZEVW+o2rQ6d4xP0AP3mC7/ZelHYZBv/A X-Received: by 10.66.140.8 with SMTP id rc8mr19603841pab.41.1395407227493; Fri, 21 Mar 2014 06:07:07 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.89.70 with SMTP id u64ls613517qgd.80.gmail; Fri, 21 Mar 2014 06:07:07 -0700 (PDT) X-Received: by 10.220.103.141 with SMTP id k13mr8793182vco.25.1395407227390; Fri, 21 Mar 2014 06:07:07 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id 16si1099932vce.120.2014.03.21.06.07.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 06:07:07 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id sa20so2455935veb.8 for ; Fri, 21 Mar 2014 06:07:07 -0700 (PDT) X-Received: by 10.58.107.167 with SMTP id hd7mr8409veb.66.1395407227307; Fri, 21 Mar 2014 06:07:07 -0700 (PDT) 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.220.78.9 with SMTP id i9csp29353vck; Fri, 21 Mar 2014 06:07:07 -0700 (PDT) X-Received: by 10.140.41.134 with SMTP id z6mr1691838qgz.112.1395407225686; Fri, 21 Mar 2014 06:07:05 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id z6si2116814qai.86.2014.03.21.06.07.04 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 21 Mar 2014 06:07:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) 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 1WQz8U-0007WG-HX; Fri, 21 Mar 2014 13:05:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQz8T-0007V6-9U for xen-devel@lists.xenproject.org; Fri, 21 Mar 2014 13:05:21 +0000 Received: from [193.109.254.147:58173] by server-7.bemta-14.messagelabs.com id 57/23-17726-0193C235; Fri, 21 Mar 2014 13:05:20 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1395407119!3287711!1 X-Originating-IP: [74.125.83.49] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19097 invoked from network); 21 Mar 2014 13:05:20 -0000 Received: from mail-ee0-f49.google.com (HELO mail-ee0-f49.google.com) (74.125.83.49) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 21 Mar 2014 13:05:20 -0000 Received: by mail-ee0-f49.google.com with SMTP id c41so1766455eek.22 for ; Fri, 21 Mar 2014 06:05:19 -0700 (PDT) X-Received: by 10.14.213.197 with SMTP id a45mr50993eep.111.1395407119725; Fri, 21 Mar 2014 06:05:19 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id w12sm11444707eez.36.2014.03.21.06.05.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Mar 2014 06:05:18 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Fri, 21 Mar 2014 13:05:09 +0000 Message-Id: <1395407109-19153-5-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395407109-19153-1-git-send-email-julien.grall@linaro.org> References: <1395407109-19153-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v3 4/4] xen/arm: Add support for XSM 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: , MIME-Version: 1.0 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: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/setup.c | 4 ++-- xen/arch/arm/traps.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 215ec24..dbe3831 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -44,6 +44,7 @@ #include #include #include +#include struct cpuinfo_arm __read_mostly boot_cpu_data; @@ -719,8 +720,7 @@ void __init start_xen(unsigned long boot_phys_offset, init_IRQ(); - gic_route_ppis(); - gic_route_spis(); + xsm_dt_init(); init_maintenance_interrupt(); init_timer_interrupt(); diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index ec43e65..a7edc4e 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1006,6 +1006,7 @@ static arm_hypercall_t arm_hypercall_table[] = { HYPERCALL(sched_op, 2), HYPERCALL(console_io, 3), HYPERCALL(xen_version, 2), + HYPERCALL(xsm_op, 1), HYPERCALL(event_channel_op, 2), HYPERCALL(physdev_op, 2), HYPERCALL(sysctl, 2),