From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH v3 4/4] xen/arm: Add support for XSM Date: Fri, 21 Mar 2014 13:05:09 +0000 Message-ID: <1395407109-19153-5-git-send-email-julien.grall@linaro.org> References: <1395407109-19153-1-git-send-email-julien.grall@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: 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: by mail-ee0-f49.google.com with SMTP id c41so1766455eek.22 for ; Fri, 21 Mar 2014 06:05:19 -0700 (PDT) In-Reply-To: <1395407109-19153-1-git-send-email-julien.grall@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com List-Id: xen-devel@lists.xenproject.org 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), -- 1.7.10.4