Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1439869
| From | Mitchel Humpherys <mitchelh@codeaurora.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 2/6] iommu/io-pgtable-arm: add support for the IOMMU_PRIV flag |
| Date | 2016-07-09 04:10 +0200 |
| Message-ID | <rSPSp-4T7-11@gated-at.bofh.it> (permalink) |
| References | <rSPSp-4T7-1@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Jeremy Gebben <jgebben@codeaurora.org>
Allow the creation of privileged mode mappings, for stage 1 only.
Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
---
drivers/iommu/io-pgtable-arm.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index a1ed1b73fed4..e9e7dd179708 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -101,8 +101,10 @@
ARM_LPAE_PTE_ATTR_HI_MASK)
/* Stage-1 PTE */
-#define ARM_LPAE_PTE_AP_UNPRIV (((arm_lpae_iopte)1) << 6)
-#define ARM_LPAE_PTE_AP_RDONLY (((arm_lpae_iopte)2) << 6)
+#define ARM_LPAE_PTE_AP_PRIV_RW (((arm_lpae_iopte)0) << 6)
+#define ARM_LPAE_PTE_AP_RW (((arm_lpae_iopte)1) << 6)
+#define ARM_LPAE_PTE_AP_PRIV_RO (((arm_lpae_iopte)2) << 6)
+#define ARM_LPAE_PTE_AP_RO (((arm_lpae_iopte)3) << 6)
#define ARM_LPAE_PTE_ATTRINDX_SHIFT 2
#define ARM_LPAE_PTE_nG (((arm_lpae_iopte)1) << 11)
@@ -350,10 +352,14 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
if (data->iop.fmt == ARM_64_LPAE_S1 ||
data->iop.fmt == ARM_32_LPAE_S1) {
- pte = ARM_LPAE_PTE_AP_UNPRIV | ARM_LPAE_PTE_nG;
+ pte = ARM_LPAE_PTE_nG;
- if (!(prot & IOMMU_WRITE) && (prot & IOMMU_READ))
- pte |= ARM_LPAE_PTE_AP_RDONLY;
+ if (prot & IOMMU_WRITE)
+ pte |= (prot & IOMMU_PRIV) ? ARM_LPAE_PTE_AP_PRIV_RW
+ : ARM_LPAE_PTE_AP_RW;
+ else
+ pte |= (prot & IOMMU_PRIV) ? ARM_LPAE_PTE_AP_PRIV_RO
+ : ARM_LPAE_PTE_AP_RO;
if (prot & IOMMU_MMIO)
pte |= (ARM_LPAE_MAIR_ATTR_IDX_DEV
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 0/6] Add support for privileged mappings Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
[PATCH v2 5/6] arm64/dma-mapping: Implement DMA_ATTR_PRIVILEGED_EXECUTABLE Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
Re: [PATCH v2 5/6] arm64/dma-mapping: Implement DMA_ATTR_PRIVILEGED_EXECUTABLE Robin Murphy <robin.murphy@arm.com> - 2016-07-11 17:10 +0200
[PATCH v2 3/6] Revert "iommu/arm-smmu: Treat all device transactions as unprivileged" Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
Re: [PATCH v2 3/6] Revert "iommu/arm-smmu: Treat all device transactions as unprivileged" Robin Murphy <robin.murphy@arm.com> - 2016-07-11 16:30 +0200
[PATCH v2 4/6] common: DMA-mapping: add DMA_ATTR_PRIVILEGED_EXECUTABLE attribute Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
Re: [PATCH v2 4/6] common: DMA-mapping: add DMA_ATTR_PRIVILEGED_EXECUTABLE attribute Robin Murphy <robin.murphy@arm.com> - 2016-07-11 16:50 +0200
[PATCH v2 2/6] iommu/io-pgtable-arm: add support for the IOMMU_PRIV flag Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
Re: [PATCH v2 2/6] iommu/io-pgtable-arm: add support for the IOMMU_PRIV flag Robin Murphy <robin.murphy@arm.com> - 2016-07-11 16:20 +0200
[PATCH v2 1/6] iommu: add IOMMU_PRIV attribute Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
Re: [PATCH v2 1/6] iommu: add IOMMU_PRIV attribute Robin Murphy <robin.murphy@arm.com> - 2016-07-11 16:10 +0200
[PATCH v2 6/6] dmaengine: pl330: Make sure microcode is privileged-executable Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
Re: [PATCH v2 6/6] dmaengine: pl330: Make sure microcode is privileged-executable Robin Murphy <robin.murphy@arm.com> - 2016-07-11 17:30 +0200
Re: [PATCH v2 0/6] Add support for privileged mappings Robin Murphy <robin.murphy@arm.com> - 2016-07-11 16:10 +0200
Re: [PATCH v2 0/6] Add support for privileged mappings Jordan Crouse <jcrouse@codeaurora.org> - 2016-07-11 17:10 +0200
csiph-web