Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu',...

Conflicts:
	drivers/iommu/arm-smmu.c

diff --cc drivers/iommu/Kconfig
index 1d54996b6a705be934ae338adfca18dffa4c878e,dd5112265cc9f20d138ae7d70afedbc8476ffacf,f6f259af653c48eb4658a46396ca62b114cc3ba3,dd5112265cc9f20d138ae7d70afedbc8476ffacf,dd5112265cc9f20d138ae7d70afedbc8476ffacf,dd5112265cc9f20d138ae7d70afedbc8476ffacf,dd5112265cc9f20d138ae7d70afedbc8476ffacf,dd5112265cc9f20d138ae7d70afedbc8476ffacf..22f15f9951e789322cf3734879016f28e7992157
--- 1/drivers/iommu/Kconfig
--- 2/drivers/iommu/Kconfig
--- 3/drivers/iommu/Kconfig
--- 4/drivers/iommu/Kconfig
--- 5/drivers/iommu/Kconfig
--- 6/drivers/iommu/Kconfig
--- 7/drivers/iommu/Kconfig
--- 8/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@@@@@@@@ -144,14 -144,14 -144,27 -144,14 -144,14 -144,14 -144,14 -144,14 +144,27 @@@@@@@@@ config OMAP_IOMM
                select IOMMU_API
        
        config OMAP_IOMMU_DEBUG
 -------       tristate "Export OMAP IOMMU internals in DebugFS"
 -------       depends on OMAP_IOMMU && DEBUG_FS
 -------       help
 -------         Select this to see extensive information about
 -------         the internal state of OMAP IOMMU in debugfs.
 +++++++        bool "Export OMAP IOMMU internals in DebugFS"
 +++++++        depends on OMAP_IOMMU && DEBUG_FS
 +++++++        ---help---
 +++++++          Select this to see extensive information about
 +++++++          the internal state of OMAP IOMMU in debugfs.
 + +++++
  -              Say N unless you know you need this.
 +++++++          Say N unless you know you need this.
        
 - -----         Say N unless you know you need this.
++ +++++config ROCKCHIP_IOMMU
++ +++++        bool "Rockchip IOMMU Support"
++ +++++        depends on ARM
++ +++++        depends on ARCH_ROCKCHIP || COMPILE_TEST
++ +++++        select IOMMU_API
++ +++++        select ARM_DMA_USE_IOMMU
++ +++++        help
++ +++++          Support for IOMMUs found on Rockchip rk32xx SOCs.
++ +++++          These IOMMUs allow virtualization of the address space used by most
++ +++++          cores within the multimedia subsystem.
++ +++++          Say Y here if you are using a Rockchip SoC that includes an IOMMU
++ +++++          device.
+       
        config TEGRA_IOMMU_GART
                bool "Tegra GART IOMMU Support"
                depends on ARCH_TEGRA_2x_SOC

diff --cc drivers/iommu/Makefile
index 18fa446a4ffadcb1f392edaf0b3af841fb698fbe,16edef74b8ee6373d281a34ed5c7ae9c56fc2437,3e47ef35a35f552d17e963996641d3e330f974ef,16edef74b8ee6373d281a34ed5c7ae9c56fc2437,16edef74b8ee6373d281a34ed5c7ae9c56fc2437,16edef74b8ee6373d281a34ed5c7ae9c56fc2437,16edef74b8ee6373d281a34ed5c7ae9c56fc2437,16edef74b8ee6373d281a34ed5c7ae9c56fc2437..7b976f294a695994aafe3fd99b4256ca70c95f4c
--- 1/drivers/iommu/Makefile
--- 2/drivers/iommu/Makefile
--- 3/drivers/iommu/Makefile
--- 4/drivers/iommu/Makefile
--- 5/drivers/iommu/Makefile
--- 6/drivers/iommu/Makefile
--- 7/drivers/iommu/Makefile
--- 8/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@@@@@@@@ -11,7 -11,8 -11,9 -11,8 -11,8 -11,8 -11,8 -11,8 +11,8 @@@@@@@@@ obj-$(CONFIG_INTEL_IOMMU) += iova.o int
        obj-$(CONFIG_IPMMU_VMSA) += ipmmu-vmsa.o
        obj-$(CONFIG_IRQ_REMAP) += intel_irq_remapping.o irq_remapping.o
        obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o
 -------obj-$(CONFIG_OMAP_IOMMU) += omap-iommu2.o
        obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o
++ +++++obj-$(CONFIG_ROCKCHIP_IOMMU) += rockchip-iommu.o
        obj-$(CONFIG_TEGRA_IOMMU_GART) += tegra-gart.o
        obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o
        obj-$(CONFIG_EXYNOS_IOMMU) += exynos-iommu.o

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

diff --cc drivers/iommu/arm-smmu.c
index 60558f794922f9c7c0b5f690b195fd133c1a730a,60558f794922f9c7c0b5f690b195fd133c1a730a,60558f794922f9c7c0b5f690b195fd133c1a730a,60558f794922f9c7c0b5f690b195fd133c1a730a,7a80f710ba2d4ee972fcc2cf8de9c48ec4ae81ce,60558f794922f9c7c0b5f690b195fd133c1a730a,60558f794922f9c7c0b5f690b195fd133c1a730a,e393ae01b5d28316bce3fde017635bbe653aef21..b8aac1389a96b5ad653e817aa4084375a5f808f1
--- 1/drivers/iommu/arm-smmu.c
--- 2/drivers/iommu/arm-smmu.c
--- 3/drivers/iommu/arm-smmu.c
--- 4/drivers/iommu/arm-smmu.c
--- 5/drivers/iommu/arm-smmu.c
--- 6/drivers/iommu/arm-smmu.c
--- 7/drivers/iommu/arm-smmu.c
--- 8/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@@@@@@@@ -1644,20 -1644,20 -1644,20 -1644,20 -1681,56 -1644,20 -1644,20 -1644,21 +1681,57 @@@@@@@@@ static void arm_smmu_remove_device(stru
                iommu_group_remove_device(dev);
        }
        
++++ +++static int arm_smmu_domain_get_attr(struct iommu_domain *domain,
++++ +++                                    enum iommu_attr attr, void *data)
++++ +++{
++++ +++        struct arm_smmu_domain *smmu_domain = domain->priv;
++++ +++
++++ +++        switch (attr) {
++++ +++        case DOMAIN_ATTR_NESTING:
++++ +++                *(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED);
++++ +++                return 0;
++++ +++        default:
++++ +++                return -ENODEV;
++++ +++        }
++++ +++}
++++ +++
++++ +++static int arm_smmu_domain_set_attr(struct iommu_domain *domain,
++++ +++                                    enum iommu_attr attr, void *data)
++++ +++{
++++ +++        struct arm_smmu_domain *smmu_domain = domain->priv;
++++ +++
++++ +++        switch (attr) {
++++ +++        case DOMAIN_ATTR_NESTING:
++++ +++                if (smmu_domain->smmu)
++++ +++                        return -EPERM;
++++ +++                if (*(int *)data)
++++ +++                        smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED;
++++ +++                else
++++ +++                        smmu_domain->stage = ARM_SMMU_DOMAIN_S1;
++++ +++
++++ +++                return 0;
++++ +++        default:
++++ +++                return -ENODEV;
++++ +++        }
++++ +++}
++++ +++
        static const struct iommu_ops arm_smmu_ops = {
---- ---        .capable        = arm_smmu_capable,
---- ---        .domain_init    = arm_smmu_domain_init,
---- ---        .domain_destroy = arm_smmu_domain_destroy,
---- ---        .attach_dev     = arm_smmu_attach_dev,
---- ---        .detach_dev     = arm_smmu_detach_dev,
---- ---        .map            = arm_smmu_map,
---- ---        .unmap          = arm_smmu_unmap,
       -        .map_sg         = default_iommu_map_sg,
---- ---        .iova_to_phys   = arm_smmu_iova_to_phys,
---- ---        .add_device     = arm_smmu_add_device,
---- ---        .remove_device  = arm_smmu_remove_device,
---- ---        .pgsize_bitmap  = (SECTION_SIZE |
---- ---                           ARM_SMMU_PTE_CONT_SIZE |
---- ---                           PAGE_SIZE),
++++ +++        .capable                = arm_smmu_capable,
++++ +++        .domain_init            = arm_smmu_domain_init,
++++ +++        .domain_destroy         = arm_smmu_domain_destroy,
++++ +++        .attach_dev             = arm_smmu_attach_dev,
++++ +++        .detach_dev             = arm_smmu_detach_dev,
++++ +++        .map                    = arm_smmu_map,
++++ +++        .unmap                  = arm_smmu_unmap,
++++++++        .map_sg                 = default_iommu_map_sg,
++++ +++        .iova_to_phys           = arm_smmu_iova_to_phys,
++++ +++        .add_device             = arm_smmu_add_device,
++++ +++        .remove_device          = arm_smmu_remove_device,
++++ +++        .domain_get_attr        = arm_smmu_domain_get_attr,
++++ +++        .domain_set_attr        = arm_smmu_domain_set_attr,
++++ +++        .pgsize_bitmap          = (SECTION_SIZE |
++++ +++                                   ARM_SMMU_PTE_CONT_SIZE |
++++ +++                                   PAGE_SIZE),
        };
        
        static void arm_smmu_device_reset(struct arm_smmu_device *smmu)

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

diff --cc drivers/iommu/ipmmu-vmsa.c
Simple merge

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

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

diff --cc include/linux/iommu.h
Simple merge