From patchwork Mon Jun 16 16:18:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 31994 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4D21720E7A for ; Mon, 16 Jun 2014 16:20:37 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wm4sf28244684obc.3 for ; Mon, 16 Jun 2014 09:20:36 -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=mXf0sCpkgK93WMFD5w1jjwi8kULARbngOdaGzYNwh6E=; b=bBBhkKc3U7j9nW694Ocf5HPbJrJz2TVT2GDEvJyhhhn8oSSaqhznFeYrIjWd+5XT5/ ukEh4BsWAQ1zEo3LU89cAh5kNXm6HAqRQbTJn7DH+gMBj48HZ2BxJOTQMuXPKOiWWJoJ dt+UQJwB1hd++BAFp7QYyTAUoB95E3YMOymC2c06pjsmpec1hkMiUYhxKjS1R5jccnDh u4tQdTjaVgEYZ7ajnaPjZ0w0Jc6VMfquf4cf2ichv4O3RbJNqhRMUtuXMhrBYr4+vOFG 7JMKjilH0PUzYLpe86sMUlvYnZgCvNg07g+xAU3Gqx1ebHxR9GtTo9deOw6bF8oF7P5X x0VA== X-Gm-Message-State: ALoCoQk8y8Xh1aIB9M10V15ktiDT/FqGsBbKC93ZpLtEYE/mRDvadZP0tBRBJWiBiPcTAq+7GN24 X-Received: by 10.50.6.45 with SMTP id x13mr3354043igx.4.1402935636859; Mon, 16 Jun 2014 09:20:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.163 with SMTP id p32ls4553262qgd.42.gmail; Mon, 16 Jun 2014 09:20:36 -0700 (PDT) X-Received: by 10.58.29.164 with SMTP id l4mr17062912veh.8.1402935636683; Mon, 16 Jun 2014 09:20:36 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id xr4si4283164veb.87.2014.06.16.09.20.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 16 Jun 2014 09:20:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id ik5so5078902vcb.7 for ; Mon, 16 Jun 2014 09:20:36 -0700 (PDT) X-Received: by 10.58.112.65 with SMTP id io1mr902663veb.61.1402935636614; Mon, 16 Jun 2014 09:20:36 -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.54.6 with SMTP id vs6csp146216vcb; Mon, 16 Jun 2014 09:20:36 -0700 (PDT) X-Received: by 10.224.60.137 with SMTP id p9mr6057676qah.92.1402935636150; Mon, 16 Jun 2014 09:20:36 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id n13si13800350qay.108.2014.06.16.09.20.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 16 Jun 2014 09:20:36 -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 1WwZcC-0006rL-Ij; Mon, 16 Jun 2014 16:18:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WwZcB-0006q1-1W for xen-devel@lists.xenproject.org; Mon, 16 Jun 2014 16:18:35 +0000 Received: from [85.158.137.68:59867] by server-9.bemta-3.messagelabs.com id C5/F8-30063-AD81F935; Mon, 16 Jun 2014 16:18:34 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-12.tower-31.messagelabs.com!1402935513!10330254!1 X-Originating-IP: [209.85.212.180] 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 32443 invoked from network); 16 Jun 2014 16:18:33 -0000 Received: from mail-wi0-f180.google.com (HELO mail-wi0-f180.google.com) (209.85.212.180) by server-12.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 16 Jun 2014 16:18:33 -0000 Received: by mail-wi0-f180.google.com with SMTP id hi2so4386998wib.1 for ; Mon, 16 Jun 2014 09:18:33 -0700 (PDT) X-Received: by 10.180.91.162 with SMTP id cf2mr28669065wib.57.1402935513464; Mon, 16 Jun 2014 09:18:33 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id l45sm34836161eep.25.2014.06.16.09.18.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jun 2014 09:18:32 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 16 Jun 2014 17:18:00 +0100 Message-Id: <1402935486-29136-14-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1402935486-29136-1-git-send-email-julien.grall@linaro.org> References: <1402935486-29136-1-git-send-email-julien.grall@linaro.org> Cc: Keir Fraser , ian.campbell@citrix.com, Julien Grall , tim@xen.org, stefano.stabellini@citrix.com, Jan Beulich Subject: [Xen-devel] [RFC 13/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: , 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.176 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: The call iommu_do_domctl is similar as the x86 one. Move this code to the common code and protected by HAS_PASSTHROUGH. Signed-off-by: Julien Grall Cc: Keir Fraser Cc: Jan Beulich --- xen/arch/x86/domctl.c | 2 +- xen/common/domctl.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 437ba11..ffecc15 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1320,7 +1320,7 @@ long arch_do_domctl( break; default: - ret = iommu_do_domctl(domctl, d, u_domctl); + ret = -ENOSYS; break; } diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 5d3ac87..85866b7 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -1028,6 +1028,10 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) default: ret = arch_do_domctl(op, d, u_domctl); +#ifdef HAS_PASSTHROUGH + if ( ret == -ENOSYS ) + ret = iommu_do_domctl(op, d, u_domctl); +#endif break; }