Commit e34a0425 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Alex Williamson
Browse files

vfio/pci: Split linux/vfio_pci_core.h 



The header in include/linux should have only the exported interface for
other vfio_pci modules to use.  Internal definitions for vfio_pci.ko
should be in a "priv" header along side the .c files.

Move the internal declarations out of vfio_pci_core.h. They either move to
vfio_pci_priv.h or to the C file that is the only user.

Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Link: https://lore.kernel.org/r/1-v2-1bd95d72f298+e0e-vfio_pci_priv_jgg@nvidia.com


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent b90cb105

drivers/vfio/pci/vfio_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/types.h>

#include <linux/uaccess.h>



#include <linux/vfio_pci_core.h>

#include "vfio_pci_priv.h"



#define DRIVER_AUTHOR   "Alex Williamson <alex.williamson@redhat.com>"

#define DRIVER_DESC     "VFIO PCI - User Level meta-driver"

drivers/vfio/pci/vfio_pci_config.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <linux/vfio.h>

#include <linux/slab.h>



#include <linux/vfio_pci_core.h>

#include "vfio_pci_priv.h"



/* Fake capability ID for standard config space */

#define PCI_CAP_ID_BASIC	0

drivers/vfio/pci/vfio_pci_core.c

+18 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/nospec.h>

#include <linux/sched/mm.h>



#include <linux/vfio_pci_core.h>

#include "vfio_pci_priv.h"



#define DRIVER_AUTHOR   "Alex Williamson <alex.williamson@redhat.com>"

#define DRIVER_DESC "core driver for VFIO based PCI devices"
@@ -41,6 +41,23 @@ static bool disable_idle_d3; 
static DEFINE_MUTEX(vfio_pci_sriov_pfs_mutex);

static LIST_HEAD(vfio_pci_sriov_pfs);



struct vfio_pci_dummy_resource {

	struct resource		resource;

	int			index;

	struct list_head	res_next;

};



struct vfio_pci_vf_token {

	struct mutex		lock;

	uuid_t			uuid;

	int			users;

};



struct vfio_pci_mmap_vma {

	struct vm_area_struct	*vma;

	struct list_head	vma_next;

};



static inline bool vfio_vga_disabled(void)

{

#ifdef CONFIG_VFIO_PCI_VGA

drivers/vfio/pci/vfio_pci_igd.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/uaccess.h>

#include <linux/vfio.h>



#include <linux/vfio_pci_core.h>

#include "vfio_pci_priv.h"



#define OPREGION_SIGNATURE	"IntelGraphicsMem"

#define OPREGION_SIZE		(8 * 1024)

drivers/vfio/pci/vfio_pci_intrs.c

+15 −1
Original line number Diff line number Diff line
@@ -20,7 +20,21 @@ 
#include <linux/wait.h>

#include <linux/slab.h>



#include <linux/vfio_pci_core.h>

#include "vfio_pci_priv.h"



#define is_intx(vdev) (vdev->irq_type == VFIO_PCI_INTX_IRQ_INDEX)

#define is_msix(vdev) (vdev->irq_type == VFIO_PCI_MSIX_IRQ_INDEX)

#define is_irq_none(vdev) (!(is_intx(vdev) || is_msi(vdev) || is_msix(vdev)))

#define irq_is(vdev, type) (vdev->irq_type == type)



struct vfio_pci_irq_ctx {

	struct eventfd_ctx	*trigger;

	struct virqfd		*unmask;

	struct virqfd		*mask;

	char			*name;

	bool			masked;

	struct irq_bypass_producer	producer;

};



/*

 * INTx