From: Sricharan R <sricharan@codeaurora.org>
To: jcrouse@codeaurora.org, pdaly@codeaurora.org,
jgebben@codeaurora.org, joro@8bytes.org,
linux-kernel@vger.kernel.org, pratikp@codeaurora.org,
iommu@lists.linux-foundation.org, robin.murphy@arm.com,
tzeng@codeaurora.org, linux-arm-kernel@lists.infradead.org,
will.deacon@arm.com, mitchelh@codeaurora.org,
vinod.koul@intel.com
Cc: sricharan@codeaurora.org, dan.j.williams@intel.com,
linux@armlinux.org.uk
Subject: [PATCH V8 3/9] iommu/io-pgtable-arm-v7s: Add support for the IOMMU_PRIV flag
Date: Mon, 2 Jan 2017 18:42:38 +0530 [thread overview]
Message-ID: <1483362764-11990-4-git-send-email-sricharan@codeaurora.org> (raw)
In-Reply-To: <1483362764-11990-1-git-send-email-sricharan@codeaurora.org>
From: Robin Murphy <robin.murphy@arm.com>
The short-descriptor format also allows privileged-only mappings, so
let's wire it up.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Tested-by: Sricharan R <sricharan@codeaurora.org>
---
drivers/iommu/io-pgtable-arm-v7s.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
index 0769276..1c049e2 100644
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -265,7 +265,9 @@ static arm_v7s_iopte arm_v7s_prot_to_pte(int prot, int lvl,
if (!(prot & IOMMU_MMIO))
pte |= ARM_V7S_ATTR_TEX(1);
if (ap) {
- pte |= ARM_V7S_PTE_AF | ARM_V7S_PTE_AP_UNPRIV;
+ pte |= ARM_V7S_PTE_AF;
+ if (!(prot & IOMMU_PRIV))
+ pte |= ARM_V7S_PTE_AP_UNPRIV;
if (!(prot & IOMMU_WRITE))
pte |= ARM_V7S_PTE_AP_RDONLY;
}
@@ -288,6 +290,8 @@ static int arm_v7s_pte_to_prot(arm_v7s_iopte pte, int lvl)
if (!(attr & ARM_V7S_PTE_AP_RDONLY))
prot |= IOMMU_WRITE;
+ if (!(attr & ARM_V7S_PTE_AP_UNPRIV))
+ prot |= IOMMU_PRIV;
if ((attr & (ARM_V7S_TEX_MASK << ARM_V7S_TEX_SHIFT)) == 0)
prot |= IOMMU_MMIO;
else if (pte & ARM_V7S_ATTR_C)
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2017-01-02 13:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-02 13:12 [PATCH V8 0/9] Add support for privileged mappings Sricharan R
2017-01-02 13:12 ` [PATCH V8 1/9] iommu: add IOMMU_PRIV attribute Sricharan R
2017-01-06 11:06 ` Joerg Roedel
2017-01-06 12:05 ` Sricharan
2017-01-02 13:12 ` [PATCH V8 2/9] iommu/io-pgtable-arm: add support for the IOMMU_PRIV flag Sricharan R
2017-01-02 13:12 ` Sricharan R [this message]
2017-01-02 13:12 ` [PATCH V8 4/9] common: DMA-mapping: add DMA_ATTR_PRIVILEGED attribute Sricharan R
2017-01-02 13:12 ` [PATCH V8 5/9] arm64/dma-mapping: Implement DMA_ATTR_PRIVILEGED Sricharan R
2017-01-02 13:12 ` [PATCH V8 6/9] arm/dma-mapping: " Sricharan R
2017-01-04 18:05 ` Will Deacon
2017-01-02 13:12 ` [PATCH V8 7/9] dmaengine: pl330: Make sure microcode is privileged Sricharan R
2017-01-02 13:12 ` [PATCH V8 8/9] iommu/arm-smmu: Set privileged attribute to 'default' instead of 'unprivileged' Sricharan R
2017-01-02 13:12 ` [PATCH V8 9/9] Revert "iommu/arm-smmu: Set PRIVCFG in stage 1 STEs" Sricharan R
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=1483362764-11990-4-git-send-email-sricharan@codeaurora.org \
--to=sricharan@codeaurora.org \
--cc=dan.j.williams@intel.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jcrouse@codeaurora.org \
--cc=jgebben@codeaurora.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mitchelh@codeaurora.org \
--cc=pdaly@codeaurora.org \
--cc=pratikp@codeaurora.org \
--cc=robin.murphy@arm.com \
--cc=tzeng@codeaurora.org \
--cc=vinod.koul@intel.com \
--cc=will.deacon@arm.com \
/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