From patchwork Thu Apr 18 17:26:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 162514 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1013838jan; Thu, 18 Apr 2019 10:26:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqyWr0VD3YmSuR9byB3072JYGBS1OnnGU7lvGugBhXmqo7haEMWItBA3nVEvWEYIeKBdI67+ X-Received: by 2002:a17:902:e4:: with SMTP id a91mr78255247pla.2.1555608405744; Thu, 18 Apr 2019 10:26:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555608405; cv=none; d=google.com; s=arc-20160816; b=cJ9Izx1MeyAxQEV84NhtmDzUTTE3wwX0FZBAbYt2OHoBhtEnbcN70LQ/0cCaRwpLYH yNg21uP6LIiHXa0S49NGJ52KE5MwD2kdWd2JDaYU6hlaXEZZCwhqrfrLu1m+n/GUwT9M wtgp93k8wXQObXtTNN2FUDEbHidGZYMFLMKGyfzrBLF11NAU2uClQdGsldGHDpIiHG8T gq7TNkB/xO0ypAYN6p2JlaP9S5Jo65J+0W2jWIZd3mZLhN8ytF2Z0+T8ZVvoK6xqQrQg V43Tmd4sFXAXrBcADp5zvUD2t6emWE6b7RHWYXAzHe1HYvk69DZIKOChlwFXRnC2kE8w 7+8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=qS5Uf3QTrWqYRlwI/gBTPLS/7pyASIybkUR9qrVS77w=; b=fuNHEPuh32JxBrbG4hxHVg9ga2IBm/wp+Usp4edDhDBO83Tzr+nmc6fNlBAz3aImI1 Vmq7euhKHVx6z7kVWiPmVMCmcuUwEMlvZ2mj80IIpF84KszBU1kqYbp5rUHl+TUBK7V7 Y5/bMEaUa2wtDdVV9tTkV0a4MCE3TCN1w/WR1TBCk1ouJ2OaB6fsxOAtrGVpDTj8i/GH +DkGYcby+ZnqoUP+z6fstlajl7jg49s6QJt9J2TITzeTLZZ2JkF59TAAK8l7NaAKPwqU gOrTZb/XADwb3D2b2ALT66HYcE84y+xC6GPAIGMgnUQkq3e4jEC9Lotr8EOjzuCF5bAC PdOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s9si2593950plr.17.2019.04.18.10.26.45; Thu, 18 Apr 2019 10:26:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389905AbfDRR0o (ORCPT + 30 others); Thu, 18 Apr 2019 13:26:44 -0400 Received: from foss.arm.com ([217.140.101.70]:38158 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389775AbfDRR0i (ORCPT ); Thu, 18 Apr 2019 13:26:38 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 812D080D; Thu, 18 Apr 2019 10:26:38 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 49BEC3F557; Thu, 18 Apr 2019 10:26:36 -0700 (PDT) From: Julien Grall To: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org Cc: logang@deltatee.com, douliyangs@gmail.com, miquel.raynal@bootlin.com, marc.zyngier@arm.com, jason@lakedaemon.net, tglx@linutronix.de, joro@8bytes.org, robin.murphy@arm.com, bigeasy@linutronix.de, linux-rt-users@vger.kernel.org, Julien Grall Subject: [PATCH 7/7] iommu/dma-iommu: Remove iommu_dma_map_msi_msg() Date: Thu, 18 Apr 2019 18:26:11 +0100 Message-Id: <20190418172611.21561-8-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190418172611.21561-1-julien.grall@arm.com> References: <20190418172611.21561-1-julien.grall@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A recent patch introduced two new functions to replace iommu_dma_map_msi_msg() to avoid executing preemptible code in non-preemptible context. All the existings callers are now using the two new functions, so iommu_dma_map_msi_msg() can be removed. Signed-off-by: Julien Grall --- drivers/iommu/dma-iommu.c | 20 -------------------- include/linux/dma-iommu.h | 5 ----- 2 files changed, 25 deletions(-) -- 2.11.0 diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index f5c1f1685095..fdc8ded62e87 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -928,23 +928,3 @@ void iommu_dma_compose_msi_msg(int irq, struct msi_msg *msg) msg->address_lo &= cookie_msi_granule(domain->iova_cookie) - 1; msg->address_lo += lower_32_bits(msi_page->iova); } - -void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg) -{ - struct msi_desc *desc = irq_get_msi_desc(irq); - phys_addr_t msi_addr = (u64)msg->address_hi << 32 | msg->address_lo; - - if (WARN_ON(iommu_dma_prepare_msi(desc, msi_addr))) { - /* - * We're called from a void callback, so the best we can do is - * 'fail' by filling the message with obviously bogus values. - * Since we got this far due to an IOMMU being present, it's - * not like the existing address would have worked anyway... - */ - msg->address_hi = ~0U; - msg->address_lo = ~0U; - msg->data = ~0U; - } else { - iommu_dma_compose_msi_msg(irq, msg); - } -} diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h index 2f4b2c2cc859..4fe2b2fb19bf 100644 --- a/include/linux/dma-iommu.h +++ b/include/linux/dma-iommu.h @@ -81,7 +81,6 @@ int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr); /* Update the MSI message if required. */ void iommu_dma_compose_msi_msg(int irq, struct msi_msg *msg); -void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg); void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list); #else @@ -120,10 +119,6 @@ static inline void iommu_dma_compose_msi_msg(int irq, struct msi_msg *msg) { } -static inline void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg) -{ -} - static inline void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list) { }