hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iommu/omap: Fix iommu archdata name for DT-based devices 

A device is tied to an iommu through its archdata field. The archdata
is allocated on the fly for DT-based devices automatically through the
.add_device iommu ops. The current logic incorrectly assigned the name
of the IOMMU user device, instead of the name of the IOMMU device as
required by the attach logic. Fix this issue so that DT-based devices
can attach successfully to an IOMMU domain.

Signed-off-by: Suman Anna <s-anna@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Suman Anna 2014-09-04 17:27:30 -05:00 committed by Joerg Roedel
parent e3f595b903
commit 7d6827748d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/iommu/omap-iommu.c
View File

@ -26,6 +26,7 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_iommu.h> #include <linux/of_iommu.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
@ -1244,6 +1245,7 @@ static int omap_iommu_add_device(struct device *dev)
{ {
struct omap_iommu_arch_data *arch_data; struct omap_iommu_arch_data *arch_data;
struct device_node *np; struct device_node *np;
struct platform_device *pdev;
/* /*
* Allocate the archdata iommu structure for DT-based devices. * Allocate the archdata iommu structure for DT-based devices.
@ -1258,13 +1260,19 @@ static int omap_iommu_add_device(struct device *dev)
if (!np) if (!np)
return 0; return 0;
pdev = of_find_device_by_node(np);
if (WARN_ON(!pdev)) {
of_node_put(np);
return -EINVAL;
}
arch_data = kzalloc(sizeof(*arch_data), GFP_KERNEL); arch_data = kzalloc(sizeof(*arch_data), GFP_KERNEL);
if (!arch_data) { if (!arch_data) {
of_node_put(np); of_node_put(np);
return -ENOMEM; return -ENOMEM;
} }
arch_data->name = kstrdup(dev_name(dev), GFP_KERNEL); arch_data->name = kstrdup(dev_name(&pdev->dev), GFP_KERNEL);
dev->archdata.iommu = arch_data; dev->archdata.iommu = arch_data;
of_node_put(np); of_node_put(np);