From patchwork Tue Apr 28 14:32:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 47678 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C86E62121F for ; Tue, 28 Apr 2015 14:49:22 +0000 (UTC) Received: by lbcne10 with SMTP id ne10sf33428425lbc.1 for ; Tue, 28 Apr 2015 07:49:21 -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=I+/7wTugxHc6AyvslWM525ekW1MbKw+b5a41K8dTWjo=; b=UoCSfkuB48kpulBzpXP/OtdJzLAa+To/XiedcmyhHv4jqLTjpmUXr90yKNectpzyAF s5MQJduSmD0EAxJmPp8Ow0DWkjngb6tIidLw8u7zANXf9rVLLQ1ELoetbmsZ7kTZ9Nhw RuYQLmO8PwHt6W6y0c4HDbV8jDEyXRVV1oLCO0zC5TF42RxmYaKzquwPz8gs5Va7mUqg gHgHjn57TWax86/jn52AcIDkD/6JecAG4FxIEKxRPmtDwJ/mK4IUYzNu0sPJIla6VWtK 9y/jAFRfGVPIlD0v5l5lSMcjctrCnA3QzmDZF/3GIezJAkzYsWPvo1RCDit1VKKa1xMm uARA== X-Gm-Message-State: ALoCoQnvGjFViF6jS6dhFESV3w8rAB+L7mBdC0smCMY++a1YRX0kRb+B0NZ0hv7vS04hocOAoIRC X-Received: by 10.180.106.10 with SMTP id gq10mr10301112wib.0.1430232561731; Tue, 28 Apr 2015 07:49:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.41 with SMTP id t9ls85899lal.82.gmail; Tue, 28 Apr 2015 07:49:21 -0700 (PDT) X-Received: by 10.152.206.103 with SMTP id ln7mr14985835lac.40.1430232561599; Tue, 28 Apr 2015 07:49:21 -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 l10si17212009lal.82.2015.04.28.07.49.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Apr 2015 07:49:21 -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 lagv1 with SMTP id v1so106332394lag.3 for ; Tue, 28 Apr 2015 07:49:21 -0700 (PDT) X-Received: by 10.112.150.100 with SMTP id uh4mr14600809lbb.112.1430232561449; Tue, 28 Apr 2015 07:49:21 -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 l1csp1932141lbt; Tue, 28 Apr 2015 07:49:20 -0700 (PDT) X-Received: by 10.55.43.220 with SMTP id r89mr19988577qkr.27.1430232559207; Tue, 28 Apr 2015 07:49:19 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id v94si18611038qge.82.2015.04.28.07.49.18 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 28 Apr 2015 07:49:19 -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 1Yn6oG-00015M-Ph; Tue, 28 Apr 2015 14:48:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yn6oF-00014P-NL for xen-devel@lists.xenproject.org; Tue, 28 Apr 2015 14:48:27 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id D9/10-02119-ABD9F355; Tue, 28 Apr 2015 14:48:26 +0000 X-Env-Sender: julien.grall@citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1430232502!11277468!2 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.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6359 invoked from network); 28 Apr 2015 14:48:25 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 28 Apr 2015 14:48:25 -0000 X-IronPort-AV: E=Sophos;i="5.11,664,1422921600"; d="scan'208";a="259453148" From: Julien Grall To: Date: Tue, 28 Apr 2015 15:32:34 +0100 Message-ID: <1430231563-25648-11-git-send-email-julien.grall@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1430231563-25648-1-git-send-email-julien.grall@citrix.com> References: <1430231563-25648-1-git-send-email-julien.grall@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH v6 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 4600019..30453d8 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -109,7 +109,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; + } } }