From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [PATCH v3 19/24] xen/iommu: arm: Wire iommu DOMCTL
	for ARM
Date: Fri, 20 Feb 2015 17:06:50 +0000
Message-ID: <1424452010.30924.364.camel@citrix.com>
References: <1421159133-31526-1-git-send-email-julien.grall@linaro.org>
	<1421159133-31526-20-git-send-email-julien.grall@linaro.org>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta3.messagelabs.com ([195.245.230.39])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <Ian.Campbell@citrix.com>) id 1YOrhR-0008Lm-Q7
	for xen-devel@lists.xenproject.org; Fri, 20 Feb 2015 17:49:13 +0000
In-Reply-To: <1421159133-31526-20-git-send-email-julien.grall@linaro.org>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Julien Grall <julien.grall@linaro.org>
Cc: xen-devel@lists.xenproject.org, tim@xen.org, Jan Beulich <jbeulich@suse.com>, stefano.stabellini@citrix.com
List-Id: xen-devel@lists.xenproject.org

On Tue, 2015-01-13 at 14:25 +0000, Julien Grall wrote:
> Signed-off-by: Julien Grall <julien.grall@linaro.org>
> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

(although this does seem to suggest that my decision to use
subarch_do_domctl was flawed -- I should just have inlined
XEN_DOMCTL_set_address_size with a call to a subarch helper)

> Cc: Jan Beulich <jbeulich@suse.com>
> 
> ---
>     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 485d3aa..cc4894e 100644
> --- a/xen/arch/arm/domctl.c
> +++ b/xen/arch/arm/domctl.c
> @@ -33,7 +33,16 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d,
>          return p2m_cache_flush(d, s, e);
>      }
>      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;
> +    }
>      }
>  }
>