From patchwork Thu Apr 28 08:15:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 66859 Delivered-To: patches@linaro.org Received: by 10.140.93.198 with SMTP id d64csp75469qge; Thu, 28 Apr 2016 01:15:34 -0700 (PDT) X-Received: by 10.194.87.103 with SMTP id w7mr13790764wjz.13.1461831334704; Thu, 28 Apr 2016 01:15:34 -0700 (PDT) Return-Path: Received: from mail-wm0-x234.google.com (mail-wm0-x234.google.com. [2a00:1450:400c:c09::234]) by mx.google.com with ESMTPS id gk7si9373547wjb.5.2016.04.28.01.15.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Apr 2016 01:15:34 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::234 as permitted sender) client-ip=2a00:1450:400c:c09::234; 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::234 as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-wm0-x234.google.com with SMTP id a17so51621241wme.0 for ; Thu, 28 Apr 2016 01:15:34 -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=W0ApuM4Nlz07785L7THsbfdugCamLavLAK/v4oQYNyY=; b=O7zrvuPGdfJ3D3s4qQa/ZxsvSe4N4TWTXNxueg6Ix5txGHLaCZIB9zlq6wsiD2c5lm SRLZPhkMBA1ZYthOnqqF/16ERlP2E2jI4p3GR7/h2cq9sHNFp1p2yCtawPTdknkpIsxF 3LO8Tg0z0ZGI3UMSB0Gq+aYR9mhZ63w3f1ovg= 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=W0ApuM4Nlz07785L7THsbfdugCamLavLAK/v4oQYNyY=; b=mqWehI4fG/f+fwmLYQWzaMeGSpG5o7vEwS/zSQHG1bUBRITl0Vsii6FG7A0S3Q0XI0 HKznugzqQvdiIzjR3UWgGvFOuLDvr6GDpO3GXYGPJ/lvTH1a8KO5oMpUNfdFObc6vG9e C53Hwl1nxY+wLnmtwndYmrB/BFOivlBvc6z/S1E9kU8QJup+PZOYWjDYe02Md6iaDMTV Q8kVDJnoZVsvRt4vKgJoDgvZ6q9ElfG3TK49PxKrBjwTbLqeNi9ZhgTObRtEpYtmWv8g tslXZM9ZsGwZwb2ctmsz4q9JcpXH7ee2hgKIDgpXWPXClaT9mL0koZawYLnDYCW2l40A ctDQ== X-Gm-Message-State: AOPr4FVfWgWzysUtIl8pqAUUzAfTd3HstIFVx5XlQkWyKAn/BLzfH6MHNRaRBakp4ptqyGKMSHY= X-Received: by 10.28.86.10 with SMTP id k10mr14070022wmb.96.1461831334359; Thu, 28 Apr 2016 01:15:34 -0700 (PDT) Return-Path: Received: from new-host-46.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id h8sm12749860wmd.2.2016.04.28.01.15.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Apr 2016 01:15:31 -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 Subject: [PATCH v8 1/8] iommu: Add iommu_domain_msi_geometry and DOMAIN_ATTR_MSI_GEOMETRY Date: Thu, 28 Apr 2016 08:15:16 +0000 Message-Id: <1461831323-5480-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461831323-5480-1-git-send-email-eric.auger@linaro.org> References: <1461831323-5480-1-git-send-email-eric.auger@linaro.org> Introduce a new DOMAIN_ATTR_MSI_GEOMETRY domain attribute. It enables to query the IOVA window dedicated to MSIs and whether this window is programmable or fixed/reserved. x86 IOMMUs will typically expose an MSI aperture matching the 1MB region [FEE0_0000h - FEF0_000h] corresponding to the the APIC configuration space and not programmable. On ARM we will report a programmable region and start/end will be set to 0. In case the MSI IOVA aperture is programmable, the msi-iommu API needs to be used to set it. Signed-off-by: Eric Auger Suggested-by: Alex Williamson --- v8: creation - deprecates DOMAIN_ATTR_MSI_MAPPING flag --- drivers/iommu/iommu.c | 5 +++++ include/linux/iommu.h | 9 +++++++++ 2 files changed, 14 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..ea5d288 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -52,6 +52,13 @@ 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 programmable; /* Is the aperture programmable? */ + /* In case the aperture is programmable, start/end are set to 0 */ +}; + /* 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 +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; }; @@ -107,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,