From patchwork Mon Mar 17 14:06:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 26376 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f72.google.com (mail-pb0-f72.google.com [209.85.160.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1C689202FA for ; Mon, 17 Mar 2014 14:08:43 +0000 (UTC) Received: by mail-pb0-f72.google.com with SMTP id jt11sf14351687pbb.11 for ; Mon, 17 Mar 2014 07:08:43 -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=pIdrJML3IP1aVqhGDhrSkt30+3nBa8c6lfV/k23WXLg=; b=XattIffxinkbLCsTB6v2tvd+vWG4SL/xhAL03q/0P1mlUhMtDlhz1+l4iIiXY4u7Bg 36iwdLrlon3Wa4rutJc2MNseVujcS8rhtyXeGZvCW+Jlc8IC8wKqepFO6Qf2XIFobIov rvSbiE1UvzOvLJunTY9OAw2051HTWClJLZ+y8Zt0YwujnTa0s7MRiaIltj6cPx++0txH Q0WaTcblQUVHh06VwpbSNE+EamU1h7jtvlvIT4sqhJhGfJJkCgOw4QidPtVjMV0CvsmT EtqRO3mBcYjM9eIabf9s2nPM1FCJvN/DTZhNWdOc1xO7wgHUAzyEnRta5QkKH3yanObT IqJQ== X-Gm-Message-State: ALoCoQnJwhdOE6t5bgYrDhkTbiF2Pk5ENwnSuibLRfo2ytH3hlLKs8elc3kAzurjEtMLwuBUBOFT X-Received: by 10.66.146.65 with SMTP id ta1mr9466404pab.19.1395065323350; Mon, 17 Mar 2014 07:08:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.83.85 with SMTP id i79ls1652738qgd.21.gmail; Mon, 17 Mar 2014 07:08:43 -0700 (PDT) X-Received: by 10.52.173.165 with SMTP id bl5mr7886707vdc.13.1395065323209; Mon, 17 Mar 2014 07:08:43 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id uw4si1776053vdc.109.2014.03.17.07.08.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Mar 2014 07:08:43 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 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.180; Received: by mail-vc0-f180.google.com with SMTP id lf12so5660220vcb.39 for ; Mon, 17 Mar 2014 07:08:43 -0700 (PDT) X-Received: by 10.220.131.210 with SMTP id y18mr20336600vcs.12.1395065323130; Mon, 17 Mar 2014 07:08:43 -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 i9csp130126vck; Mon, 17 Mar 2014 07:08:42 -0700 (PDT) X-Received: by 10.224.115.142 with SMTP id i14mr28651053qaq.9.1395065322188; Mon, 17 Mar 2014 07:08:42 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id v4si8606503qap.87.2014.03.17.07.08.41 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 17 Mar 2014 07:08:41 -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 1WPYBj-0002d1-1c; Mon, 17 Mar 2014 14:06:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPYBd-0002Ww-UG for xen-devel@lists.xenproject.org; Mon, 17 Mar 2014 14:06:42 +0000 Received: from [85.158.139.211:2277] by server-17.bemta-5.messagelabs.com id 8C/7C-09046-17107235; Mon, 17 Mar 2014 14:06:41 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-16.tower-206.messagelabs.com!1395065200!1507458!1 X-Originating-IP: [74.125.83.50] 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 8067 invoked from network); 17 Mar 2014 14:06:40 -0000 Received: from mail-ee0-f50.google.com (HELO mail-ee0-f50.google.com) (74.125.83.50) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 17 Mar 2014 14:06:40 -0000 Received: by mail-ee0-f50.google.com with SMTP id c13so4130952eek.37 for ; Mon, 17 Mar 2014 07:06:40 -0700 (PDT) X-Received: by 10.14.213.135 with SMTP id a7mr24034194eep.57.1395065200084; Mon, 17 Mar 2014 07:06:40 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id x3sm39716538eep.17.2014.03.17.07.06.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Mar 2014 07:06:38 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 17 Mar 2014 14:06:05 +0000 Message-Id: <1395065165-15915-16-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395065165-15915-1-git-send-email-julien.grall@linaro.org> References: <1395065165-15915-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 v2 15/15] 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.180 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 | 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 21c7b26..f967d2f 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),