From patchwork Fri Mar 21 15:22:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 26853 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 87443203AB for ; Fri, 21 Mar 2014 15:24:48 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id a41sf6331839yho.2 for ; Fri, 21 Mar 2014 08:24:48 -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=L5hjnB0Em+53wzevtfMJ/8Vvm6ena34nJMp+oV4MeMs=; b=WPiSwJUpEtRM/IkrtB4CGnzWkiObML17ykrG0VmcppVyCpZhL0jSQPYYVjBpBIFlj2 t/bDHIzcIo8PZnbg4RJNLEM5Tv56bBLk08Rd3anrf1FavCrVfvtXRrNgjiEwi2xG8bcG V2aObpO/MWfvr5TbeCLdaHYOgNS8+1/9BDM1ZRodB32GDUF1PN6t8sYHFQnFiKm9qmVX PpH892UYAYkyoYgqj0NXYFBNiaUW+FTBAHdsAUby6cMIXm7UlLskWxGBuyaVV4cYZxah NlA8rrgO5bteUPgbg6jI0L/GASj1EvSf1xhw00DtXsynwMHDi0as2TAoTQnFAcKgC9qf vFIg== X-Gm-Message-State: ALoCoQnehUnBN0Igrb0knoBh/RZfItmrsvt2MvpqGwPdbGlb4xD8Oh37DE6IJIAWbPjy3KqXF5DF X-Received: by 10.224.36.137 with SMTP id t9mr19828031qad.4.1395415488315; Fri, 21 Mar 2014 08:24:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.200 with SMTP id x66ls225518qgx.46.gmail; Fri, 21 Mar 2014 08:24:48 -0700 (PDT) X-Received: by 10.58.165.68 with SMTP id yw4mr38432041veb.17.1395415488222; Fri, 21 Mar 2014 08:24:48 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id tr5si1239574vdc.0.2014.03.21.08.24.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 08:24:48 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hu19so2797868vcb.29 for ; Fri, 21 Mar 2014 08:24:48 -0700 (PDT) X-Received: by 10.58.247.193 with SMTP id yg1mr5578415vec.41.1395415488134; Fri, 21 Mar 2014 08:24:48 -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 i9csp39120vck; Fri, 21 Mar 2014 08:24:47 -0700 (PDT) X-Received: by 10.50.154.3 with SMTP id vk3mr3366449igb.37.1395415487266; Fri, 21 Mar 2014 08:24:47 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id w7si4151142igl.40.2014.03.21.08.24.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 21 Mar 2014 08:24:46 -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 1WR1HS-0007Hv-2c; Fri, 21 Mar 2014 15:22:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WR1HQ-0007Gp-0Q for xen-devel@lists.xenproject.org; Fri, 21 Mar 2014 15:22:44 +0000 Received: from [193.109.254.147:55690] by server-8.bemta-14.messagelabs.com id 60/5A-01877-3495C235; Fri, 21 Mar 2014 15:22:43 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1395415362!3304250!1 X-Originating-IP: [74.125.83.51] 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 19444 invoked from network); 21 Mar 2014 15:22:42 -0000 Received: from mail-ee0-f51.google.com (HELO mail-ee0-f51.google.com) (74.125.83.51) by server-14.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 21 Mar 2014 15:22:42 -0000 Received: by mail-ee0-f51.google.com with SMTP id c13so1926617eek.24 for ; Fri, 21 Mar 2014 08:22:42 -0700 (PDT) X-Received: by 10.14.198.197 with SMTP id v45mr49062432een.9.1395415343241; Fri, 21 Mar 2014 08:22:23 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id m8sm12218015eeg.11.2014.03.21.08.22.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Mar 2014 08:22:22 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Fri, 21 Mar 2014 15:22:14 +0000 Message-Id: <1395415334-31538-5-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395415334-31538-1-git-send-email-julien.grall@linaro.org> References: <1395415334-31538-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 v4 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.220.170 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 --- Changes in v4: - Correctly rebase it... --- xen/arch/arm/setup.c | 2 ++ xen/arch/arm/traps.c | 1 + 2 files changed, 3 insertions(+) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 215ec24..154b707 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; @@ -721,6 +722,7 @@ void __init start_xen(unsigned long boot_phys_offset, 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),