allows the creation of multiple ports from one ark device via
the use of ark pmd extension, though the splitting of queues
Add unique dev_private data for each port
Signed-off-by: Ed Czeck <ed.cz...@atomicrules.com>
---
drivers/net/ark/ark_ethdev.c | 14 +++++++++++++-
drivers/net/ark/ark_ethdev_rx.c | 6 +++---
drivers/net/ark/ark_ethdev_tx.c | 2 +-
drivers/net/ark/ark_global.h | 4 ++++
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index d237e80cf4..96d0c2b0f0 100644
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -432,6 +432,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
ark->user_ext.dev_get_port_count(dev,
ark->user_data[dev->data->port_id]);
ark->num_ports = port_count;
+ ark->num_queues = ark_api_num_queues_per_port(ark->mpurx.v, port_count);
for (p = 0; p < port_count; p++) {
struct rte_eth_dev *eth_dev;
@@ -457,7 +458,18 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
}
eth_dev->device = &pci_dev->device;
- eth_dev->data->dev_private = ark;
+ /* Device requires new dev_private data */
+ eth_dev->data->dev_private =
+ rte_zmalloc_socket(name,
+ sizeof(struct ark_adapter),
+ RTE_CACHE_LINE_SIZE,
+ rte_socket_id());
+
+ memcpy(eth_dev->data->dev_private, ark,
+ sizeof(struct ark_adapter));
+ ark = eth_dev->data->dev_private;
+ ark->qbase = p * ark->num_queues;
+
eth_dev->dev_ops = ark->eth_dev->dev_ops;
eth_dev->tx_pkt_burst = ark->eth_dev->tx_pkt_burst;
eth_dev->rx_pkt_burst = ark->eth_dev->rx_pkt_burst;
diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c
index cbc0416bc2..38bc69dff4 100644
--- a/drivers/net/ark/ark_ethdev_rx.c
+++ b/drivers/net/ark/ark_ethdev_rx.c
@@ -68,7 +68,7 @@ struct ark_rx_queue {
static int
eth_ark_rx_hw_setup(struct rte_eth_dev *dev,
struct ark_rx_queue *queue,
- uint16_t rx_queue_id __rte_unused, uint16_t rx_queue_idx)
+ uint16_t rx_queue_idx)
{
rte_iova_t queue_base;
rte_iova_t phys_addr_q_base;
@@ -124,7 +124,7 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint32_t i;
int status;
- int qidx = queue_idx;
+ int qidx = ark->qbase + queue_idx;
/* We may already be setup, free memory prior to re-allocation */
if (dev->data->rx_queues[queue_idx] != NULL) {
@@ -215,7 +215,7 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev,
}
/* MPU Setup */
if (status == 0)
- status = eth_ark_rx_hw_setup(dev, queue, qidx, queue_idx);
+ status = eth_ark_rx_hw_setup(dev, queue, queue_idx);
if (unlikely(status != 0)) {
struct rte_mbuf **mbuf;
diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c
index 5940a592a2..4792754f19 100644
--- a/drivers/net/ark/ark_ethdev_tx.c
+++ b/drivers/net/ark/ark_ethdev_tx.c
@@ -229,7 +229,7 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev,
struct ark_tx_queue *queue;
int status;
- int qidx = queue_idx;
+ int qidx = ark->qbase + queue_idx;
if (!rte_is_power_of_2(nb_desc)) {
ARK_PMD_LOG(ERR,
diff --git a/drivers/net/ark/ark_global.h b/drivers/net/ark/ark_global.h
index 71d0b53e03..176fbcda17 100644
--- a/drivers/net/ark/ark_global.h
+++ b/drivers/net/ark/ark_global.h
@@ -112,7 +112,11 @@ struct ark_adapter {
ark_pkt_chkr_t pc;
ark_pkt_dir_t pd;
+ /* For single function, multiple ports */
int num_ports;
+ uint16_t qbase;
+ uint16_t num_queues;
+
bool isvf;
/* Packet generator/checker args */
--
2.34.1
