ethdev: increase port id range

[dpdk.git] / drivers / net / bonding / rte_eth_bond_private.h

diff --git a/drivers/net/bonding/rte_eth_bond_private.h b/drivers/net/bonding/rte_eth_bond_private.h
index c8db090..1392da9 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_private.h
+++ b/drivers/net/bonding/rte_eth_bond_private.h
@@ -45,6 +45,7 @@
 #define PMD_BOND_SLAVE_PORT_KVARG                      ("slave")
 #define PMD_BOND_PRIMARY_SLAVE_KVARG           ("primary")
 #define PMD_BOND_MODE_KVARG                                    ("mode")
+#define PMD_BOND_AGG_MODE_KVARG                                ("agg_mode")
 #define PMD_BOND_XMIT_POLICY_KVARG                     ("xmit_policy")
 #define PMD_BOND_SOCKET_ID_KVARG                       ("socket_id")
 #define PMD_BOND_MAC_ADDR_KVARG                                ("mac")
@@ -92,12 +93,12 @@ struct bond_tx_queue {
 
 /** Bonded slave devices structure */
 struct bond_ethdev_slave_ports {
-       uint8_t slaves[RTE_MAX_ETHPORTS];       /**< Slave port id array */
-       uint8_t slave_count;                            /**< Number of slaves */
+       uint16_t slaves[RTE_MAX_ETHPORTS];      /**< Slave port id array */
+       uint16_t slave_count;                           /**< Number of slaves */
 };
 
 struct bond_slave_details {
-       uint8_t port_id;
+       uint16_t port_id;
 
        uint8_t link_status_poll_enabled;
        uint8_t link_status_wait_to_complete;
@@ -113,14 +114,14 @@ typedef uint16_t (*xmit_hash_t)(const struct rte_mbuf *buf, uint8_t slave_count)
 
 /** Link Bonding PMD device private configuration Structure */
 struct bond_dev_private {
-       uint8_t port_id;                                        /**< Port Id of Bonded Port */
+       uint16_t port_id;                       /**< Port Id of Bonded Port */
        uint8_t mode;                                           /**< Link Bonding Mode */
 
        rte_spinlock_t lock;
 
-       uint8_t primary_port;                           /**< Primary Slave Port */
-       uint8_t current_primary_port;           /**< Primary Slave Port */
-       uint8_t user_defined_primary_port;
+       uint16_t primary_port;                  /**< Primary Slave Port */
+       uint16_t current_primary_port;          /**< Primary Slave Port */
+       uint16_t user_defined_primary_port;
        /**< Flag for whether primary port is user defined or not */
 
        uint8_t balance_xmit_policy;
@@ -132,8 +133,7 @@ struct bond_dev_private {
        /**< Flag for whether MAC address is user defined or not */
        uint8_t promiscuous_en;
        /**< Enabled/disable promiscuous mode on bonding device */
-       uint8_t link_props_set;
-       /**< flag to denote if the link properties are set */
+
 
        uint8_t link_status_polling_enabled;
        uint32_t link_status_polling_interval_ms;
@@ -144,16 +144,17 @@ struct bond_dev_private {
        uint16_t nb_rx_queues;                  /**< Total number of rx queues */
        uint16_t nb_tx_queues;                  /**< Total number of tx queues*/
 
-       uint8_t active_slave;           /**< Next active_slave to poll */
-       uint8_t active_slave_count;             /**< Number of active slaves */
-       uint8_t active_slaves[RTE_MAX_ETHPORTS];        /**< Active slave list */
+       uint16_t active_slave;          /**< Next active_slave to poll */
+       uint16_t active_slave_count;            /**< Number of active slaves */
+       uint16_t active_slaves[RTE_MAX_ETHPORTS];    /**< Active slave list */
 
-       uint8_t slave_count;                    /**< Number of bonded slaves */
+       uint16_t slave_count;                   /**< Number of bonded slaves */
        struct bond_slave_details slaves[RTE_MAX_ETHPORTS];
        /**< Arary of bonded slaves details */
 
        struct mode8023ad_private mode4;
-       uint8_t tlb_slaves_order[RTE_MAX_ETHPORTS]; /* TLB active slaves send order */
+       uint16_t tlb_slaves_order[RTE_MAX_ETHPORTS];
+       /**< TLB active slaves send order */
        struct mode_alb_private mode6;
 
        uint32_t rx_offload_capa;            /** Rx offload capability */
@@ -184,12 +185,12 @@ extern const struct eth_dev_ops default_dev_ops;
 int
 check_for_bonded_ethdev(const struct rte_eth_dev *eth_dev);
 
-/* Search given slave array to find possition of given id.
+/* Search given slave array to find position of given id.
  * Return slave pos or slaves_count if not found. */
-static inline uint8_t
-find_slave_by_id(uint8_t *slaves, uint8_t slaves_count, uint8_t slave_id) {
+static inline uint16_t
+find_slave_by_id(uint16_t *slaves, uint16_t slaves_count, uint16_t slave_id) {
 
-       uint8_t pos;
+       uint16_t pos;
        for (pos = 0; pos < slaves_count; pos++) {
                if (slave_id == slaves[pos])
                        break;
@@ -199,28 +200,25 @@ find_slave_by_id(uint8_t *slaves, uint8_t slaves_count, uint8_t slave_id) {
 }
 
 int
-valid_port_id(uint8_t port_id);
+valid_port_id(uint16_t port_id);
 
 int
-valid_bonded_port_id(uint8_t port_id);
+valid_bonded_port_id(uint16_t port_id);
 
 int
-valid_slave_port_id(uint8_t port_id);
+valid_slave_port_id(uint16_t port_id, uint8_t mode);
 
 void
-deactivate_slave(struct rte_eth_dev *eth_dev, uint8_t port_id);
+deactivate_slave(struct rte_eth_dev *eth_dev, uint16_t port_id);
 
 void
-activate_slave(struct rte_eth_dev *eth_dev, uint8_t port_id);
+activate_slave(struct rte_eth_dev *eth_dev, uint16_t port_id);
 
 void
 link_properties_set(struct rte_eth_dev *bonded_eth_dev,
                struct rte_eth_link *slave_dev_link);
-void
-link_properties_reset(struct rte_eth_dev *bonded_eth_dev);
-
 int
-link_properties_valid(struct rte_eth_link *bonded_dev_link,
+link_properties_valid(struct rte_eth_dev *bonded_eth_dev,
                struct rte_eth_link *slave_dev_link);
 
 int
@@ -232,9 +230,6 @@ mac_address_get(struct rte_eth_dev *eth_dev, struct ether_addr *dst_mac_addr);
 int
 mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev);
 
-uint8_t
-number_of_sockets(void);
-
 int
 bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, int mode);
 
@@ -261,38 +256,42 @@ xmit_l34_hash(const struct rte_mbuf *buf, uint8_t slave_count);
 
 void
 bond_ethdev_primary_set(struct bond_dev_private *internals,
-               uint8_t slave_port_id);
+               uint16_t slave_port_id);
 
-void
-bond_ethdev_lsc_event_callback(uint8_t port_id, enum rte_eth_event_type type,
-               void *param);
+int
+bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
+               void *param, void *ret_param);
+
+int
+bond_ethdev_parse_slave_port_kvarg(const char *key,
+               const char *value, void *extra_args);
 
 int
-bond_ethdev_parse_slave_port_kvarg(const char *key __rte_unused,
+bond_ethdev_parse_slave_mode_kvarg(const char *key,
                const char *value, void *extra_args);
 
 int
-bond_ethdev_parse_slave_mode_kvarg(const char *key __rte_unused,
+bond_ethdev_parse_slave_agg_mode_kvarg(const char *key __rte_unused,
                const char *value, void *extra_args);
 
 int
-bond_ethdev_parse_socket_id_kvarg(const char *key __rte_unused,
+bond_ethdev_parse_socket_id_kvarg(const char *key,
                const char *value, void *extra_args);
 
 int
-bond_ethdev_parse_primary_slave_port_id_kvarg(const char *key __rte_unused,
+bond_ethdev_parse_primary_slave_port_id_kvarg(const char *key,
                const char *value, void *extra_args);
 
 int
-bond_ethdev_parse_balance_xmit_policy_kvarg(const char *key __rte_unused,
+bond_ethdev_parse_balance_xmit_policy_kvarg(const char *key,
                const char *value, void *extra_args);
 
 int
-bond_ethdev_parse_bond_mac_addr_kvarg(const char *key __rte_unused,
+bond_ethdev_parse_bond_mac_addr_kvarg(const char *key,
                const char *value, void *extra_args);
 
 int
-bond_ethdev_parse_time_ms_kvarg(const char *key __rte_unused,
+bond_ethdev_parse_time_ms_kvarg(const char *key,
                const char *value, void *extra_args);
 
 void