From patchwork Thu Apr 9 15:09:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 46972 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4864C21416 for ; Thu, 9 Apr 2015 15:22:29 +0000 (UTC) Received: by wizk4 with SMTP id k4sf2015346wiz.2 for ; Thu, 09 Apr 2015 08:22:28 -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:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive; bh=w7EwXyoe95Vhl1bMI6irm0YDzCUyzseLLIpuZXAKudg=; b=OJS0PQLSidnNXsBkiK/1XHh3VM/W8nI6J9WsqRdTfGutdg/inNn98ArX3TWH6LOp46 vo5M2+CAa71Y10UDsqGi0T4PxyS5X8DkY2kJtBnQZgMu+0jVSIMj/A1/WC4+585ecrVZ jO7Gkjh83HLeJVFud4/ZGZP4ZMPnQvt6lqhf+R+DXqqRbcdhL7b93VpJ1C/sjl0CI/lz TfsdL9MhVzwXsTbNqCMwoP/HlA7HIHeYZoa6KDgVMSAJcomVH887MAjJ0VsU3wwabrE4 cQCA40XGPnLx+rDu6qCADw3VmhEpRXlj5eZxWn3trDmQSvnq+P4n+wqOfuMjUiaPqkuF HrwA== X-Gm-Message-State: ALoCoQl43vOfhnHzGGFy5VnGpfaJE3hGQp3/u+XnA9+SEXCKGhneBQwdHQ6LXs0DJW63kzxCcoHM X-Received: by 10.180.101.39 with SMTP id fd7mr719733wib.0.1428592948452; Thu, 09 Apr 2015 08:22:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.171 with SMTP id az11ls343120lab.107.gmail; Thu, 09 Apr 2015 08:22:28 -0700 (PDT) X-Received: by 10.152.36.227 with SMTP id t3mr4973990laj.12.1428592948323; Thu, 09 Apr 2015 08:22:28 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id kx10si10188169lbb.152.2015.04.09.08.22.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Apr 2015 08:22:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by labbd9 with SMTP id bd9so80751001lab.2 for ; Thu, 09 Apr 2015 08:22:28 -0700 (PDT) X-Received: by 10.112.29.36 with SMTP id g4mr29301269lbh.56.1428592948186; Thu, 09 Apr 2015 08:22:28 -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.112.67.65 with SMTP id l1csp537659lbt; Thu, 9 Apr 2015 08:22:27 -0700 (PDT) X-Received: by 10.55.52.4 with SMTP id b4mr59943933qka.37.1428592946829; Thu, 09 Apr 2015 08:22:26 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id 131si14642442qhf.51.2015.04.09.08.22.26 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 09 Apr 2015 08:22:26 -0700 (PDT) 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 1YgEGu-0003Lk-LM; Thu, 09 Apr 2015 15:21:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YgEGt-0003Kz-Im for xen-devel@lists.xenproject.org; Thu, 09 Apr 2015 15:21:35 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 04/03-06072-EF896255; Thu, 09 Apr 2015 15:21:34 +0000 X-Env-Sender: julien.grall@citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1428592892!16715287!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7244 invoked from network); 9 Apr 2015 15:21:34 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 9 Apr 2015 15:21:34 -0000 X-IronPort-AV: E=Sophos;i="5.11,550,1422921600"; d="scan'208";a="253569312" From: Julien Grall To: Date: Thu, 9 Apr 2015 16:09:36 +0100 Message-ID: <1428592185-18581-11-git-send-email-julien.grall@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1428592185-18581-1-git-send-email-julien.grall@citrix.com> References: <1428592185-18581-1-git-send-email-julien.grall@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH v5 p2 10/19] xen/iommu: arm: Wire iommu DOMCTL for ARM 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: patch@linaro.org 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.52 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: From: Julien Grall Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- Changes in v4: - Add Ian's ack Changes in v3: - Add Stefano's ack Changes in v2: - Don't move the call in common code. --- xen/arch/arm/domctl.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index 531bb13..fd1e610 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -108,7 +108,16 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, return 0; } default: - return subarch_do_domctl(domctl, d, u_domctl); + { + int rc; + + rc = subarch_do_domctl(domctl, d, u_domctl); + + if ( rc == -ENOSYS ) + rc = iommu_do_domctl(domctl, d, u_domctl); + + return rc; + } } }