From: Radu Nicolau <radu.nicolau@intel.com>
To: Thomas Monjalon <thomas@monjalon.net>
Cc: wenzhuo.lu@intel.com, dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH] app/testpmd: fix build without ixgbe
Date: Thu, 15 Jun 2017 12:37:28 +0100 [thread overview]
Message-ID: <ff6185d5-5d11-3c1b-4138-7b040ae35394@intel.com> (raw)
In-Reply-To: <20170615095446.2187-1-thomas@monjalon.net>
Looks ok to me, but why would one enable IXGBE_BYPASS without enabling
IXGBE?
On 6/15/2017 10:54 AM, Thomas Monjalon wrote:
> When ixgbe bypass is not explictly disabled while ixgbe is disabled:
> app/test-pmd/testpmd.c:304:27: error:
> ‘RTE_PMD_IXGBE_BYPASS_TMT_OFF’ undeclared here
>
> The ixgbe bypass feature is meaningful only if ixgbe is enabled.
> So we need to check both.
>
> A best fix will be to enable bypass always and remove this option.
>
> Fixes: e261265e42a1 ("ethdev: move bypass functions to ixgbe PMD")
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> app/test-pmd/cmdline.c | 8 ++++----
> app/test-pmd/testpmd.c | 4 ++--
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index b84c1ab40..7f5373a7e 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -3928,7 +3928,7 @@ cmd_set_bypass_mode_parsed(void *parsed_result,
> portid_t port_id = res->port_id;
> int32_t rc = -EINVAL;
>
> -#ifdef RTE_LIBRTE_IXGBE_BYPASS
> +#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS
> uint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
>
> if (!strcmp(res->value, "bypass"))
> @@ -3996,7 +3996,7 @@ cmd_set_bypass_event_parsed(void *parsed_result,
> struct cmd_set_bypass_event_result *res = parsed_result;
> portid_t port_id = res->port_id;
>
> -#ifdef RTE_LIBRTE_IXGBE_BYPASS
> +#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS
> uint32_t bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_NONE;
> uint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL;
>
> @@ -4101,7 +4101,7 @@ cmd_set_bypass_timeout_parsed(void *parsed_result,
> {
> __rte_unused struct cmd_set_bypass_timeout_result *res = parsed_result;
>
> -#ifdef RTE_LIBRTE_IXGBE_BYPASS
> +#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS
> if (!strcmp(res->value, "1.5"))
> bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_1_5_SEC;
> else if (!strcmp(res->value, "2"))
> @@ -4164,7 +4164,7 @@ cmd_show_bypass_config_parsed(void *parsed_result,
> struct cmd_show_bypass_config_result *res = parsed_result;
> portid_t port_id = res->port_id;
> int rc = -EINVAL;
> -#ifdef RTE_LIBRTE_IXGBE_BYPASS
> +#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS
> uint32_t event_mode;
> uint32_t bypass_mode;
> uint32_t timeout = bypass_timeout;
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
> index d32cbb96d..b29328a69 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -299,7 +299,7 @@ uint32_t event_print_mask = (UINT32_C(1) << RTE_ETH_EVENT_UNKNOWN) |
> * NIC bypass mode configuration options.
> */
>
> -#ifdef RTE_LIBRTE_IXGBE_BYPASS
> +#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS
> /* The NIC bypass watchdog timeout. */
> uint32_t bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF;
> #endif
> @@ -2015,7 +2015,7 @@ init_port_config(void)
> rte_eth_macaddr_get(pid, &port->eth_addr);
>
> map_port_queue_stats_mapping_registers(pid, port);
> -#ifdef RTE_LIBRTE_IXGBE_BYPASS
> +#if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS
> rte_pmd_ixgbe_bypass_init(pid);
> #endif
>
next prev parent reply other threads:[~2017-06-15 11:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-15 9:54 Thomas Monjalon
2017-06-15 11:37 ` Radu Nicolau [this message]
2017-06-15 12:48 ` Thomas Monjalon
2017-06-16 1:29 ` Lu, Wenzhuo
2017-06-16 14:09 ` Thomas Monjalon
-- strict thread matches above, loose matches on Subject: below --
2017-06-15 7:26 [dpdk-dev] cmdline.c: error: ‘cmd_set_vf_rxmode’ undeclared here (not in a function) Jan Viktorin
2017-06-15 10:17 ` [dpdk-dev] [PATCH] app/testpmd: fix build without ixgbe Thomas Monjalon
2017-06-15 16:35 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ff6185d5-5d11-3c1b-4138-7b040ae35394@intel.com \
--to=radu.nicolau@intel.com \
--cc=dev@dpdk.org \
--cc=thomas@monjalon.net \
--cc=wenzhuo.lu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).