Merge tag 'iommu-updates-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull IOMMU updates from Joerg Roedel:
 "Slightly more changes than usual this time:

   - KDump Kernel IOMMU take-over code for AMD IOMMU. The code now tries
     to preserve the mappings of the kernel so that master aborts for
     devices are avoided. Master aborts cause some devices to fail in
     the kdump kernel, so this code makes the dump more likely to
     succeed when AMD IOMMU is enabled.

   - common flush queue implementation for IOVA code users. The code is
     still optional, but AMD and Intel IOMMU drivers had their own
     implementation which is now unified.

   - finish support for iommu-groups. All drivers implement this feature
     now so that IOMMU core code can rely on it.

   - finish support for 'struct iommu_device' in iommu drivers. All
     drivers now use the interface.

   - new functions in the IOMMU-API for explicit IO/TLB flushing. This
     will help to reduce the number of IO/TLB flushes when IOMMU drivers
     support this interface.

   - support for mt2712 in the Mediatek IOMMU driver

   - new IOMMU driver for QCOM hardware

   - system PM support for ARM-SMMU

   - shutdown method for ARM-SMMU-v3

   - some constification patches

   - various other small improvements and fixes"

* tag 'iommu-updates-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (87 commits)
  iommu/vt-d: Don't be too aggressive when clearing one context entry
  iommu: Introduce Interface for IOMMU TLB Flushing
  iommu/s390: Constify iommu_ops
  iommu/vt-d: Avoid calling virt_to_phys() on null pointer
  iommu/vt-d: IOMMU Page Request needs to check if address is canonical.
  arm/tegra: Call bus_set_iommu() after iommu_device_register()
  iommu/exynos: Constify iommu_ops
  iommu/ipmmu-vmsa: Make ipmmu_gather_ops const
  iommu/ipmmu-vmsa: Rereserving a free context before setting up a pagetable
  iommu/amd: Rename a few flush functions
  iommu/amd: Check if domain is NULL in get_domain() and return -EBUSY
  iommu/mediatek: Fix a build warning of BIT(32) in ARM
  iommu/mediatek: Fix a build fail of m4u_type
  iommu: qcom: annotate PM functions as __maybe_unused
  iommu/pamu: Fix PAMU boot crash
  memory: mtk-smi: Degrade SMI init to module_init
  iommu/mediatek: Enlarge the validate PA range for 4GB mode
  iommu/mediatek: Disable iommu clock when system suspend
  iommu/mediatek: Move pgtable allocation into domain_alloc
  iommu/mediatek: Merge 2 M4U HWs into one iommu domain
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/s390/pci/pci.c
Simple merge

diff --cc drivers/iommu/amd_iommu.c
index 4ad7e5e31943db7b1d1d90850fac652fbfeb8ed6,538c16f669f9bf7cb8fda0491c9c02b63f483a2b..51f8215877f552ed168424107078ac786febaf3b
--- 1/drivers/iommu/amd_iommu.c
--- 2/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@@ -1538,10 -1476,10 +1478,10 @@@ static int iommu_map_page(struct protec
                        return -EBUSY;
  
        if (count > 1) {
 -              __pte = PAGE_SIZE_PTE(phys_addr, page_size);
 +              __pte = PAGE_SIZE_PTE(__sme_set(phys_addr), page_size);
-               __pte |= PM_LEVEL_ENC(7) | IOMMU_PTE_P | IOMMU_PTE_FC;
+               __pte |= PM_LEVEL_ENC(7) | IOMMU_PTE_PR | IOMMU_PTE_FC;
        } else
-               __pte = __sme_set(phys_addr) | IOMMU_PTE_P | IOMMU_PTE_FC;
 -              __pte = phys_addr | IOMMU_PTE_PR | IOMMU_PTE_FC;
++              __pte = __sme_set(phys_addr) | IOMMU_PTE_PR | IOMMU_PTE_FC;
  
        if (prot & IOMMU_PROT_IR)
                __pte |= IOMMU_PTE_IR;

diff --cc drivers/iommu/amd_iommu_init.c
index 2292a6cece76e02e73411935c58f5d35387f60fc,ff8887ac5555210f3f69a2676b6f954c1a381e92..382de42b835939e167604053060e9944e19131ba
--- 1/drivers/iommu/amd_iommu_init.c
--- 2/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@@ -29,8 -29,6 +29,7 @@@
  #include <linux/export.h>
  #include <linux/iommu.h>
  #include <linux/kmemleak.h>
- #include <linux/crash_dump.h>
 +#include <linux/mem_encrypt.h>
  #include <asm/pci-direct.h>
  #include <asm/iommu.h>
  #include <asm/gart.h>

diff --cc drivers/iommu/amd_iommu_proto.h
index 3f12fb2338ea5bbc1850f779fd98fff92808d7c0,90e62e9b01c5a48bccd79c6b4f544081e68b8524..640c286a0ab9c40109d68efb9dfb13376959fc63
--- 1/drivers/iommu/amd_iommu_proto.h
--- 2/drivers/iommu/amd_iommu_proto.h
+++ b/drivers/iommu/amd_iommu_proto.h
@@@ -87,14 -87,6 +87,16 @@@ static inline bool iommu_feature(struc
        return !!(iommu->features & f);
  }
  
 +static inline u64 iommu_virt_to_phys(void *vaddr)
 +{
 +      return (u64)__sme_set(virt_to_phys(vaddr));
 +}
 +
 +static inline void *iommu_phys_to_virt(unsigned long paddr)
 +{
 +      return phys_to_virt(__sme_clr(paddr));
 +}
 +
+ extern bool translation_pre_enabled(struct amd_iommu *iommu);
+ extern struct iommu_dev_data *get_dev_data(struct device *dev);
  #endif /* _ASM_X86_AMD_IOMMU_PROTO_H  */

diff --cc drivers/iommu/amd_iommu_types.h
index 8e3a8575924293f46a1b3243d64b2db757ee3377,5f775fef341c6bcf3974c43e87fe317e0b35ad52..f6b24c7d8b70e335d94992fe54ccd4d72b062be2
--- 1/drivers/iommu/amd_iommu_types.h
--- 2/drivers/iommu/amd_iommu_types.h
+++ b/drivers/iommu/amd_iommu_types.h
@@@ -343,8 -361,8 +361,8 @@@
  #define GCR3_VALID            0x01ULL
  
  #define IOMMU_PAGE_MASK (((1ULL << 52) - 1) & ~0xfffULL)
- #define IOMMU_PTE_PRESENT(pte) ((pte) & IOMMU_PTE_P)
+ #define IOMMU_PTE_PRESENT(pte) ((pte) & IOMMU_PTE_PR)
 -#define IOMMU_PTE_PAGE(pte) (phys_to_virt((pte) & IOMMU_PAGE_MASK))
 +#define IOMMU_PTE_PAGE(pte) (iommu_phys_to_virt((pte) & IOMMU_PAGE_MASK))
  #define IOMMU_PTE_MODE(pte) (((pte) >> 9) & 0x07)
  
  #define IOMMU_PROT_MASK 0x03

diff --cc drivers/iommu/amd_iommu_v2.c
Simple merge

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc drivers/iommu/intel-svm.c
Simple merge