From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8EC65A2F18 for ; Thu, 3 Oct 2019 17:26:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 96C5E1C0BD; Thu, 3 Oct 2019 17:26:42 +0200 (CEST) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by dpdk.org (Postfix) with ESMTP id C13DC1C0B4 for ; Thu, 3 Oct 2019 17:26:40 +0200 (CEST) Received: by mail-io1-f66.google.com with SMTP id c6so6384761ioo.13 for ; Thu, 03 Oct 2019 08:26:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=NPZIbgH9tuOFAfsZ4uQ3exRCAkGtvk3xCtvlEHRRreI=; b=rLhVA7G3Ebrg2fYZbtUC1PHvwnGHIgG/xv+mt/lmSYGvA2vpK80fu7cj6zC1mByhOl jdUXBk7Kgksa3J+ddMfXW0tthmA9yYAOLIGHujcITfQBeinM9x1O2ngB8LMXdU1Yqwb1 gRmt9w4Px6nDmbXPHLwVsByg7wWtX8IpMDUVAuiCrjsFzm7dGxfeXO2mDdlGpkLTg0cv Aw7eh4em8unM+DlTXdNdd1snXxxYW09MlRbTeKSeYFPNerkfLtKauhU9BM94RhxyJxf5 wvhwbldxrq/l9/niF+tq0qOqmoXolPJEZHPz7QBZlO+lEV0uk2bjPLM45FrY0Ha1tvUR 1RIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NPZIbgH9tuOFAfsZ4uQ3exRCAkGtvk3xCtvlEHRRreI=; b=pQv7m2XKBD1IzTmxIGTbejmI/KUCamm8nvXuDOMmIlpSdM1OmKZIg3yjyEIypnmhB/ NNhc6Zq/UAO+THbGCONFeDuO9wJBvFa8zdDT2y5/QSoXP5mkog1rXh4XaEJQQ86lVfqq l7T6/4iglySYW4lJuxFKoNnl8jjqZtNdgd7bHuwIGWmd/JCGLzM8s3fUEJqhXB9d1bWk m4TfRasaGJ5a7B1GAg0yv9KgShDHqxn5Pfc7az4nazxMwUt0h0iIMmU8Greusp3gbbnh y5/tR2coHBKIbV8Y7P3HQjWRa7Mb7s5wXLZqp+YBVLdpgTk6OaE8lhQDMsjMWiMOG+c+ SVhQ== X-Gm-Message-State: APjAAAXp7ypQd/rXKESoQpGOtxK7JjG6rHItEfcatZfjWxWDG9xOTaB5 HbVciA6xxIdCzE88ugeyHli1UzSoeXIMDDDF5GzzO7Jma7JFmg== X-Google-Smtp-Source: APXvYqzmsQCwcltTFmenCYbR5I33aXX5XuPOSePDoOOYMe0JdhOkPAZLACr4DRocfK+kzKnnFAPNDF7AdXsi6Bz3oqI= X-Received: by 2002:a92:de42:: with SMTP id e2mr10369619ilr.271.1570116399768; Thu, 03 Oct 2019 08:26:39 -0700 (PDT) MIME-Version: 1.0 References: <1567728839-11991-1-git-send-email-viveksharma@marvell.com> In-Reply-To: From: Jerin Jacob Date: Thu, 3 Oct 2019 20:56:28 +0530 Message-ID: To: Vivek Kumar Sharma Cc: "dev@dpdk.org" , Jerin Jacob Kollanukkaran , Ferruh Yigit Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH] net/octeontx2: use updated LB ltypes 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" On Sun, Sep 29, 2019 at 9:59 AM Vivek Kumar Sharma wrote: > > Ping! > > > Thanks, > Vivek > > ________________________________________ > From: viveksharma@marvell.com > Sent: 06 September 2019 05:43 > To: dev@dpdk.org > Cc: Jerin Jacob Kollanukkaran; Vivek Kumar Sharma > Subject: [PATCH] net/octeontx2: use updated LB ltypes > > From: Vivek Sharma > > Update LB ltypes and use the updated ones so as replace > LB_STAG and LB_QINQ by single LB_STAG_QINQ ltype. > > Signed-off-by: Vivek Sharma Changed the subject to net/octeontx2: update KPU parser profile Acked-by: Jerin Jacob Applied to dpdk-next-net-mrvl/master. Thanks > --- > drivers/common/octeontx2/hw/otx2_npc.h | 9 +++++++-- > drivers/net/octeontx2/otx2_flow_parse.c | 4 ++-- > drivers/net/octeontx2/otx2_lookup.c | 2 +- > drivers/net/octeontx2/otx2_vlan.c | 14 +++++++++----- > 4 files changed, 19 insertions(+), 10 deletions(-) > > diff --git a/drivers/common/octeontx2/hw/otx2_npc.h b/drivers/common/octeontx2/hw/otx2_npc.h > index 0f85d7f..5eccb9e 100644 > --- a/drivers/common/octeontx2/hw/otx2_npc.h > +++ b/drivers/common/octeontx2/hw/otx2_npc.h > @@ -186,10 +186,15 @@ enum npc_kpu_la_ltype { > enum npc_kpu_lb_ltype { > NPC_LT_LB_ETAG = 1, > NPC_LT_LB_CTAG, > - NPC_LT_LB_STAG, > + NPC_LT_LB_STAG_QINQ, > NPC_LT_LB_BTAG, > - NPC_LT_LB_QINQ, > NPC_LT_LB_ITAG, > + NPC_LT_LB_DSA, > + NPC_LT_LB_DSA_VLAN, > + NPC_LT_LB_EDSA, > + NPC_LT_LB_EDSA_VLAN, > + NPC_LT_LB_EXDSA, > + NPC_LT_LB_EXDSA_VLAN, > }; > > enum npc_kpu_lc_ltype { > diff --git a/drivers/net/octeontx2/otx2_flow_parse.c b/drivers/net/octeontx2/otx2_flow_parse.c > index 6670c1a..71650b5 100644 > --- a/drivers/net/octeontx2/otx2_flow_parse.c > +++ b/drivers/net/octeontx2/otx2_flow_parse.c > @@ -599,11 +599,11 @@ otx2_flow_parse_lb(struct otx2_parse_state *pst) > lt = NPC_LT_LB_CTAG; > break; > case 2: > - lt = NPC_LT_LB_STAG; > + lt = NPC_LT_LB_STAG_QINQ; > lflags = NPC_F_STAG_CTAG; > break; > case 3: > - lt = NPC_LT_LB_STAG; > + lt = NPC_LT_LB_STAG_QINQ; > lflags = NPC_F_STAG_STAG_CTAG; > break; > default: > diff --git a/drivers/net/octeontx2/otx2_lookup.c b/drivers/net/octeontx2/otx2_lookup.c > index 99199d0..2511386 100644 > --- a/drivers/net/octeontx2/otx2_lookup.c > +++ b/drivers/net/octeontx2/otx2_lookup.c > @@ -88,7 +88,7 @@ nix_create_non_tunnel_ptype_array(uint16_t *ptype) > val = RTE_PTYPE_UNKNOWN; > > switch (lb) { > - case NPC_LT_LB_QINQ: > + case NPC_LT_LB_STAG_QINQ: > val |= RTE_PTYPE_L2_ETHER_QINQ; > break; > case NPC_LT_LB_CTAG: > diff --git a/drivers/net/octeontx2/otx2_vlan.c b/drivers/net/octeontx2/otx2_vlan.c > index c01089b..14e3ee9 100644 > --- a/drivers/net/octeontx2/otx2_vlan.c > +++ b/drivers/net/octeontx2/otx2_vlan.c > @@ -300,8 +300,11 @@ nix_vlan_mcam_config(struct rte_eth_dev *eth_dev, > > /* Adds vlan_id & LB CTAG flag to MCAM KW */ > if (flags & VLAN_ID_MATCH) { > - entry.kw[kwi] |= NPC_LT_LB_CTAG << mkex->lb_lt_offset; > - entry.kw_mask[kwi] |= 0xFULL << mkex->lb_lt_offset; > + entry.kw[kwi] |= (NPC_LT_LB_CTAG | NPC_LT_LB_STAG_QINQ) > + << mkex->lb_lt_offset; > + entry.kw_mask[kwi] |= > + (0xF & ~(NPC_LT_LB_CTAG ^ NPC_LT_LB_STAG_QINQ)) > + << mkex->lb_lt_offset; > > mcam_data = ((uint32_t)vlan_id << 16); > mcam_mask = (BIT_ULL(16) - 1) << 16; > @@ -313,15 +316,16 @@ nix_vlan_mcam_config(struct rte_eth_dev *eth_dev, > > /* Adds LB STAG flag to MCAM KW */ > if (flags & QINQ_F_MATCH) { > - entry.kw[kwi] |= NPC_LT_LB_STAG << mkex->lb_lt_offset; > + entry.kw[kwi] |= NPC_LT_LB_STAG_QINQ << mkex->lb_lt_offset; > entry.kw_mask[kwi] |= 0xFULL << mkex->lb_lt_offset; > } > > /* Adds LB CTAG & LB STAG flags to MCAM KW */ > if (flags & VTAG_F_MATCH) { > - entry.kw[kwi] |= (NPC_LT_LB_CTAG | NPC_LT_LB_STAG) > + entry.kw[kwi] |= (NPC_LT_LB_CTAG | NPC_LT_LB_STAG_QINQ) > << mkex->lb_lt_offset; > - entry.kw_mask[kwi] |= (NPC_LT_LB_CTAG & NPC_LT_LB_STAG) > + entry.kw_mask[kwi] |= > + (0xF & ~(NPC_LT_LB_CTAG ^ NPC_LT_LB_STAG_QINQ)) > << mkex->lb_lt_offset; > } > > -- > 2.7.4 >