Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d682774 authored by Suman Anna's avatar Suman Anna Committed by Joerg Roedel
Browse files

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: default avatarSuman Anna <s-anna@ti.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent e3f595b9

drivers/iommu/omap-iommu.c

+9 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/of.h>

#include <linux/of_iommu.h>

#include <linux/of_irq.h>

#include <linux/of_platform.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 device_node *np;

	struct platform_device *pdev;



	/*

	 * Allocate the archdata iommu structure for DT-based devices.
@@ -1258,13 +1260,19 @@ static int omap_iommu_add_device(struct device *dev) 
	if (!np)

		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);

	if (!arch_data) {

		of_node_put(np);

		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;



	of_node_put(np);