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/txgbe: support VF stats and xstats
[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
bdf2a7c
..
8cf59e2
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>
@@
-13,7
+13,7
@@
#include "pfe_logs.h"
#include "pfe_mod.h"
#include "pfe_logs.h"
#include "pfe_mod.h"
-#define PFE_MAX_MACS 1 /*
we can support upto 4 MACs per IF
*/
+#define PFE_MAX_MACS 1 /*
we can support up to 4 MACs per IF
*/
#define PFE_VDEV_GEM_ID_ARG "intf"
struct pfe_vdev_init_params {
#define PFE_VDEV_GEM_ID_ARG "intf"
struct pfe_vdev_init_params {
@@
-40,8
+40,6
@@
unsigned int pfe_svr = SVR_LS1012A_REV1;
static void *cbus_emac_base[3];
static void *cbus_gpi_base[3];
static void *cbus_emac_base[3];
static void *cbus_gpi_base[3];
-int pfe_logtype_pmd;
-
/* pfe_gemac_init
*/
static int
/* pfe_gemac_init
*/
static int
@@
-375,41
+373,43
@@
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;
+ dev->data->dev_started = 0;
+
gemac_disable(priv->EMAC_baseaddr);
gpi_disable(priv->GPI_baseaddr);
dev->rx_pkt_burst = &pfe_dummy_recv_pkts;
dev->tx_pkt_burst = &pfe_dummy_xmit_pkts;
gemac_disable(priv->EMAC_baseaddr);
gpi_disable(priv->GPI_baseaddr);
dev->rx_pkt_burst = &pfe_dummy_recv_pkts;
dev->tx_pkt_burst = &pfe_dummy_xmit_pkts;
-}
-static void
-pfe_eth_exit(struct rte_eth_dev *dev, struct pfe *pfe)
-{
- PMD_INIT_FUNC_TRACE();
-
- pfe_eth_stop(dev);
- /* Close the device file for link status */
- pfe_eth_close_cdev(dev->data->dev_private);
-
- rte_eth_dev_release_port(dev);
- pfe->nb_devs--;
+ return 0;
}
}
-static
void
+static
int
pfe_eth_close(struct rte_eth_dev *dev)
{
pfe_eth_close(struct rte_eth_dev *dev)
{
+ int ret;
+ PMD_INIT_FUNC_TRACE();
+
if (!dev)
if (!dev)
- return;
+ return
-1
;
if (!g_pfe)
if (!g_pfe)
- return;
+ return -1;
+
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
+ ret = pfe_eth_stop(dev);
+ /* Close the device file for link status */
+ pfe_eth_close_cdev(dev->data->dev_private);
- pfe_eth_exit(dev, g_pfe);
+ munmap(g_pfe->cbus_baseaddr, g_pfe->cbus_size);
+ g_pfe->nb_devs--;
if (g_pfe->nb_devs == 0) {
pfe_hif_exit(g_pfe);
if (g_pfe->nb_devs == 0) {
pfe_hif_exit(g_pfe);
@@
-417,6
+417,8
@@
pfe_eth_close(struct rte_eth_dev *dev)
rte_free(g_pfe);
g_pfe = NULL;
}
rte_free(g_pfe);
g_pfe = NULL;
}
+
+ return ret;
}
static int
}
static int
@@
-429,9
+431,6
@@
static int
pfe_eth_info(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info)
{
pfe_eth_info(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info)
{
- struct pfe_eth_priv_s *internals = dev->data->dev_private;
-
- dev_info->if_index = internals->id;
dev_info->max_mac_addrs = PFE_MAX_MACS;
dev_info->max_rx_queues = dev->data->nb_rx_queues;
dev_info->max_tx_queues = dev->data->nb_tx_queues;
dev_info->max_mac_addrs = PFE_MAX_MACS;
dev_info->max_rx_queues = dev->data->nb_rx_queues;
dev_info->max_tx_queues = dev->data->nb_tx_queues;
@@
-673,8
+672,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
@@
-849,12
+847,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.
@@
-1147,6
+1149,7
@@
pmd_pfe_remove(struct rte_vdev_device *vdev)
{
const char *name;
struct rte_eth_dev *eth_dev = NULL;
{
const char *name;
struct rte_eth_dev *eth_dev = NULL;
+ int ret = 0;
name = rte_vdev_device_name(vdev);
if (name == NULL)
name = rte_vdev_device_name(vdev);
if (name == NULL)
@@
-1158,19
+1161,12
@@
pmd_pfe_remove(struct rte_vdev_device *vdev)
return 0;
eth_dev = rte_eth_dev_allocated(name);
return 0;
eth_dev = rte_eth_dev_allocated(name);
- if (eth_dev == NULL)
- return -ENODEV;
-
- pfe_eth_exit(eth_dev, g_pfe);
- munmap(g_pfe->cbus_baseaddr, g_pfe->cbus_size);
-
- if (g_pfe->nb_devs == 0) {
- pfe_hif_exit(g_pfe);
- pfe_hif_lib_exit(g_pfe);
- rte_free(g_pfe);
- g_pfe = NULL;
+ if (eth_dev) {
+ pfe_eth_close(eth_dev);
+ ret = rte_eth_dev_release_port(eth_dev);
}
}
- return 0;
+
+ return ret;
}
static
}
static
@@
-1181,10
+1177,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_INIT(pfe_pmd_init_log)
-{
- pfe_logtype_pmd = rte_log_register("pmd.net.pfe");
- if (pfe_logtype_pmd >= 0)
- rte_log_set_level(pfe_logtype_pmd, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(pfe_logtype_pmd, pmd.net.pfe, NOTICE);