Commit 167d67d5 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Joerg Roedel
Browse files

iommu/tegra: gart: Don't use managed resources 



GART is a part of the Memory Controller driver that is always built-in,
hence there is no benefit from the use of managed resources.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 7d849b7b

drivers/iommu/tegra-gart.c

+7 −5
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static int gart_iommu_attach_dev(struct iommu_domain *domain, 
	struct gart_client *client, *c;

	int err = 0;



	client = devm_kzalloc(gart->dev, sizeof(*c), GFP_KERNEL);

	client = kzalloc(sizeof(*c), GFP_KERNEL);

	if (!client)

		return -ENOMEM;

	client->dev = dev;
@@ -199,7 +199,7 @@ static int gart_iommu_attach_dev(struct iommu_domain *domain, 
	return 0;



fail:

	devm_kfree(gart->dev, client);

	kfree(client);

	spin_unlock(&gart->client_lock);

	return err;

}
@@ -214,7 +214,7 @@ static void __gart_iommu_detach_dev(struct iommu_domain *domain, 
	list_for_each_entry(c, &gart->client, list) {

		if (c->dev == dev) {

			list_del(&c->list);

			devm_kfree(gart->dev, c);

			kfree(c);

			if (list_empty(&gart->client))

				gart->active_domain = NULL;

			dev_dbg(gart->dev, "Detached %s\n", dev_name(dev));
@@ -455,7 +455,7 @@ struct gart_device *tegra_gart_probe(struct device *dev, struct tegra_mc *mc) 
		return ERR_PTR(-ENXIO);

	}



	gart = devm_kzalloc(dev, sizeof(*gart), GFP_KERNEL);

	gart = kzalloc(sizeof(*gart), GFP_KERNEL);

	if (!gart) {

		dev_err(dev, "failed to allocate gart_device\n");

		return ERR_PTR(-ENOMEM);
@@ -464,7 +464,7 @@ struct gart_device *tegra_gart_probe(struct device *dev, struct tegra_mc *mc) 
	ret = iommu_device_sysfs_add(&gart->iommu, dev, NULL, "gart");

	if (ret) {

		dev_err(dev, "Failed to register IOMMU in sysfs\n");

		return ERR_PTR(ret);

		goto free_gart;

	}



	iommu_device_set_ops(&gart->iommu, &gart_iommu_ops);
@@ -502,6 +502,8 @@ unregister_iommu: 
	iommu_device_unregister(&gart->iommu);

remove_sysfs:

	iommu_device_sysfs_remove(&gart->iommu);

free_gart:

	kfree(gart);



	return ERR_PTR(ret);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE