git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/bnx2x: get cache line size from build configuration
[dpdk.git]
/
drivers
/
net
/
mpipe
/
mpipe_tilegx.c
diff --git
a/drivers/net/mpipe/mpipe_tilegx.c
b/drivers/net/mpipe/mpipe_tilegx.c
index
aef7600
..
b9eefdf
100644
(file)
--- a/
drivers/net/mpipe/mpipe_tilegx.c
+++ b/
drivers/net/mpipe/mpipe_tilegx.c
@@
-33,7
+33,7
@@
#include <unistd.h>
#include <rte_eal.h>
#include <unistd.h>
#include <rte_eal.h>
-#include <rte_dev.h>
+#include <rte_
v
dev.h>
#include <rte_eal_memconfig.h>
#include <rte_ethdev.h>
#include <rte_malloc.h>
#include <rte_eal_memconfig.h>
#include <rte_ethdev.h>
#include <rte_malloc.h>
@@
-394,14
+394,16
@@
mpipe_link_update(struct rte_eth_dev *dev, int wait_to_complete)
speed = state & GXIO_MPIPE_LINK_SPEED_MASK;
speed = state & GXIO_MPIPE_LINK_SPEED_MASK;
+ new.link_autoneg = (dev->data->dev_conf.link_speeds &
+ ETH_LINK_SPEED_AUTONEG);
if (speed == GXIO_MPIPE_LINK_1G) {
if (speed == GXIO_MPIPE_LINK_1G) {
- new.link_speed = ETH_
LINK_SPEED_1000
;
+ new.link_speed = ETH_
SPEED_NUM_1G
;
new.link_duplex = ETH_LINK_FULL_DUPLEX;
new.link_duplex = ETH_LINK_FULL_DUPLEX;
- new.link_status =
1
;
+ new.link_status =
ETH_LINK_UP
;
} else if (speed == GXIO_MPIPE_LINK_10G) {
} else if (speed == GXIO_MPIPE_LINK_10G) {
- new.link_speed = ETH_
LINK_SPEED_10000
;
+ new.link_speed = ETH_
SPEED_NUM_10G
;
new.link_duplex = ETH_LINK_FULL_DUPLEX;
new.link_duplex = ETH_LINK_FULL_DUPLEX;
- new.link_status =
1
;
+ new.link_status =
ETH_LINK_UP
;
}
rc = mpipe_link_compare(&old, &new);
}
rc = mpipe_link_compare(&old, &new);
@@
-514,7
+516,7
@@
mpipe_recv_fill_stack(struct mpipe_dev_priv *priv, int count)
int i;
for (i = 0; i < count; i++) {
int i;
for (i = 0; i < count; i++) {
- mbuf =
__
rte_mbuf_raw_alloc(priv->rx_mpool);
+ mbuf = rte_mbuf_raw_alloc(priv->rx_mpool);
if (!mbuf)
break;
mpipe_recv_push(priv, mbuf);
if (!mbuf)
break;
mpipe_recv_push(priv, mbuf);
@@
-848,9
+850,9
@@
mpipe_start(struct rte_eth_dev *dev)
/* Start xmit/recv on queues. */
for (queue = 0; queue < priv->nb_tx_queues; queue++)
/* Start xmit/recv on queues. */
for (queue = 0; queue < priv->nb_tx_queues; queue++)
- mpipe_tx_queue(priv, queue)->q.link_status =
1
;
+ mpipe_tx_queue(priv, queue)->q.link_status =
ETH_LINK_UP
;
for (queue = 0; queue < priv->nb_rx_queues; queue++)
for (queue = 0; queue < priv->nb_rx_queues; queue++)
- mpipe_rx_queue(priv, queue)->q.link_status =
1
;
+ mpipe_rx_queue(priv, queue)->q.link_status =
ETH_LINK_UP
;
priv->running = 1;
return 0;
priv->running = 1;
return 0;
@@
-865,9
+867,9
@@
mpipe_stop(struct rte_eth_dev *dev)
int rc;
for (queue = 0; queue < priv->nb_tx_queues; queue++)
int rc;
for (queue = 0; queue < priv->nb_tx_queues; queue++)
- mpipe_tx_queue(priv, queue)->q.link_status =
0
;
+ mpipe_tx_queue(priv, queue)->q.link_status =
ETH_LINK_DOWN
;
for (queue = 0; queue < priv->nb_rx_queues; queue++)
for (queue = 0; queue < priv->nb_rx_queues; queue++)
- mpipe_rx_queue(priv, queue)->q.link_status =
0
;
+ mpipe_rx_queue(priv, queue)->q.link_status =
ETH_LINK_DOWN
;
/* Make sure the link_status writes land. */
rte_wmb();
/* Make sure the link_status writes land. */
rte_wmb();
@@
-1165,7
+1167,7
@@
mpipe_promiscuous_disable(struct rte_eth_dev *dev)
}
}
}
}
-static struct eth_dev_ops mpipe_dev_ops = {
+static
const
struct eth_dev_ops mpipe_dev_ops = {
.dev_infos_get = mpipe_infos_get,
.dev_configure = mpipe_configure,
.dev_start = mpipe_start,
.dev_infos_get = mpipe_infos_get,
.dev_configure = mpipe_configure,
.dev_start = mpipe_start,
@@
-1450,7
+1452,7
@@
mpipe_do_recv(struct mpipe_rx_queue *rx_queue, struct rte_mbuf **rx_pkts,
MPIPE_BUF_DEBT_THRESHOLD)
mpipe_local.mbuf_push_debt[in_port]++;
else {
MPIPE_BUF_DEBT_THRESHOLD)
mpipe_local.mbuf_push_debt[in_port]++;
else {
- mbuf =
__
rte_mbuf_raw_alloc(priv->rx_mpool);
+ mbuf = rte_mbuf_raw_alloc(priv->rx_mpool);
if (unlikely(!mbuf)) {
nb_nomem++;
gxio_mpipe_iqueue_drop(iqueue, idesc);
if (unlikely(!mbuf)) {
nb_nomem++;
gxio_mpipe_iqueue_drop(iqueue, idesc);
@@
-1547,7
+1549,7
@@
mpipe_link_mac(const char *ifname, uint8_t *mac)
}
static int
}
static int
-rte_pmd_mpipe_
devinit
(const char *ifname,
+rte_pmd_mpipe_
probe
(const char *ifname,
const char *params __rte_unused)
{
gxio_mpipe_context_t *context;
const char *params __rte_unused)
{
gxio_mpipe_context_t *context;
@@
-1585,7
+1587,7
@@
rte_pmd_mpipe_devinit(const char *ifname,
return -ENODEV;
}
return -ENODEV;
}
- eth_dev = rte_eth_dev_allocate(ifname
, RTE_ETH_DEV_VIRTUAL
);
+ eth_dev = rte_eth_dev_allocate(ifname);
if (!eth_dev) {
RTE_LOG(ERR, PMD, "%s: Failed to allocate device.\n", ifname);
rte_free(priv);
if (!eth_dev) {
RTE_LOG(ERR, PMD, "%s: Failed to allocate device.\n", ifname);
rte_free(priv);
@@
-1621,20
+1623,16
@@
rte_pmd_mpipe_devinit(const char *ifname,
return 0;
}
return 0;
}
-static struct rte_driver pmd_mpipe_xgbe_drv = {
- .name = "xgbe",
- .type = PMD_VDEV,
- .init = rte_pmd_mpipe_devinit,
+static struct rte_vdev_driver pmd_mpipe_xgbe_drv = {
+ .probe = rte_pmd_mpipe_probe,
};
};
-static struct rte_driver pmd_mpipe_gbe_drv = {
- .name = "gbe",
- .type = PMD_VDEV,
- .init = rte_pmd_mpipe_devinit,
+static struct rte_vdev_driver pmd_mpipe_gbe_drv = {
+ .probe = rte_pmd_mpipe_probe,
};
};
-
PMD_REGISTER_DRIVER(
pmd_mpipe_xgbe_drv);
-
PMD_REGISTER_DRIVER(
pmd_mpipe_gbe_drv);
+
DRIVER_REGISTER_VDEV(net_mpipe_xgbe,
pmd_mpipe_xgbe_drv);
+
DRIVER_REGISTER_VDEV(net_mpipe_gbe,
pmd_mpipe_gbe_drv);
static void __attribute__((constructor, used))
mpipe_init_contexts(void)
static void __attribute__((constructor, used))
mpipe_init_contexts(void)