ethdev: increase port id range

[dpdk.git] / drivers / net / bonding / rte_eth_bond_pmd.c

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index d783320..4bc5329 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -174,7 +174,7 @@ const struct rte_flow_attr flow_attr_8023ad = {
 
 int
 bond_ethdev_8023ad_flow_verify(struct rte_eth_dev *bond_dev,
-               uint8_t slave_port) {
+               uint16_t slave_port) {
        struct rte_eth_dev_info slave_info;
        struct rte_flow_error error;
        struct bond_dev_private *internals = (struct bond_dev_private *)
@@ -216,12 +216,12 @@ bond_ethdev_8023ad_flow_verify(struct rte_eth_dev *bond_dev,
 }
 
 int
-bond_8023ad_slow_pkt_hw_filter_supported(uint8_t port_id) {
+bond_8023ad_slow_pkt_hw_filter_supported(uint16_t port_id) {
        struct rte_eth_dev *bond_dev = &rte_eth_devices[port_id];
        struct bond_dev_private *internals = (struct bond_dev_private *)
                        (bond_dev->data->dev_private);
        struct rte_eth_dev_info bond_info;
-       uint8_t idx;
+       uint16_t idx;
 
        /* Verify if all slaves in bonding supports flow director and */
        if (internals->slave_count > 0) {
@@ -241,7 +241,7 @@ bond_8023ad_slow_pkt_hw_filter_supported(uint8_t port_id) {
 }
 
 int
-bond_ethdev_8023ad_flow_set(struct rte_eth_dev *bond_dev, uint8_t slave_port) {
+bond_ethdev_8023ad_flow_set(struct rte_eth_dev *bond_dev, uint16_t slave_port) {
 
        struct rte_flow_error error;
        struct bond_dev_private *internals = (struct bond_dev_private *)
@@ -281,10 +281,10 @@ bond_ethdev_rx_burst_8023ad_fast_queue(void *queue, struct rte_mbuf **bufs,
        struct bond_rx_queue *bd_rx_q = (struct bond_rx_queue *)queue;
        struct bond_dev_private *internals = bd_rx_q->dev_private;
        uint16_t num_rx_total = 0;      /* Total number of received packets */
-       uint8_t slaves[RTE_MAX_ETHPORTS];
-       uint8_t slave_count;
+       uint16_t slaves[RTE_MAX_ETHPORTS];
+       uint16_t slave_count;
 
-       uint8_t i, idx;
+       uint16_t i, idx;
 
        /* Copy slave list to protect against slave up/down changes during tx
         * bursting */
@@ -313,8 +313,8 @@ bond_ethdev_tx_burst_8023ad_fast_queue(void *queue, struct rte_mbuf **bufs,
        struct bond_dev_private *internals;
        struct bond_tx_queue *bd_tx_q;
 
-       uint8_t num_of_slaves;
-       uint8_t slaves[RTE_MAX_ETHPORTS];
+       uint16_t num_of_slaves;
+       uint16_t slaves[RTE_MAX_ETHPORTS];
         /* positions in slaves, not ID */
        uint8_t distributing_offsets[RTE_MAX_ETHPORTS];
        uint8_t distributing_count;
@@ -405,8 +405,8 @@ bond_ethdev_rx_burst_8023ad(void *queue, struct rte_mbuf **bufs,
 
        const uint16_t ether_type_slow_be = rte_be_to_cpu_16(ETHER_TYPE_SLOW);
        uint16_t num_rx_total = 0;      /* Total number of received packets */
-       uint8_t slaves[RTE_MAX_ETHPORTS];
-       uint8_t slave_count, idx;
+       uint16_t slaves[RTE_MAX_ETHPORTS];
+       uint16_t slave_count, idx;
 
        uint8_t collecting;  /* current slave collecting status */
        const uint8_t promisc = internals->promiscuous_en;
@@ -684,8 +684,8 @@ bond_ethdev_tx_burst_round_robin(void *queue, struct rte_mbuf **bufs,
        struct rte_mbuf *slave_bufs[RTE_MAX_ETHPORTS][nb_pkts];
        uint16_t slave_nb_pkts[RTE_MAX_ETHPORTS] = { 0 };
 
-       uint8_t num_of_slaves;
-       uint8_t slaves[RTE_MAX_ETHPORTS];
+       uint16_t num_of_slaves;
+       uint16_t slaves[RTE_MAX_ETHPORTS];
 
        uint16_t num_tx_total = 0, num_tx_slave;
 
@@ -915,7 +915,7 @@ bandwidth_cmp(const void *a, const void *b)
 }
 
 static void
-bandwidth_left(uint8_t port_id, uint64_t load, uint8_t update_idx,
+bandwidth_left(uint16_t port_id, uint64_t load, uint8_t update_idx,
                struct bwg_slave *bwg_slave)
 {
        struct rte_eth_link link_status;
@@ -981,10 +981,10 @@ bond_ethdev_tx_burst_tlb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
        struct rte_eth_dev *primary_port =
                        &rte_eth_devices[internals->primary_port];
        uint16_t num_tx_total = 0;
-       uint8_t i, j;
+       uint16_t i, j;
 
-       uint8_t num_of_slaves = internals->active_slave_count;
-       uint8_t slaves[RTE_MAX_ETHPORTS];
+       uint16_t num_of_slaves = internals->active_slave_count;
+       uint16_t slaves[RTE_MAX_ETHPORTS];
 
        struct ether_hdr *ether_hdr;
        struct ether_addr primary_slave_addr;
@@ -1070,7 +1070,7 @@ bond_ethdev_tx_burst_alb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 
        uint16_t num_send, num_not_send = 0;
        uint16_t num_tx_total = 0;
-       uint8_t slave_idx;
+       uint16_t slave_idx;
 
        int i, j;
 
@@ -1189,8 +1189,8 @@ bond_ethdev_tx_burst_balance(void *queue, struct rte_mbuf **bufs,
        struct bond_dev_private *internals;
        struct bond_tx_queue *bd_tx_q;
 
-       uint8_t num_of_slaves;
-       uint8_t slaves[RTE_MAX_ETHPORTS];
+       uint16_t num_of_slaves;
+       uint16_t slaves[RTE_MAX_ETHPORTS];
 
        uint16_t num_tx_total = 0, num_tx_slave = 0, tx_fail_total = 0;
 
@@ -1250,8 +1250,8 @@ bond_ethdev_tx_burst_8023ad(void *queue, struct rte_mbuf **bufs,
        struct bond_dev_private *internals;
        struct bond_tx_queue *bd_tx_q;
 
-       uint8_t num_of_slaves;
-       uint8_t slaves[RTE_MAX_ETHPORTS];
+       uint16_t num_of_slaves;
+       uint16_t slaves[RTE_MAX_ETHPORTS];
         /* positions in slaves, not ID */
        uint8_t distributing_offsets[RTE_MAX_ETHPORTS];
        uint8_t distributing_count;
@@ -1344,7 +1344,7 @@ bond_ethdev_tx_burst_broadcast(void *queue, struct rte_mbuf **bufs,
        struct bond_tx_queue *bd_tx_q;
 
        uint8_t tx_failed_flag = 0, num_of_slaves;
-       uint8_t slaves[RTE_MAX_ETHPORTS];
+       uint16_t slaves[RTE_MAX_ETHPORTS];
 
        uint16_t max_nb_of_tx_pkts = 0;
 
@@ -1872,7 +1872,7 @@ slave_add(struct bond_dev_private *internals,
 
 void
 bond_ethdev_primary_set(struct bond_dev_private *internals,
-               uint8_t slave_port_id)
+               uint16_t slave_port_id)
 {
        int i;
 
@@ -2136,7 +2136,7 @@ static int
 bond_ethdev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 {
        int res;
-       uint8_t i;
+       uint16_t i;
        struct bond_dev_private *internals = dev->data->dev_private;
 
        /* don't do this while a slave is being added */
@@ -2148,7 +2148,7 @@ bond_ethdev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
                rte_bitmap_clear(internals->vlan_filter_bmp, vlan_id);
 
        for (i = 0; i < internals->slave_count; i++) {
-               uint8_t port_id = internals->slaves[i].port_id;
+               uint16_t port_id = internals->slaves[i].port_id;
 
                res = rte_eth_dev_vlan_filter(port_id, vlan_id, on);
                if (res == ENOTSUP)
@@ -2288,7 +2288,7 @@ bond_ethdev_slave_link_status_change_monitor(void *cb_arg)
 static int
 bond_ethdev_link_update(struct rte_eth_dev *ethdev, int wait_to_complete)
 {
-       void (*link_update)(uint8_t port_id, struct rte_eth_link *eth_link);
+       void (*link_update)(uint16_t port_id, struct rte_eth_link *eth_link);
 
        struct bond_dev_private *bond_ctx;
        struct rte_eth_link slave_link;
@@ -2477,7 +2477,7 @@ bond_ethdev_delayed_lsc_propagation(void *arg)
 }
 
 int
-bond_ethdev_lsc_event_callback(uint8_t port_id, enum rte_eth_event_type type,
+bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
                void *param, void *ret_param __rte_unused)
 {
        struct rte_eth_dev *bonded_eth_dev;
@@ -2962,7 +2962,7 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
        struct bond_dev_private *internals = dev->data->dev_private;
        struct rte_kvargs *kvlist = internals->kvlist;
        int arg_count;
-       uint8_t port_id = dev - rte_eth_devices;
+       uint16_t port_id = dev - rte_eth_devices;
        uint8_t agg_mode;
 
        static const uint8_t default_rss_key[40] = {
@@ -3097,7 +3097,7 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
        /* Parse/set primary slave port id*/
        arg_count = rte_kvargs_count(kvlist, PMD_BOND_PRIMARY_SLAVE_KVARG);
        if (arg_count == 1) {
-               uint8_t primary_slave_port_id;
+               uint16_t primary_slave_port_id;
 
                if (rte_kvargs_process(kvlist,
                                PMD_BOND_PRIMARY_SLAVE_KVARG,
@@ -3110,7 +3110,7 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
                }
 
                /* Set balance mode transmit policy*/
-               if (rte_eth_bond_primary_set(port_id, (uint8_t)primary_slave_port_id)
+               if (rte_eth_bond_primary_set(port_id, primary_slave_port_id)
                                != 0) {
                        RTE_LOG(ERR, EAL,
                                        "Failed to set primary slave port %d on bonded device %s\n",