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

Commit bf8763d8 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

powerpc/iommu: Use device_iommu_mapped() 



Use the new function to replace the open-coded iommu check.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Russell Currey <ruscur@russell.cc>
Cc: Sam Bobroff <sbobroff@linux.ibm.com>
Acked-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 13e6a84d

arch/powerpc/kernel/eeh.c

+1 −1
Original line number Diff line number Diff line
@@ -1472,7 +1472,7 @@ static int dev_has_iommu_table(struct device *dev, void *data) 
	if (!dev)

		return 0;



	if (dev->iommu_group) {

	if (device_iommu_mapped(dev)) {

		*ppdev = pdev;

		return 1;

	}

arch/powerpc/kernel/iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -1086,7 +1086,7 @@ int iommu_add_device(struct device *dev) 
	if (!device_is_registered(dev))

		return -ENOENT;



	if (dev->iommu_group) {

	if (device_iommu_mapped(dev)) {

		pr_debug("%s: Skipping device %s with iommu group %d\n",

			 __func__, dev_name(dev),

			 iommu_group_id(dev->iommu_group));
@@ -1129,7 +1129,7 @@ void iommu_del_device(struct device *dev) 
	 * and we needn't detach them from the associated

	 * IOMMU groups

	 */

	if (!dev->iommu_group) {

	if (!device_iommu_mapped(dev)) {

		pr_debug("iommu_tce: skipping device %s with no tbl\n",

			 dev_name(dev));

		return;
@@ -1148,7 +1148,7 @@ static int tce_iommu_bus_notifier(struct notifier_block *nb, 
        case BUS_NOTIFY_ADD_DEVICE:

                return iommu_add_device(dev);

        case BUS_NOTIFY_DEL_DEVICE:

                if (dev->iommu_group)

                if (device_iommu_mapped(dev))

                        iommu_del_device(dev);

                return 0;

        default: