From patchwork Thu Mar 19 19:29:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 46113 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1EB5721515 for ; Thu, 19 Mar 2015 19:33:07 +0000 (UTC) Received: by wesu56 with SMTP id u56sf14148447wes.2 for ; Thu, 19 Mar 2015 12:33:06 -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:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive; bh=TMaSQR7tpS4v+r7TL8gR3BzNbWDHjo3cJ2zJe++ARmM=; b=JhW5VRbWBJHDilmuptUkVRXI6tRyUXq4gMpLRcFE7uOU+8gJpCsjflRrnqgnuVUvp5 bpZjvqbvTLa4TX/1raQhvKTre1Ib1ziPNHZVN6GC/v77glr+LT1uGba14ldLwr1LjYlv TstdWCcSJchHxEwyk/rN83Huo4WoJOcb4bPvPzpYlTGgcZKeDcIIDYXuRE2vH/Pccq0P G6zPOZ8a9/G3W9F/hQtuGyif5DgPNIHEAjokz4HZ2ax5WWbfNh8PNYi1acpbEfXwd/FF YhQ2tY5+tmaUcZ/+2N31NQwZaT/FUoWPUjqt2MeKpRN+sONdzQsUaR7fwoMDc3GAcHsC HQSA== X-Gm-Message-State: ALoCoQnGC/z4dVKQG1YGGnACzWnNnHxs4oDSU4avysJctUbMZ7BQzY+sG8ZDYLwjcTCifFDZhPUt X-Received: by 10.180.11.34 with SMTP id n2mr2073714wib.2.1426793586468; Thu, 19 Mar 2015 12:33:06 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.132 with SMTP id b4ls342553lah.33.gmail; Thu, 19 Mar 2015 12:33:06 -0700 (PDT) X-Received: by 10.152.183.196 with SMTP id eo4mr7815364lac.22.1426793586298; Thu, 19 Mar 2015 12:33:06 -0700 (PDT) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id zg6si1606073lbb.169.2015.03.19.12.33.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2015 12:33:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by lbcgn8 with SMTP id gn8so60370793lbc.2 for ; Thu, 19 Mar 2015 12:33:06 -0700 (PDT) X-Received: by 10.152.29.68 with SMTP id i4mr20563923lah.19.1426793586208; Thu, 19 Mar 2015 12:33:06 -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.35.133 with SMTP id h5csp597929lbj; Thu, 19 Mar 2015 12:33:05 -0700 (PDT) X-Received: by 10.55.50.203 with SMTP id y194mr105571771qky.8.1426793560746; Thu, 19 Mar 2015 12:32:40 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id i84si720722qhc.95.2015.03.19.12.32.40 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 19 Mar 2015 12:32:40 -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 1YYgA0-000536-S4; Thu, 19 Mar 2015 19:31:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YYg9z-0004z0-JK for xen-devel@lists.xenproject.org; Thu, 19 Mar 2015 19:31:15 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 59/41-24808-2042B055; Thu, 19 Mar 2015 19:31:14 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-12.tower-31.messagelabs.com!1426793474!13749428!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8137 invoked from network); 19 Mar 2015 19:31:14 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-12.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 19 Mar 2015 19:31:14 -0000 Received: by weop45 with SMTP id p45so65631846weo.0 for ; Thu, 19 Mar 2015 12:31:14 -0700 (PDT) X-Received: by 10.180.80.37 with SMTP id o5mr18683326wix.65.1426793474094; Thu, 19 Mar 2015 12:31:14 -0700 (PDT) Received: from chilopoda.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id hl8sm3203005wjb.38.2015.03.19.12.31.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Mar 2015 12:31:13 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Thu, 19 Mar 2015 19:29:50 +0000 Message-Id: <1426793399-6283-25-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1426793399-6283-1-git-send-email-julien.grall@linaro.org> References: <1426793399-6283-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH v4 24/33] 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: , 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 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: 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 f5d5a10..fab9ff7 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -97,7 +97,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; + } } }