Commit fd522d27 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'of-iommu-configure' of... 

Merge tag 'of-iommu-configure' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/iommu-config

Pull "Automatic DMA configuration for OF-based IOMMU masters" from Will Deacon:

This series adds automatic IOMMU and DMA-mapping configuration for
OF-based DMA masters described using the generic IOMMU devicetree
bindings. Although there is plenty of future work around splitting up
iommu_ops, adding default IOMMU domains and sorting out automatic IOMMU
group creation for the platform_bus, this is already useful enough for
people to port over their IOMMU drivers and start using the new probing
infrastructure (indeed, Marek has patches queued for the Exynos IOMMU).

* tag 'of-iommu-configure' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux

:
  iommu: store DT-probed IOMMU data privately
  arm: dma-mapping: plumb our iommu mapping ops into arch_setup_dma_ops
  arm: call iommu_init before of_platform_populate
  dma-mapping: detect and configure IOMMU in of_dma_configure
  iommu: fix initialization without 'add_device' callback
  iommu: provide helper function to configure an IOMMU for an of master
  iommu: add new iommu_ops callback for adding an OF device
  dma-mapping: replace set_arch_dma_coherent_ops with arch_setup_dma_ops
  iommu: provide early initialisation hook for IOMMU drivers

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5d01410f a42a7a1f

arch/arm/include/asm/dma-mapping.h

+6 −6
Original line number Diff line number Diff line
@@ -121,12 +121,12 @@ static inline unsigned long dma_max_pfn(struct device *dev) 
}

#define dma_max_pfn(dev) dma_max_pfn(dev)



static inline int set_arch_dma_coherent_ops(struct device *dev)

{

	set_dma_ops(dev, &arm_coherent_dma_ops);

	return 0;

}

#define set_arch_dma_coherent_ops(dev)	set_arch_dma_coherent_ops(dev)

#define arch_setup_dma_ops arch_setup_dma_ops

extern void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

			       struct iommu_ops *iommu, bool coherent);



#define arch_teardown_dma_ops arch_teardown_dma_ops

extern void arch_teardown_dma_ops(struct device *dev);



static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)

{

arch/arm/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/bootmem.h>

#include <linux/seq_file.h>

#include <linux/screen_info.h>

#include <linux/of_iommu.h>

#include <linux/of_platform.h>

#include <linux/init.h>

#include <linux/kexec.h>
@@ -806,6 +807,7 @@ static int __init customize_machine(void) 
	 * machine from the device tree, if no callback is provided,

	 * otherwise we would always need an init_machine callback.

	 */

	of_iommu_init();

	if (machine_desc->init_machine)

		machine_desc->init_machine();

#ifdef CONFIG_OF

arch/arm/mm/dma-mapping.c

+76 −7
Original line number Diff line number Diff line
@@ -1947,9 +1947,8 @@ EXPORT_SYMBOL_GPL(arm_iommu_release_mapping); 
 *	arm_iommu_create_mapping)

 *

 * Attaches specified io address space mapping to the provided device,

 * this replaces the dma operations (dma_map_ops pointer) with the

 * IOMMU aware version. More than one client might be attached to

 * the same io address space mapping.

 * More than one client might be attached to the same io address space

 * mapping.

 */

int arm_iommu_attach_device(struct device *dev,

			    struct dma_iommu_mapping *mapping)
@@ -1962,7 +1961,6 @@ int arm_iommu_attach_device(struct device *dev, 


	kref_get(&mapping->kref);

	dev->archdata.mapping = mapping;

	set_dma_ops(dev, &iommu_ops);



	pr_debug("Attached IOMMU controller to %s device.\n", dev_name(dev));

	return 0;
@@ -1974,7 +1972,6 @@ EXPORT_SYMBOL_GPL(arm_iommu_attach_device); 
 * @dev: valid struct device pointer

 *

 * Detaches the provided device from a previously attached map.

 * This voids the dma operations (dma_map_ops pointer)

 */

void arm_iommu_detach_device(struct device *dev)

{
@@ -1989,10 +1986,82 @@ void arm_iommu_detach_device(struct device *dev) 
	iommu_detach_device(mapping->domain, dev);

	kref_put(&mapping->kref, release_iommu_mapping);

	dev->archdata.mapping = NULL;

	set_dma_ops(dev, NULL);



	pr_debug("Detached IOMMU controller from %s device.\n", dev_name(dev));

}

EXPORT_SYMBOL_GPL(arm_iommu_detach_device);



#endif
 
static struct dma_map_ops *arm_get_iommu_dma_map_ops(bool coherent)

{

	return coherent ? &iommu_coherent_ops : &iommu_ops;

}



static bool arm_setup_iommu_dma_ops(struct device *dev, u64 dma_base, u64 size,

				    struct iommu_ops *iommu)

{

	struct dma_iommu_mapping *mapping;



	if (!iommu)

		return false;



	mapping = arm_iommu_create_mapping(dev->bus, dma_base, size);

	if (IS_ERR(mapping)) {

		pr_warn("Failed to create %llu-byte IOMMU mapping for device %s\n",

				size, dev_name(dev));

		return false;

	}



	if (arm_iommu_attach_device(dev, mapping)) {

		pr_warn("Failed to attached device %s to IOMMU_mapping\n",

				dev_name(dev));

		arm_iommu_release_mapping(mapping);

		return false;

	}



	return true;

}



static void arm_teardown_iommu_dma_ops(struct device *dev)

{

	struct dma_iommu_mapping *mapping = dev->archdata.mapping;



	arm_iommu_detach_device(dev);

	arm_iommu_release_mapping(mapping);

}



#else



static bool arm_setup_iommu_dma_ops(struct device *dev, u64 dma_base, u64 size,

				    struct iommu_ops *iommu)

{

	return false;

}



static void arm_teardown_iommu_dma_ops(struct device *dev) { }



#define arm_get_iommu_dma_map_ops arm_get_dma_map_ops



#endif	/* CONFIG_ARM_DMA_USE_IOMMU */



static struct dma_map_ops *arm_get_dma_map_ops(bool coherent)

{

	return coherent ? &arm_coherent_dma_ops : &arm_dma_ops;

}



void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

			struct iommu_ops *iommu, bool coherent)

{

	struct dma_map_ops *dma_ops;



	if (arm_setup_iommu_dma_ops(dev, dma_base, size, iommu))

		dma_ops = arm_get_iommu_dma_map_ops(coherent);

	else

		dma_ops = arm_get_dma_map_ops(coherent);



	set_dma_ops(dev, dma_ops);

}



void arch_teardown_dma_ops(struct device *dev)

{

	arm_teardown_iommu_dma_ops(dev);

}

drivers/iommu/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ if IOMMU_SUPPORT 


config OF_IOMMU

       def_bool y

       depends on OF

       depends on OF && IOMMU_API



config FSL_PAMU

	bool "Freescale IOMMU support"

drivers/iommu/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ static int add_iommu_group(struct device *dev, void *data) 
	const struct iommu_ops *ops = cb->ops;



	if (!ops->add_device)

		return -ENODEV;

		return 0;



	WARN_ON(dev->iommu_group);

CRA Git | Maintained and supported by SUSTech CRA and CCSE