p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Bjorn Helgaas 2019-02-08 16:05:45 -06:00 committed by Joerg Roedel
parent b77cf11f09
commit 780da9e4f5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/iommu/iommu.c
View File

@ -668,7 +668,7 @@ int iommu_group_add_device(struct iommu_group *group, struct device *dev)
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 @@ int iommu_group_add_device(struct iommu_group *group, struct device *dev)
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: