From patchwork Tue Jun 7 15:59:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 9161737 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 E4CC860801 for ; Tue, 7 Jun 2016 16:01:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D231827248 for ; Tue, 7 Jun 2016 16:01:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C6D3228179; Tue, 7 Jun 2016 16:01:47 +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, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 83864281F9 for ; Tue, 7 Jun 2016 16:01:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAJQ1-0002qa-Vm; Tue, 07 Jun 2016 15:59:53 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAJPy-0002kx-Ld for linux-arm-kernel@lists.infradead.org; Tue, 07 Jun 2016 15:59:51 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 17FB8C0467E6; Tue, 7 Jun 2016 15:59:32 +0000 (UTC) Received: from localhost.redhat.com (vpn1-5-152.ams2.redhat.com [10.36.5.152]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u57FxMVw023462; Tue, 7 Jun 2016 11:59:28 -0400 From: Eric Auger To: eric.auger@redhat.com, eric.auger.pro@gmail.com, robin.murphy@arm.com, alex.williamson@redhat.com, will.deacon@arm.com, joro@8bytes.org, tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com, christoffer.dall@linaro.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v10 1/8] iommu: Add iommu_domain_msi_geometry and DOMAIN_ATTR_MSI_GEOMETRY Date: Tue, 7 Jun 2016 15:59:15 +0000 Message-Id: <1465315162-5888-2-git-send-email-eric.auger@redhat.com> In-Reply-To: <1465315162-5888-1-git-send-email-eric.auger@redhat.com> References: <1465315162-5888-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 07 Jun 2016 15:59:32 +0000 (UTC) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160607_085950_772852_4DA6661C X-CRM114-Status: GOOD ( 16.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: julien.grall@arm.com, Jean-Philippe.Brucker@arm.com, p.fedin@samsung.com, linux-kernel@vger.kernel.org, Bharat.Bhushan@freescale.com, iommu@lists.linux-foundation.org, pranav.sawargaonkar@gmail.com, yehuday@marvell.com MIME-Version: 1.0 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 Introduce a new DOMAIN_ATTR_MSI_GEOMETRY domain attribute. It enables to query the aperture of the IOVA window dedicated to MSIs and test whether the MSIs must be mapped with the IOMMU-MSI API. x86 IOMMUs will typically expose an MSI aperture matching the 1MB region [FEE0_0000h - FEF0_000h] corresponding to the the APIC configuration space and no support of the IOMMU-MSI API. On ARM, the support of the IOMMU-MSI API will be advertised. Aperture will refect the setting performed with the IOMMU-MSI API. A helper function is added to allow testing if the aperture is valid. Signed-off-by: Eric Auger Suggested-by: Alex Williamson --- v8 -> v9: - rename programmable into iommu_msi_supported - add iommu_domain_msi_aperture_valid v8: creation - deprecates DOMAIN_ATTR_MSI_MAPPING flag --- drivers/iommu/iommu.c | 5 +++++ include/linux/iommu.h | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 3000051..feab3cc 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1496,6 +1496,7 @@ int iommu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr attr, void *data) { struct iommu_domain_geometry *geometry; + struct iommu_domain_msi_geometry *msi_geometry; bool *paging; int ret = 0; u32 *count; @@ -1506,6 +1507,10 @@ int iommu_domain_get_attr(struct iommu_domain *domain, *geometry = domain->geometry; break; + case DOMAIN_ATTR_MSI_GEOMETRY: + msi_geometry = data; + *msi_geometry = domain->msi_geometry; + break; case DOMAIN_ATTR_PAGING: paging = data; *paging = (domain->pgsize_bitmap != 0UL); diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 664683a..1b553ee 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -52,6 +52,12 @@ struct iommu_domain_geometry { bool force_aperture; /* DMA only allowed in mappable range? */ }; +struct iommu_domain_msi_geometry { + dma_addr_t aperture_start; /* First address used for MSI IOVA */ + dma_addr_t aperture_end; /* Last address used for MSI IOVA */ + bool iommu_msi_supported; /* Is MSI mapping supported? */ +}; + /* Domain feature flags */ #define __IOMMU_DOMAIN_PAGING (1U << 0) /* Support for iommu_map/unmap */ #define __IOMMU_DOMAIN_DMA_API (1U << 1) /* Domain for use in DMA-API @@ -83,6 +89,7 @@ struct iommu_domain { iommu_fault_handler_t handler; void *handler_token; struct iommu_domain_geometry geometry; + struct iommu_domain_msi_geometry msi_geometry; void *iova_cookie; }; @@ -108,6 +115,7 @@ enum iommu_cap { enum iommu_attr { DOMAIN_ATTR_GEOMETRY, + DOMAIN_ATTR_MSI_GEOMETRY, DOMAIN_ATTR_PAGING, DOMAIN_ATTR_WINDOWS, DOMAIN_ATTR_FSL_PAMU_STASH, @@ -328,6 +336,12 @@ extern struct iommu_group *pci_device_group(struct device *dev); /* Generic device grouping function */ extern struct iommu_group *generic_device_group(struct device *dev); +static inline bool iommu_domain_msi_aperture_valid(struct iommu_domain *domain) +{ + return (domain->msi_geometry.aperture_end > + domain->msi_geometry.aperture_start); +} + #else /* CONFIG_IOMMU_API */ struct iommu_ops {};