From patchwork Tue Apr 22 13:14:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 28813 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 36DC9203AC for ; Tue, 22 Apr 2014 13:16:55 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id b6sf27912890yha.4 for ; Tue, 22 Apr 2014 06:16:54 -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=y7k1WfQ/kGu+n/U2mBYbmdoXoEh9U9QIFeLZXJyMrTo=; b=VzfHFJLoviZMO4zTVbFZ987CXXPAAaCQGAGnaOmOR6SRGY35dCJ5F7NM9jTk30kjbl OkXg2FLjW+aaJnYxF3UoDfhOy8Y803ojSi5+pyrkPluL+YZp6KZ30JrsRZgWN+ATZ1ni hZhqKaj9YApF2FRhQ5wJm8bZOJewrE72yYCh98CS1oYD/EiK9NYAdjtE6LasnPTKV3Wg hPaBkBJ+JlP9CWtCuODbvCVoghyyGEXYnk0YYFErZdl/ZjijpcQ9Dla+2AHu9nHR93mn dN1qiSwwqxMFWo8EHM0czrZLfAEjVvuowUl+V6w0yqbQMCg4F6GUjHbv/N1jbOz17xFg IngA== X-Gm-Message-State: ALoCoQkCtIOafvqMOaDGXTfnw67Boo7+4mOrZmWzwUER22BJF0j0NQgekzl7luzWKOnnGgZm5oBY X-Received: by 10.58.111.202 with SMTP id ik10mr21339870veb.4.1398172614866; Tue, 22 Apr 2014 06:16:54 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.19.115 with SMTP id 106ls90620qgg.75.gmail; Tue, 22 Apr 2014 06:16:54 -0700 (PDT) X-Received: by 10.52.34.4 with SMTP id v4mr476521vdi.42.1398172614707; Tue, 22 Apr 2014 06:16:54 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id v14si6892270vco.111.2014.04.22.06.16.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Apr 2014 06:16:54 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so9253375veb.26 for ; Tue, 22 Apr 2014 06:16:54 -0700 (PDT) X-Received: by 10.58.169.97 with SMTP id ad1mr63364vec.45.1398172614621; Tue, 22 Apr 2014 06:16:54 -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.220.221.72 with SMTP id ib8csp23899vcb; Tue, 22 Apr 2014 06:16:54 -0700 (PDT) X-Received: by 10.220.159.4 with SMTP id h4mr37384278vcx.1.1398172614281; Tue, 22 Apr 2014 06:16:54 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id dq1si6893416vcb.41.2014.04.22.06.16.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 22 Apr 2014 06:16:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) 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 1WcaXx-0006Tt-7G; Tue, 22 Apr 2014 13:15:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WcaXk-0006Ex-1m for xen-devel@lists.xenproject.org; Tue, 22 Apr 2014 13:15:24 +0000 Received: from [193.109.254.147:57442] by server-10.bemta-14.messagelabs.com id 11/AF-04546-66B66535; Tue, 22 Apr 2014 13:15:18 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1398172517!125132!1 X-Originating-IP: [74.125.83.51] 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 2994 invoked from network); 22 Apr 2014 13:15:17 -0000 Received: from mail-ee0-f51.google.com (HELO mail-ee0-f51.google.com) (74.125.83.51) by server-16.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 22 Apr 2014 13:15:17 -0000 Received: by mail-ee0-f51.google.com with SMTP id c13so4672899eek.10 for ; Tue, 22 Apr 2014 06:15:17 -0700 (PDT) X-Received: by 10.15.82.132 with SMTP id a4mr55354430eez.47.1398172517013; Tue, 22 Apr 2014 06:15:17 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id 45sm112969867eeh.9.2014.04.22.06.15.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Apr 2014 06:15:15 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 22 Apr 2014 14:14:31 +0100 Message-Id: <1398172475-27873-18-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398172475-27873-1-git-send-email-julien.grall@linaro.org> References: <1398172475-27873-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v4 17/21] xen/arm: Don't give IOMMU devices to dom0 when iommu is disabled 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=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: When iommu={disable,off,no,false} is given to Xen command line, the IOMMU framework won't specify that the device shouldn't be passthrough to DOM0. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- Changes in v2: - Patch added --- xen/arch/arm/device.c | 15 +++++++++++++++ xen/arch/arm/domain_build.c | 10 ++++++++++ xen/include/asm-arm/device.h | 10 ++++++++++ 3 files changed, 35 insertions(+) diff --git a/xen/arch/arm/device.c b/xen/arch/arm/device.c index f86b2e3..59e94c0 100644 --- a/xen/arch/arm/device.c +++ b/xen/arch/arm/device.c @@ -67,6 +67,21 @@ int __init device_init(struct dt_device_node *dev, enum device_type type, return -EBADF; } +enum device_type device_get_type(const struct dt_device_node *dev) +{ + const struct device_desc *desc; + + ASSERT(dev != NULL); + + for ( desc = _sdevice; desc != _edevice; desc++ ) + { + if ( device_is_compatible(desc, dev) ) + return desc->type; + } + + return DEVICE_UNKNOWN; +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 12e8238..b9b2fa0 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -833,6 +834,15 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, return 0; } + /* Even if the IOMMU device is not used by Xen, it should not be + * passthrough to DOM0 + */ + if ( device_get_type(node) == DEVICE_IOMMU ) + { + DPRINT(" IOMMU, skip it\n"); + return 0; + } + /* * Some device doesn't need to be mapped in Xen: * - Memory: the guest will see a different view of memory. It will diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index ed04344..60109cc 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -8,6 +8,8 @@ enum device_type { DEVICE_SERIAL, DEVICE_IOMMU, + /* Use for error */ + DEVICE_UNKNOWN, }; struct device_desc { @@ -32,6 +34,14 @@ struct device_desc { int __init device_init(struct dt_device_node *dev, enum device_type type, const void *data); +/** + * device_get_type - Get the type of the device + * @dev: device to match + * + * Return the device type on success or DEVICE_ANY on failure + */ +enum device_type device_get_type(const struct dt_device_node *dev); + #define DT_DEVICE_START(_name, _namestr, _type) \ static const struct device_desc __dev_desc_##_name __used \ __attribute__((__section__(".dev.info"))) = { \