From patchwork Tue Jul 25 17:26:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Tyshchenko X-Patchwork-Id: 9862567 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 39F02603F9 for ; Tue, 25 Jul 2017 17:30:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E0AA286F8 for ; Tue, 25 Jul 2017 17:30:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E3BA286E0; Tue, 25 Jul 2017 17:30:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0BD3A286FC for ; Tue, 25 Jul 2017 17:30:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1da3c9-00005j-5N; Tue, 25 Jul 2017 17:27:21 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1da3c7-0008Uy-Tt for xen-devel@lists.xenproject.org; Tue, 25 Jul 2017 17:27:20 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id F6/BA-03044-77F77795; Tue, 25 Jul 2017 17:27:19 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRWlGSWpSXmKPExsVyMfS6o25ZfXm kwfGFmhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bT/nUsBZ85Kw6dPcjawPiHvYuRi0NIYDqj xN//f5m6GDk5WAReskg0z64CSUgI9LNKTF/ZytLFyAHkxEk82pgBUiMhUClxevpJsHohASWJ1 zs3M0EMms0k8W/rGnaQBJuAgcT+d0/AbBGgonurJoM1MAPN6Z54lgXEFhZwk/i96zA7xGJViU MrVzKD2LwCzhKrF+1lg1gmJ3HzXCdYnFPARWLrp20sEIudJdYfO8A8gVFgASPDKkaN4tSistQ iXSNDvaSizPSMktzEzBxdQwMzvdzU4uLE9NScxKRiveT83E2MwMBiAIIdjH+WBRxilORgUhLl /aZbHinEl5SfUpmRWJwRX1Sak1p8iFGGg0NJgnd5HVBOsCg1PbUiLTMHGOIwaQkOHiUR3jsga d7igsTc4sx0iNQpRkuOK1fWfWHimHJgO5B8NeH/NyYhlrz8vFQpcV4fkAYBkIaM0jy4cbA4vM QoKyXMywh0oBBPQWpRbmYJqvwrRnEORiVh3vW1QFN4MvNK4La+AjqICeigOTNKQQ4qSURISTU wNipuXfZpwq+9ztNzdr6N7mX4/FeXSzll4sWVR+4mmO/S69xwSfqTz9XDCiyWeVeLA+MTpyro 7172wP7OYoYtz3rbatZ82/E/dFv/xAnWlQs/zkp4dN2mMOrFhMnmfo9TT7yZfcTKMrZhktqGX VfcJBpbCu1vFt3mkbt4b97ku2HfGz0XTfsioaHEUpyRaKjFXFScCAAM2dRBvgIAAA== X-Env-Sender: olekstysh@gmail.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1501003638!108030060!1 X-Originating-IP: [209.85.215.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21051 invoked from network); 25 Jul 2017 17:27:18 -0000 Received: from mail-lf0-f65.google.com (HELO mail-lf0-f65.google.com) (209.85.215.65) by server-4.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 25 Jul 2017 17:27:18 -0000 Received: by mail-lf0-f65.google.com with SMTP id d80so3644830lfg.1 for ; Tue, 25 Jul 2017 10:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=h4iATFYvTG+g3mMdfgUick0yuFdI07vpxsLPhD9bum0=; b=kRl+FAv8zFR3a54wyoqf1WAKQ/kWcydYzPRN7OkW3IHGkvC1d1np8gFfMJwWVkoFCT 2G6zHfJppaihs8Ba26QU+OENR8agFozXBjGR6O3AC1c4KOIUgPsmDCRlFTnlypWxKvda n+OinEN0IC0+eHr9Y6HDS5cvao1QGJ4wCHCD7HOQhqkYytwwd4X5toL/Xp9n3USDJNsz b54j37MamelKLbswxlCD8JYbuk6kpEujKAdVgXlvhDysgp/ji11+WruHnEP3cc2pNxBw 4HJyveRYxm4OdOtkZc3tBWBU1cz8vnOkbe8KRGebQrI6EK5I5hWCu313sqG5XBiFBsQL af4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=h4iATFYvTG+g3mMdfgUick0yuFdI07vpxsLPhD9bum0=; b=MBWZ4AN4p9nvbCGTD2fdtNcHYw/Ik5AvTU8HHxU5F0hPyg02d5fPzThGhEEJEy2TLg dYConP9EIgDiO6RxU+j0+3Rip1Hu6WXlllgCnwczfabAjymix27XgpOSg9w6lM509U+y ASKBvsyS5HY4AOhxJOfdkATcOdZGOCmB3nEYPoar7pa5j6mWLySumc76Aweuasv+FEwm zQuwNUiKXlEDr2fIID7VhEvq9+Z4QxvpkY1+E5Zrc0bORJtzK4w6XnkFbwke7PfHQN63 Inp0y/O1Djuv5yCKi/EviDQnHsDy6c9PflID0K6XigGgky9oyjVq0JIeSeAMIaa6p/oR Mv/g== X-Gm-Message-State: AIVw1108zyJ1KEr9txRWrGVLEIhrCW6r5p0Zucz1Z0aLsInU6YDxpCmn f8/XyHAP8G27Sm5s X-Received: by 10.25.225.130 with SMTP id l2mr6562399lfk.103.1501003637637; Tue, 25 Jul 2017 10:27:17 -0700 (PDT) Received: from otyshchenko.kyiv.epam.com (ll-59.209.223.85.sovam.net.ua. [85.223.209.59]) by smtp.gmail.com with ESMTPSA id v145sm411748lfa.21.2017.07.25.10.27.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Jul 2017 10:27:17 -0700 (PDT) From: Oleksandr Tyshchenko To: xen-devel@lists.xenproject.org Date: Tue, 25 Jul 2017 20:26:50 +0300 Message-Id: <1501003615-15274-9-git-send-email-olekstysh@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501003615-15274-1-git-send-email-olekstysh@gmail.com> References: <1501003615-15274-1-git-send-email-olekstysh@gmail.com> Cc: Oleksandr Tyshchenko , Julien Grall Subject: [Xen-devel] [PATCH v2 08/13] iommu/arm: Misc fixes for arch specific part X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Oleksandr Tyshchenko 1. Add missing return in case if IOMMU ops have been already set. 2. Add check for shared IOMMU before returning an error. Signed-off-by: Oleksandr Tyshchenko CC: Julien Grall Reviewed-by: Julien Grall --- Changes in V1: - Changes in V2: - --- xen/drivers/passthrough/arm/iommu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/arm/iommu.c b/xen/drivers/passthrough/arm/iommu.c index 95b1abb..6f01c13 100644 --- a/xen/drivers/passthrough/arm/iommu.c +++ b/xen/drivers/passthrough/arm/iommu.c @@ -32,7 +32,10 @@ void __init iommu_set_ops(const struct iommu_ops *ops) BUG_ON(ops == NULL); if ( iommu_ops && iommu_ops != ops ) + { printk("WARNING: Cannot set IOMMU ops, already set to a different value\n"); + return; + } iommu_ops = ops; } @@ -70,6 +73,6 @@ void arch_iommu_domain_destroy(struct domain *d) int arch_iommu_populate_page_table(struct domain *d) { - /* The IOMMU shares the p2m with the CPU */ - return -ENOSYS; + /* Return an error if the IOMMU shares the p2m with the CPU */ + return iommu_use_hap_pt(d) ? -ENOSYS : 0; }