From: Hiroshi Doyu <hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org
Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linaro-mm-sig-cunTk1MwBs8s++Sfvej+rw@public.gmane.org,
Hiroshi Doyu <hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Subject: [RFC 3/3] iommu/tegra: smmu: Support read-only mapping
Date: Thu, 20 Jun 2013 08:49:44 +0300 [thread overview]
Message-ID: <1371707384-30037-4-git-send-email-hdoyu@nvidia.com> (raw)
In-Reply-To: <1371707384-30037-1-git-send-email-hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Support read-only mapping via struct dma_attrs.
Signed-off-by: Hiroshi Doyu <hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
drivers/iommu/tegra-smmu.c | 41 +++++++++++++++++++++++++++++------------
1 file changed, 29 insertions(+), 12 deletions(-)
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index fab1f19..3aff4cd 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -862,12 +862,13 @@ static size_t __smmu_iommu_unmap_largepage(struct smmu_as *as, dma_addr_t iova)
}
static int __smmu_iommu_map_pfn(struct smmu_as *as, dma_addr_t iova,
- unsigned long pfn)
+ unsigned long pfn, int prot)
{
struct smmu_device *smmu = as->smmu;
unsigned long *pte;
unsigned int *count;
struct page *page;
+ int attrs = as->pte_attr;
pte = locate_pte(as, iova, true, &page, &count);
if (WARN_ON(!pte))
@@ -875,7 +876,11 @@ static int __smmu_iommu_map_pfn(struct smmu_as *as, dma_addr_t iova,
if (*pte == _PTE_VACANT(iova))
(*count)++;
- *pte = SMMU_PFN_TO_PTE(pfn, as->pte_attr);
+
+ if (dma_get_attr(DMA_ATTR_READ_ONLY, (struct dma_attrs *)prot))
+ attrs &= ~_WRITABLE;
+
+ *pte = SMMU_PFN_TO_PTE(pfn, attrs);
FLUSH_CPU_DCACHE(pte, page, sizeof(*pte));
flush_ptc_and_tlb(smmu, as, iova, pte, page, 0);
put_signature(as, iova, pfn);
@@ -883,23 +888,27 @@ static int __smmu_iommu_map_pfn(struct smmu_as *as, dma_addr_t iova,
}
static int __smmu_iommu_map_page(struct smmu_as *as, dma_addr_t iova,
- phys_addr_t pa)
+ phys_addr_t pa, int prot)
{
unsigned long pfn = __phys_to_pfn(pa);
- return __smmu_iommu_map_pfn(as, iova, pfn);
+ return __smmu_iommu_map_pfn(as, iova, pfn, prot);
}
static int __smmu_iommu_map_largepage(struct smmu_as *as, dma_addr_t iova,
- phys_addr_t pa)
+ phys_addr_t pa, int prot)
{
unsigned long pdn = SMMU_ADDR_TO_PDN(iova);
unsigned long *pdir = (unsigned long *)page_address(as->pdir_page);
+ int attrs = _PDE_ATTR;
if (pdir[pdn] != _PDE_VACANT(pdn))
return -EINVAL;
- pdir[pdn] = SMMU_ADDR_TO_PDN(pa) << 10 | _PDE_ATTR;
+ if (dma_get_attr(DMA_ATTR_READ_ONLY, (struct dma_attrs *)prot))
+ attrs &= ~_WRITABLE;
+
+ pdir[pdn] = SMMU_ADDR_TO_PDN(pa) << 10 | attrs;
FLUSH_CPU_DCACHE(&pdir[pdn], as->pdir_page, sizeof pdir[pdn]);
flush_ptc_and_tlb(as->smmu, as, iova, &pdir[pdn], as->pdir_page, 1);
@@ -912,7 +921,8 @@ static int smmu_iommu_map(struct iommu_domain *domain, unsigned long iova,
struct smmu_as *as = domain->priv;
unsigned long flags;
int err;
- int (*fn)(struct smmu_as *as, dma_addr_t iova, phys_addr_t pa);
+ int (*fn)(struct smmu_as *as, dma_addr_t iova, phys_addr_t pa,
+ int prot);
dev_dbg(as->smmu->dev, "[%d] %08lx:%08x\n", as->asid, iova, pa);
@@ -929,7 +939,7 @@ static int smmu_iommu_map(struct iommu_domain *domain, unsigned long iova,
}
spin_lock_irqsave(&as->lock, flags);
- err = fn(as, iova, pa);
+ err = fn(as, iova, pa, prot);
spin_unlock_irqrestore(&as->lock, flags);
return err;
}
@@ -943,6 +953,10 @@ static int smmu_iommu_map_pages(struct iommu_domain *domain, unsigned long iova,
unsigned long *pdir = page_address(as->pdir_page);
int err = 0;
bool flush_all = (total > SZ_512) ? true : false;
+ int attrs = as->pte_attr;
+
+ if (dma_get_attr(DMA_ATTR_READ_ONLY, (struct dma_attrs *)prot))
+ attrs &= ~_WRITABLE;
spin_lock_irqsave(&as->lock, flags);
@@ -977,8 +991,7 @@ static int smmu_iommu_map_pages(struct iommu_domain *domain, unsigned long iova,
if (*pte == _PTE_VACANT(iova + i * PAGE_SIZE))
(*rest)++;
- *pte = SMMU_PFN_TO_PTE(page_to_pfn(pages[i]),
- as->pte_attr);
+ *pte = SMMU_PFN_TO_PTE(page_to_pfn(pages[i]), attrs);
}
pte = &ptbl[ptn];
@@ -1010,6 +1023,10 @@ static int smmu_iommu_map_sg(struct iommu_domain *domain, unsigned long iova,
bool flush_all = (nents * PAGE_SIZE > SZ_512) ? true : false;
struct smmu_as *as = domain->priv;
struct smmu_device *smmu = as->smmu;
+ int attrs = as->pte_attr;
+
+ if (dma_get_attr(DMA_ATTR_READ_ONLY, (struct dma_attrs *)prot))
+ attrs &= ~_WRITABLE;
for (count = 0, s = sgl; count < nents; s = sg_next(s)) {
phys_addr_t phys = page_to_phys(sg_page(s));
@@ -1053,7 +1070,7 @@ static int smmu_iommu_map_sg(struct iommu_domain *domain, unsigned long iova,
(*rest)++;
}
- *pte = SMMU_PFN_TO_PTE(pfn + i, as->pte_attr);
+ *pte = SMMU_PFN_TO_PTE(pfn + i, attrs);
}
pte = &ptbl[ptn];
@@ -1191,7 +1208,7 @@ static int smmu_iommu_attach_dev(struct iommu_domain *domain,
struct page *page;
page = as->smmu->avp_vector_page;
- __smmu_iommu_map_pfn(as, 0, page_to_pfn(page));
+ __smmu_iommu_map_pfn(as, 0, page_to_pfn(page), 0);
pr_debug("Reserve \"page zero\" \
for AVP vectors using a common dummy\n");
--
1.8.1.5
next prev parent reply other threads:[~2013-06-20 5:49 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-20 5:49 [RFC 0/3] How to pass IOMMU map attr via DMA API? Hiroshi Doyu
[not found] ` <1371707384-30037-1-git-send-email-hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-06-20 5:49 ` [RFC 1/3] common: DMA-mapping: add DMA_ATTR_READ_ONLY attribute Hiroshi Doyu
2013-06-20 5:49 ` [RFC 2/3] ARM: dma-mapping: Pass DMA attrs as IOMMU prot Hiroshi Doyu
[not found] ` <1371707384-30037-3-git-send-email-hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-06-20 8:07 ` [Linaro-mm-sig] " Nishanth Peethambaran
[not found] ` <CAMcxFTRnnCnPnvMi89r7rUsN4xeYzZGqy9s5v5ukm_fJ_d_RGg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-06-20 8:24 ` Hiroshi Doyu
[not found] ` <20130620.112439.1330557591655135630.hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-06-20 8:55 ` Nishanth Peethambaran
[not found] ` <CAMcxFTS0dUUEfGj-=-cb_rdfy+qWvtsaoR6Tv+-x05XX0mZmmw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-06-20 9:54 ` Hiroshi Doyu
[not found] ` <20130620.125431.1161068035083905855.hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-06-20 10:13 ` Arnd Bergmann
[not found] ` <201306201213.13644.arnd-r2nGTMty4D4@public.gmane.org>
2013-06-20 10:34 ` Hiroshi Doyu
[not found] ` <20130620.133407.798194318297047071.hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-06-20 10:57 ` Arnd Bergmann
[not found] ` <201306201257.58419.arnd-r2nGTMty4D4@public.gmane.org>
2013-06-20 12:49 ` Nishanth Peethambaran
2013-06-20 5:49 ` Hiroshi Doyu [this message]
[not found] ` <1371707384-30037-4-git-send-email-hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-06-20 6:50 ` [Linaro-mm-sig] [RFC 3/3] iommu/tegra: smmu: Support read-only mapping Kyungmin Park
[not found] ` <CAH9JG2VUCJErBNwT0_u_9niaSWUza5gJ-+q8OOJhrrdw5D-hUg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-06-20 7:27 ` Hiroshi Doyu
2013-06-20 9:31 ` [RFC 0/3] How to pass IOMMU map attr via DMA API? Will Deacon
[not found] ` <20130620093152.GE2842-MRww78TxoiP5vMa5CHWGZ34zcgK1vI+I0E9HWUfgJXw@public.gmane.org>
2013-06-20 9:59 ` Hiroshi Doyu
[not found] ` <20130620.125929.2250094502232662356.hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-06-20 10:11 ` Catalin Marinas
[not found] ` <20130620101110.GB18536-5wv7dgnIgG8@public.gmane.org>
2013-06-20 11:00 ` Hiroshi Doyu
2013-06-20 10:12 ` Will Deacon
2013-06-21 7:17 ` Marek Szyprowski
[not found] ` <51C3FE27.5070702-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2013-06-21 16:03 ` Joerg Roedel
[not found] ` <20130621160344.GM11309-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2013-06-24 5:17 ` Hiroshi Doyu
[not found] ` <20130624081759.76e66d42bbf7c2c54ed1975c-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-06-24 7:21 ` Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371707384-30037-4-git-send-email-hdoyu@nvidia.com \
--to=hdoyu-ddmlm1+adcrqt0dzr+alfa@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=linaro-mm-sig-cunTk1MwBs8s++Sfvej+rw@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox