• Linus Torvalds's avatar
    Merge tag 'vfio-v5.10-rc1' of git://github.com/awilliam/linux-vfio · fc996db9
    Linus Torvalds authored
    Pull VFIO updates from Alex Williamson:
    
     - New fsl-mc vfio bus driver supporting userspace drivers of objects
       within NXP's DPAA2 architecture (Diana Craciun)
    
     - Support for exposing zPCI information on s390 (Matthew Rosato)
    
     - Fixes for "detached" VFs on s390 (Matthew Rosato)
    
     - Fixes for pin-pages and dma-rw accesses (Yan Zhao)
    
     - Cleanups and optimize vconfig regen (Zenghui Yu)
    
     - Fix duplicate irq-bypass token registration (Alex Williamson)
    
    * tag 'vfio-v5.10-rc1' of git://github.com/awilliam/linux-vfio: (30 commits)
      vfio iommu type1: Fix memory leak in vfio_iommu_type1_pin_pages
      vfio/pci: Clear token on bypass registration failure
      vfio/fsl-mc: fix the return of the uninitialized variable ret
      vfio/fsl-mc: Fix the dead code in vfio_fsl_mc_set_irq_trigger
      vfio/fsl-mc: Fixed vfio-fsl-mc driver compilation on 32 bit
      MAINTAINERS: Add entry for s390 vfio-pci
      vfio-pci/zdev: Add zPCI capabilities to VFIO_DEVICE_GET_INFO
      vfio/fsl-mc: Add support for device reset
      vfio/fsl-mc: Add read/write support for fsl-mc devices
      vfio/fsl-mc: trigger an interrupt via eventfd
      vfio/fsl-mc: Add irq infrastructure for fsl-mc devices
      vfio/fsl-mc: Added lock support in preparation for interrupt handling
      vfio/fsl-mc: Allow userspace to MMAP fsl-mc device MMIO regions
      vfio/fsl-mc: Implement VFIO_DEVICE_GET_REGION_INFO ioctl call
      vfio/fsl-mc: Implement VFIO_DEVICE_GET_INFO ioctl
      vfio/fsl-mc: Scan DPRC objects on vfio-fsl-mc driver bind
      vfio: Introduce capability definitions for VFIO_DEVICE_GET_INFO
      s390/pci: track whether util_str is valid in the zpci_dev
      s390/pci: stash version in the zpci_dev
      vfio/fsl-mc: Add VFIO framework skeleton for fsl-mc devices
      ...
    fc996db9
vfio_pci.c 60.7 KB