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
common/sfc_efx/base: add user mark RxQ flag
[dpdk.git]
/
drivers
/
net
/
pfe
/
pfe_ethdev.c
diff --git
a/drivers/net/pfe/pfe_ethdev.c
b/drivers/net/pfe/pfe_ethdev.c
index
c4dd0a5
..
feec4d1
100644
(file)
--- a/
drivers/net/pfe/pfe_ethdev.c
+++ b/
drivers/net/pfe/pfe_ethdev.c
@@
-5,7
+5,7
@@
#include <sys/ioctl.h>
#include <sys/epoll.h>
#include <rte_kvargs.h>
#include <sys/ioctl.h>
#include <sys/epoll.h>
#include <rte_kvargs.h>
-#include <
rte_
ethdev_vdev.h>
+#include <ethdev_vdev.h>
#include <rte_bus_vdev.h>
#include <rte_ether.h>
#include <dpaa_of.h>
#include <rte_bus_vdev.h>
#include <rte_ether.h>
#include <dpaa_of.h>
@@
-373,7
+373,7
@@
pfe_eth_close_cdev(struct pfe_eth_priv_s *priv)
}
}
}
}
-static
void
+static
int
pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/)
{
struct pfe_eth_priv_s *priv = dev->data->dev_private;
pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/)
{
struct pfe_eth_priv_s *priv = dev->data->dev_private;
@@
-385,11
+385,14
@@
pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/)
dev->rx_pkt_burst = &pfe_dummy_recv_pkts;
dev->tx_pkt_burst = &pfe_dummy_xmit_pkts;
dev->rx_pkt_burst = &pfe_dummy_recv_pkts;
dev->tx_pkt_burst = &pfe_dummy_xmit_pkts;
+
+ return 0;
}
static int
pfe_eth_close(struct rte_eth_dev *dev)
{
}
static int
pfe_eth_close(struct rte_eth_dev *dev)
{
+ int ret;
PMD_INIT_FUNC_TRACE();
if (!dev)
PMD_INIT_FUNC_TRACE();
if (!dev)
@@
-401,7
+404,7
@@
pfe_eth_close(struct rte_eth_dev *dev)
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
- pfe_eth_stop(dev);
+
ret =
pfe_eth_stop(dev);
/* Close the device file for link status */
pfe_eth_close_cdev(dev->data->dev_private);
/* Close the device file for link status */
pfe_eth_close_cdev(dev->data->dev_private);
@@
-415,7
+418,7
@@
pfe_eth_close(struct rte_eth_dev *dev)
g_pfe = NULL;
}
g_pfe = NULL;
}
- return
0
;
+ return
ret
;
}
static int
}
static int
@@
-579,11
+582,6
@@
pfe_eth_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
struct rte_eth_link link, old;
unsigned int lstatus = 1;
struct rte_eth_link link, old;
unsigned int lstatus = 1;
- if (dev == NULL) {
- PFE_PMD_ERR("Invalid device in link_update.\n");
- return 0;
- }
-
memset(&old, 0, sizeof(old));
memset(&link, 0, sizeof(struct rte_eth_link));
memset(&old, 0, sizeof(old));
memset(&link, 0, sizeof(struct rte_eth_link));
@@
-669,8
+667,7
@@
pfe_allmulticast_enable(struct rte_eth_dev *dev)
static int
pfe_link_down(struct rte_eth_dev *dev)
{
static int
pfe_link_down(struct rte_eth_dev *dev)
{
- pfe_eth_stop(dev);
- return 0;
+ return pfe_eth_stop(dev);
}
static int
}
static int
@@
-845,12
+842,16
@@
pfe_eth_init(struct rte_vdev_device *vdev, struct pfe *pfe, int id)
eth_dev->data->mtu = 1500;
eth_dev->dev_ops = &ops;
eth_dev->data->mtu = 1500;
eth_dev->dev_ops = &ops;
- pfe_eth_stop(eth_dev);
+ err = pfe_eth_stop(eth_dev);
+ if (err != 0)
+ goto err0;
pfe_gemac_init(priv);
eth_dev->data->nb_rx_queues = 1;
eth_dev->data->nb_tx_queues = 1;
pfe_gemac_init(priv);
eth_dev->data->nb_rx_queues = 1;
eth_dev->data->nb_tx_queues = 1;
+ eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
+
/* For link status, open the PFE CDEV; Error from this function
* is silently ignored; In case of error, the link status will not
* be available.
/* For link status, open the PFE CDEV; Error from this function
* is silently ignored; In case of error, the link status will not
* be available.
@@
-1171,4
+1172,4
@@
struct rte_vdev_driver pmd_pfe_drv = {
RTE_PMD_REGISTER_VDEV(PFE_NAME_PMD, pmd_pfe_drv);
RTE_PMD_REGISTER_PARAM_STRING(PFE_NAME_PMD, PFE_VDEV_GEM_ID_ARG "=<int> ");
RTE_PMD_REGISTER_VDEV(PFE_NAME_PMD, pmd_pfe_drv);
RTE_PMD_REGISTER_PARAM_STRING(PFE_NAME_PMD, PFE_VDEV_GEM_ID_ARG "=<int> ");
-RTE_LOG_REGISTER
(pfe_logtype_pmd, pmd.net.pfe
, NOTICE);
+RTE_LOG_REGISTER
_DEFAULT(pfe_logtype_pmd
, NOTICE);