New upstream version 17.11-rc3

[deb_dpdk.git] / drivers / bus / fslmc / fslmc_vfio.h

diff --git a/drivers/bus/fslmc/fslmc_vfio.h b/drivers/bus/fslmc/fslmc_vfio.h
index 0aff9b1..b442dc0 100644 (file)
--- a/drivers/bus/fslmc/fslmc_vfio.h
+++ b/drivers/bus/fslmc/fslmc_vfio.h
@@ -34,9 +34,10 @@
 #ifndef _FSLMC_VFIO_H_
 #define _FSLMC_VFIO_H_
 
+#include <rte_vfio.h>
+
 #include "eal_vfio.h"
 
-#define DPAA2_VENDOR_ID                0x1957
 #define DPAA2_MC_DPNI_DEVID    7
 #define DPAA2_MC_DPSECI_DEVID  3
 #define DPAA2_MC_DPCON_DEVID   5
@@ -44,8 +45,6 @@
 #define DPAA2_MC_DPBP_DEVID    10
 #define DPAA2_MC_DPCI_DEVID    11
 
-#define VFIO_MAX_GRP 1
-
 typedef struct fslmc_vfio_device {
        int fd; /* fslmc root container device ?? */
        int index; /*index of child object */
@@ -64,51 +63,20 @@ typedef struct fslmc_vfio_container {
        int fd; /* /dev/vfio/vfio */
        int used;
        int index; /* index in group list */
-       struct fslmc_vfio_group *group_list[VFIO_MAX_GRP];
+       struct fslmc_vfio_group *group;
 } fslmc_vfio_container;
 
-struct rte_dpaa2_object;
-
-TAILQ_HEAD(rte_fslmc_object_list, rte_dpaa2_object);
-
-typedef int (*rte_fslmc_obj_create_t)(struct fslmc_vfio_device *vdev,
-                                        struct vfio_device_info *obj_info,
-                                        int object_id);
-
-/**
- * A structure describing a DPAA2 driver.
- */
-struct rte_dpaa2_object {
-       TAILQ_ENTRY(rte_dpaa2_object) next; /**< Next in list. */
-       const char *name;            /**< Name of Object. */
-       uint16_t object_id;             /**< DPAA2 Object ID */
-       rte_fslmc_obj_create_t create;
-};
+int rte_dpaa2_intr_enable(struct rte_intr_handle *intr_handle, int index);
+int rte_dpaa2_intr_disable(struct rte_intr_handle *intr_handle, int index);
 
-int rte_dpaa2_intr_enable(struct rte_intr_handle *intr_handle,
-                         uint32_t index);
+int rte_dpaa2_vfio_setup_intr(struct rte_intr_handle *intr_handle,
+                             int vfio_dev_fd,
+                             int num_irqs);
 
 int fslmc_vfio_setup_group(void);
 int fslmc_vfio_process_group(void);
+char *fslmc_get_container(void);
+int fslmc_get_container_group(int *gropuid);
 int rte_fslmc_vfio_dmamap(void);
 
-/**
- * Register a DPAA2 MC Object driver.
- *
- * @param mc_object
- *   A pointer to a rte_dpaa_object structure describing the mc object
- *   to be registered.
- */
-void rte_fslmc_object_register(struct rte_dpaa2_object *object);
-
-/** Helper for DPAA2 object registration */
-#define RTE_PMD_REGISTER_DPAA2_OBJECT(nm, dpaa2_obj) \
-RTE_INIT(dpaa2objinitfn_ ##nm); \
-static void dpaa2objinitfn_ ##nm(void) \
-{\
-       (dpaa2_obj).name = RTE_STR(nm);\
-       rte_fslmc_object_register(&dpaa2_obj); \
-} \
-RTE_PMD_EXPORT_NAME(nm, __COUNTER__)
-
 #endif /* _FSLMC_VFIO_H_ */