From patchwork Wed Sep 27 13:32:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shameerali Kolothum Thodi X-Patchwork-Id: 9974103 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 8B7A26037F for ; Wed, 27 Sep 2017 13:36:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7888D28BB5 for ; Wed, 27 Sep 2017 13:36:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D4D028C03; Wed, 27 Sep 2017 13:36:49 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E2D3C28BB5 for ; Wed, 27 Sep 2017 13:36:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZBdIe7eVznxjH/3nJtLEPh5lrdIxIleQPeewq8mqARY=; b=eJu+OHh4LE2inR g46DUIiyyd4HyrzRrfEqI7Y8B56Tafvc+W1ILTZlsQaQMhvK9wuPTvZ+3glgw+gOVqsB0Ta/XKkbV 1/VfdZ8oalwu3V8rsnH1KdK8st5XqarvfZeT/ppQA9YY1FGY+oR6+l6sI7zYfp7IBFTtod9OqROie ne7rR2ORmYHhsxOzhhjBRW3tHUa4La40ieyJkMel9pPtmIaDyrTKYumSnLqrr16z9S7e3vR4Pi6LY kix+UfjUuvuIQlJ+nfUo7hK0QKTdz4iRVONSfnxKE4Jcd/84wj6dsTQBvTSwZEsKEEz5AfSAMT6xw hT1cBD18LFnFwlmZcmNQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dxCW4-0003Pn-7Z; Wed, 27 Sep 2017 13:36:44 +0000 Received: from szxga05-in.huawei.com ([45.249.212.191]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dxCV3-0001dG-S0 for linux-arm-kernel@lists.infradead.org; Wed, 27 Sep 2017 13:35:55 +0000 Received: from 172.30.72.58 (EHLO DGGEMS401-HUB.china.huawei.com) ([172.30.72.58]) by dggrg05-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id DID21045; Wed, 27 Sep 2017 21:35:16 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.203.177.212) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.301.0; Wed, 27 Sep 2017 21:35:08 +0800 From: Shameer Kolothum To: , , , , , , , Subject: [PATCH v8 3/5] iommu/of: Add msi address regions reservation helper Date: Wed, 27 Sep 2017 14:32:39 +0100 Message-ID: <20170927133241.21036-4-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20170927133241.21036-1-shameerali.kolothum.thodi@huawei.com> References: <20170927133241.21036-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.203.177.212] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090202.59CBA914.01C8, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 6ecd795c30fff79cfb60a13e0fa29c86 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170927_063542_835114_10007AD2 X-CRM114-Status: GOOD ( 12.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, gabriele.paoloni@huawei.com, john.garry@huawei.com, linuxarm@huawei.com, Shameer Kolothum , linux-acpi@vger.kernel.org, iommu@lists.linux-foundation.org, wangzhou1@hisilicon.com, guohanjun@huawei.com, linux-arm-kernel@lists.infradead.org, devel@acpica.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: John Garry On some platforms msi-controller address regions have to be excluded from normal IOVA allocation in that they are detected and decoded in a HW specific way by system components and so they cannot be considered normal IOVA address space. Add a helper function that retrieves msi address regions through device tree msi mapping, so that these regions will not be translated by IOMMU and will be excluded from IOVA allocations. Signed-off-by: John Garry [Shameer: Modified msi-parent retrieval logic] Signed-off-by: Shameer Kolothum --- drivers/iommu/of_iommu.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/of_iommu.h | 10 +++++ 2 files changed, 105 insertions(+) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index e60e3db..ffd7fb7 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -138,6 +139,14 @@ static int of_iommu_xlate(struct device *dev, return ops->of_xlate(dev, iommu_spec); } +static int __get_pci_rid(struct pci_dev *pdev, u16 alias, void *data) +{ + u32 *rid = data; + + *rid = alias; + return 0; +} + struct of_pci_iommu_alias_info { struct device *dev; struct device_node *np; @@ -163,6 +172,73 @@ static int of_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data) return info->np == pdev->bus->dev.of_node; } +static int of_iommu_alloc_resv_region(struct device_node *np, + struct list_head *head) +{ + int prot = IOMMU_WRITE | IOMMU_NOEXEC | IOMMU_MMIO; + struct iommu_resv_region *region; + struct resource res; + int err; + + err = of_address_to_resource(np, 0, &res); + if (err) + return err; + + region = iommu_alloc_resv_region(res.start, resource_size(&res), + prot, IOMMU_RESV_MSI); + if (!region) + return -ENOMEM; + + list_add_tail(®ion->list, head); + + return 0; +} + +static int of_pci_msi_get_resv_regions(struct device *dev, + struct list_head *head) +{ + struct device_node *msi_np; + struct device *pdev; + u32 rid; + int err, resv = 0; + + pci_for_each_dma_alias(to_pci_dev(dev), __get_pci_rid, &rid); + + for_each_node_with_property(msi_np, "msi-controller") { + for (pdev = dev; pdev; pdev = pdev->parent) { + if (!of_pci_map_rid(pdev->of_node, rid, "msi-map", + "msi-map-mask", &msi_np, NULL)) { + + err = of_iommu_alloc_resv_region(msi_np, head); + if (err) + return err; + resv++; + } + } + } + + return resv; +} + +static int of_platform_msi_get_resv_regions(struct device *dev, + struct list_head *head) +{ + struct of_phandle_args args; + int err, resv = 0; + + while (!of_parse_phandle_with_args(dev->of_node, "msi-parent", + "#msi-cells", resv, &args)) { + + err = of_iommu_alloc_resv_region(args.np, head); + of_node_put(args.np); + if (err) + return err; + resv++; + } + + return resv; +} + const struct iommu_ops *of_iommu_configure(struct device *dev, struct device_node *master_np) { @@ -235,6 +311,25 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, return ops; } +/** + * of_iommu_msi_get_resv_regions - Reserved region driver helper + * @dev: Device from iommu_get_resv_regions() + * @head: Reserved region list from iommu_get_resv_regions() + * + * Returns: Number of reserved regions on success (0 if no associated + * msi parent), appropriate error value otherwise. + */ +int of_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head) +{ + + if (dev_is_pci(dev)) + return of_pci_msi_get_resv_regions(dev, head); + else if (dev->of_node) + return of_platform_msi_get_resv_regions(dev, head); + + return 0; +} + static int __init of_iommu_init(void) { struct device_node *np; diff --git a/include/linux/of_iommu.h b/include/linux/of_iommu.h index 13394ac..9267772 100644 --- a/include/linux/of_iommu.h +++ b/include/linux/of_iommu.h @@ -14,6 +14,9 @@ extern int of_get_dma_window(struct device_node *dn, const char *prefix, extern const struct iommu_ops *of_iommu_configure(struct device *dev, struct device_node *master_np); +extern int of_iommu_msi_get_resv_regions(struct device *dev, + struct list_head *head); + #else static inline int of_get_dma_window(struct device_node *dn, const char *prefix, @@ -29,6 +32,13 @@ static inline const struct iommu_ops *of_iommu_configure(struct device *dev, return NULL; } +static int of_iommu_msi_get_resv_regions(struct device *dev, + struct list_head *head) +{ + return -ENODEV; +} + + #endif /* CONFIG_OF_IOMMU */ extern struct of_device_id __iommu_of_table;