Commit 780da9e4 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Joerg Roedel
Browse files

iommu: Use dev_printk() when possible 



Use dev_printk() when possible so the IOMMU messages are more consistent
with other messages related to the device.

E.g., I think these messages related to surprise hotplug:

  pciehp 0000:80:10.0:pcie004: Slot(36): Link Down
  iommu: Removing device 0000:87:00.0 from group 12
  pciehp 0000:80:10.0:pcie004: Slot(36): Card present
  pcieport 0000:80:10.0: Data Link Layer Link Active not set in 1000 msec

would be easier to read as these (also requires some PCI changes not
included here):

  pci 0000:80:10.0: Slot(36): Link Down
  pci 0000:87:00.0: Removing from iommu group 12
  pci 0000:80:10.0: Slot(36): Card present
  pci 0000:80:10.0: Data Link Layer Link Active not set in 1000 msec

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent b77cf11f

drivers/iommu/iommu.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -668,7 +668,7 @@ rename: 




	trace_add_device_to_group(group->id, dev);

	trace_add_device_to_group(group->id, dev);





	pr_info("Adding device %s to group %d\n", dev_name(dev), group->id);

	dev_info(dev, "Adding to iommu group %d\n", group->id);





	return 0;

	return 0;
@@ -684,7 +684,7 @@ err_remove_link: 
	sysfs_remove_link(&dev->kobj, "iommu_group");

	sysfs_remove_link(&dev->kobj, "iommu_group");

err_free_device:

err_free_device:

	kfree(device);

	kfree(device);

	pr_err("Failed to add device %s to group %d: %d\n", dev_name(dev), group->id, ret);

	dev_err(dev, "Failed to add to iommu group %d: %d\n", group->id, ret);

	return ret;

	return ret;

}

}

EXPORT_SYMBOL_GPL(iommu_group_add_device);

EXPORT_SYMBOL_GPL(iommu_group_add_device);
@@ -701,7 +701,7 @@ void iommu_group_remove_device(struct device *dev) 
	struct iommu_group *group = dev->iommu_group;

	struct iommu_group *group = dev->iommu_group;

	struct group_device *tmp_device, *device = NULL;

	struct group_device *tmp_device, *device = NULL;





	pr_info("Removing device %s from group %d\n", dev_name(dev), group->id);

	dev_info(dev, "Removing from iommu group %d\n", group->id);





	/* Pre-notify listeners that a device is being removed. */

	/* Pre-notify listeners that a device is being removed. */

	blocking_notifier_call_chain(&group->notifier,

	blocking_notifier_call_chain(&group->notifier,
@@ -1951,7 +1951,7 @@ int iommu_request_dm_for_dev(struct device *dev) 
		iommu_domain_free(group->default_domain);

		iommu_domain_free(group->default_domain);

	group->default_domain = dm_domain;

	group->default_domain = dm_domain;





	pr_info("Using direct mapping for device %s\n", dev_name(dev));

	dev_info(dev, "Using iommu direct mapping\n");





	ret = 0;

	ret = 0;

out:

out:

CRA Git | Maintained and supported by SUSTech CRA and CCSE