diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2023-05-17 02:35:26 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2023-06-01 11:47:47 +0200 |
| commit | 5f6489723df9a292328a8defc02227d660eea1b9 (patch) | |
| tree | bd2ce58c366292d84d839a110d935fffda2c044b /drivers/iommu | |
| parent | Linux 6.4-rc3 (diff) | |
| download | linux-5f6489723df9a292328a8defc02227d660eea1b9.tar.xz linux-5f6489723df9a292328a8defc02227d660eea1b9.zip | |
iommu/fsl: Always allocate a group for non-pci devices
fsl_pamu_device_group() is only called if dev->iommu_group is NULL, so
iommu_group_get() always returns NULL. Remove this test and just allocate
a group. Call generic_device_group() for this like the other drivers.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Tested-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/1-v2-ce71068deeec+4cf6-fsl_rm_groups_jgg@nvidia.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/fsl_pamu_domain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c index bce372297099..cd0c60b40215 100644 --- a/drivers/iommu/fsl_pamu_domain.c +++ b/drivers/iommu/fsl_pamu_domain.c @@ -437,7 +437,7 @@ static struct iommu_group *fsl_pamu_device_group(struct device *dev) if (dev_is_pci(dev)) group = get_pci_device_group(to_pci_dev(dev)); else if (of_get_property(dev->of_node, "fsl,liodn", &len)) - group = get_device_iommu_group(dev); + return generic_device_group(dev); return group; } |