From patchwork Fri Feb 17 16:00:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 124133 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 529A141CC1; Fri, 17 Feb 2023 17:00:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 369D94161A; Fri, 17 Feb 2023 17:00:46 +0100 (CET) Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by mails.dpdk.org (Postfix) with ESMTP id CA5D440EE3 for ; Fri, 17 Feb 2023 17:00:44 +0100 (CET) Received: by mail-qv1-f52.google.com with SMTP id qh27so1603714qvb.2 for ; Fri, 17 Feb 2023 08:00:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atomicrules-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FqQjCru+Men6Cl9eZ9QW3zP7vhgpg2FxEGvPPXFQMLU=; b=FyWwFJn861pL/kav1boeSvvV4u++GPQMoLPlL/OPQyL9XoMh/IfbYPxvkwycq7nNUK O1FzXVZAO6fB0xEJT7tuDa8iarGQSBZte+KNQS6EK/Yg2WfMcTm8XIuYz34MsYKye0MS hNdt2IsZLDvKqRY/fihDZKF3Ufg0ALqaGxHtnApKwuhXHpBDrNhKn0YmtIX/j01tPcJM l+bDmqIBhqFOxovdW3NStd2oqaU3HmygQAY4TEoHNCHwn+EqXXMpdicbaR6xjSJLvR7W dEiZs7X8u9Ymt+qK1t3e0L4Jkxl4FuMjIQDnXXNYUpnG/pflqYKmWa1XQhpYI709SFdw X0ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FqQjCru+Men6Cl9eZ9QW3zP7vhgpg2FxEGvPPXFQMLU=; b=29JmAkyeX71cLWM88gh9nEpSI5LOxBEElk44bOPfhFBpIaOvZaF5K/1et8SepJaU34 wgNdrL96By+0SZtWElKZ7ptAu0MN4xCA55M+7033+NTHXh02124kCaYx79FDzEYalaY0 fov4cqCCqEv/xT0jrfepuBJG89TZrwKQPYIUm9MiFdATu2ykkmv0EIm9xODLLocD4zIL ucBA7yt4HeKCOC/k1rw7dEIi6s6z4bdvspriXb2wmomhpI3RLuPJDzjL+oG6IrtFuk8X Yerrlh7U0CanvsfVLAmq6HDbeOrgYuyIJPZem4V1/4ThDMX1LKhxNI80cYMifGrUsgBp 0OPw== X-Gm-Message-State: AO0yUKVG5cJ9lEL0BrRk2btr8dwi7CbdCfzjt7lbzDBtp0uBckmUUtyk 0r94rBGpUf7gQvfeA7BaeM7PdZ3BVjMO0Viu X-Google-Smtp-Source: AK7set9Z3TZGDXD3YYkceCSmYFT5W/XDdfBUUdMSLSlOKgyEw0AhpHuzd3liENSPV+mcrdZ4d65hoA== X-Received: by 2002:ad4:5fc8:0:b0:56e:a756:919 with SMTP id jq8-20020ad45fc8000000b0056ea7560919mr1233791qvb.47.1676649643334; Fri, 17 Feb 2023 08:00:43 -0800 (PST) Received: from z690.czeck.local (pool-173-48-111-149.bstnma.fios.verizon.net. [173.48.111.149]) by smtp.gmail.com with ESMTPSA id o6-20020a37be06000000b0073b338b4eb1sm3382460qkf.133.2023.02.17.08.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 08:00:42 -0800 (PST) From: Ed Czeck To: dev@dpdk.org, ferruh.yigit@amd.com Cc: John Miller , Shepard Siegel , Anatoly Burakov Subject: [PATCH 1/3] net/ark: support secondary process Date: Fri, 17 Feb 2023 11:00:36 -0500 Message-Id: <20230217160039.2487085-1-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: John Miller disable device configuration for secondary processes Signed-off-by: John Miller --- drivers/net/ark/ark_ethdev.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index b2995427c8..f96722551e 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -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; From patchwork Fri Feb 17 16:00:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 124134 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 29E7B41CC1; Fri, 17 Feb 2023 17:00:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A393A42D2D; Fri, 17 Feb 2023 17:00:49 +0100 (CET) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by mails.dpdk.org (Postfix) with ESMTP id 2CF4640EE3 for ; Fri, 17 Feb 2023 17:00:46 +0100 (CET) Received: by mail-qt1-f175.google.com with SMTP id u22so1050955qtq.13 for ; Fri, 17 Feb 2023 08:00:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atomicrules-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Za96cy54hNnpA2RBCW5VRodHJ7t0VdB4hm0NFPKEBa8=; b=ajSEU7LpxNkl5/em4V5u6fsnKo0+fhaNXkGD2iet25bpFmAFYZxbpI67nDD6Vfu3Ba xcn+SJXYx6U1EV45P3JjQbZ8Km8RvNOHqwZ8w2f2f0NaTfoCna3tYAdNtcJCuMCJTCvM K5f3Rm8VkynzuaavRuLlBkmoRyGAffz5/UEohSdKFvpBY5H/SE3hBUCTjUmM3BJdYuQv axKlgOs9pfmV0J989lkkLc3h6z1XDTcs8ip8EUOjoax9zIbDb9FpJdO9noikoXGkilrl xwP3wUlhUoldfcedLpqqOFfVQ1nLahyI6H6tBkzFWFbYc044eOohv3DcSlw8qh6VJ79M xrEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Za96cy54hNnpA2RBCW5VRodHJ7t0VdB4hm0NFPKEBa8=; b=kMjvHzsSCmLovbBRsgRU7rfn6lsIt2JL9vIta6mRzgMFVAcMsPyCSNJ9VoyrzNXC8n DGQi4UGX53IOsKX6My2Xt6ZGy6tdGcUr2Qh4qZlN13DsVZvyW3BbjgjlLANKe09tloAM TKuLhP1gP6vxC9jboHQOqDc2Tp5zZRU+StkpqsO7pjGI+QdCMbImkz0AwyBK1UIfC9TH jAqxKg3yoJq8FXWTVQ/SB5zEPkuSMTEKNBtReuZTL9eybFoN1gbMYv/CbHKN5veQ/HJw n4jN+nq64igKVcZP0glpRLQUxnKHHoT7PNA/wA4vgx5lFb1l7qMndUGs3oHmvGPC728l DbUg== X-Gm-Message-State: AO0yUKVoD97BqEY5BUbbPQpvjGQebwUFFE2iEyAbD7vc63HRBSXW+ObO x+zNSrrPE+A8GcC69uAVMK5+8+34fvGjJKiZ X-Google-Smtp-Source: AK7set8lfXXqdFj8/JoE0vHVZobCZlE4PtDm/52BxMTA+YZ7XSt83PIylCTSmJqVACOeumRTnPgBSA== X-Received: by 2002:ac8:5911:0:b0:3ba:2066:58dc with SMTP id 17-20020ac85911000000b003ba206658dcmr17237018qty.11.1676649645004; Fri, 17 Feb 2023 08:00:45 -0800 (PST) Received: from z690.czeck.local (pool-173-48-111-149.bstnma.fios.verizon.net. [173.48.111.149]) by smtp.gmail.com with ESMTPSA id o6-20020a37be06000000b0073b338b4eb1sm3382460qkf.133.2023.02.17.08.00.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 08:00:43 -0800 (PST) From: Ed Czeck To: dev@dpdk.org, ferruh.yigit@amd.com Cc: Shepard Siegel , John Miller Subject: [PATCH 2/3] net/ark: support for single function with multiple port Date: Fri, 17 Feb 2023 11:00:37 -0500 Message-Id: <20230217160039.2487085-2-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230217160039.2487085-1-ed.czeck@atomicrules.com> References: <20230217160039.2487085-1-ed.czeck@atomicrules.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 --- 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 f96722551e..2fff3cd6ba 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 */ From patchwork Fri Feb 17 16:00:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 124135 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CD5CF41CC1; Fri, 17 Feb 2023 17:00:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BBC4D42D31; Fri, 17 Feb 2023 17:00:50 +0100 (CET) Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by mails.dpdk.org (Postfix) with ESMTP id A66BE42D1A for ; Fri, 17 Feb 2023 17:00:47 +0100 (CET) Received: by mail-qt1-f180.google.com with SMTP id s22so1277815qtw.11 for ; Fri, 17 Feb 2023 08:00:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atomicrules-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c4IWdJFwYnergjPZw1qFObMqN+KdP18tyOspeVVD7JA=; b=wPsoF2QMd6fXz6IM3aQMTA/SKBBVIAgQ7lYfHalNMkfWy1MNL8l0MxqTeRkGUa13ge dosr9AgvDqLivqFBbhzgoWOvMbMJTWS4GT08GIgukWqwAXJ6Y++h7xQ5CTmaeJuqGysC Fa7bi0r3iPbWxwV/NCvAZI6ELBHkewLZiSlA1R/DT0/ey2i4rFOXk5Olwbzr+keTbjpM Xb9NYVJzntRqHjdZSElZNjengv4DzvKNG610mRHl3Dk0XJFZPfv8ttA5u7hDPT4jeyy9 dGfpaN3715PAUd9y7zCzvofMfjDj+zxEzEIdBXnl0ioJWqU5fKHOv3SY63m2SSWb7Roa 3mCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c4IWdJFwYnergjPZw1qFObMqN+KdP18tyOspeVVD7JA=; b=ttqzEG6hC2dj3gsgExkz3uazGighuFH5Uqk7nOtnnxPXU6hJPB5e8LJSwQ8CS/uUUA SBwTcU+fVm9hPyhTNxTMgZHN3DshV28w8FrSVOoNPz0MhvEgoQB3VxL3mIxHH2BJ9PoV 6WLFwP1jP1G+xcYzbNGja20GghANyp8xMrjTGz3xhf765Lf9zUowzO7abwUDgnqVJ/bl 8WAwZQwJMSKsNiIzimBa77+xTlp8Q5A6wPwdJm0D1nVQo2wWdVw91NL3HgKaaZizB0Wv fi18Bfvl2FMIciXIwFXHcPEvggs+vPsCzABn67SrVtPxhiUvLJ8MpfAa+xUJ89t/1Mjx BK9Q== X-Gm-Message-State: AO0yUKUHXoXxE8tFME0ZEmw5/2bZOXQApGrDZ5Xeg5TLb1d9PP39CpTf J7elDC0xtQFrJ1J84V8Zv047gtkH+4Xm8Eii X-Google-Smtp-Source: AK7set/s/fthpnyV1ruwCg+al/ur0bEsb9cnQ2p8N+rly1/7snvmaJdNu/evmvfTSv02z0GLg8uwkQ== X-Received: by 2002:a05:622a:1805:b0:3b9:bb27:e116 with SMTP id t5-20020a05622a180500b003b9bb27e116mr1911649qtc.1.1676649646529; Fri, 17 Feb 2023 08:00:46 -0800 (PST) Received: from z690.czeck.local (pool-173-48-111-149.bstnma.fios.verizon.net. [173.48.111.149]) by smtp.gmail.com with ESMTPSA id o6-20020a37be06000000b0073b338b4eb1sm3382460qkf.133.2023.02.17.08.00.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 08:00:45 -0800 (PST) From: Ed Czeck To: dev@dpdk.org, ferruh.yigit@amd.com Cc: Shepard Siegel , John Miller Subject: [PATCH 3/3] net/ark: resize data field to match fpga access Date: Fri, 17 Feb 2023 11:00:38 -0500 Message-Id: <20230217160039.2487085-3-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230217160039.2487085-1-ed.czeck@atomicrules.com> References: <20230217160039.2487085-1-ed.czeck@atomicrules.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org all fpga accesses are multiples of 4 bytes Signed-off-by: Ed Czeck --- drivers/net/ark/ark_mpu.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ark/ark_mpu.h b/drivers/net/ark/ark_mpu.h index 9d2b70d35f..10842ba484 100644 --- a/drivers/net/ark/ark_mpu.h +++ b/drivers/net/ark/ark_mpu.h @@ -39,8 +39,7 @@ struct ark_mpu_id_t { #define ARK_MPU_HW 0x010 struct 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;