#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>
static struct pfe *g_pfe;
/* Supported Rx offloads */
static uint64_t dev_rx_offloads_sup =
- DEV_RX_OFFLOAD_IPV4_CKSUM |
- DEV_RX_OFFLOAD_UDP_CKSUM |
- DEV_RX_OFFLOAD_TCP_CKSUM;
+ RTE_ETH_RX_OFFLOAD_IPV4_CKSUM |
+ RTE_ETH_RX_OFFLOAD_UDP_CKSUM |
+ RTE_ETH_RX_OFFLOAD_TCP_CKSUM;
/* Supported Tx offloads */
static uint64_t dev_tx_offloads_sup =
- DEV_TX_OFFLOAD_IPV4_CKSUM |
- DEV_TX_OFFLOAD_UDP_CKSUM |
- DEV_TX_OFFLOAD_TCP_CKSUM;
+ RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |
+ RTE_ETH_TX_OFFLOAD_UDP_CKSUM |
+ RTE_ETH_TX_OFFLOAD_TCP_CKSUM;
/* TODO: make pfe_svr a runtime option.
* Driver should be able to get the SVR
}
}
-static void
+static int
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;
-}
-
-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 int
pfe_eth_close(struct rte_eth_dev *dev)
{
+ int ret;
+ PMD_INIT_FUNC_TRACE();
+
if (!dev)
return -1;
if (!g_pfe)
return -1;
- pfe_eth_exit(dev, g_pfe);
+ 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);
+
+ munmap(g_pfe->cbus_baseaddr, g_pfe->cbus_size);
+ g_pfe->nb_devs--;
if (g_pfe->nb_devs == 0) {
pfe_hif_exit(g_pfe);
g_pfe = NULL;
}
- return 0;
+ return ret;
}
static int
return 0;
}
-static void
-pfe_rx_queue_release(void *q __rte_unused)
-{
- PMD_INIT_FUNC_TRACE();
-}
-
-static void
-pfe_tx_queue_release(void *q __rte_unused)
-{
- PMD_INIT_FUNC_TRACE();
-}
-
static int
pfe_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
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));
}
link.link_status = lstatus;
- link.link_speed = ETH_LINK_SPEED_1G;
- link.link_duplex = ETH_LINK_FULL_DUPLEX;
- link.link_autoneg = ETH_LINK_AUTONEG;
+ link.link_speed = RTE_ETH_LINK_SPEED_1G;
+ link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
+ link.link_autoneg = RTE_ETH_LINK_AUTONEG;
pfe_eth_atomic_write_link_status(dev, &link);
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
pfe_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
{
- int ret;
struct pfe_eth_priv_s *priv = dev->data->dev_private;
uint16_t frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
/*TODO Support VLAN*/
- ret = gemac_set_rx(priv->EMAC_baseaddr, frame_size);
- if (!ret)
- dev->data->mtu = mtu;
-
- return ret;
+ return gemac_set_rx(priv->EMAC_baseaddr, frame_size);
}
/* pfe_eth_enet_addr_byte_mac
.dev_configure = pfe_eth_configure,
.dev_infos_get = pfe_eth_info,
.rx_queue_setup = pfe_rx_queue_setup,
- .rx_queue_release = pfe_rx_queue_release,
.tx_queue_setup = pfe_tx_queue_setup,
- .tx_queue_release = pfe_tx_queue_release,
.dev_supported_ptypes_get = pfe_supported_ptypes_get,
.link_update = pfe_eth_link_update,
.promiscuous_enable = pfe_promiscuous_enable,
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;
{
const char *name;
struct rte_eth_dev *eth_dev = NULL;
+ int ret = 0;
name = rte_vdev_device_name(vdev);
if (name == NULL)
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
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);