From patchwork Tue Mar 9 16:08:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 88758 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 5D537A0567; Tue, 9 Mar 2021 17:09:14 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1012E22A4D7; Tue, 9 Mar 2021 17:08:37 +0100 (CET) Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) by mails.dpdk.org (Postfix) with ESMTP id 61A004068A for ; Tue, 9 Mar 2021 17:08:32 +0100 (CET) Received: by mail-qv1-f43.google.com with SMTP id 2so6655227qvd.0 for ; Tue, 09 Mar 2021 08:08:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atomicrules-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SZeMSIp/WdQNbNjA2/O9hwQIUMRv3Ot8pKRwPk06kWs=; b=hl1gq8J0qO4xxB/WT9LTZ3janIeqwPClQojoRLlgRiu2ZNlKoCgqnEXWBiynSLYxRo guec1iVphtBI5+PjY8JjVerE8wnvHstz+JWIK82TQZuucE1Nb4IhCJ3afhaoW4Hh4dpS VXfzxh0DUIHWEiJTqYy2Lajy4px0nQ7jfcPkOrOscksXfOoOaIPbOHK+ZP56t3zOj32v 0PwidoWIBzp1tKSsdxE7eZ83kWaEgZWOTdHu2jO48lJLcF1TPcieUYVRd1is9pk0PeRa HRkcG2zho2JYKRXTTopxGUaU6XnOTQz5C7b1JdFR374qIHG6Vj/fNEgUvorE3iC7Glf7 5fow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SZeMSIp/WdQNbNjA2/O9hwQIUMRv3Ot8pKRwPk06kWs=; b=YJcJ4r7m2B/doSuQeYZHGF7hGvWrJCaafK872oOJ0YKMnD12Cx4/pNhArQOP4NoIOS A11UdKcxfg+zZsXOv0YxrOtjkKwkYij7HZMyElkQu2FhMNa5Gqkr0s3H+4UAS/TlU4s0 paTUE6ao9F2p8QoykxieX0ch+Zn99nhNeY6Z44i3Ih11FrCjtx+7yQmmPLuujQfqMirt OlGa2rDHKx1aWQDc9VNMUX6JWaicW1aQIQN/E/jLj/vDic3mhPb+JPpt9SqxEdrqBz/3 qw80dlRDSM1TJIsFMx6TqtdZsvWSQah+zJcuVl20E9D6nl/NO0sgo4jhgL7OiSYGQjjL 6YBw== X-Gm-Message-State: AOAM532EU4SMK6cCUuWGQB9OWc/nD/Kwxk3x3OyfVEvNk9BvgA+D3HCO hc02Pj9vSxn9GkEN1zuaZsmNF3I6C+4AYg== X-Google-Smtp-Source: ABdhPJy8vGnfJnOX4Kse3nl2DfZ0Er6tjeXIO4/8ll3maa1cfqHrsdNaR301QmuD2eNKR4HrnxN+ow== X-Received: by 2002:a0c:aa44:: with SMTP id e4mr26070842qvb.49.1615306111611; Tue, 09 Mar 2021 08:08:31 -0800 (PST) Received: from z390.czeck.local (pool-72-74-133-40.bstnma.fios.verizon.net. [72.74.133.40]) by smtp.gmail.com with ESMTPSA id j24sm10376407qka.67.2021.03.09.08.08.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Mar 2021 08:08:31 -0800 (PST) From: Ed Czeck To: dev@dpdk.org, ferruh.yigit@intel.com Cc: shepard.siegel@atomicrules.com, john.miller@atomicrules.com Date: Tue, 9 Mar 2021 11:08:18 -0500 Message-Id: <20210309160818.3553-6-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210309160818.3553-1-ed.czeck@atomicrules.com> References: <20210304165637.24658-1-ed.czeck@atomicrules.com> <20210309160818.3553-1-ed.czeck@atomicrules.com> Subject: [dpdk-dev] [PATCH v4 6/6] net/ark: localize internal packet generator code 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 Sender: "dev" remove unnecessary includes no functional changes Signed-off-by: Ed Czeck --- drivers/net/ark/ark_ethdev.c | 17 ++--------------- drivers/net/ark/ark_pktchkr.c | 4 ---- drivers/net/ark/ark_pktgen.c | 20 ++++++++++++++------ drivers/net/ark/ark_pktgen.h | 1 + 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index bdebfdba4..9a5835d70 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -535,20 +535,6 @@ eth_ark_dev_configure(struct rte_eth_dev *dev) return 0; } -static void * -delay_pg_start(void *arg) -{ - struct ark_adapter *ark = (struct ark_adapter *)arg; - - /* This function is used exclusively for regression testing, We - * perform a blind sleep here to ensure that the external test - * application has time to setup the test before we generate packets - */ - usleep(100000); - ark_pktgen_run(ark->pg); - return NULL; -} - static int eth_ark_dev_start(struct rte_eth_dev *dev) { @@ -583,7 +569,8 @@ eth_ark_dev_start(struct rte_eth_dev *dev) /* Delay packet generatpr start allow the hardware to be ready * This is only used for sanity checking with internal generator */ - if (pthread_create(&thread, NULL, delay_pg_start, ark)) { + if (pthread_create(&thread, NULL, + ark_pktgen_delay_start, ark->pg)) { ARK_PMD_LOG(ERR, "Could not create pktgen " "starter thread\n"); return -1; diff --git a/drivers/net/ark/ark_pktchkr.c b/drivers/net/ark/ark_pktchkr.c index 0f2d31e5b..84bb567a4 100644 --- a/drivers/net/ark/ark_pktchkr.c +++ b/drivers/net/ark/ark_pktchkr.c @@ -2,13 +2,9 @@ * Copyright (c) 2015-2018 Atomic Rules LLC */ -#include -#include -#include #include #include -#include #include #include "ark_pktchkr.h" diff --git a/drivers/net/ark/ark_pktgen.c b/drivers/net/ark/ark_pktgen.c index ac4322a35..28a44f754 100644 --- a/drivers/net/ark/ark_pktgen.c +++ b/drivers/net/ark/ark_pktgen.c @@ -2,15 +2,9 @@ * Copyright (c) 2015-2018 Atomic Rules LLC */ -#include -#include -#include #include #include -#include - -#include #include #include "ark_pktgen.h" @@ -470,3 +464,17 @@ ark_pktgen_setup(ark_pkt_gen_t handle) ark_pktgen_run(handle); } } + +void * +ark_pktgen_delay_start(void *arg) +{ + struct ark_pkt_gen_inst *inst = (struct ark_pkt_gen_inst *)arg; + + /* This function is used exclusively for regression testing, We + * perform a blind sleep here to ensure that the external test + * application has time to setup the test before we generate packets + */ + usleep(100000); + ark_pktgen_run(inst); + return NULL; +} diff --git a/drivers/net/ark/ark_pktgen.h b/drivers/net/ark/ark_pktgen.h index c61dfee6d..7147fe1bd 100644 --- a/drivers/net/ark/ark_pktgen.h +++ b/drivers/net/ark/ark_pktgen.h @@ -75,5 +75,6 @@ void ark_pktgen_set_hdr_dW(ark_pkt_gen_t handle, uint32_t *hdr); void ark_pktgen_set_start_offset(ark_pkt_gen_t handle, uint32_t x); void ark_pktgen_parse(char *argv); void ark_pktgen_setup(ark_pkt_gen_t handle); +void *ark_pktgen_delay_start(void *arg); #endif