From patchwork Fri May 6 21:27:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 110781 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 F0915A0505; Fri, 6 May 2022 23:28:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD9B842832; Fri, 6 May 2022 23:27:49 +0200 (CEST) Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by mails.dpdk.org (Postfix) with ESMTP id 1E59B40395 for ; Fri, 6 May 2022 23:27:48 +0200 (CEST) Received: by mail-qk1-f196.google.com with SMTP id n8so6374483qke.11 for ; Fri, 06 May 2022 14:27:48 -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; bh=8SgbC35YQD9FiBkBicG8isVlWwv0XIgsopI19wXPjns=; b=MFS1uonbZWTDm6xn5ZpFvMdNaM41rWwZfGw8D4wQY8pibRJN93clOsAS+t7J56euAd EDKyMq7qPdz30+pxwPB7ylRLoQAelK3DtY4gyOXD5hmIpLFQ8LpaPd+2sPW/U4ALKGQz Z7zMNkrpugcMC5HO7D0/dwwhtqzFNpN7SVDzySSILmI1rzVRXoiHXVarumr6C823qdls LJgtHZoc2u3tBZ5kpT65IVRwUllR16ctqv4u8KMPLpQB6gMfW2bmepY3zkhIli225d6S 7YoPeSns2p6v2Qwvt7sHd7yJsE7FLCBeW38B3P0H9xa++IHZUIne4rM9+ujzuKtLK17O JmNQ== 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; bh=8SgbC35YQD9FiBkBicG8isVlWwv0XIgsopI19wXPjns=; b=7vfvzcmVp41m6AFfpnI8iH6lLr7K+Q+Ly98SPQhXXnmDdzxq8dw9wgw9G8q2oBz4fH kCmKMgH1t94gBexyGAhJcx7gtK5mAX4mLwCXAoZCebzH/vdD7dpK4FYk960IXqBMAZ31 1wyhf/f/d45NImiuqmMAzUYqQUY2cfeoG5kBrmaqe4AncRjvV1F6TQDA479na3BjLI4X hHy9OQBDYUu+MCvnzNr86EK2K74g1xdTrvWFfIkb+I5dplYnc16rGKekHfkEoKPs5N6d BOXCS0/52I7BINkHPyEgUcNbzLPrTv5HEdTIk97LlFQJcKyGwI4k3xCUSrDbH5JmM3FU Ytdg== X-Gm-Message-State: AOAM531hNA8CobrbHFaugd6kLnTvUFEXE5ZUSzDjbCm02vvKng6eiq6s iItkIBsZKBUGoln3A/TQzvn7tvyp03O08SxV X-Google-Smtp-Source: ABdhPJwGVbP95FZr5jsWWQ86QLUYnvOa8LUsaRkSWgMVGeAqYXWDZc2TmtKKqwjZJ5Ukv1GGxPcT6Q== X-Received: by 2002:a05:620a:1a07:b0:6a0:2601:6f57 with SMTP id bk7-20020a05620a1a0700b006a026016f57mr3786806qkb.579.1651872467168; Fri, 06 May 2022 14:27:47 -0700 (PDT) Received: from z170.czeck.local (pool-173-48-102-189.bstnma.fios.verizon.net. [173.48.102.189]) by smtp.gmail.com with ESMTPSA id t3-20020ac85303000000b002f39b99f6a9sm3143802qtn.67.2022.05.06.14.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 May 2022 14:27:46 -0700 (PDT) From: Ed Czeck To: dev@dpdk.org Cc: Ed Czeck , Shepard Siegel , John Miller Subject: [PATCH v1 5/5] net/ark: add PMD support for devices as virtual functions Date: Fri, 6 May 2022 17:27:32 -0400 Message-Id: <20220506212732.28504-5-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220506212732.28504-1-ed.czeck@atomicrules.com> References: <20220502212232.1283-1-ed.czeck@atomicrules.com> <20220506212732.28504-1-ed.czeck@atomicrules.com> 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 --- drivers/net/ark/ark_ethdev.c | 79 ++++++++++++++++++++---------------- drivers/net/ark/ark_global.h | 1 + 2 files changed, 45 insertions(+), 35 deletions(-) diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index 7cf896f6f1..fde94ee431 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, false, 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; } @@ -661,7 +666,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); } @@ -974,6 +979,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];