From patchwork Thu May 5 15:37:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 110734 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 D2242A00C2; Thu, 5 May 2022 17:37:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7E5E34014F; Thu, 5 May 2022 17:37:59 +0200 (CEST) Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by mails.dpdk.org (Postfix) with ESMTP id A28CB40042 for ; Thu, 5 May 2022 17:37:57 +0200 (CEST) Received: by mail-qk1-f170.google.com with SMTP id b20so3417830qkc.6 for ; Thu, 05 May 2022 08:37:57 -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=2WjmXnRQ/yhcxfxQBeL8LMUegrSsK588dy9IEbffrhU=; b=we2xSj/xWR0rDHWNHP+XQlP2JM1F7x+TRxCx197Yw9IbFHPKOIHxARiVP0IHPrwdyo rICHIqKuL11hmozBjJdKguOJwbJgBQLwjsIeyBPGsxhhd1cdjWoI2XWAGG2xgBxJsYGP OfvOvQTAhugtxIWeZ4onQxRO2UK80j1R4+KsGPTXxe54OYOozSJ2phUuOK3jSMoCMdn9 EYQHlbc4ErSwYiLlkFBteMqOvq/iD0EHCsNfhQz2wUZUGKEhi2Dwn3C98c+usE0Sl9Jb a6dt0CiKuWPNgW7yxJWXLl+lxloV1BLMhOnNIKvpl15huwCPeDoP7eTBuUd+9i529fcc wG0A== 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=2WjmXnRQ/yhcxfxQBeL8LMUegrSsK588dy9IEbffrhU=; b=VBZHJdGYyPAhhgjT3qwssdZ9jZkHXLLKatDsebj+9ImyL3Q6sNkHxX7PFGdWwvQ7aJ aw910jlYnCSvZXQVjcWsWmxqXAvFQii12vT/qhIvrhZBw2pxaGLc3w+tOxNtqmmUUzcD RRNxSA63/fCgyNb0I4m7ZolxRRgO0qxh8YEXRbVzH1mnfCOTrpWiOwWjOD9BJyEt6iZl ymrfyLXOxPE/8swveZKznBBsoVwrL6K61wWkui+PKf+I6X6oa9QTCGTq79GG4RxjTLfB eTRWGlnDgz3GlBlTuwrCjbvqLly/CuMsz2f70yeUVmgG+Zds6tYHV+koEpMu+MoCfm2o Qo/g== X-Gm-Message-State: AOAM5324GMQ3rsdDjaWJ09f0wrrb1cXCdGkNOv+l3m8N9oESR+EcvhGm LM2oYv87xq2MiPaW0sm4rRkLEWKv7Zfd/FAh X-Google-Smtp-Source: ABdhPJw9y046Tq6gSYX/dtK4C6ZK8OpvGI0RJgD7egM1lzLW0EMxscaQzoUFgddA2ILS/w2cQHYbIA== X-Received: by 2002:a37:4d4:0:b0:69f:cc67:6f89 with SMTP id 203-20020a3704d4000000b0069fcc676f89mr17689845qke.61.1651765076665; Thu, 05 May 2022 08:37:56 -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 r68-20020ae9dd47000000b0069fc13ce201sm592555qkf.50.2022.05.05.08.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 08:37:56 -0700 (PDT) From: Ed Czeck To: dev@dpdk.org Cc: Ed Czeck , Shepard Siegel , John Miller Subject: [PATCH v1 1/5] net/ark: update mpu code to match current hardware version Date: Thu, 5 May 2022 11:37:24 -0400 Message-Id: <20220505153728.22636-1-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220502212232.1283-1-ed.czeck@atomicrules.com> References: <20220502212232.1283-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 new version code remove device-level global operations remove ark_mpu_reset_stats function Signed-off-by: Ed Czeck --- drivers/net/ark/ark_ethdev.c | 2 -- drivers/net/ark/ark_ethdev_rx.c | 4 ---- drivers/net/ark/ark_mpu.c | 21 ++++----------------- drivers/net/ark/ark_mpu.h | 29 ++--------------------------- 4 files changed, 6 insertions(+), 50 deletions(-) diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index 76b88c62d0..c0578b85ce 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -524,7 +524,6 @@ ark_config_device(struct rte_eth_dev *dev) num_q = ark_api_num_queues(mpu); ark->rx_queues = num_q; for (i = 0; i < num_q; i++) { - ark_mpu_reset(mpu); mpu = RTE_PTR_ADD(mpu, ARK_MPU_QOFFSET); } @@ -536,7 +535,6 @@ ark_config_device(struct rte_eth_dev *dev) num_q = ark_api_num_queues(mpu); ark->tx_queues = num_q; for (i = 0; i < num_q; i++) { - ark_mpu_reset(mpu); mpu = RTE_PTR_ADD(mpu, ARK_MPU_QOFFSET); } diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index 0fbb2603db..85e34d0bb8 100644 --- a/drivers/net/ark/ark_ethdev_rx.c +++ b/drivers/net/ark/ark_ethdev_rx.c @@ -91,9 +91,6 @@ eth_ark_rx_hw_setup(struct rte_eth_dev *dev, ark_udm_write_addr(queue->udm, phys_addr_prod_index); - /* advance the valid pointer, but don't start until the queue starts */ - ark_mpu_reset_stats(queue->mpu); - /* The seed is the producer index for the HW */ ark_mpu_set_producer(queue->mpu, queue->seed_index); dev->data->rx_queue_state[rx_queue_idx] = RTE_ETH_QUEUE_STATE_STOPPED; @@ -589,7 +586,6 @@ eth_rx_queue_stats_reset(void *vqueue) if (queue == 0) return; - ark_mpu_reset_stats(queue->mpu); ark_udm_queue_stats_reset(queue->udm); } diff --git a/drivers/net/ark/ark_mpu.c b/drivers/net/ark/ark_mpu.c index b8e94b6ed3..9d5ee7841b 100644 --- a/drivers/net/ark/ark_mpu.c +++ b/drivers/net/ark/ark_mpu.c @@ -24,10 +24,10 @@ ark_mpu_verify(struct ark_mpu_t *mpu, uint32_t obj_size) { uint32_t version; - version = mpu->id.vernum & 0x0000fF00; - if ((mpu->id.idnum != 0x2055504d) || - (mpu->hw.obj_size != obj_size) || - (version != 0x00003100)) { + version = mpu->id.vernum; + if (mpu->id.idnum != ARK_MPU_MODID || + version != ARK_MPU_MODVER || + mpu->hw.obj_size != obj_size) { ARK_PMD_LOG(ERR, " MPU module not found as expected %08x" " \"%c%c%c%c %c%c%c%c\"\n", @@ -79,16 +79,9 @@ ark_mpu_reset(struct ark_mpu_t *mpu) mpu->cfg.command = MPU_CMD_FORCE_RESET; usleep(10); } - ark_mpu_reset_stats(mpu); return mpu->cfg.command != MPU_CMD_IDLE; } -void -ark_mpu_reset_stats(struct ark_mpu_t *mpu) -{ - mpu->stats.pci_request = 1; /* reset stats */ -} - int ark_mpu_configure(struct ark_mpu_t *mpu, rte_iova_t ring, uint32_t ring_size, int is_tx) @@ -118,12 +111,6 @@ ark_mpu_dump(struct ark_mpu_t *mpu, const char *code, uint16_t qid) ARK_PMD_LOG(DEBUG, "MPU: %s Q: %3u sw_prod %u, hw_cons: %u\n", code, qid, mpu->cfg.sw_prod_index, mpu->cfg.hw_cons_index); - ARK_PMD_LOG(DEBUG, "MPU: %s state: %d count %d, reserved %d" - "\n", - code, - mpu->debug.state, mpu->debug.count, - mpu->debug.reserved - ); } void diff --git a/drivers/net/ark/ark_mpu.h b/drivers/net/ark/ark_mpu.h index 92c3e67c86..9d2b70d35f 100644 --- a/drivers/net/ark/ark_mpu.h +++ b/drivers/net/ark/ark_mpu.h @@ -15,6 +15,8 @@ * there is minimal documentation. */ +#define ARK_MPU_MODID 0x2055504d +#define ARK_MPU_MODVER 0x37313232 /* * MPU hardware structures * These are overlay structures to a memory mapped FPGA device. These @@ -64,26 +66,6 @@ enum ARK_MPU_COMMAND { MPU_COMMAND_LIMIT = 0xfFFFFFFF }; -#define ARK_MPU_STATS 0x080 -struct ark_mpu_stats_t { - volatile uint64_t pci_request; - volatile uint64_t q_empty; - volatile uint64_t q_q1; - volatile uint64_t q_q2; - volatile uint64_t q_q3; - volatile uint64_t q_q4; - volatile uint64_t q_full; -}; - -#define ARK_MPU_DEBUG 0x0C0 -struct ark_mpu_debug_t { - volatile uint32_t state; - uint32_t reserved; - volatile uint32_t count; - volatile uint32_t take; - volatile uint32_t peek[4]; -}; - /* Consolidated structure */ struct ark_mpu_t { struct ark_mpu_id_t id; @@ -93,12 +75,6 @@ struct ark_mpu_t { uint8_t reserved1[(ARK_MPU_CFG - ARK_MPU_HW) - sizeof(struct ark_mpu_hw_t)]; struct ark_mpu_cfg_t cfg; - uint8_t reserved2[(ARK_MPU_STATS - ARK_MPU_CFG) - - sizeof(struct ark_mpu_cfg_t)]; - struct ark_mpu_stats_t stats; - uint8_t reserved3[(ARK_MPU_DEBUG - ARK_MPU_STATS) - - sizeof(struct ark_mpu_stats_t)]; - struct ark_mpu_debug_t debug; }; uint16_t ark_api_num_queues(struct ark_mpu_t *mpu); @@ -113,7 +89,6 @@ int ark_mpu_configure(struct ark_mpu_t *mpu, rte_iova_t ring, void ark_mpu_dump(struct ark_mpu_t *mpu, const char *msg, uint16_t idx); void ark_mpu_dump_setup(struct ark_mpu_t *mpu, uint16_t qid); -void ark_mpu_reset_stats(struct ark_mpu_t *mpu); /* this action is in a performance critical path */ static inline void From patchwork Thu May 5 15:37:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 110735 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 383B2A00C2; Thu, 5 May 2022 17:38:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5607B41145; Thu, 5 May 2022 17:38:00 +0200 (CEST) Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by mails.dpdk.org (Postfix) with ESMTP id EEA7E40042 for ; Thu, 5 May 2022 17:37:58 +0200 (CEST) Received: by mail-qk1-f177.google.com with SMTP id j6so3421222qkp.9 for ; Thu, 05 May 2022 08:37:58 -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=mE+WVXcWgSAcCCjpZ408SSgeeRClgHpLK3KQyF2bda8=; b=H2OkYvdfn0Oy+EqhN6yNzdfWFKxX+UOg1fY1zovkydXVDsyRpz1aidN3ZXJRTiuL1n i06Dov/gxro+B5OLoxaeeygL4lm6Fm6dSNKox6YvcdePGq0yPMKkttX91wXaY9TkNHX2 pdL/6hvE1hNkvLgz3OvYUoQprpba/gupvzhEl9q77l3z2oCzdPDasnbsbJ7wrX+PHvzH ZHId1OVjcw8Ek/bJTF7Efcdub462E22FZS6BnsoxL2YdeMc3rcFxEuaDPZEaKrdymvL2 3LlaYp04LhsgjjVtopgeqstaALP+jQsmAUG1O2A8Lrl+ghpoZbcdm9aXauIGgo8NIvUr uLNw== 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=mE+WVXcWgSAcCCjpZ408SSgeeRClgHpLK3KQyF2bda8=; b=eSRfUFJ5wxJqGPV58Yka2qxJuHT7HXJO4cMpCX5WQVMQY9Js57sEqWKaH1T2Ey+OcA df0FZHEartFFoCmaH9ZZfHKdOnO6tU1dpgPHMCI0gHO42BX7JgkELPKz/OJc6aNN+EKy nHlNiuHbE5w3JA3YoiF6DzQTit0K2/lLhmpz52y3A086KxK2RbR7Zx9/BfduMtj9Ub2+ sjAE/BAjkk/NqTvWG3bWxfB0SO20C5v1nSfgcey1+ndw+nCj7dxj9VwdxuZShsfs3mgY BESt2hOqQZ+VXsrLiFFzbe0hlUuEcZ0XDG+xl2Prb+Sna5NQ2KwJhRCd9MQnRkYUu5XL 0osQ== X-Gm-Message-State: AOAM530yGG7hjVTi24/TQ9qcIAA2F0GacYINL97BdyYf6ePVfitggE3f Mf9FNvQgNwLXTqcJIqDKrMpp1x1bgEYAm/1V X-Google-Smtp-Source: ABdhPJz3pk0kkDwhqOPM5Nb3oN4N30O31Bb4HRqlP9pMJiktJGEKcylicG8DNafidMbnLy6bLjF+QA== X-Received: by 2002:a37:5846:0:b0:6a0:23d8:d49b with SMTP id m67-20020a375846000000b006a023d8d49bmr4815069qkb.700.1651765077899; Thu, 05 May 2022 08:37:57 -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 r68-20020ae9dd47000000b0069fc13ce201sm592555qkf.50.2022.05.05.08.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 08:37:57 -0700 (PDT) From: Ed Czeck To: dev@dpdk.org Cc: Ed Czeck , Shepard Siegel , John Miller Subject: [PATCH v1 2/5] net/ark: update ddm code to match current hardware version Date: Thu, 5 May 2022 11:37:25 -0400 Message-Id: <20220505153728.22636-2-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505153728.22636-1-ed.czeck@atomicrules.com> References: <20220502212232.1283-1-ed.czeck@atomicrules.com> <20220505153728.22636-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 new version code remove device-level start, stop, and reset operations add queue-based start, stop and reset as required by hardware Signed-off-by: Ed Czeck --- drivers/net/ark/ark_ddm.c | 80 +++++------------------------- drivers/net/ark/ark_ddm.h | 86 +++++++++------------------------ drivers/net/ark/ark_ethdev.c | 33 ------------- drivers/net/ark/ark_ethdev_tx.c | 35 +++----------- 4 files changed, 40 insertions(+), 194 deletions(-) diff --git a/drivers/net/ark/ark_ddm.c b/drivers/net/ark/ark_ddm.c index b16c739d50..eb88349b7b 100644 --- a/drivers/net/ark/ark_ddm.c +++ b/drivers/net/ark/ark_ddm.c @@ -14,95 +14,45 @@ int ark_ddm_verify(struct ark_ddm_t *ddm) { uint32_t hw_const; + uint32_t hw_ver; if (sizeof(struct ark_ddm_t) != ARK_DDM_EXPECTED_SIZE) { ARK_PMD_LOG(ERR, "DDM structure looks incorrect %d vs %zd\n", ARK_DDM_EXPECTED_SIZE, sizeof(struct ark_ddm_t)); return -1; } - hw_const = ddm->cfg.const0; - if (hw_const == ARK_DDM_CONST3) + hw_const = ddm->cfg.idnum; + hw_ver = ddm->cfg.vernum; + if (hw_const == ARK_DDM_MODID && hw_ver == ARK_DDM_MODVER) return 0; - if (hw_const == ARK_DDM_CONST1) { - ARK_PMD_LOG(ERR, - "ARK: DDM module is version 1, " - "PMD expects version 2\n"); - return -1; - } - - if (hw_const == ARK_DDM_CONST2) { - ARK_PMD_LOG(ERR, - "ARK: DDM module is version 2, " - "PMD expects version 3\n"); - return -1; - } ARK_PMD_LOG(ERR, - "ARK: DDM module not found as expected 0x%08x\n", - ddm->cfg.const0); + "ARK: DDM module not found as expected" + " id: %08x ver: %08x\n", + hw_const, hw_ver); return -1; } void -ark_ddm_start(struct ark_ddm_t *ddm) -{ - ddm->cfg.command = 1; -} - -int -ark_ddm_stop(struct ark_ddm_t *ddm, const int wait) +ark_ddm_queue_enable(struct ark_ddm_t *ddm, int enable) { - int cnt = 0; - - ddm->cfg.command = 2; - rte_wmb(); - while (wait && (ddm->cfg.stop_flushed & 0x01) == 0) { - if (cnt++ > 1000) - return 1; - - usleep(10); - } - return 0; + ddm->setup.qcommand = enable ? 1U : 0U; } void -ark_ddm_reset(struct ark_ddm_t *ddm) -{ - int status; - - /* reset only works if ddm has stopped properly. */ - status = ark_ddm_stop(ddm, 1); - - if (status != 0) { - ARK_PMD_LOG(NOTICE, "%s stop failed doing forced reset\n", - __func__); - ddm->cfg.command = 4; - usleep(10); - } - ddm->cfg.command = 3; -} - -void -ark_ddm_setup(struct ark_ddm_t *ddm, rte_iova_t cons_addr, uint32_t interval) +ark_ddm_queue_setup(struct ark_ddm_t *ddm, rte_iova_t cons_addr) { ddm->setup.cons_write_index_addr = cons_addr; - ddm->setup.write_index_interval = interval / 4; /* 4 ns period */ + ddm->setup.cons_index = 0; } +/* Global stats clear */ void ark_ddm_stats_reset(struct ark_ddm_t *ddm) { ddm->cfg.tlp_stats_clear = 1; } -void -ark_ddm_dump(struct ark_ddm_t *ddm, const char *msg) -{ - ARK_PMD_LOG(DEBUG, "%s Stopped: %d\n", msg, - ark_ddm_is_stopped(ddm) - ); -} - void ark_ddm_dump_stats(struct ark_ddm_t *ddm, const char *msg) { @@ -116,12 +66,6 @@ ark_ddm_dump_stats(struct ark_ddm_t *ddm, const char *msg) "MBufs", stats->tx_mbuf_count); } -int -ark_ddm_is_stopped(struct ark_ddm_t *ddm) -{ - return (ddm->cfg.stop_flushed & 0x01) != 0; -} - uint64_t ark_ddm_queue_byte_count(struct ark_ddm_t *ddm) { diff --git a/drivers/net/ark/ark_ddm.h b/drivers/net/ark/ark_ddm.h index 687ff2519a..84beeb063a 100644 --- a/drivers/net/ark/ark_ddm.h +++ b/drivers/net/ark/ark_ddm.h @@ -40,17 +40,24 @@ union ark_tx_meta { */ #define ARK_DDM_CFG 0x0000 /* Set unique HW ID for hardware version */ -#define ARK_DDM_CONST3 (0x334d4444) -#define ARK_DDM_CONST2 (0x324d4444) -#define ARK_DDM_CONST1 (0xfacecafe) +#define ARK_DDM_MODID 0x204d4444 +#define ARK_DDM_MODVER 0x37313232 struct ark_ddm_cfg_t { + union { + char id[4]; + uint32_t idnum; + }; + union { + char ver[4]; + uint32_t vernum; + volatile uint32_t tlp_stats_clear; + }; uint32_t r0; - volatile uint32_t tlp_stats_clear; - uint32_t const0; volatile uint32_t tag_max; volatile uint32_t command; - volatile uint32_t stop_flushed; + uint32_t write_index_interval; /* 4ns each */ + volatile uint64_t qflow; }; #define ARK_DDM_STATS 0x0020 @@ -60,34 +67,6 @@ struct ark_ddm_stats_t { volatile uint64_t tx_mbuf_count; }; -#define ARK_DDM_MRDQ 0x0040 -struct ark_ddm_mrdq_t { - volatile uint32_t mrd_q1; - volatile uint32_t mrd_q2; - volatile uint32_t mrd_q3; - volatile uint32_t mrd_q4; - volatile uint32_t mrd_full; -}; - -#define ARK_DDM_CPLDQ 0x0068 -struct ark_ddm_cpldq_t { - volatile uint32_t cpld_q1; - volatile uint32_t cpld_q2; - volatile uint32_t cpld_q3; - volatile uint32_t cpld_q4; - volatile uint32_t cpld_full; -}; - -#define ARK_DDM_MRD_PS 0x0090 -struct ark_ddm_mrd_ps_t { - volatile uint32_t mrd_ps_min; - volatile uint32_t mrd_ps_max; - volatile uint32_t mrd_full_ps_min; - volatile uint32_t mrd_full_ps_max; - volatile uint32_t mrd_dw_ps_min; - volatile uint32_t mrd_dw_ps_max; -}; - #define ARK_DDM_QUEUE_STATS 0x00a8 struct ark_ddm_qstats_t { volatile uint64_t byte_count; @@ -95,20 +74,10 @@ struct ark_ddm_qstats_t { volatile uint64_t mbuf_count; }; -#define ARK_DDM_CPLD_PS 0x00c0 -struct ark_ddm_cpld_ps_t { - volatile uint32_t cpld_ps_min; - volatile uint32_t cpld_ps_max; - volatile uint32_t cpld_full_ps_min; - volatile uint32_t cpld_full_ps_max; - volatile uint32_t cpld_dw_ps_min; - volatile uint32_t cpld_dw_ps_max; -}; - #define ARK_DDM_SETUP 0x00e0 struct ark_ddm_setup_t { rte_iova_t cons_write_index_addr; - uint32_t write_index_interval; /* 4ns each */ + volatile uint32_t qcommand; volatile uint32_t cons_index; }; @@ -119,39 +88,28 @@ struct ark_ddm_t { struct ark_ddm_cfg_t cfg; uint8_t reserved0[(ARK_DDM_STATS - ARK_DDM_CFG) - sizeof(struct ark_ddm_cfg_t)]; + struct ark_ddm_stats_t stats; - uint8_t reserved1[(ARK_DDM_MRDQ - ARK_DDM_STATS) - + uint8_t reserved1[(ARK_DDM_QUEUE_STATS - ARK_DDM_STATS) - sizeof(struct ark_ddm_stats_t)]; - struct ark_ddm_mrdq_t mrdq; - uint8_t reserved2[(ARK_DDM_CPLDQ - ARK_DDM_MRDQ) - - sizeof(struct ark_ddm_mrdq_t)]; - struct ark_ddm_cpldq_t cpldq; - uint8_t reserved3[(ARK_DDM_MRD_PS - ARK_DDM_CPLDQ) - - sizeof(struct ark_ddm_cpldq_t)]; - struct ark_ddm_mrd_ps_t mrd_ps; + struct ark_ddm_qstats_t queue_stats; - struct ark_ddm_cpld_ps_t cpld_ps; - uint8_t reserved5[(ARK_DDM_SETUP - ARK_DDM_CPLD_PS) - - sizeof(struct ark_ddm_cpld_ps_t)]; + uint8_t reserved5[(ARK_DDM_SETUP - ARK_DDM_QUEUE_STATS) - + sizeof(struct ark_ddm_qstats_t)]; + struct ark_ddm_setup_t setup; uint8_t reserved_p[(ARK_DDM_EXPECTED_SIZE - ARK_DDM_SETUP) - sizeof(struct ark_ddm_setup_t)]; }; - /* DDM function prototype */ int ark_ddm_verify(struct ark_ddm_t *ddm); -void ark_ddm_start(struct ark_ddm_t *ddm); -int ark_ddm_stop(struct ark_ddm_t *ddm, const int wait); -void ark_ddm_reset(struct ark_ddm_t *ddm); void ark_ddm_stats_reset(struct ark_ddm_t *ddm); -void ark_ddm_setup(struct ark_ddm_t *ddm, rte_iova_t cons_addr, - uint32_t interval); +void ark_ddm_queue_setup(struct ark_ddm_t *ddm, rte_iova_t cons_addr); void ark_ddm_dump_stats(struct ark_ddm_t *ddm, const char *msg); -void ark_ddm_dump(struct ark_ddm_t *ddm, const char *msg); -int ark_ddm_is_stopped(struct ark_ddm_t *ddm); uint64_t ark_ddm_queue_byte_count(struct ark_ddm_t *ddm); uint64_t ark_ddm_queue_pkt_count(struct ark_ddm_t *ddm); void ark_ddm_queue_reset_stats(struct ark_ddm_t *ddm); +void ark_ddm_queue_enable(struct ark_ddm_t *ddm, int enable); #endif diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index c0578b85ce..07d1d2178d 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -527,10 +527,6 @@ ark_config_device(struct rte_eth_dev *dev) mpu = RTE_PTR_ADD(mpu, ARK_MPU_QOFFSET); } - /* TX -- DDM */ - if (ark_ddm_stop(ark->ddm.v, 1)) - ARK_PMD_LOG(ERR, "Unable to stop DDM\n"); - mpu = ark->mputx.v; num_q = ark_api_num_queues(mpu); ark->tx_queues = num_q; @@ -538,10 +534,6 @@ ark_config_device(struct rte_eth_dev *dev) mpu = RTE_PTR_ADD(mpu, ARK_MPU_QOFFSET); } - ark_ddm_reset(ark->ddm.v); - ark_ddm_stats_reset(ark->ddm.v); - - ark_ddm_stop(ark->ddm.v, 0); if (ark->rqpacing) ark_rqp_stats_reset(ark->rqpacing); @@ -595,9 +587,6 @@ eth_ark_dev_start(struct rte_eth_dev *dev) for (i = 0; i < dev->data->nb_tx_queues; i++) eth_ark_tx_queue_start(dev, i); - /* start DDM */ - ark_ddm_start(ark->ddm.v); - ark->started = 1; /* set xmit and receive function */ dev->rx_pkt_burst = ð_ark_recv_pkts; @@ -671,28 +660,6 @@ eth_ark_dev_stop(struct rte_eth_dev *dev) } } - /* Stop DDM */ - /* Wait up to 0.1 second. each stop is up to 1000 * 10 useconds */ - for (i = 0; i < 10; i++) { - status = ark_ddm_stop(ark->ddm.v, 1); - if (status == 0) - break; - } - if (status || i != 0) { - ARK_PMD_LOG(ERR, "DDM stop anomaly. status:" - " %d iter: %u. (%s)\n", - status, - i, - __func__); - ark_ddm_dump(ark->ddm.v, "Stop anomaly"); - - mpu = ark->mputx.v; - for (i = 0; i < ark->tx_queues; i++) { - ark_mpu_dump(mpu, "DDM failure dump", i); - mpu = RTE_PTR_ADD(mpu, ARK_MPU_QOFFSET); - } - } - /* STOP RX Side */ /* Stop UDM multiple tries attempted */ for (i = 0; i < 10; i++) { diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c index abdce6a8cc..5940a592a2 100644 --- a/drivers/net/ark/ark_ethdev_tx.c +++ b/drivers/net/ark/ark_ethdev_tx.c @@ -59,12 +59,6 @@ static int eth_ark_tx_jumbo(struct ark_tx_queue *queue, static int eth_ark_tx_hw_queue_config(struct ark_tx_queue *queue); static void free_completed_tx(struct ark_tx_queue *queue); -static inline void -ark_tx_hw_queue_stop(struct ark_tx_queue *queue) -{ - ark_mpu_stop(queue->mpu); -} - /* ************************************************************************* */ static inline void eth_ark_tx_desc_fill(struct ark_tx_queue *queue, @@ -309,7 +303,6 @@ static int eth_ark_tx_hw_queue_config(struct ark_tx_queue *queue) { rte_iova_t queue_base, ring_base, cons_index_addr; - uint32_t write_interval_ns; /* Verify HW -- MPU */ if (ark_mpu_verify(queue->mpu, sizeof(union ark_tx_meta))) @@ -326,28 +319,9 @@ eth_ark_tx_hw_queue_config(struct ark_tx_queue *queue) /* Stop and Reset and configure MPU */ ark_mpu_configure(queue->mpu, ring_base, queue->queue_size, 1); - /* - * Adjust the write interval based on queue size -- - * increase pcie traffic when low mbuf count - * Queue sizes less than 128 are not allowed - */ - switch (queue->queue_size) { - case 128: - write_interval_ns = 500; - break; - case 256: - write_interval_ns = 500; - break; - case 512: - write_interval_ns = 1000; - break; - default: - write_interval_ns = 2000; - break; - } - /* Completion address in UDM */ - ark_ddm_setup(queue->ddm, cons_index_addr, write_interval_ns); + ark_ddm_queue_setup(queue->ddm, cons_index_addr); + ark_ddm_queue_reset_stats(queue->ddm); return 0; } @@ -360,7 +334,8 @@ eth_ark_tx_queue_release(void *vtx_queue) queue = (struct ark_tx_queue *)vtx_queue; - ark_tx_hw_queue_stop(queue); + ark_ddm_queue_enable(queue->ddm, 0); + ark_mpu_stop(queue->mpu); queue->cons_index = queue->prod_index; free_completed_tx(queue); @@ -386,6 +361,7 @@ eth_ark_tx_queue_stop(struct rte_eth_dev *dev, uint16_t queue_id) return -1; } + ark_ddm_queue_enable(queue->ddm, 0); ark_mpu_stop(queue->mpu); free_completed_tx(queue); @@ -404,6 +380,7 @@ eth_ark_tx_queue_start(struct rte_eth_dev *dev, uint16_t queue_id) return 0; ark_mpu_start(queue->mpu); + ark_ddm_queue_enable(queue->ddm, 1); dev->data->tx_queue_state[queue_id] = RTE_ETH_QUEUE_STATE_STARTED; return 0; From patchwork Thu May 5 15:37:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 110736 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 3814FA00C2; Thu, 5 May 2022 17:38:15 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9173542829; Thu, 5 May 2022 17:38:03 +0200 (CEST) Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) by mails.dpdk.org (Postfix) with ESMTP id 2307440E0F for ; Thu, 5 May 2022 17:38:00 +0200 (CEST) Received: by mail-qv1-f46.google.com with SMTP id e17so3224026qvj.11 for ; Thu, 05 May 2022 08:38:00 -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=vCK09sSfOivZKZgfU/ClLgBock6/2OW2DkJnKwTrv1U=; b=nm981uMYis0VgDGpxJ1hdhvWqHpJPcSXT4/lNXzhk+f7AuxjbGNxEUzYbRWz087l7n O2UN6G7H9ENxeXSDzSSF+1v0TAVzm4NkeY0v1jmTC+bWgBK3/qPZsFX9LyT/AlMilbWP fqSFrDnJOfxXTIIy2ApiZioaeC3iVINbyhuw/plU200OmTpf/sdG75nhq2RlS8XbPofK VAsF4t3yK8sjXClTE7tWB3LLQW/kS/z3RH8nCfTS3+nAQhtpzlfbHUgVvKlKRjRztt4k UApwkO9lV1b4wCXya6nMPyXyLDKyp80WZcKfGDWg+nO1eSsRi2JRbTReM0eQrtvpX/OD +S8w== 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=vCK09sSfOivZKZgfU/ClLgBock6/2OW2DkJnKwTrv1U=; b=lMIQTMWc8mXldVIYvud3deVWH7uRIx0XbhiUkShqUjkwJkQKD6JMuVsvSp039WDUGJ VwgKZmkojBa/d8oOJ/5df/eNvTqOOauPn2jxW6cqQ0k6H2mlheFqh5YDheLwD/cm2fFB MYX0Uvh6+d4FO25HdzKvECkVA9tqskTQ3qtQJgpQcO8o/+chhHodztNbjZdE2LkEuEJj Sav6L9fUf7T5PNWxfPHlWdAV2CY6b9+ibFfBC0ZngGvetvluZCuGjaAAN4rSg1eY96fP nDKvUvtVyW4YMes5sFgm9PMxkjfq4nA5yiHBQ1z6WyHb1ix5X/7j2fHi1jKc8RJju2mw m5fQ== X-Gm-Message-State: AOAM530m0X0/OH4M8BioUTmGR7nN8Rl+BFU4xe2X55U22c0eKcp0k5Ez kxqnCOHDZiRTb6DWmHaRujYrTc2PaVAEgZ/8 X-Google-Smtp-Source: ABdhPJydfn3LKGgQ4VV7rzjDb/NHBXPNH8YLKkXfs2ar0Et9ShUEM/Tc/2kLtNvRC5DV0zyceeVKPw== X-Received: by 2002:a05:6214:194e:b0:45a:d8e3:2d3f with SMTP id q14-20020a056214194e00b0045ad8e32d3fmr553515qvk.59.1651765079059; Thu, 05 May 2022 08:37:59 -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 r68-20020ae9dd47000000b0069fc13ce201sm592555qkf.50.2022.05.05.08.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 08:37:58 -0700 (PDT) From: Ed Czeck To: dev@dpdk.org Cc: Ed Czeck , Shepard Siegel , John Miller Subject: [PATCH v1 3/5] net/ark: update udm code to match current hardware version Date: Thu, 5 May 2022 11:37:26 -0400 Message-Id: <20220505153728.22636-3-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505153728.22636-1-ed.czeck@atomicrules.com> References: <20220502212232.1283-1-ed.czeck@atomicrules.com> <20220505153728.22636-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 new version code remove device-level start, stop, and reset operations add queue-based start, stop and reset as required by hardware remove performance structs as they are not in the hardware module Signed-off-by: Ed Czeck --- drivers/net/ark/ark_ethdev.c | 34 +---------- drivers/net/ark/ark_ethdev_rx.c | 38 +----------- drivers/net/ark/ark_ethdev_rx.h | 1 - drivers/net/ark/ark_udm.c | 103 +++----------------------------- drivers/net/ark/ark_udm.h | 73 +++++----------------- 5 files changed, 27 insertions(+), 222 deletions(-) diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index 07d1d2178d..8b4daa819b 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -512,13 +512,6 @@ ark_config_device(struct rte_eth_dev *dev) if (ark_ddm_verify(ark->ddm.v)) return -1; - /* UDM */ - if (ark_udm_reset(ark->udm.v)) { - ARK_PMD_LOG(ERR, "Unable to stop and reset UDM\n"); - return -1; - } - /* Keep in reset until the MPU are cleared */ - /* MPU reset */ mpu = ark->mpurx.v; num_q = ark_api_num_queues(mpu); @@ -577,9 +570,6 @@ eth_ark_dev_start(struct rte_eth_dev *dev) int i; /* RX Side */ - /* start UDM */ - ark_udm_start(ark->udm.v); - for (i = 0; i < dev->data->nb_rx_queues; i++) eth_ark_rx_start_queue(dev, i); @@ -627,7 +617,6 @@ eth_ark_dev_stop(struct rte_eth_dev *dev) uint16_t i; int status; struct ark_adapter *ark = dev->data->dev_private; - struct ark_mpu_t *mpu; if (ark->started == 0) return 0; @@ -660,27 +649,7 @@ eth_ark_dev_stop(struct rte_eth_dev *dev) } } - /* STOP RX Side */ - /* Stop UDM multiple tries attempted */ - for (i = 0; i < 10; i++) { - status = ark_udm_stop(ark->udm.v, 1); - if (status == 0) - break; - } - if (status || i != 0) { - ARK_PMD_LOG(ERR, "UDM stop anomaly. status %d iter: %u. (%s)\n", - status, i, __func__); - ark_udm_dump(ark->udm.v, "Stop anomaly"); - - mpu = ark->mpurx.v; - for (i = 0; i < ark->rx_queues; i++) { - ark_mpu_dump(mpu, "UDM Stop anomaly", i); - mpu = RTE_PTR_ADD(mpu, ARK_MPU_QOFFSET); - } - } - ark_udm_dump_stats(ark->udm.v, "Post stop"); - ark_udm_dump_perf(ark->udm.v, "Post stop"); for (i = 0; i < dev->data->nb_rx_queues; i++) eth_ark_rx_dump_queue(dev, i, __func__); @@ -708,10 +677,9 @@ eth_ark_dev_close(struct rte_eth_dev *dev) ark->user_data[dev->data->port_id]); eth_ark_dev_stop(dev); - eth_ark_udm_force_close(dev); /* - * TODO This should only be called once for the device during shutdown + * This should only be called once for the device during shutdown */ if (ark->rqpacing) ark_rqp_dump(ark->rqpacing); diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index 85e34d0bb8..cbc0416bc2 100644 --- a/drivers/net/ark/ark_ethdev_rx.c +++ b/drivers/net/ark/ark_ethdev_rx.c @@ -200,13 +200,10 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev, queue->mpu = RTE_PTR_ADD(ark->mpurx.v, qidx * ARK_MPU_QOFFSET); /* Configure UDM per queue */ - ark_udm_stop(queue->udm, 0); ark_udm_configure(queue->udm, RTE_PKTMBUF_HEADROOM, - queue->dataroom, - ARK_RX_WRITE_TIME_NS); - ark_udm_stats_reset(queue->udm); - ark_udm_stop(queue->udm, 0); + queue->dataroom); + ark_udm_queue_stats_reset(queue->udm); /* populate mbuf reserve */ status = eth_ark_rx_seed_mbufs(queue); @@ -589,36 +586,6 @@ eth_rx_queue_stats_reset(void *vqueue) ark_udm_queue_stats_reset(queue->udm); } -void -eth_ark_udm_force_close(struct rte_eth_dev *dev) -{ - struct ark_adapter *ark = dev->data->dev_private; - struct ark_rx_queue *queue; - uint32_t index; - uint16_t i; - - if (!ark_udm_is_flushed(ark->udm.v)) { - /* restart the MPUs */ - ARK_PMD_LOG(NOTICE, "UDM not flushed -- forcing flush\n"); - for (i = 0; i < dev->data->nb_rx_queues; i++) { - queue = (struct ark_rx_queue *)dev->data->rx_queues[i]; - if (queue == 0) - continue; - - ark_mpu_start(queue->mpu); - /* Add some buffers */ - index = ARK_RX_MPU_CHUNK + queue->seed_index; - ark_mpu_set_producer(queue->mpu, index); - } - /* Wait to allow data to pass */ - usleep(100); - - ARK_PMD_LOG(NOTICE, "UDM forced flush attempt, stopped = %d\n", - ark_udm_is_flushed(ark->udm.v)); - } - ark_udm_reset(ark->udm.v); -} - static void ark_ethdev_rx_dump(const char *name, struct ark_rx_queue *queue) { @@ -633,7 +600,6 @@ ark_ethdev_rx_dump(const char *name, struct ark_rx_queue *queue) ark_mpu_dump(queue->mpu, name, queue->phys_qid); ark_mpu_dump_setup(queue->mpu, queue->phys_qid); - ark_udm_dump(queue->udm, name); ark_udm_dump_setup(queue->udm, queue->phys_qid); } diff --git a/drivers/net/ark/ark_ethdev_rx.h b/drivers/net/ark/ark_ethdev_rx.h index f64b3dd137..2e3400fd2f 100644 --- a/drivers/net/ark/ark_ethdev_rx.h +++ b/drivers/net/ark/ark_ethdev_rx.h @@ -27,6 +27,5 @@ void eth_rx_queue_stats_get(void *vqueue, struct rte_eth_stats *stats); void eth_rx_queue_stats_reset(void *vqueue); void eth_ark_rx_dump_queue(struct rte_eth_dev *dev, uint16_t queue_id, const char *msg); -void eth_ark_udm_force_close(struct rte_eth_dev *dev); #endif diff --git a/drivers/net/ark/ark_udm.c b/drivers/net/ark/ark_udm.c index 9ebed89627..81b141ad0b 100644 --- a/drivers/net/ark/ark_udm.c +++ b/drivers/net/ark/ark_udm.c @@ -12,6 +12,8 @@ static_assert(sizeof(struct ark_rx_meta) == 32, "Unexpected struct size ark_rx_m int ark_udm_verify(struct ark_udm_t *udm) { + uint32_t idnum = udm->setup.idnum; + uint32_t vernum = udm->setup.vernum; if (sizeof(struct ark_udm_t) != ARK_UDM_EXPECT_SIZE) { ARK_PMD_LOG(ERR, "ARK: UDM structure looks incorrect %d vs %zd\n", @@ -19,94 +21,30 @@ ark_udm_verify(struct ark_udm_t *udm) return -1; } - if (udm->setup.const0 != ARK_UDM_CONST) { + if (idnum != ARK_UDM_MODID || vernum != ARK_UDM_MODVER) { ARK_PMD_LOG(ERR, - "ARK: UDM module not found as expected 0x%08x\n", - udm->setup.const0); + "ARK: UDM module not found as expected 0x%08x 0x%08x\n", + idnum, vernum); return -1; } return 0; } -int -ark_udm_stop(struct ark_udm_t *udm, const int wait) -{ - int cnt = 0; - - udm->setup.r0 = 0; - udm->cfg.command = 2; - rte_wmb(); - - while (wait && (udm->cfg.stop_flushed & 0x01) == 0) { - if (cnt++ > 1000) - return 1; - - usleep(10); - } - return 0; -} - -int -ark_udm_reset(struct ark_udm_t *udm) -{ - int status; - - status = ark_udm_stop(udm, 1); - if (status != 0) { - ARK_PMD_LOG(NOTICE, "%s stop failed doing forced reset\n", - __func__); - udm->cfg.command = 4; - usleep(10); - udm->cfg.command = 3; - status = ark_udm_stop(udm, 0); - ARK_PMD_LOG(INFO, "%s stop status %d post failure" - " and forced reset\n", - __func__, status); - } else { - udm->cfg.command = 3; - } - - return status; -} - -void -ark_udm_start(struct ark_udm_t *udm) -{ - udm->setup.r0 = 0x100; - udm->cfg.command = 1; -} - -void -ark_udm_stats_reset(struct ark_udm_t *udm) -{ - udm->pcibp.pci_clear = 1; - udm->tlp_ps.tlp_clear = 1; -} - void ark_udm_configure(struct ark_udm_t *udm, uint32_t headroom, - uint32_t dataroom, - uint32_t write_interval_ns) + uint32_t dataroom) { /* headroom and data room are in DWords in the UDM */ udm->cfg.dataroom = dataroom / 4; udm->cfg.headroom = headroom / 4; - - /* 4 NS period ns */ - udm->rt_cfg.write_interval = write_interval_ns / 4; } void ark_udm_write_addr(struct ark_udm_t *udm, rte_iova_t addr) { udm->rt_cfg.hw_prod_addr = addr; -} - -int -ark_udm_is_flushed(struct ark_udm_t *udm) -{ - return (udm->cfg.stop_flushed & 0x01) != 0; + udm->rt_cfg.prod_idx = 0; } uint64_t @@ -131,11 +69,10 @@ void ark_udm_dump_stats(struct ark_udm_t *udm, const char *msg) { ARK_PMD_LOG(INFO, "UDM Stats: %s" - ARK_SU64 ARK_SU64 ARK_SU64 ARK_SU64 ARK_SU64 "\n", + ARK_SU64 ARK_SU64 ARK_SU64 ARK_SU64 "\n", msg, "Pkts Received", udm->stats.rx_packet_count, "Pkts Finalized", udm->stats.rx_sent_packets, - "Pkts Dropped", udm->tlp.pkt_drop, "Bytes Count", udm->stats.rx_byte_count, "MBuf Count", udm->stats.rx_mbuf_count); } @@ -155,13 +92,6 @@ ark_udm_dump_queue_stats(struct ark_udm_t *udm, const char *msg, uint16_t qid) "MBuf Count", udm->qstats.q_mbuf_count); } -void -ark_udm_dump(struct ark_udm_t *udm, const char *msg) -{ - ARK_PMD_LOG(DEBUG, "UDM Dump: %s Stopped: %d\n", msg, - udm->cfg.stop_flushed); -} - void ark_udm_dump_setup(struct ark_udm_t *udm, uint16_t q_id) { @@ -172,23 +102,6 @@ ark_udm_dump_setup(struct ark_udm_t *udm, uint16_t q_id) "prod_idx", udm->rt_cfg.prod_idx); } -void -ark_udm_dump_perf(struct ark_udm_t *udm, const char *msg) -{ - struct ark_udm_pcibp_t *bp = &udm->pcibp; - - ARK_PMD_LOG(INFO, "UDM Performance %s" - ARK_SU32 ARK_SU32 ARK_SU32 ARK_SU32 ARK_SU32 ARK_SU32 - "\n", - msg, - "PCI Empty", bp->pci_empty, - "PCI Q1", bp->pci_q1, - "PCI Q2", bp->pci_q2, - "PCI Q3", bp->pci_q3, - "PCI Q4", bp->pci_q4, - "PCI Full", bp->pci_full); -} - void ark_udm_queue_stats_reset(struct ark_udm_t *udm) { diff --git a/drivers/net/ark/ark_udm.h b/drivers/net/ark/ark_udm.h index 1cbcd94a98..f0685c95c7 100644 --- a/drivers/net/ark/ark_udm.h +++ b/drivers/net/ark/ark_udm.h @@ -32,19 +32,25 @@ struct ark_rx_meta { #define ARK_RX_WRITE_TIME_NS 2500 #define ARK_UDM_SETUP 0 -#define ARK_UDM_CONST2 0xbACECACE -#define ARK_UDM_CONST3 0x344d4455 -#define ARK_UDM_CONST ARK_UDM_CONST3 +#define ARK_UDM_MODID 0x4d445500 +#define ARK_UDM_MODVER 0x37313232 + struct ark_udm_setup_t { + union { + char id[4]; + uint32_t idnum; + }; + union { + char ver[4]; + uint32_t vernum; + }; uint32_t r0; - uint32_t r4; - volatile uint32_t cycle_count; uint32_t const0; }; #define ARK_UDM_CFG 0x010 struct ark_udm_cfg_t { - volatile uint32_t stop_flushed; /* RO */ + uint32_t write_interval; /* 4ns cycles */ volatile uint32_t command; uint32_t dataroom; uint32_t headroom; @@ -74,45 +80,11 @@ struct ark_udm_queue_stats_t { uint32_t q_enable; }; -#define ARK_UDM_TLP 0x0070 -struct ark_udm_tlp_t { - volatile uint64_t pkt_drop; /* global */ - volatile uint32_t tlp_q1; - volatile uint32_t tlp_q2; - volatile uint32_t tlp_q3; - volatile uint32_t tlp_q4; - volatile uint32_t tlp_full; -}; - -#define ARK_UDM_PCIBP 0x00a0 -struct ark_udm_pcibp_t { - volatile uint32_t pci_clear; - volatile uint32_t pci_empty; - volatile uint32_t pci_q1; - volatile uint32_t pci_q2; - volatile uint32_t pci_q3; - volatile uint32_t pci_q4; - volatile uint32_t pci_full; -}; - -#define ARK_UDM_TLP_PS 0x00bc -struct ark_udm_tlp_ps_t { - volatile uint32_t tlp_clear; - volatile uint32_t tlp_ps_min; - volatile uint32_t tlp_ps_max; - volatile uint32_t tlp_full_ps_min; - volatile uint32_t tlp_full_ps_max; - volatile uint32_t tlp_dw_ps_min; - volatile uint32_t tlp_dw_ps_max; - volatile uint32_t tlp_pldw_ps_min; - volatile uint32_t tlp_pldw_ps_max; -}; - #define ARK_UDM_RT_CFG 0x00e0 struct ark_udm_rt_cfg_t { rte_iova_t hw_prod_addr; - uint32_t write_interval; /* 4ns cycles */ - volatile uint32_t prod_idx; /* RO */ + uint32_t reserved; + volatile uint32_t prod_idx; /* Updated by HW */ }; /* Consolidated structure */ @@ -123,13 +95,8 @@ struct ark_udm_t { struct ark_udm_cfg_t cfg; struct ark_udm_stats_t stats; struct ark_udm_queue_stats_t qstats; - uint8_t reserved1[(ARK_UDM_TLP - ARK_UDM_PQ) - + uint8_t reserved1[(ARK_UDM_RT_CFG - ARK_UDM_PQ) - sizeof(struct ark_udm_queue_stats_t)]; - struct ark_udm_tlp_t tlp; - uint8_t reserved2[(ARK_UDM_PCIBP - ARK_UDM_TLP) - - sizeof(struct ark_udm_tlp_t)]; - struct ark_udm_pcibp_t pcibp; - struct ark_udm_tlp_ps_t tlp_ps; struct ark_udm_rt_cfg_t rt_cfg; int8_t reserved3[(ARK_UDM_EXPECT_SIZE - ARK_UDM_RT_CFG) - sizeof(struct ark_udm_rt_cfg_t)]; @@ -137,22 +104,14 @@ struct ark_udm_t { int ark_udm_verify(struct ark_udm_t *udm); -int ark_udm_stop(struct ark_udm_t *udm, int wait); -void ark_udm_start(struct ark_udm_t *udm); -int ark_udm_reset(struct ark_udm_t *udm); void ark_udm_configure(struct ark_udm_t *udm, uint32_t headroom, - uint32_t dataroom, - uint32_t write_interval_ns); + uint32_t dataroom); void ark_udm_write_addr(struct ark_udm_t *udm, rte_iova_t addr); -void ark_udm_stats_reset(struct ark_udm_t *udm); void ark_udm_dump_stats(struct ark_udm_t *udm, const char *msg); void ark_udm_dump_queue_stats(struct ark_udm_t *udm, const char *msg, uint16_t qid); -void ark_udm_dump(struct ark_udm_t *udm, const char *msg); -void ark_udm_dump_perf(struct ark_udm_t *udm, const char *msg); void ark_udm_dump_setup(struct ark_udm_t *udm, uint16_t q_id); -int ark_udm_is_flushed(struct ark_udm_t *udm); /* Per queue data */ uint64_t ark_udm_dropped(struct ark_udm_t *udm); From patchwork Thu May 5 15:37:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 110737 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 D6957A00C2; Thu, 5 May 2022 17:38:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 92F234282F; Thu, 5 May 2022 17:38:04 +0200 (CEST) Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by mails.dpdk.org (Postfix) with ESMTP id 1D4E44281D for ; Thu, 5 May 2022 17:38:01 +0200 (CEST) Received: by mail-qk1-f170.google.com with SMTP id n8so2969877qke.11 for ; Thu, 05 May 2022 08:38:01 -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=cO73bQSd1UZ86ymbNe+L7+Ui/lgaWl6/g1GWVyoCXLM=; b=KrE0Y/xOTjbA0dViw24CvE36QS0jimX83jX9Vi7qiJZM5qIw8v5Sz0xFKVKzp2saTr TP24K1TJL9RoYXiuBOHMPy3V6MDZZJo5VpJQqpvNqka1nA4PMqOlmBFmAYoCaOQmUUyG Y/nqSqvapa9m3xo1iaBtSX8g7yiomkxkiZInAKUuvzK22SpWZGTzFYqFaP42PyMVzbz8 bpgnFdCsCfiDRVvz+gD+ff7WB2G58VUOzoU8+yZmlLGwX1uKK31SdPBCtNl1XVYn1SjR NcQXofDH7GMD28kSuvNBYDetG8SDoe/njut1Z7TMp9XckJArFoezGtnbOEiov7qsOG2U tSvQ== 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=cO73bQSd1UZ86ymbNe+L7+Ui/lgaWl6/g1GWVyoCXLM=; b=WsKQZj/koiLJtAB7AikkhavRXSWuJPFSukVraRtvoK6JSnpFC0dE6cWacOnY7GPFv4 jFnQdEXk/OUdqmOMZA8xc4y2jd4aFcEs6w2bleRkFfFhRigmkE2Rd1yqvI0SNgXIulXj b8PCbtnogjTMxLKkyhiG9LMyvC/1FXDZQE1YXhZBwQFNz9kCEX72pSk2ICDx69PabZsr lI2FLUWKr5igKtJQKS9xgQilSGaOAcs5zJj0r1I+fW18+NaCaHSR1U9mRvAqR80oAcf2 2eqgpxcD/FT6BdvxYYWfuh1uoohEbdf3l2UEcH1drUOPsJmY5+wPuuxvKFqYc2mgrhfn 62WA== X-Gm-Message-State: AOAM533GopXoYLhgf+s6c5VdpL006dyt29vQIMdvcRQ5yJ77RiTHdLqt aEzEGk8p8lKzKi5gYtdmBlgjYga2kImza2MY X-Google-Smtp-Source: ABdhPJxBTWqHyhE28bYQbgz/Y5MPaFsy6+AwZmBtI5bd7zHO/BVBI/J8zinuv6QFsrGkA7JhUs+zcw== X-Received: by 2002:a05:620a:240f:b0:69f:c768:c384 with SMTP id d15-20020a05620a240f00b0069fc768c384mr18304064qkn.228.1651765080203; Thu, 05 May 2022 08:38:00 -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 r68-20020ae9dd47000000b0069fc13ce201sm592555qkf.50.2022.05.05.08.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 08:37:59 -0700 (PDT) From: Ed Czeck To: dev@dpdk.org Cc: Ed Czeck , Shepard Siegel , John Miller Subject: [PATCH v1 4/5] net/ark: add new devices to support list Date: Thu, 5 May 2022 11:37:27 -0400 Message-Id: <20220505153728.22636-4-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505153728.22636-1-ed.czeck@atomicrules.com> References: <20220502212232.1283-1-ed.czeck@atomicrules.com> <20220505153728.22636-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 update device list is doc Signed-off-by: Ed Czeck --- doc/guides/nics/ark.rst | 4 +++- drivers/net/ark/ark_ethdev.c | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index c965406a7b..cec6fce2ff 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -297,6 +297,9 @@ ARK PMD supports the following Arkville RTL PCIe instances including: * ``1d6c:1017`` - AR-ARK-FX1 [Arkville 64B Multi-Homed Primary Endpoint] * ``1d6c:1018`` - AR-ARK-FX1 [Arkville 64B Multi-Homed Secondary Endpoint] * ``1d6c:1019`` - AR-ARK-FX1 [Arkville 64B Multi-Homed Tertiary Endpoint] +* ``1d6c:101a`` - AR-ARK-SRIOV-FX0 [Arkville 32B Primary Physical Function] +* ``1d6c:101b`` - AR-ARK-SRIOV-FX1 [Arkville 64B Primary Physical Function] +* ``1d6c:101c`` - AR-ARK-SRIOV-VF [Arkville Virtual Function] * ``1d6c:101e`` - AR-ARKA-FX1 [Arkville 64B DPDK Data Mover for Agilex R-Tile] * ``1d6c:101f`` - AR-TK242 [2x100GbE Packet Capture Device] @@ -322,7 +325,6 @@ Unsupported Features Features that may be part of, or become part of, the Arkville RTL IP that are not currently supported or exposed by the ARK PMD include: -* PCIe SR-IOV Virtual Functions (VFs) * Arkville's Packet Generator Control and Status * Arkville's Packet Director Control and Status * Arkville's Packet Checker Control and Status diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index 8b4daa819b..7cf896f6f1 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -94,6 +94,9 @@ static const struct rte_pci_id pci_id_ark_map[] = { {RTE_PCI_DEVICE(AR_VENDOR_ID, 0x1017)}, {RTE_PCI_DEVICE(AR_VENDOR_ID, 0x1018)}, {RTE_PCI_DEVICE(AR_VENDOR_ID, 0x1019)}, + {RTE_PCI_DEVICE(AR_VENDOR_ID, 0x101a)}, + {RTE_PCI_DEVICE(AR_VENDOR_ID, 0x101b)}, + {RTE_PCI_DEVICE(AR_VENDOR_ID, 0x101c)}, {RTE_PCI_DEVICE(AR_VENDOR_ID, 0x101e)}, {RTE_PCI_DEVICE(AR_VENDOR_ID, 0x101f)}, {.vendor_id = 0, /* sentinel */ }, @@ -127,6 +130,9 @@ ark_device_caps[] = { 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), {.device_id = 0,} From patchwork Thu May 5 15:37:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 110738 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 2E4F1A00C2; Thu, 5 May 2022 17:38:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 819E942824; Thu, 5 May 2022 17:38:05 +0200 (CEST) Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) by mails.dpdk.org (Postfix) with ESMTP id 38E6842829 for ; Thu, 5 May 2022 17:38:02 +0200 (CEST) Received: by mail-qv1-f65.google.com with SMTP id l1so847970qvh.1 for ; Thu, 05 May 2022 08:38:02 -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=2tubjz8krEMgnyBJBGsCi3Lze2Q0wK0KCcmBXHvloCPk5u5kjCOnxJ/qnxUARQYum+ iOygACudB+qk0R95GdSaTOoInAhr7p5NqL0pEFs9dlJfLQDZHhhM086JYxjtSYqaF7hl IGZTCjP6GOIjhh1CAvZ9M4hyWFtgQKUI9G9MB23I8fD+d6q4ApE/xWJkgRp3CAblcxaD alQFG9z9uJOYlJEh58svw0zUj8xCNgMF/DvnXHAa//EZo6y5GMj/vtXonrp5p7pjVhom QxcZw1sd94xlT7OzPXj96Yf28o1W6vVDU3wA0+LDOTFwtSGYxXNB5IUe9ouDxFHsD0ua seyw== 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=5t6QRjEm+RcF/mRo5AwowRpFqNCKdivvL62pvecIPiByBW39p6UbiwRG1itxdsKULB VeFKCY31BpDcuiN9V6aCJpzNO9j9lEV9qXsjSEQqhGERULjt4nnwUo8Zv4oIu1U73p3x 9ay9YO8V/IApueapBWIXT5xLEL/QIlgPdaoi3CGJvaux8n7VTmhyf2yGJx8vZRIBJhvn J2gx4wPMk7qvLzbbf2pF+cwT2TgEPslINU7/p1FHnLoXiu2R1hWhVRv5WojxWmk125eD 6DWqFkXsdHvkS259HPzrt4IbTxyAd7wmlB10ixMVruTMi1i7UtgPAj6mnsXtvnscVk/U 61kA== X-Gm-Message-State: AOAM531GmzO4mKmf/h33KT6ooDCFlC+YjgetWtbCBNFgzw/nbVHcYEax SSLdMVOVyBe5sN2kKEHC55h/Olbs+W4tj/xI X-Google-Smtp-Source: ABdhPJwKiSPp9W7QD+bif/VRATuY0Rv/FjakSUuI5rWBxVquM/P+Cki9uPt9s9pDa4oF8pdit2Y05Q== X-Received: by 2002:ad4:5c6c:0:b0:45a:ac0b:5980 with SMTP id i12-20020ad45c6c000000b0045aac0b5980mr10305036qvh.124.1651765081321; Thu, 05 May 2022 08:38:01 -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 r68-20020ae9dd47000000b0069fc13ce201sm592555qkf.50.2022.05.05.08.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 08:38:00 -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: Thu, 5 May 2022 11:37:28 -0400 Message-Id: <20220505153728.22636-5-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505153728.22636-1-ed.czeck@atomicrules.com> References: <20220502212232.1283-1-ed.czeck@atomicrules.com> <20220505153728.22636-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];