From patchwork Tue Feb 21 16:30:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 124300 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 C2C2A41D30; Tue, 21 Feb 2023 17:30:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5349C431FD; Tue, 21 Feb 2023 17:30:16 +0100 (CET) Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) by mails.dpdk.org (Postfix) with ESMTP id 2445E40E0F for ; Tue, 21 Feb 2023 17:30:15 +0100 (CET) Received: by mail-qt1-f171.google.com with SMTP id fp16so4816104qtb.10 for ; Tue, 21 Feb 2023 08:30:15 -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=ObHb0OzGgGDRzIb/6uaks/Ww3+mcq148SJG3nxc5Hds=; b=aqEY7exhrE1u6AjNsR+qsq/CFlW33LJPPDYHPqj4WWIQkii5NWvngHUJsHgQ1jB9Ft 4jRWUz/osMhLaoaaaqkdycJRJr61LxHhBhyfkpZEA83tIwNxFWKXtFF2xy0eNR18X4a/ +klFU1R6YZlpr+tKXgZHDHy6mOdLj82nH1lGYghMGFy2n9M42qkfBYiK4IYnIT2fAdOA X+LJGLuDrVoRJPhbPuFx3KhfWvY17K7Ij1YGOdg1Ua63dlkVQ1K4rYQ40P9/8z14lRHn qVrk/5avwCkfZZj1Gi65LmxvGpyFuCfbR4NoR8MLEx/1PRnjmdwhrfHQoAcT/m253Cex Ntaw== 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=ObHb0OzGgGDRzIb/6uaks/Ww3+mcq148SJG3nxc5Hds=; b=8RAlgvWqYxD7fIHnEUSFUBM9nXvxD5rrYcX5Wehe5tjAMWGRTSlP9V827hYOCuTFkF /4UIPmSNpctTPPvu2QV+tUJ1d7IP9LXCeVK+dX1R87yj+aF7Lr27QFWavb9UhVuLM8U7 VMyv3faZJKb0vvvU9xo5dsUD2LY2CmHOif9jk+1nUVEqFRF5KnTGGn+FiPzENhZdqWex Ps6/bAI0XtLxr9A8B7eggP/tALhLlHAEqfzWBiZ6AWJfK0wGoTvuuHsT2tfUslzXIalp 0heyp/018lIUICpm7tLiMqjVrtOU8nQzadn4y+Dp64WVZa6gZqVKnFstKQX17ge0BuFZ xW1A== X-Gm-Message-State: AO0yUKVtz/hNB7gasTIyLaX4H2V2E7pM3qZUeQd5jd1UBeRqiaj3hG+X K9PxSAcODyhIAGF71yj+36jln+FCZ/lC5hZL X-Google-Smtp-Source: AK7set9uv9LyuDzJCymXCJgpo3s4yZN9QoP4u2w+Hz3jajaEXoUn7YUny0ZgfpWnh7GkRei73gfQIg== X-Received: by 2002:ac8:57d5:0:b0:3b8:5057:376a with SMTP id w21-20020ac857d5000000b003b85057376amr8904811qta.66.1676997013744; Tue, 21 Feb 2023 08:30:13 -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 o13-20020ac8024d000000b003b8238114d9sm109834qtg.12.2023.02.21.08.30.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 08:30:12 -0800 (PST) From: Ed Czeck To: dev@dpdk.org, ferruh.yigit@amd.com Cc: stephen@networkplumber.org, Shepard Siegel , John Miller Subject: [PATCH v4] net/ark: support for single function with multiple port Date: Tue, 21 Feb 2023 11:30:06 -0500 Message-Id: <20230221163006.2716167-1-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 Support the creation of multiple ports from one ark device via the use of ark pmd extension, though the assignment of queues to port. Add unique dev_private data for each port. This patch repairs a latent issue uncovered during testing. Signed-off-by: Ed Czeck --- v3: * Backport to LTS version is not recommended since firmware changes are required and limited * remove unused num_queues field from struct ark_adapter v4: * additional comments * separate patch from unrelated patch in series --- drivers/net/ark/ark_ethdev.c | 15 ++++++++++++++- drivers/net/ark/ark_ethdev_rx.c | 6 +++--- drivers/net/ark/ark_ethdev_tx.c | 2 +- drivers/net/ark/ark_global.h | 3 +++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index b2995427c8..24c1cb3932 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -300,6 +300,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev) int ret; int port_count = 1; int p; + uint16_t num_queues; bool rqpacing = false; ark->eth_dev = dev; @@ -427,6 +428,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; + 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; @@ -452,7 +454,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 * 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..2f198edfe4 100644 --- a/drivers/net/ark/ark_global.h +++ b/drivers/net/ark/ark_global.h @@ -112,7 +112,10 @@ struct ark_adapter { ark_pkt_chkr_t pc; ark_pkt_dir_t pd; + /* For single function, multiple ports */ int num_ports; + uint16_t qbase; + bool isvf; /* Packet generator/checker args */