From patchwork Thu Jul 31 15:00:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 34659 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0F46E20540 for ; Thu, 31 Jul 2014 15:02:31 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id v6sf1875773lbi.11 for ; Thu, 31 Jul 2014 08:02:29 -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=whmfq2zKlFgWlG15D1Eg4Wuq5izsbeS/Ix8qHj0RUss=; b=amsKrE3E9LEWhAV++Fgieh6l/q16/QnuFsxzitkHOMX2Vq6gIQBHInkvOVO8du7VDZ SsHAKiAe4PUw0HDBn7JM3lhjL9Erq97gJBpNC072LaqGdxkuCL2rkJi7WPQTB/IzHu4Q fCjLhhRRVMLZqGeDs2MrZlHA+u1G18R6KlrTllF19L2AMoHc+uu92Mh7Ij7n2WlYcAIy 5afvYBg02tvDYSNUqcN66sQdlu1imbnk6Gyip0ZQ525H3lblmnoI9ZzIllsB5lWWW16N Snk80aqe/O+vO3hxpsLLWLjat7snYbmdCEnZo41LLP+EN/n7cc5wgFkjylf8p2KAFW/Q yqkw== X-Gm-Message-State: ALoCoQmlNV7C3QQPG8EFjWtI6awbAgg6NCXAu5FkdcGVzR3biSCOe/LrOkq1dmGA887Wx8EzpkcX X-Received: by 10.194.6.138 with SMTP id b10mr1191202wja.0.1406818948636; Thu, 31 Jul 2014 08:02:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.37 with SMTP id n34ls963973qga.86.gmail; Thu, 31 Jul 2014 08:02:28 -0700 (PDT) X-Received: by 10.52.253.39 with SMTP id zx7mr15377974vdc.2.1406818948437; Thu, 31 Jul 2014 08:02:28 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id m8si4612590vcj.67.2014.07.31.08.02.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jul 2014 08:02:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hq11so4445118vcb.10 for ; Thu, 31 Jul 2014 08:02:28 -0700 (PDT) X-Received: by 10.52.129.165 with SMTP id nx5mr15432590vdb.25.1406818948171; Thu, 31 Jul 2014 08:02: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.221.37.5 with SMTP id tc5csp25080vcb; Thu, 31 Jul 2014 08:02:27 -0700 (PDT) X-Received: by 10.42.49.196 with SMTP id x4mr15702731icf.85.1406818947563; Thu, 31 Jul 2014 08:02:27 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id ge8si14910124icb.28.2014.07.31.08.02.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 31 Jul 2014 08:02:27 -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 1XCrrD-0000rU-OE; Thu, 31 Jul 2014 15:01:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XCrrC-0000oP-12 for xen-devel@lists.xenproject.org; Thu, 31 Jul 2014 15:01:26 +0000 Received: from [85.158.143.35:44853] by server-2.bemta-4.messagelabs.com id D6/4A-04525-54A5AD35; Thu, 31 Jul 2014 15:01:25 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1406818884!12634498!1 X-Originating-IP: [74.125.82.172] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29314 invoked from network); 31 Jul 2014 15:01:24 -0000 Received: from mail-we0-f172.google.com (HELO mail-we0-f172.google.com) (74.125.82.172) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 31 Jul 2014 15:01:24 -0000 Received: by mail-we0-f172.google.com with SMTP id x48so2904307wes.17 for ; Thu, 31 Jul 2014 08:01:24 -0700 (PDT) X-Received: by 10.194.110.7 with SMTP id hw7mr17907031wjb.38.1406818884293; Thu, 31 Jul 2014 08:01:24 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id r20sm67128337wik.0.2014.07.31.08.01.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jul 2014 08:01:23 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Thu, 31 Jul 2014 16:00:48 +0100 Message-Id: <1406818852-31856-18-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1406818852-31856-1-git-send-email-julien.grall@linaro.org> References: <1406818852-31856-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com, Jan Beulich Subject: [Xen-devel] [PATCH v2 17/21] 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.220.179 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 Cc: Jan Beulich Acked-by: Stefano Stabellini --- 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 bab92b2..370dd99 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -43,7 +43,16 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, } 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; + } } }