mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
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: Nipun Gupta <[email protected]> Reviewed-by: Robin Murphy <[email protected]> Signed-off-by: Joerg Roedel <[email protected]>
This commit is contained in:
parent
fa0656b40e
commit
eab03e2a1a
4 changed files with 30 additions and 0 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue