eal: initialize logging before bus

[dpdk.git] / lib / librte_eal / common / include / rte_bus.h

diff --git a/lib/librte_eal/common/include/rte_bus.h b/lib/librte_eal/common/include/rte_bus.h
index 052ac8d..8f8b099 100644 (file)
--- a/lib/librte_eal/common/include/rte_bus.h
+++ b/lib/librte_eal/common/include/rte_bus.h
@@ -1,8 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2016 NXP
- *   All rights reserved.
+ *   Copyright 2016 NXP
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -107,6 +106,68 @@ typedef struct rte_device *
 (*rte_bus_find_device_t)(const struct rte_device *start, rte_dev_cmp_t cmp,
                         const void *data);
 
+/**
+ * Implementation specific probe function which is responsible for linking
+ * devices on that bus with applicable drivers.
+ *
+ * @param dev
+ *     Device pointer that was returned by a previous call to find_device.
+ *
+ * @return
+ *     0 on success.
+ *     !0 on error.
+ */
+typedef int (*rte_bus_plug_t)(struct rte_device *dev);
+
+/**
+ * Implementation specific remove function which is responsible for unlinking
+ * devices on that bus from assigned driver.
+ *
+ * @param dev
+ *     Device pointer that was returned by a previous call to find_device.
+ *
+ * @return
+ *     0 on success.
+ *     !0 on error.
+ */
+typedef int (*rte_bus_unplug_t)(struct rte_device *dev);
+
+/**
+ * Bus specific parsing function.
+ * Validates the syntax used in the textual representation of a device,
+ * If the syntax is valid and ``addr`` is not NULL, writes the bus-specific
+ * device representation to ``addr``.
+ *
+ * @param[in] name
+ *     device textual description
+ *
+ * @param[out] addr
+ *     device information location address, into which parsed info
+ *     should be written. If NULL, nothing should be written, which
+ *     is not an error.
+ *
+ * @return
+ *     0 if parsing was successful.
+ *     !0 for any error.
+ */
+typedef int (*rte_bus_parse_t)(const char *name, void *addr);
+
+/**
+ * Bus scan policies
+ */
+enum rte_bus_scan_mode {
+       RTE_BUS_SCAN_UNDEFINED,
+       RTE_BUS_SCAN_WHITELIST,
+       RTE_BUS_SCAN_BLACKLIST,
+};
+
+/**
+ * A structure used to configure bus operations.
+ */
+struct rte_bus_conf {
+       enum rte_bus_scan_mode scan_mode; /**< Scan policy. */
+};
+
 /**
  * A structure describing a generic bus.
  */
@@ -116,6 +177,10 @@ struct rte_bus {
        rte_bus_scan_t scan;         /**< Scan for devices attached to bus */
        rte_bus_probe_t probe;       /**< Probe devices on bus */
        rte_bus_find_device_t find_device; /**< Find a device on the bus */
+       rte_bus_plug_t plug;         /**< Probe single device for drivers */
+       rte_bus_unplug_t unplug;     /**< Remove single device from driver */
+       rte_bus_parse_t parse;       /**< Parse a device name */
+       struct rte_bus_conf conf;    /**< Bus configuration */
 };
 
 /**
@@ -160,10 +225,6 @@ int rte_bus_probe(void);
  *
  * @param f
  *      A valid and open output stream handle
- *
- * @return
- *      0 in case of success
- *     !0 in case there is error in opening the output stream
  */
 void rte_bus_dump(FILE *f);
 
@@ -209,12 +270,23 @@ typedef int (*rte_bus_cmp_t)(const struct rte_bus *bus, const void *data);
 struct rte_bus *rte_bus_find(const struct rte_bus *start, rte_bus_cmp_t cmp,
                             const void *data);
 
+/**
+ * Find the registered bus for a particular device.
+ */
+struct rte_bus *rte_bus_find_by_device(const struct rte_device *dev);
+
+/**
+ * Find the registered bus for a given name.
+ */
+struct rte_bus *rte_bus_find_by_name(const char *busname);
+
 /**
  * Helper for Bus registration.
  * The constructor has higher priority than PMD constructors.
  */
 #define RTE_REGISTER_BUS(nm, bus) \
-static void __attribute__((constructor(101), used)) businitfn_ ##nm(void) \
+RTE_INIT_PRIO(businitfn_ ##nm, 110); \
+static void businitfn_ ##nm(void) \
 {\
        (bus).name = RTE_STR(nm);\
        rte_bus_register(&bus); \