From: Jason Gunthorpe Date: Wed, 17 May 2023 00:35:26 +0000 (-0300) Subject: iommu/fsl: Always allocate a group for non-pci devices X-Git-Tag: v6.5-rc1~130^2^4~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f6489723df9a292328a8defc02227d660eea1b9;p=thirdparty%2Flinux.git 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 Tested-by: Michael Ellerman Link: https://lore.kernel.org/r/1-v2-ce71068deeec+4cf6-fsl_rm_groups_jgg@nvidia.com Signed-off-by: Joerg Roedel --- diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c index bce3722970996..cd0c60b402154 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; }