net/ark: support secondary process
PATCH 1/3 net/ark: support secondary process
From: John Miller <[email protected]>
disable device configuration for secondary processes
Signed-off-by John Miller <[email protected]>
--- drivers/net/ark/ark_ethdev.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/net/ark/ark_ethdev.c +8 -3
@@ -147,6 +147,9 @@ eth_ark_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,struct rte_eth_dev *eth_dev;int ret; +if (rte_eal_process_type () ==RTE_PROC_SECONDARY ) +fprintf (stderr,"ARK probed by secondary process\n" ); + eth_dev =rte_eth_dev_pci_allocate (pci_dev,sizeof (struct ark_adapter ));if (eth_dev ==NULL )
@@ -385,9 +388,11 @@ eth_ark_dev_init(struct rte_eth_dev *dev) 0xcafef00d, ark->sysctrl.t32[4], __func__);/* We are a single function multi-port device. */ - ret =ark_config_device (dev); -if (ret) -return -1 ; +if (rte_eal_process_type () ==RTE_PROC_PRIMARY ) { + ret =ark_config_device (dev); +if (ret) +return -1 ; + } dev->dev_ops = &ark_eth_dev_ops; dev->rx_queue_count = eth_ark_dev_rx_queue_count;
Signature · 1 line
2.34.1
PATCH 2/3 net/ark: support for single function with multiple port
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 <[email protected]>
--- 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(-)
drivers/net/ark/ark_ethdev.c +13 -1
@@ -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;
drivers/net/ark/ark_ethdev_rx.c +3 -3
@@ -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;
drivers/net/ark/ark_ethdev_tx.c +1 -1
@@ -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,
drivers/net/ark/ark_global.h +4 -0
@@ -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 */
Signature · 1 line
2.34.1
PATCH 3/3 net/ark: resize data field to match fpga access
In reply to Ed Czeckall fpga acces are multiples of 4 bytes
Signed-off-by Ed Czeck <[email protected]>
--- drivers/net/ark/ark_mpu.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ark/ark_mpu.h +1 -2
@@ -39,8 +39,7 @@ struct ark_mpu_id_t {#define ARK_MPU_HW 0x010struct ark_mpu_hw_t { -uint16_t num_queues; -uint16_t reserved; +uint32_t num_queues;uint32_t hw_depth;uint32_t obj_size;uint32_t obj_per_mrr;
Signature · 1 line
2.34.1
PATCH 1/1 net/ark: resize data field to match fpga access
In reply to Ed Czeckall fpga acces are multiples of 4 bytes
Signed-off-by Ed Czeck <[email protected]>
--- drivers/net/ark/ark_mpu.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ark/ark_mpu.h +1 -2
@@ -39,8 +39,7 @@ struct ark_mpu_id_t {#define ARK_MPU_HW 0x010struct ark_mpu_hw_t { -uint16_t num_queues; -uint16_t reserved; +uint32_t num_queues;uint32_t hw_depth;uint32_t obj_size;uint32_t obj_per_mrr;
Signature · 1 line
2.34.1
drivers/net/ark/ark_ethdev.c eth_ark_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, · line 151
Quoted 10 lines · On Fri, 17 Feb 2023 10:47:56 -0500 Ed Czeck <[email protected]> wrote:
drivers/net/ark/ark_ethdev.c +2
-0@@ -147,6 +147,9 @@ eth_ark_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,struct rte_eth_dev *eth_dev;int ret; +if (rte_eal_process_type () ==RTE_PROC_SECONDARY ) +fprintf (stderr,"ARK probed by secondary process\n" );
Use standard logging for error messages please.
ARK_PMD_LOG(DEBUG, "Secondary process probed\n");