DPDK patches and discussions
 help / color / mirror / Atom feed
From: Jerin Jacob <jerinjacobk@gmail.com>
To: Kiran Kumar K <kirankumark@marvell.com>,
	Ferruh Yigit <ferruh.yigit@intel.com>
Cc: Jerin Jacob <jerinj@marvell.com>,
	Nithin Dabilpuram <ndabilpuram@marvell.com>,
	dpdk-dev <dev@dpdk.org>,  dpdk stable <stable@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH v3] net/octeontx2: fix PTP and HIGIG2 coexistence
Date: Tue, 14 Jan 2020 19:37:27 +0530	[thread overview]
Message-ID: <CALBAE1NVFOuETg3hEEqwNOyHOwMZd74PS=FZ0O7aQQx+aJXbpg@mail.gmail.com> (raw)
In-Reply-To: <20200114092622.13944-1-kirankumark@marvell.com>

On Tue, Jan 14, 2020 at 2:57 PM <kirankumark@marvell.com> wrote:
>
> From: Kiran Kumar K <kirankumark@marvell.com>
>
> octeontx2 PMD does not support both PTP and HIGIG2 together.
> added a check to enforce this and updated the Rx offload capabilities when
> Higig2 mode enabled
>
> fixes: 602009ee2dfb (net/octeontx2: support HIGIG2)
>
> Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>

Acked-by: Jerin Jacob <jerinj@marvell.com>

Fixed the ./devtools/check-git-log.sh issues.
Applied to dpdk-next-net-mrvl/master. Thanks


> ---
> V3 Changes:
> * Fixed commit log
>
> V2 Chanhes:
> * Fixed error message
>
>  drivers/net/octeontx2/otx2_ethdev.c | 9 ++++++++-
>  drivers/net/octeontx2/otx2_ptp.c    | 5 +++++
>  2 files changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c
> index ed329273d..2e91a5ab7 100644
> --- a/drivers/net/octeontx2/otx2_ethdev.c
> +++ b/drivers/net/octeontx2/otx2_ethdev.c
> @@ -18,7 +18,8 @@ nix_get_rx_offload_capa(struct otx2_eth_dev *dev)
>  {
>         uint64_t capa = NIX_RX_OFFLOAD_CAPA;
>
> -       if (otx2_dev_is_vf(dev))
> +       if (otx2_dev_is_vf(dev) ||
> +           dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_HIGIG)
>                 capa &= ~DEV_RX_OFFLOAD_TIMESTAMP;
>
>         return capa;
> @@ -1641,6 +1642,12 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
>                 goto fail_offloads;
>         }
>
> +       if (dev->ptp_en &&
> +           dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_HIGIG) {
> +               otx2_err("Both PTP and switch header enabled");
> +               goto free_nix_lf;
> +       }
> +
>         rc = nix_lf_switch_header_type_enable(dev);
>         if (rc) {
>                 otx2_err("Failed to enable switch type nix_lf rc=%d", rc);
> diff --git a/drivers/net/octeontx2/otx2_ptp.c b/drivers/net/octeontx2/otx2_ptp.c
> index f34b9339c..ae5a2b7cd 100644
> --- a/drivers/net/octeontx2/otx2_ptp.c
> +++ b/drivers/net/octeontx2/otx2_ptp.c
> @@ -221,6 +221,11 @@ otx2_nix_timesync_enable(struct rte_eth_dev *eth_dev)
>                 return -EINVAL;
>         }
>
> +       if (dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_HIGIG) {
> +               otx2_err("Both PTP and switch header enabled");
> +               return -EINVAL;
> +       }
> +
>         /* Allocating a iova address for tx tstamp */
>         const struct rte_memzone *ts;
>         ts = rte_eth_dma_zone_reserve(eth_dev, "otx2_ts",
> --
> 2.17.1
>

      reply	other threads:[~2020-01-14 14:07 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-13  4:24 [dpdk-dev] [PATCH] net/octeontx2: add check for PTP and HIGIG2 kirankumark
2020-01-14  6:49 ` Jerin Jacob
2020-01-14  8:28 ` [dpdk-dev] [PATCH v2] " kirankumark
2020-01-14  9:26   ` [dpdk-dev] [PATCH v3] net/octeontx2: fix PTP and HIGIG2 coexistence kirankumark
2020-01-14 14:07     ` Jerin Jacob [this message]

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='CALBAE1NVFOuETg3hEEqwNOyHOwMZd74PS=FZ0O7aQQx+aJXbpg@mail.gmail.com' \
    --to=jerinjacobk@gmail.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=jerinj@marvell.com \
    --cc=kirankumark@marvell.com \
    --cc=ndabilpuram@marvell.com \
    --cc=stable@dpdk.org \
    /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).