From patchwork Thu May 30 12:02:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Anisov X-Patchwork-Id: 10968655 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ED43E92A for ; Thu, 30 May 2019 12:04:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DECB828346 for ; Thu, 30 May 2019 12:04:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D320728A6D; Thu, 30 May 2019 12:04:16 +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=-5.0 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6E2DB28346 for ; Thu, 30 May 2019 12:04:16 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hWJlV-0001BX-Oa; Thu, 30 May 2019 12:02:37 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hWJlU-0001BS-7I for xen-devel@lists.xenproject.org; Thu, 30 May 2019 12:02:36 +0000 X-Inumbo-ID: ce7945b6-82d2-11e9-8980-bc764e045a96 Received: from mail-lj1-x244.google.com (unknown [2a00:1450:4864:20::244]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id ce7945b6-82d2-11e9-8980-bc764e045a96; Thu, 30 May 2019 12:02:34 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id z5so5755975lji.10 for ; Thu, 30 May 2019 05:02:33 -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; bh=yimbX/waU4vBtbed2XD5duM6pcFCvwAOvSV/8eaI0TE=; b=t5fRxok8YAs7LqQbcscXsR9DmwDagC4w6ITcPyrmeZjgJf03k7FbrT9BH/MFJ8B5ZQ LLfaLpxhW3zeB1F6KN+F1kH5VE24c3BzKrp/2eTXWxJ9ADPhRULDPP3FFVYRMkZQLsSg cTr0FwBPi8wQzKs4Bs4FC9gnDy5MjZX/+hBU5eePLjXc6fUyEx1sqUxtzZLF7ezngtlH vBO1n4Wgh/W1cLNzTnXXcDKxSJIrWF8wrWxreO30h6EP0NGBSJls8kqkmRMg2/3neWj1 Wz/Y52z7HlL4kBeLQIAjOd7dlIHk0QHm+esOtuz6/GPDj8wbjklBTT4G+n5AzhESMsN4 3GFw== 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; bh=yimbX/waU4vBtbed2XD5duM6pcFCvwAOvSV/8eaI0TE=; b=oqE+UxqqjcXadnnsedbn+m7JYXYxW/QwrPQK7JfwybUc1VY41UHl5Z041i5Jsn/9N1 ulbVZhUpmKLqsuqzCnmK8MUH6mdjSQ1biVA1TUoDA9EfcrXDBCaUDOTUdQdxEKpH2C3d o2qFIkwGbZTKPsf2HOYmHbUwZqLyA6YVu4hOa2KOChiBLAYgD0gjqgHtsKjoLwO3jCep AkU8ZRTmwQeOx0x/h7URMjBte7pLJSK7r+fEX0HIuA/ZGymzBRXO/GQpN/pQks2WyhSP x6mMmLe2+Qds70ckLga3peRF4/y2dY94z5NzjGXYn80B+bsyZn3Ag+/gEB6XHEHOpKH8 CdJA== X-Gm-Message-State: APjAAAXys6PScsnd/98194DvGg0t0CTsjR4n9eFecl6BRweu1wjhJcWP IhogoC0ivwyEb7Aiejkjhq1VAiHQgkI= X-Google-Smtp-Source: APXvYqxdUd2zF0XRMOAGXCa1CmYeiIzB1HE+nlXwSek0jtzMfxUCqUnlQTmRL5kVPJ9o3jDvHtkw2Q== X-Received: by 2002:a2e:9b0c:: with SMTP id u12mr1960876lji.189.1559217751846; Thu, 30 May 2019 05:02:31 -0700 (PDT) Received: from aanisov-work.kyiv.epam.com (ll-22.209.223.85.sovam.net.ua. [85.223.209.22]) by smtp.gmail.com with ESMTPSA id u10sm504526lfu.18.2019.05.30.05.02.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 May 2019 05:02:30 -0700 (PDT) From: Andrii Anisov To: xen-devel@lists.xenproject.org Date: Thu, 30 May 2019 15:02:28 +0300 Message-Id: <1559217748-25426-1-git-send-email-andrii.anisov@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [Xen-devel] [PATCH] iommu/arm: add missing return X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Oleksandr Tyshchenko , Julien Grall , Stefano Stabellini , Andrii Anisov MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Oleksandr Tyshchenko In case iommu_ops have been already set, we should not update it. Signed-off-by: Oleksandr Tyshchenko Signed-off-by: Andrii Anisov Acked-by: Julien Grall --- This patch is extracted from [1], as agreed here [2]. [1] https://lists.xenproject.org/archives/html/xen-devel/2019-01/msg01658.html [2] https://lists.xenproject.org/archives/html/xen-devel/2019-01/msg01859.html --- xen/drivers/passthrough/arm/iommu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/drivers/passthrough/arm/iommu.c b/xen/drivers/passthrough/arm/iommu.c index 325997b..2135233 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; }