From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DF8A1A00C3 for ; Mon, 25 Apr 2022 07:11:34 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C5408427EE; Mon, 25 Apr 2022 07:11:34 +0200 (CEST) Received: from mail-il1-f179.google.com (mail-il1-f179.google.com [209.85.166.179]) by mails.dpdk.org (Postfix) with ESMTP id 67ECC410E6; Mon, 25 Apr 2022 07:11:32 +0200 (CEST) Received: by mail-il1-f179.google.com with SMTP id r11so8673930ila.1; Sun, 24 Apr 2022 22:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=TBnSEdlenG68j5aFA4mPEn8EJtlA7yGkRQGebt2YfLo=; b=qhXG1+UjosJpRcP5JPK1nyvcAr4nGc5uulyKUmfIA7PQjnTtTpFKzFqDJoSS6j4I+P +xydNaHf8Pb78yN93qhDpAWB30qSITF4tjRP9faOXXGbFz7rJ56FA3UQSc4xA36GcICz GxJMQoyZQt9SNWaD352sDLI3v1H2lXk2V5xNOqmlp5QyJC+CshB9jjynyiIBkTh+cq0T VY2kJRNTa/UeZIstkvi7IpGzX6fAz56DMPe/gIiXSctpsKctXKHyMOJQLf9TabmB7kBK DaqeY2J8luvS33NlPAw167xRAfeQYh40OH7t9d8E23BulrWGNI3sogF7Q0bKFcZCJ3V/ Vd9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=TBnSEdlenG68j5aFA4mPEn8EJtlA7yGkRQGebt2YfLo=; b=ERbiLU+hulT3R3THmH8ikoIVIVcUUUWFf93I4RC8Hj9496XHAvuwBdvmjvCFqSEgQg h12beM7g/yByR+YrLoUf6VDqp8hCNSKu2wx9RuzUh7XAMcyJO/zBcWIyDxZ0lBJyQrcx ESYCw8EqblS/9lsV47V4R11MWLuX8YyZazePJi6WFsoYAQJwA6HaCR0AETYHqDW7Ucyc GdWW06y9Z0KTipcUQ/453Pg+Q/D20M8RRyCxR69iGjMeiQpd/ECIiPVuV7P9Wu4I5jIG keAtm2h1LUbVJeTozEIhHYGPMrdS9ouVdq7YiH4Kg4Qk/JXW4S3TbVcruzz9HKyifRC9 bEKQ== X-Gm-Message-State: AOAM532I8ng3wk0+OWXHs+osRzqA5DPJ+So/sEWy9iloC+SGHe7mLjkP xrR1uxs6pW15WK9KkT8+vudm0r52hpcjGYveLuY= X-Google-Smtp-Source: ABdhPJwn7Q8kZEKAKwbTkDXV5vrqqD6dmG2VOIIVIhphk3gaVapIfgdDPIT39TjopsTnwi9ytj1qcOVI6zqz+e0P8gE= X-Received: by 2002:a92:874b:0:b0:2c7:b987:4ed2 with SMTP id d11-20020a92874b000000b002c7b9874ed2mr6126639ilm.318.1650863491705; Sun, 24 Apr 2022 22:11:31 -0700 (PDT) MIME-Version: 1.0 References: <20220317035036.2290272-1-psatheesh@marvell.com> In-Reply-To: <20220317035036.2290272-1-psatheesh@marvell.com> From: Jerin Jacob Date: Mon, 25 Apr 2022 10:41:05 +0530 Message-ID: Subject: Re: [dpdk-dev] [PATCH 1/2] common/cnxk: fix ROC naming convention issues To: Satheesh Paul , ferruh.yigit@xilinx.com, Andrew Rybchenko Cc: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , dpdk-dev , dpdk stable Content-Type: text/plain; charset="UTF-8" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org On Thu, Mar 17, 2022 at 9:21 AM wrote: > > From: Satheesh Paul > > Fixed some names to follow ROC naming convention in ROC NPC code. > > Fixes: 4edf1246a40 ("common/cnxk: support matching VLAN existence in RTE Flow") > Cc: stable@dpdk.org > > Signed-off-by: Satheesh Paul Series Acked-by: Jerin Jacob Updated the git commit as follows and applied to dpdk-next-net-mrvl/for-next-net. Thanks commit 4ca662394ed53a6c7c658d84095b4095542c542c (HEAD -> for-next-net, origin/for-next-net) Author: Satheesh Paul Date: Thu Mar 17 09:20:36 2022 +0530 common/cnxk: fix QinQ ROC item mismatch ROC code is assuming presence of vlan extension headers in case of QinQ, because of this, there is incompatibility between the driver and ROC. Fixed this in ROC by treating QINQ as multiple VLAN pattern items for DPDK (as opposed to treating QINQ as separate pattern item). Fixes: b8ac8b089ce ("common/cnxk: support matching VLAN existence") Cc: stable@dpdk.org Signed-off-by: Satheesh Paul Acked-by: Jerin Jacob commit 259aa7ab9040d6275783e3a90cb711a2e7573ab1 Author: Satheesh Paul Date: Thu Mar 17 09:20:35 2022 +0530 common/cnxk: correct ROC naming conventions Corrected some names to follow ROC naming convention in ROC NPC code. Signed-off-by: Satheesh Paul Acked-by: Jerin Jacob > --- > drivers/common/cnxk/roc_npc.h | 6 +++--- > drivers/common/cnxk/roc_npc_mcam.c | 4 ++-- > drivers/common/cnxk/roc_platform.h | 2 +- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/common/cnxk/roc_npc.h b/drivers/common/cnxk/roc_npc.h > index 6204139396..4c0151e2e7 100644 > --- a/drivers/common/cnxk/roc_npc.h > +++ b/drivers/common/cnxk/roc_npc.h > @@ -60,7 +60,7 @@ struct roc_npc_flow_item_raw { > > struct roc_ether_addr { > uint8_t addr_bytes[PLT_ETHER_ADDR_LEN]; /**< Addr bytes in tx order */ > -} plt_aligned(2); > +} __plt_aligned(2); > > struct roc_ether_hdr { > struct roc_ether_addr d_addr; /**< Destination address. */ > @@ -72,7 +72,7 @@ struct roc_ether_hdr { > } S_un; /**< Do not use directly; use s_addr instead.*/ > }; > uint16_t ether_type; /**< Frame type. */ > -} plt_aligned(2); > +} __plt_aligned(2); > > PLT_STD_C11 > struct roc_npc_flow_item_eth { > @@ -254,7 +254,7 @@ enum roc_npc_rss_hash_function { > struct roc_npc_action_rss { > enum roc_npc_rss_hash_function func; > uint32_t level; > - uint64_t types; /**< Specific RSS hash types (see RTE_ETH_RSS_*). */ > + uint64_t types; /**< Specific RSS hash types (see ETH_RSS_*). */ > uint32_t key_len; /**< Hash key length in bytes. */ > uint32_t queue_num; /**< Number of entries in @p queue. */ > const uint8_t *key; /**< Hash key. */ > diff --git a/drivers/common/cnxk/roc_npc_mcam.c b/drivers/common/cnxk/roc_npc_mcam.c > index 9c5ff5e60a..e592310bde 100644 > --- a/drivers/common/cnxk/roc_npc_mcam.c > +++ b/drivers/common/cnxk/roc_npc_mcam.c > @@ -283,8 +283,8 @@ npc_get_kex_capability(struct npc *npc) > /* Custom L3 frame: varied offset and lengths */ > kex_cap.bit.custom_l3 = > npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_CUSTOM0, 0, 0); > - kex_cap.bit.custom_l3 |= > - npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_CUSTOM1, 0, 0); > + kex_cap.bit.custom_l3 |= (uint64_t)npc_is_kex_enabled( > + npc, NPC_LID_LC, NPC_LT_LC_CUSTOM1, 0, 0); > /* SCTP sport : offset 0B, len 2B */ > kex_cap.bit.sctp_sport = npc_is_kex_enabled( > npc, NPC_LID_LD, NPC_LT_LD_SCTP, 0 * 8, 2 * 8); > diff --git a/drivers/common/cnxk/roc_platform.h b/drivers/common/cnxk/roc_platform.h > index 28004b1743..dd6514eb10 100644 > --- a/drivers/common/cnxk/roc_platform.h > +++ b/drivers/common/cnxk/roc_platform.h > @@ -98,7 +98,7 @@ > #define plt_cpu_to_be_64 rte_cpu_to_be_64 > #define plt_be_to_cpu_64 rte_be_to_cpu_64 > > -#define plt_aligned __rte_aligned > +#define __plt_aligned __rte_aligned > #define plt_align32pow2 rte_align32pow2 > #define plt_align32prevpow2 rte_align32prevpow2 > > -- > 2.25.4 >