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

Commit eab03e2a authored by Nipun Gupta's avatar Nipun Gupta Committed by Joerg Roedel
Browse files

iommu/arm-smmu: Add support for the fsl-mc bus 



Implement bus specific support for the fsl-mc bus including
registering arm_smmu_ops and bus specific device add operations.

Signed-off-by: default avatarNipun Gupta <nipun.gupta@nxp.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent fa0656b4

drivers/iommu/arm-smmu.c

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



#include <linux/amba/bus.h>

#include <linux/fsl/mc.h>



#include "io-pgtable.h"

#include "arm-smmu-regs.h"
@@ -1459,6 +1460,8 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) 


	if (dev_is_pci(dev))

		group = pci_device_group(dev);

	else if (dev_is_fsl_mc(dev))

		group = fsl_mc_device_group(dev);

	else

		group = generic_device_group(dev);
@@ -2036,6 +2039,10 @@ static void arm_smmu_bus_init(void) 
		bus_set_iommu(&pci_bus_type, &arm_smmu_ops);

	}

#endif

#ifdef CONFIG_FSL_MC_BUS

	if (!iommu_present(&fsl_mc_bus_type))

		bus_set_iommu(&fsl_mc_bus_type, &arm_smmu_ops);

#endif

}



static int arm_smmu_device_probe(struct platform_device *pdev)

drivers/iommu/iommu.c

+13 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/pci.h>

#include <linux/bitops.h>

#include <linux/property.h>

#include <linux/fsl/mc.h>

#include <trace/events/iommu.h>



static struct kset *iommu_group_kset;
@@ -1024,6 +1025,18 @@ struct iommu_group *pci_device_group(struct device *dev) 
	return iommu_group_alloc();

}



/* Get the IOMMU group for device on fsl-mc bus */

struct iommu_group *fsl_mc_device_group(struct device *dev)

{

	struct device *cont_dev = fsl_mc_cont_dev(dev);

	struct iommu_group *group;



	group = iommu_group_get(cont_dev);

	if (!group)

		group = iommu_group_alloc();

	return group;

}



/**

 * iommu_group_get_for_dev - Find or create the IOMMU group for a device

 * @dev: target device

include/linux/fsl/mc.h

+8 −0
Original line number Diff line number Diff line
@@ -351,6 +351,14 @@ int mc_send_command(struct fsl_mc_io *mc_io, struct fsl_mc_command *cmd); 
#define dev_is_fsl_mc(_dev) (0)

#endif



/* Macro to check if a device is a container device */

#define fsl_mc_is_cont_dev(_dev) (to_fsl_mc_device(_dev)->flags & \

	FSL_MC_IS_DPRC)



/* Macro to get the container device of a MC device */

#define fsl_mc_cont_dev(_dev) (fsl_mc_is_cont_dev(_dev) ? \

	(_dev) : (_dev)->parent)



/*

 * module_fsl_mc_driver() - Helper macro for drivers that don't do

 * anything special in module init/exit.  This eliminates a lot of

include/linux/iommu.h

+2 −0
Original line number Diff line number Diff line
@@ -377,6 +377,8 @@ static inline void iommu_tlb_sync(struct iommu_domain *domain) 
extern struct iommu_group *pci_device_group(struct device *dev);

/* Generic device grouping function */

extern struct iommu_group *generic_device_group(struct device *dev);

/* FSL-MC device grouping function */

struct iommu_group *fsl_mc_device_group(struct device *dev);



/**

 * struct iommu_fwspec - per-device IOMMU instance data