From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C9E93A0548; Tue, 7 Jun 2022 23:32:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 324D942B73; Tue, 7 Jun 2022 23:32:10 +0200 (CEST) Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) by mails.dpdk.org (Postfix) with ESMTP id DB08F427F9 for ; Tue, 7 Jun 2022 23:32:07 +0200 (CEST) Received: by mail-qv1-f49.google.com with SMTP id a9so13232937qvt.6 for ; Tue, 07 Jun 2022 14:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atomicrules-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0TN11NY3TDP3GoRe5OBcvuey0uXrtxeKozw4p7CFtTE=; b=3J7rKU1uY7dD2jnz8hyaCc50vAwnS/YQK/5GWSeiXbCQYHjTPnlkH9ab3YaRLg/18p tyBGEHIM4irMzejCTBhR5x1wk8zTsAKkRZMflXZMeXQVoVZCalnSkuVhXw2xIURsg7Vo IUGgiCm1Uy8quZqASOZwP/BbGBL47hbBqImTek7+SG4hI5wMuiDGvvLubVbmx1xCTSQM kuqzNSB27jVDAOgdlhzHHjF63g7we/6r7TsDotT2QuFpWuhxxQBgBJ5iLmkcImw3YyS7 scenK2YKrh1ch2Pza3qavRDEA2A1O3uTSO/lUwH4PvUNKT39gJAItVSS0NPK1/v2FGOb y64g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0TN11NY3TDP3GoRe5OBcvuey0uXrtxeKozw4p7CFtTE=; b=jPvIkgRTtjvhUpCdMDncyhj6ZsPk8VL3J9JJ9VYT31HWQFFDMz3+zPW7c5tUIJ+eQg 0kuDSzOcOiZjrPcJLquo66HqAJK1wxtPwtbFQt+/zYaGNl9nOKpSdc3DReWR11fbFM3H GjrBSecwqNiQdhQ0Gm52n2i3lcX9jaaYN3TenioLrZTjdj+3fMPijoSD/O5IKxz9LEoC i8JdsBX39TcGX9F+kZNXm89WiAMMUVBLwtf7/wmoLesW1T3rMu72/kWqE5nKNkgThbVE Ku7/rbfioDK0/EiS2Kl77mbloyRt87ZqFk3V/dLsdXvury3O8DEXmvuZmOf6PDH1zyw1 lGVg== X-Gm-Message-State: AOAM5328fE74+CvkcOgNnQtAFhaMw7HJJN1drw+MFn5V8HbRilaqZC7d mZ9wHXfsYP0b/vXjVl/EX8gVq6IvDQxojw== X-Google-Smtp-Source: ABdhPJwa4P9fsMDgkYCMMekrV/wI2+ykHG10CBEFL0FUcl6eEr72MrDtZ2du9kQJhz2TcVW5jqRRMQ== X-Received: by 2002:a05:6214:411e:b0:467:daa4:62bf with SMTP id kc30-20020a056214411e00b00467daa462bfmr19965020qvb.80.1654637526960; Tue, 07 Jun 2022 14:32:06 -0700 (PDT) Received: from z390.czeck.local (pool-173-48-102-189.bstnma.fios.verizon.net. [173.48.102.189]) by smtp.gmail.com with ESMTPSA id x6-20020ae9f806000000b006a6cdc79229sm3774711qkh.55.2022.06.07.14.32.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 14:32:06 -0700 (PDT) From: Ed Czeck To: dev@dpdk.org Cc: ferruh.yigit@xilinx.com, ktraynor@redhat.com, bluca@debian.org, Shepard Siegel , John Miller Subject: [PATCH v4 7/7] net/ark: add PMD support for devices as virtual functions Date: Tue, 7 Jun 2022 17:31:49 -0400 Message-Id: <20220607213149.1980193-7-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220607213149.1980193-1-ed.czeck@atomicrules.com> References: <20220502212232.1283-1-ed.czeck@atomicrules.com> <20220607213149.1980193-1-ed.czeck@atomicrules.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Add capabilities field isvf to dev struct Disable configuration calls as required by vf Signed-off-by: Ed Czeck --- v2: feature Arkville vf support in release notes v3: feature new PCI device ids in release notes v4: split release note --- doc/guides/rel_notes/release_22_07.rst | 2 + drivers/net/ark/ark_ethdev.c | 83 +++++++++++++++----------- drivers/net/ark/ark_global.h | 1 + 3 files changed, 51 insertions(+), 35 deletions(-) diff --git a/doc/guides/rel_notes/release_22_07.rst b/doc/guides/rel_notes/release_22_07.rst index 191539cb72..3a6df7bed9 100644 --- a/doc/guides/rel_notes/release_22_07.rst +++ b/doc/guides/rel_notes/release_22_07.rst @@ -176,6 +176,8 @@ New Features Added support for Atomic Rules PCI device IDs ``0x101a, 0x101b, 0x101c``. + Added PMD support for virtual functions and vfio_pci driver. + Removed Items ------------- diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index 377631e66e..e8e4092be6 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -113,28 +113,29 @@ static const struct rte_pci_id pci_id_ark_map[] = { */ struct ark_caps { bool rqpacing; + bool isvf; }; struct ark_dev_caps { uint32_t device_id; struct ark_caps caps; }; -#define SET_DEV_CAPS(id, rqp) \ - {id, {.rqpacing = rqp} } +#define SET_DEV_CAPS(id, rqp, vf) \ + {id, {.rqpacing = rqp, .isvf = vf} } static const struct ark_dev_caps ark_device_caps[] = { - SET_DEV_CAPS(0x100d, true), - SET_DEV_CAPS(0x100e, true), - SET_DEV_CAPS(0x100f, true), - SET_DEV_CAPS(0x1010, false), - SET_DEV_CAPS(0x1017, true), - SET_DEV_CAPS(0x1018, true), - SET_DEV_CAPS(0x1019, true), - SET_DEV_CAPS(0x101a, true), - SET_DEV_CAPS(0x101b, true), - SET_DEV_CAPS(0x101c, false), - SET_DEV_CAPS(0x101e, false), - SET_DEV_CAPS(0x101f, false), + SET_DEV_CAPS(0x100d, true, false), + SET_DEV_CAPS(0x100e, true, false), + SET_DEV_CAPS(0x100f, true, false), + SET_DEV_CAPS(0x1010, false, false), + SET_DEV_CAPS(0x1017, true, false), + SET_DEV_CAPS(0x1018, true, false), + SET_DEV_CAPS(0x1019, true, false), + SET_DEV_CAPS(0x101a, true, false), + SET_DEV_CAPS(0x101b, true, false), + SET_DEV_CAPS(0x101c, true, true), + SET_DEV_CAPS(0x101e, false, false), + SET_DEV_CAPS(0x101f, false, false), {.device_id = 0,} }; @@ -317,6 +318,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev) while (ark_device_caps[p].device_id != 0) { if (pci_dev->id.device_id == ark_device_caps[p].device_id) { rqpacing = ark_device_caps[p].caps.rqpacing; + ark->isvf = ark_device_caps[p].caps.isvf; break; } p++; @@ -498,20 +500,21 @@ ark_config_device(struct rte_eth_dev *dev) * Make sure that the packet director, generator and checker are in a * known state */ - ark->start_pg = 0; - ark->pg_running = 0; - ark->pg = ark_pktgen_init(ark->pktgen.v, 0, 1); - if (ark->pg == NULL) - return -1; - ark_pktgen_reset(ark->pg); - ark->pc = ark_pktchkr_init(ark->pktchkr.v, 0, 1); - if (ark->pc == NULL) - return -1; - ark_pktchkr_stop(ark->pc); - ark->pd = ark_pktdir_init(ark->pktdir.v); - if (ark->pd == NULL) - return -1; - + if (!ark->isvf) { + ark->start_pg = 0; + ark->pg_running = 0; + ark->pg = ark_pktgen_init(ark->pktgen.v, 0, 1); + if (ark->pg == NULL) + return -1; + ark_pktgen_reset(ark->pg); + ark->pc = ark_pktchkr_init(ark->pktchkr.v, 0, 1); + if (ark->pc == NULL) + return -1; + ark_pktchkr_stop(ark->pc); + ark->pd = ark_pktdir_init(ark->pktdir.v); + if (ark->pd == NULL) + return -1; + } /* Verify HW */ if (ark_udm_verify(ark->udm.v)) return -1; @@ -533,7 +536,7 @@ ark_config_device(struct rte_eth_dev *dev) mpu = RTE_PTR_ADD(mpu, ARK_MPU_QOFFSET); } - if (ark->rqpacing) + if (!ark->isvf && ark->rqpacing) ark_rqp_stats_reset(ark->rqpacing); return 0; @@ -551,8 +554,10 @@ eth_ark_dev_uninit(struct rte_eth_dev *dev) ark->user_ext.dev_uninit(dev, ark->user_data[dev->data->port_id]); - ark_pktgen_uninit(ark->pg); - ark_pktchkr_uninit(ark->pc); + if (!ark->isvf) { + ark_pktgen_uninit(ark->pg); + ark_pktchkr_uninit(ark->pc); + } return 0; } @@ -588,10 +593,10 @@ eth_ark_dev_start(struct rte_eth_dev *dev) dev->rx_pkt_burst = ð_ark_recv_pkts; dev->tx_pkt_burst = ð_ark_xmit_pkts; - if (ark->start_pg) + if (!ark->isvf && ark->start_pg) ark_pktchkr_run(ark->pc); - if (ark->start_pg && !ark->pg_running) { + if (!ark->isvf && ark->start_pg && !ark->pg_running) { pthread_t thread; /* Delay packet generatpr start allow the hardware to be ready @@ -635,7 +640,7 @@ eth_ark_dev_stop(struct rte_eth_dev *dev) ark->user_data[dev->data->port_id]); /* Stop the packet generator */ - if (ark->start_pg && ark->pg_running) { + if (!ark->isvf && ark->start_pg && ark->pg_running) { ark_pktgen_pause(ark->pg); ark->pg_running = 0; } @@ -665,7 +670,7 @@ eth_ark_dev_stop(struct rte_eth_dev *dev) eth_ark_rx_dump_queue(dev, i, __func__); /* Stop the packet checker if it is running */ - if (ark->start_pg) { + if (!ark->isvf && ark->start_pg) { ark_pktchkr_dump_stats(ark->pc); ark_pktchkr_stop(ark->pc); } @@ -694,6 +699,10 @@ eth_ark_dev_close(struct rte_eth_dev *dev) if (ark->rqpacing) ark_rqp_dump(ark->rqpacing); + /* return to power-on state */ + if (ark->pd) + ark_pktdir_setup(ark->pd, ARK_PKT_DIR_INIT_VAL); + for (i = 0; i < dev->data->nb_tx_queues; i++) { eth_ark_tx_queue_release(dev->data->tx_queues[i]); dev->data->tx_queues[i] = 0; @@ -978,6 +987,10 @@ eth_ark_check_args(struct ark_adapter *ark, const char *params) goto free_kvlist; } + if (ark->isvf) { + ret = 0; + goto free_kvlist; + } ARK_PMD_LOG(INFO, "packet director set to 0x%x\n", ark->pkt_dir_v); /* Setup the packet director */ ark_pktdir_setup(ark->pd, ark->pkt_dir_v); diff --git a/drivers/net/ark/ark_global.h b/drivers/net/ark/ark_global.h index 3c3a712bc8..748db590c1 100644 --- a/drivers/net/ark/ark_global.h +++ b/drivers/net/ark/ark_global.h @@ -113,6 +113,7 @@ struct ark_adapter { ark_pkt_dir_t pd; int num_ports; + bool isvf; /* Packet generator/checker args */ char pkt_gen_args[ARK_MAX_ARG_LEN]; -- 2.25.1