Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1439866

[PATCH v2 3/6] Revert "iommu/arm-smmu: Treat all device transactions as unprivileged"

Show all headers | View raw

This reverts commit d346180e70b9 ("iommu/arm-smmu: Treat all device
transactions as unprivileged") since some platforms actually make use of
privileged transactions.

Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
---
 drivers/iommu/arm-smmu.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 9345a3fcb706..d0627ef26b05 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -178,9 +178,6 @@
 #define S2CR_TYPE_BYPASS		(1 << S2CR_TYPE_SHIFT)
 #define S2CR_TYPE_FAULT			(2 << S2CR_TYPE_SHIFT)
 
-#define S2CR_PRIVCFG_SHIFT		24
-#define S2CR_PRIVCFG_UNPRIV		(2 << S2CR_PRIVCFG_SHIFT)
-
 /* Context bank attribute registers */
 #define ARM_SMMU_GR1_CBAR(n)		(0x0 + ((n) << 2))
 #define CBAR_VMID_SHIFT			0
@@ -1175,7 +1172,7 @@ static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain,
 		u32 idx, s2cr;
 
 		idx = cfg->smrs ? cfg->smrs[i].idx : cfg->streamids[i];
-		s2cr = S2CR_TYPE_TRANS | S2CR_PRIVCFG_UNPRIV |
+		s2cr = S2CR_TYPE_TRANS |
 		       (smmu_domain->cfg.cbndx << S2CR_CBNDX_SHIFT);
 		writel_relaxed(s2cr, gr0_base + ARM_SMMU_GR0_S2CR(idx));
 	}
-- 
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

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