From patchwork Wed Aug 19 20:45:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 75719 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7C156A04AF; Wed, 19 Aug 2020 22:45:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D9C941C026; Wed, 19 Aug 2020 22:45:21 +0200 (CEST) Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by dpdk.org (Postfix) with ESMTP id 60CA21C002 for ; Wed, 19 Aug 2020 22:45:20 +0200 (CEST) Received: by mail-qk1-f194.google.com with SMTP id n129so22905606qkd.6 for ; Wed, 19 Aug 2020 13:45:20 -0700 (PDT) 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=Ccriky61aUXV5YBhkhaInjENJOQXDzTJXuu/LIKqkLw=; b=avbokCr+CRQbNLwsl8hmoXy673+Vqb+jH1nlK9Qm85HqUJ6t4wjRwKy9hXmRQfHpQL 5jeeiHkWE7dz2GodjFxHeEh56r5lYqM8B+qrIxIb5eKrW+7hATVMZQ1NYjNkdg6SAHPm Bj2NBKifmtvHTFqIHLaR8IVGnDuppLF+ZHUO0cAY40H6gq+J/t+IqkAdfJdbQ9K2rZmt iRoysNUKpjTeJ5b1ZXQCjyAV3hyZUL3Zqeh+QeUpfxqjTnQYaN3pS6fNZP6AIxuMWsHV w7J/4SLh3SzqPpC1xyqlEUbO9DTkFkY19savofd65DXM3tmJ1gJs0WsfeOiXqRPxOj9R 576w== 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=Ccriky61aUXV5YBhkhaInjENJOQXDzTJXuu/LIKqkLw=; b=BoZnPwSU8E0WKei3466gJ7Gk93r6dVdnxGq0uU03nNTIu/p8hnlzPHGycMu6EAZkC/ JEuv/L29V8oGkHhrUhmR+8LXwHeIjzSVoOKuaabXloIh982M8lQWL8aLYwCzfwh+b7We urLmkyESq0YHYX3OpbQFhcqPcTdOP1+rt7xGmuzKYq1rZCGJX3HA/J7WNagtF3XXgjB3 9FwpcCg3knv+DxlSthjSNkuM5r15wQ+AG78jmjMs1S8hpy78u666TPxXDyn3BQ3H1tQr KGZ+1oGQMhNPf/wMrHn76h4KGONXjj66dCC8jCcT8iLPEjL36UBAmPq3C6gfvIBs8Qza Dd5w== X-Gm-Message-State: AOAM532u0DDQNrqlDEdqA+BoSZyEYT2A96OM6ufDRJWK3HCeJybPXrxP HHfRBg0eHf3Ok6UE6r4tQCgy01e4grI//hut X-Google-Smtp-Source: ABdhPJwxiRLbzbD6v9bHATFPhbQQE5OOxhZbV9qIDp86oyUGePvaH9ove1Hdrn1JZEHD63VKyCbVPQ== X-Received: by 2002:a37:d97:: with SMTP id 145mr22786006qkn.218.1597869919032; Wed, 19 Aug 2020 13:45:19 -0700 (PDT) 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 s5sm26241185qke.120.2020.08.19.13.45.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2020 13:45:17 -0700 (PDT) From: Ed Czeck To: dev@dpdk.org, ferruh.yigit@intel.com, bruce.richardson@intel.com Cc: shepard.siegel@atomicrules.com, john.miller@atomicrules.com, Ed Czeck Date: Wed, 19 Aug 2020 16:45:14 -0400 Message-Id: <20200819204514.22187-1-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200819153539.32698-1-ed.czeck@atomicrules.com> References: <20200819153539.32698-1-ed.czeck@atomicrules.com> Subject: [dpdk-dev] [PATCH] net/ark: fix meson build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" * Rename net/ark specific CONFIG_RTE macros to local macros. * Change condition of ARK_PAD_TX to match behavior of meson build to makefile build. * Install header file needed for dynamic library. * Update doc as required. Signed-off-by: Ed Czeck --- doc/guides/nics/ark.rst | 24 ++++++++++++++---------- drivers/net/ark/ark_logs.h | 16 +++++++--------- drivers/net/ark/meson.build | 2 ++ 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index 06e8c3374..4d8920cd0 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -124,27 +124,31 @@ Configuration Information **DPDK Configuration Parameters** - The following configuration options are available for the ARK PMD: + The following compile-time configuration options are available for the ARK PMD: - * **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion - of the ARK PMD driver in the DPDK compilation. + * **ARK_NOPAD_TX**: When enabled TX + packets are not padded to 60 bytes to support downstream MACS. - * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX - packets are padded to 60 bytes to support downstream MACS. - - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables debug + * **ARK_DEBUG_RX**: Enables debug logging and internal checking of RX ingress logic within the ARK PMD driver. - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables debug + * **ARK_DEBUG_TX**: Enables debug logging and internal checking of TX egress logic within the ARK PMD driver. - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or disables debug + * **ARK_DEBUG_STATS**: Enables debug logging of detailed packet and performance statistics gathered in the PMD and FPGA. - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or disables debug + * **ARK_DEBUG_TRACE**: Enables debug logging of detailed PMD events and status. +Note that enabling debugging options may affect system performance. +These options may be set by specifying them in CFLAG +environment before the meson build set. E.g.:: + + export CFLAGS="-DARK_DEBUG_TRACE" + meson build + Building DPDK ------------- diff --git a/drivers/net/ark/ark_logs.h b/drivers/net/ark/ark_logs.h index 44aac6102..125583475 100644 --- a/drivers/net/ark/ark_logs.h +++ b/drivers/net/ark/ark_logs.h @@ -6,14 +6,12 @@ #define _ARK_DEBUG_H_ #include -#include - /* Configuration option to pad TX packets to 60 bytes */ -#ifdef RTE_LIBRTE_ARK_PAD_TX -#define ARK_TX_PAD_TO_60 1 -#else +#ifdef ARK_NOPAD_TX #define ARK_TX_PAD_TO_60 0 +#else +#define ARK_TX_PAD_TO_60 1 #endif /* system camel case definition changed to upper case */ @@ -55,7 +53,7 @@ extern int ark_logtype; /* Debug macro for tracing full behavior, function tracing and messages*/ -#ifdef RTE_LIBRTE_ARK_DEBUG_TRACE +#ifdef ARK_DEBUG_TRACE #define PMD_FUNC_LOG(level, fmt, ...) ARK_FUNC_ON(level, fmt, ##__VA_ARGS__) #define PMD_DEBUG_LOG(level, fmt, ...) ARK_TRACE_ON(level, fmt, ##__VA_ARGS__) #else @@ -65,7 +63,7 @@ extern int ark_logtype; /* Debug macro for reporting FPGA statistics */ -#ifdef RTE_LIBRTE_ARK_DEBUG_STATS +#ifdef ARK_DEBUG_STATS #define PMD_STATS_LOG(level, fmt, ...) ARK_TRACE_ON(level, fmt, ##__VA_ARGS__) #else #define PMD_STATS_LOG(level, fmt, ...) ARK_TRACE_OFF(level, fmt, ##__VA_ARGS__) @@ -73,7 +71,7 @@ extern int ark_logtype; /* Debug macro for RX path */ -#ifdef RTE_LIBRTE_ARK_DEBUG_RX +#ifdef ARK_DEBUG_RX #define ARK_RX_DEBUG 1 #define PMD_RX_LOG(level, fmt, ...) ARK_TRACE_ON(level, fmt, ##__VA_ARGS__) #else @@ -82,7 +80,7 @@ extern int ark_logtype; #endif /* Debug macro for TX path */ -#ifdef RTE_LIBRTE_ARK_DEBUG_TX +#ifdef ARK_DEBUG_TX #define ARK_TX_DEBUG 1 #define PMD_TX_LOG(level, fmt, ...) ARK_TRACE_ON(level, fmt, ##__VA_ARGS__) #else diff --git a/drivers/net/ark/meson.build b/drivers/net/ark/meson.build index 99151bba1..fbbc085bb 100644 --- a/drivers/net/ark/meson.build +++ b/drivers/net/ark/meson.build @@ -11,3 +11,5 @@ sources = files('ark_ddm.c', 'ark_pktgen.c', 'ark_rqp.c', 'ark_udm.c') + +install_headers('ark_ext.h')