From patchwork Wed May 4 11:40:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 67114 Delivered-To: patches@linaro.org Received: by 10.140.92.199 with SMTP id b65csp129503qge; Wed, 4 May 2016 04:40:21 -0700 (PDT) X-Received: by 10.28.19.20 with SMTP id 20mr31269456wmt.5.1462362016952; Wed, 04 May 2016 04:40:16 -0700 (PDT) Return-Path: Received: from mail-wm0-x230.google.com (mail-wm0-x230.google.com. [2a00:1450:400c:c09::230]) by mx.google.com with ESMTPS id p204si4446104wmg.101.2016.05.04.04.40.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 May 2016 04:40:16 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::230 as permitted sender) client-ip=2a00:1450:400c:c09::230; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::230 as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-wm0-x230.google.com with SMTP id a17so88922134wme.0 for ; Wed, 04 May 2016 04:40:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=81c2hjLPhZV1rzDLFWza8uyHuiM0MmaUA4XQnwY+ugg=; b=HWw+EdC6iIl8tOVoSEy9Qd0HbB4ZkBrUJtjzq+h3QVNS0diaU4h0Aig1B+E6ZNLyW8 Nt2W6/mIab3RuF995LAwkXif5q6L9pMkJJQ5AkdknQgku1PNLEMKJ93CHwQ0BbhvR33a uHYUaysbxhDFWfkssvdn/7BxTvy9078zT1CAU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=81c2hjLPhZV1rzDLFWza8uyHuiM0MmaUA4XQnwY+ugg=; b=ANgQ7N6HstqUuZhkr225Gc5GzHx6DQg8ByW4/PWign88nmIdGxHcpuyKERQXTdBNjl QTfN5Rxuu0/fRJ/8VxB3dTa7HYQWX9X192Gf1+WFsSc8Q1JwebV0OWOQd7ffwjHbHJCF b02EdWEgr6EsaVbG4nptA1FBfTdDMuU14lYSsVQPoCXvgi3ARwKsznx66Ew+9+LUWJoW mFVs3aVG9hR6VPJPKj1dD/eFlCkrQd3v4DQ02acLAA5AnvnJR8G7U5Mvn6WQxY5dM1VY n6kbawwSzewhBRakbMFOId0O1xZNi68FYR9IrwKQWKYpnhmSl91l5gs0IpoCiXiu/uSq 1O9w== X-Gm-Message-State: AOPr4FXL3mE5n/Gy+lZXRiCMRx3S7X2E7vWniaF1HOj3p08/X1NvN3sitHtNBDE8j9V8LfBWmxE= X-Received: by 10.194.76.137 with SMTP id k9mr8153615wjw.3.1462362016642; Wed, 04 May 2016 04:40:16 -0700 (PDT) Return-Path: Received: from new-host-61.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id u6sm3766963wjh.2.2016.05.04.04.40.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 May 2016 04:40:15 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, 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 Cc: patches@linaro.org, linux-kernel@vger.kernel.org, Bharat.Bhushan@freescale.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, iommu@lists.linux-foundation.org, Jean-Philippe.Brucker@arm.com, julien.grall@arm.com, yehuday@marvell.com Subject: [PATCH v9 1/8] iommu: Add iommu_domain_msi_geometry and DOMAIN_ATTR_MSI_GEOMETRY Date: Wed, 4 May 2016 11:40:00 +0000 Message-Id: <1462362007-2753-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462362007-2753-1-git-send-email-eric.auger@linaro.org> References: <1462362007-2753-1-git-send-email-eric.auger@linaro.org> 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(+) -- 1.9.1 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index b9df141..71ed58f 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1498,6 +1498,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; @@ -1508,6 +1509,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->ops->pgsize_bitmap != 0UL); diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 62a5eae..021b659 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 @@ -82,6 +88,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; }; @@ -107,6 +114,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, @@ -329,6 +337,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 {};