Merge tag 'vfio-v5.16-rc4' of git://github.com/awilliam/linux-vfio

+17 -16

2 changed files

expand all

drivers

vfio

pci

vfio_pci_igd.c

vfio.c

+3 -2

drivers/vfio/pci/vfio_pci_igd.c

··· 98 98 version = cpu_to_le16(0x0201); 99 99 100 100 if (igd_opregion_shift_copy(buf, &off, 101 - &version + (pos - OPREGION_VERSION), 101 + (u8 *)&version + 102 + (pos - OPREGION_VERSION), 102 103 &pos, &remaining, bytes)) 103 104 return -EFAULT; 104 105 } ··· 122 121 OPREGION_SIZE : 0); 123 122 124 123 if (igd_opregion_shift_copy(buf, &off, 125 - &rvda + (pos - OPREGION_RVDA), 124 + (u8 *)&rvda + (pos - OPREGION_RVDA), 126 125 &pos, &remaining, bytes)) 127 126 return -EFAULT; 128 127 }

+14 -14

drivers/vfio/vfio.c

··· 232 232 } 233 233 #endif /* CONFIG_VFIO_NOIOMMU */ 234 234 235 - /** 235 + /* 236 236 * IOMMU driver registration 237 237 */ 238 238 int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops) ··· 285 285 unsigned long action, void *data); 286 286 static void vfio_group_get(struct vfio_group *group); 287 287 288 - /** 288 + /* 289 289 * Container objects - containers are created when /dev/vfio/vfio is 290 290 * opened, but their lifecycle extends until the last user is done, so 291 291 * it's freed via kref. Must support container/group/device being ··· 309 309 kref_put(&container->kref, vfio_container_release); 310 310 } 311 311 312 - /** 312 + /* 313 313 * Group objects - create, release, get, put, search 314 314 */ 315 315 static struct vfio_group * ··· 488 488 return group; 489 489 } 490 490 491 - /** 491 + /* 492 492 * Device objects - create, release, get, put, search 493 493 */ 494 494 /* Device reference always implies a group reference */ ··· 595 595 return ret; 596 596 } 597 597 598 - /** 598 + /* 599 599 * Async device support 600 600 */ 601 601 static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev) ··· 689 689 return NOTIFY_OK; 690 690 } 691 691 692 - /** 692 + /* 693 693 * VFIO driver API 694 694 */ 695 695 void vfio_init_group_dev(struct vfio_device *device, struct device *dev, ··· 831 831 } 832 832 EXPORT_SYMBOL_GPL(vfio_register_emulated_iommu_dev); 833 833 834 - /** 834 + /* 835 835 * Get a reference to the vfio_device for a device. Even if the 836 836 * caller thinks they own the device, they could be racing with a 837 837 * release call path, so we can't trust drvdata for the shortcut. ··· 965 965 } 966 966 EXPORT_SYMBOL_GPL(vfio_unregister_group_dev); 967 967 968 - /** 968 + /* 969 969 * VFIO base fd, /dev/vfio/vfio 970 970 */ 971 971 static long vfio_ioctl_check_extension(struct vfio_container *container, ··· 1183 1183 .compat_ioctl = compat_ptr_ioctl, 1184 1184 }; 1185 1185 1186 - /** 1186 + /* 1187 1187 * VFIO Group fd, /dev/vfio/$GROUP 1188 1188 */ 1189 1189 static void __vfio_group_unset_container(struct vfio_group *group) ··· 1536 1536 .release = vfio_group_fops_release, 1537 1537 }; 1538 1538 1539 - /** 1539 + /* 1540 1540 * VFIO Device fd 1541 1541 */ 1542 1542 static int vfio_device_fops_release(struct inode *inode, struct file *filep) ··· 1611 1611 .mmap = vfio_device_fops_mmap, 1612 1612 }; 1613 1613 1614 - /** 1614 + /* 1615 1615 * External user API, exported by symbols to be linked dynamically. 1616 1616 * 1617 1617 * The protocol includes: ··· 1659 1659 } 1660 1660 EXPORT_SYMBOL_GPL(vfio_group_get_external_user); 1661 1661 1662 - /** 1662 + /* 1663 1663 * External user API, exported by symbols to be linked dynamically. 1664 1664 * The external user passes in a device pointer 1665 1665 * to verify that: ··· 1725 1725 } 1726 1726 EXPORT_SYMBOL_GPL(vfio_external_check_extension); 1727 1727 1728 - /** 1728 + /* 1729 1729 * Sub-module support 1730 1730 */ 1731 1731 /* ··· 2272 2272 } 2273 2273 EXPORT_SYMBOL_GPL(vfio_group_iommu_domain); 2274 2274 2275 - /** 2275 + /* 2276 2276 * Module/class support 2277 2277 */ 2278 2278 static char *vfio_devnode(struct device *dev, umode_t *mode)

Configure Feed

Configure Feed