Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 403b2f1f authored by Rohit Vaswani's avatar Rohit Vaswani Committed by Matt Wagantall
Browse files

Merge branch 'smmu_from_3.14' into branch 'msm-3.18'



Port missing SMMU features and fixes from msm-3.14 to msm-3.18.

* smmu_from_3.14 (49 commits):
  iommu: io-pgtable-arm: unmap correct addresses in error path
  iommu/arm-smmu: restrict virtual address range to 36 bits
  iommu: io-pgtable: use size_t for unmap return value
  iommu: io-pgtable-arm: set page tables as outer shareable
  ARM: dts: msm8996: Update implementation defined registers
  cnss: Set new attribute when attach to SMMU driver
  Revert "arm64: dma-mapping: avoid calling iommu_iova_to_phys"
  ipa: set IOMMU domain attributes before attaching
  ipa: set atomic IOMMU domain attr
  arm64: dma-mapping: Split large pages when allocating in atomic context
  arm64: dma_mapping: Add support for .dma_mapping_error() ops
  arm64: dma_mapping: Implement .dma_supported()
  iommu/arm-smmu: Implement .dma_supported()
  iommu: Add support for .dma_supported() ops
  iommu/arm-smmu: Add support for map/unmap to be atomic
  iommu: io-pgtable-arm: flush tlb for stale mappings
  iommu/arm-smmu: silently succeed the secure VMID domain attr
  iommu: add more debug for iommu_pgsize failure
  iommu: io-pgtable-arm: use correct mask during iova_to_phys
  iommu: io-pgtable-arm: make selftests more thorough
  dma-mapping: check for failed IOVA allocation
  iommu: io-pgtable-arm: add support for IOMMU_DEVICE
  iommu/arm-smmu: respect DOMAIN_ATTR_COHERENT_HTW_DISABLE
  iommu: io-pgtable-arm: unmap last level all at once
  iommu/arm-smmu: add missing cleanup to attach error path
  iommu: io-pgtable-arm: Flush all tlbs at end of unmap
  iommu/arm-smmu: wire up .map_sg from the ARM LPAE io-pgtable
  iommu: io-pgtable-arm: add self-test for .mag_sg
  iommu: io-pgtable-arm: implement .map_sg
  iommu: io-pgtable: add .map_sg op to io_pgtable_ops
  iommu: export iommu_pgsize
  iommu/arm-smmu: enable clocks in tlb invalidation routines
  iommu/arm-smmu: re-use the init_mutex for protecting smmu_domain.smmu
  iommu/arm-smmu: implement DOMAIN_ATTR_PT_BASE_ADDR using ttbr[0]
  iommu/arm-smmu: save the pgtbl_cfg in the domain
  iommu: io-pgtable-arm: add non-secure quirk
  iommu/arm-smmu: make use of generic LPAE allocator
  iommu: add self-consistency tests to ARM LPAE IO page table allocator
  iommu: add ARM LPAE page table allocator
  iommu: introduce generic page table allocation framework
  Revert "iommu/arm-smmu: implement DOMAIN_ATTR_PT_BASE_ADDR"
  iommu/arm-smmu: add support for DOMAIN_ATTR_NESTING attribute
  iommu/arm-smmu: Play nice on non-ARM/SMMU systems
  iommu/arm-smmu: change IOMMU_EXEC to IOMMU_NOEXEC
  iommu/arm-smmu: Check of_match_node for NULL
  Revert "iommu/arm-smmu: Add support for page table donation"
  Revert "Add support of the IOMMU_DEVICE flag."
  Revert "iommu/arm-smmu: Make the arm_smmu_map operation atomic"
  Revert "iommu/arm-smmu: change IOMMU_EXEC to IOMMU_NOEXEC"

Change-Id: I2274db9d702c3f21c9ee9184265a9e9998a43629
Signed-off-by: default avatarRohit Vaswani <rvaswani@codeaurora.org>
parents 76247c57 64e19d89
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment