[PATCH 1/2] ARM: IOMMU: Tegra20: Add iommu_ops for GART driver
From: Hiroshi Doyu <hidden>
Date: 2012-01-26 14:46:11
Also in:
linux-iommu, linux-tegra, lkml
On Thu, 26 Jan 2012 12:58:13 +0100 "joro at 8bytes.org" [off-list ref] wrote:
On Wed, Jan 25, 2012 at 08:40:20AM +0100, Hiroshi Doyu wrote:quoted
From: Hiroshi DOYU <redacted> Date: Wed, 16 Nov 2011 17:36:37 +0200 Subject: [PATCH 1/2] ARM: IOMMU: Tegra20: Add iommu_ops for GART driver Tegra 20 IOMMU H/W, GART (Graphics Address Relocation Table). This patch implements struct iommu_ops for GART for the upper IOMMU API. This H/W module supports only single virtual address space(domain), and manages a single level 1-to-1 mapping H/W translation page table.Thanks. Applied with a few minor changes and fixes. Please see below.
All fixes are valid. Thanks.
quoted
+config TEGRA_IOMMU_GART + bool "Tegra GART IOMMU Support" + depends on ARCH_TEGRA_2x_SOC + default yI removed 'default y'. New drivers shouldn't be selected by default.quoted
+static int gart_iommu_map(struct iommu_domain *domain, unsigned long iova, + phys_addr_t pa, size_t bytes, int prot) +{ + struct gart_device *gart = domain->priv; + unsigned long flags; + unsigned long pfn; + + if (!gart_iova_range_valid(gart, iova, bytes)) + return -EINVAL; + + spin_lock_irqsave(&gart->pte_lock, flags); + pfn = __phys_to_pfn(pa); + if (!pfn_valid(pfn)) { + dev_err(gart->dev, "Invalid page: %08x\n", pa); + spin_unlock(&gart->pte_lock);Changed this to spin_unlock_irqrestore().quoted
+ return -EINVAL; + } + gart_set_pte(gart, iova, GART_PTE(pfn)); + FLUSH_GART_REGS(gart); + spin_unlock_irqrestore(&gart->pte_lock, flags); + return 0; +} + +static size_t gart_iommu_unmap(struct iommu_domain *domain, unsigned long iova, + size_t bytes) +{ + struct gart_device *gart = domain->priv; + unsigned long flags; + + if (!gart_iova_range_valid(gart, iova, bytes)) + return -EINVAL;Return 0 here instead of -EINVAL. Size_t is unsigned and the unmap path returns 0 on failure.