diff options
author | Linus Torvalds | 2019-05-11 16:47:46 +0200 |
---|---|---|
committer | Linus Torvalds | 2019-05-11 16:47:46 +0200 |
commit | 6fe567df04a27468b306ae5c53fa7a1cd3acc5e1 (patch) | |
tree | ce0043f26383a69767b25204b275c5ead5fdd397 /drivers/vfio/platform/reset/vfio_platform_amdxgbe.c | |
parent | Merge branch 'next-tomoyo2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | vfio: Add Cornelia Huck as reviewer (diff) | |
download | kernel-qcow2-linux-6fe567df04a27468b306ae5c53fa7a1cd3acc5e1.tar.gz kernel-qcow2-linux-6fe567df04a27468b306ae5c53fa7a1cd3acc5e1.tar.xz kernel-qcow2-linux-6fe567df04a27468b306ae5c53fa7a1cd3acc5e1.zip |
Merge tag 'vfio-v5.2-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Improve dev_printk() usage (Bjorn Helgaas)
- Fix issue with blocking in !TASK_RUNNING state while waiting for
userspace to release devices (Farhan Ali)
- Fix error path cleanup in nvlink setup (Greg Kurz)
- mdev-core cleanups and fixes in preparation for more use cases (Parav
Pandit)
- Cornelia has volunteered as an official vfio reviewer (Cornelia Huck)
* tag 'vfio-v5.2-rc1' of git://github.com/awilliam/linux-vfio:
vfio: Add Cornelia Huck as reviewer
vfio/mdev: Avoid inline get and put parent helpers
vfio/mdev: Fix aborting mdev child device removal if one fails
vfio/mdev: Follow correct remove sequence
vfio/mdev: Avoid masking error code to EBUSY
vfio/mdev: Drop redundant extern for exported symbols
vfio/mdev: Removed unused kref
vfio/mdev: Avoid release parent reference during error path
vfio-pci/nvlink2: Fix potential VMA leak
vfio: Fix WARNING "do not call blocking ops when !TASK_RUNNING"
vfio: Use dev_printk() when possible
Diffstat (limited to 'drivers/vfio/platform/reset/vfio_platform_amdxgbe.c')
-rw-r--r-- | drivers/vfio/platform/reset/vfio_platform_amdxgbe.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c b/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c index 3ddb2704221d..fe95964bc3be 100644 --- a/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c +++ b/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c @@ -89,7 +89,8 @@ static int vfio_platform_amdxgbe_reset(struct vfio_platform_device *vdev) } while ((pcs_value & MDIO_CTRL1_RESET) && --count); if (pcs_value & MDIO_CTRL1_RESET) - pr_warn("%s XGBE PHY reset timeout\n", __func__); + dev_warn(vdev->device, "%s: XGBE PHY reset timeout\n", + __func__); /* disable auto-negotiation */ value = xmdio_read(xpcs_regs->ioaddr, MDIO_MMD_AN, MDIO_CTRL1); @@ -114,7 +115,7 @@ static int vfio_platform_amdxgbe_reset(struct vfio_platform_device *vdev) usleep_range(500, 600); if (!count) - pr_warn("%s MAC SW reset failed\n", __func__); + dev_warn(vdev->device, "%s: MAC SW reset failed\n", __func__); return 0; } |