From: Pavel Belous <pavel.bel...@aquantia.com>
Signed-off-by: Igor Russkikh <igor.russk...@aquantia.com>
Signed-off-by: Pavel Belous <pavel.bel...@aquantia.com>
---
drivers/net/atlantic/Makefile | 1 +
drivers/net/atlantic/atl_ethdev.c | 20 ++++++++++++++++++-
drivers/net/atlantic/atl_ethdev.h | 15 ++++++++++++++
drivers/net/atlantic/atl_rxtx.c | 42 +++++++++++++++++++++++++++++++++++++++
drivers/net/atlantic/meson.build | 1 +
5 files changed, 78 insertions(+), 1 deletion(-)
create mode 100644 drivers/net/atlantic/atl_rxtx.c
diff --git a/drivers/net/atlantic/Makefile b/drivers/net/atlantic/Makefile
index 91306d71ba97..b88da362146d 100644
--- a/drivers/net/atlantic/Makefile
+++ b/drivers/net/atlantic/Makefile
@@ -24,6 +24,7 @@ VPATH += $(SRCDIR)/hw_atl
#
# all source are stored in SRCS-y
#
+SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_rxtx.c
SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_ethdev.c
SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_hw_regs.c
SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_utils.c
diff --git a/drivers/net/atlantic/atl_ethdev.c
b/drivers/net/atlantic/atl_ethdev.c
index afb2972ffcc2..4347f9772358 100644
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -111,6 +111,9 @@ eth_atl_dev_init(struct rte_eth_dev *eth_dev)
PMD_INIT_FUNC_TRACE();
eth_dev->dev_ops = &atl_eth_dev_ops;
+ eth_dev->rx_pkt_burst = &atl_recv_pkts;
+ eth_dev->tx_pkt_burst = &atl_xmit_pkts;
+ eth_dev->tx_pkt_prepare = &atl_prep_pkts;
/* For secondary processes, the primary process has done all the work */
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
@@ -164,6 +167,8 @@ eth_atl_dev_uninit(struct rte_eth_dev *eth_dev)
atl_dev_close(eth_dev);
eth_dev->dev_ops = NULL;
+ eth_dev->rx_pkt_burst = NULL;
+ eth_dev->tx_pkt_burst = NULL;
rte_free(eth_dev->data->mac_addrs);
eth_dev->data->mac_addrs = NULL;
@@ -224,10 +229,23 @@ atl_dev_start(struct rte_eth_dev *dev)
err = hw_atl_b0_hw_init(hw, (uint8_t *)dev->data->mac_addrs);
hw_atl_b0_hw_start(hw);
+ /* initialize transmission unit */
+ atl_tx_init(dev);
+
+ /* This can fail when allocating mbufs for descriptor rings */
+ err = atl_rx_init(dev);
+ if (err) {
+ PMD_INIT_LOG(ERR, "Unable to initialize RX hardware");
+ goto error;
+ }
atl_print_adapter_info(hw);
- return err;
+ return 0;
+
+error:
+ PMD_INIT_LOG(ERR, "failure in atl_dev_start(): %d", err);
+ return -EIO;
}
/*
diff --git a/drivers/net/atlantic/atl_ethdev.h
b/drivers/net/atlantic/atl_ethdev.h
index 0b5db79e1c22..53fbc0a17bd2 100644
--- a/drivers/net/atlantic/atl_ethdev.h
+++ b/drivers/net/atlantic/atl_ethdev.h
@@ -20,4 +20,19 @@ struct atl_adapter {
struct aq_hw_cfg_s hw_cfg;
};
+/*
+ * RX/TX function prototypes
+ */
+int atl_rx_init(struct rte_eth_dev *dev);
+int atl_tx_init(struct rte_eth_dev *dev);
+
+uint16_t atl_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
+ uint16_t nb_pkts);
+
+uint16_t atl_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
+ uint16_t nb_pkts);
+
+uint16_t atl_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
+ uint16_t nb_pkts);
+
#endif /* _ATLANTIC_ETHDEV_H_ */
diff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c
new file mode 100644
index 000000000000..0fbd93038075
--- /dev/null
+++ b/drivers/net/atlantic/atl_rxtx.c
@@ -0,0 +1,42 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Aquantia Corporation
+ */
+
+#include "atl_ethdev.h"
+
+int
+atl_tx_init(struct rte_eth_dev *eth_dev __rte_unused)
+{
+ return 0;
+}
+
+int
+atl_rx_init(struct rte_eth_dev *eth_dev __rte_unused)
+{
+ return 0;
+}
+
+uint16_t
+atl_prep_pkts(void *tx_queue __rte_unused,
+ struct rte_mbuf **tx_pkts __rte_unused,
+ uint16_t nb_pkts __rte_unused)
+{
+ return 0;
+}
+
+uint16_t
+atl_recv_pkts(void *rx_queue __rte_unused,
+ struct rte_mbuf **rx_pkts __rte_unused,
+ uint16_t nb_pkts __rte_unused)
+{
+ return 0;
+}
+
+uint16_t
+atl_xmit_pkts(void *tx_queue __rte_unused,
+ struct rte_mbuf **tx_pkts __rte_unused,
+ uint16_t nb_pkts __rte_unused)
+{
+ return 0;
+}
+
diff --git a/drivers/net/atlantic/meson.build b/drivers/net/atlantic/meson.build
index e7b4e0cba574..7575e471e306 100644
--- a/drivers/net/atlantic/meson.build
+++ b/drivers/net/atlantic/meson.build
@@ -4,6 +4,7 @@
#subdir('hw_atl')
sources = files(
+ 'atl_rxtx.c',
'atl_ethdev.c',
'atl_hw_regs.c',
'hw_atl/hw_atl_b0.c',
--
2.7.4
