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 71C95A0542; Mon, 29 Aug 2022 08:25:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 892E7427F6; Mon, 29 Aug 2022 08:25:01 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id AF6DD427F4 for ; Mon, 29 Aug 2022 08:24:59 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 27SJk8P5005534 for ; Sun, 28 Aug 2022 23:24:59 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=wOYHfSXoQpVIU8ZVKrvh4+DIXknBny8PQ0mc+bZlXME=; b=U3znpEO+QSPpJenni1EbHT9nRtoG2YlLv3C38jAarCnzjd2YnjFmWub7S+xx3fylIzlo eFLGoOxXwYnMjWN4JHXhj1yHo/Tsagjv+E4T1EWjyRItqkScLj03UMbWwM9UyLsWi+o1 xWKyH++nyXfP4tvUdAtnuQ3ViZEXzcaOuNm96uMAm1P3iCU4giLwN2OUlVz6FAY30p4m lUwEb11ScT9LiC5nti/6zm0wjoUREzsn+zjdFOhEmAjNaTvVlIbpOvSwAUpRtNCOCZPP edreMZMeXy8SGkj7ZjCiMKbtOydNFofs8cT3zM8uMFTtMUeBSH3vwJuFYQEs5p1gqCXe zQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3j7jsn5xj9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Sun, 28 Aug 2022 23:24:59 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 28 Aug 2022 23:24:57 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Sun, 28 Aug 2022 23:24:57 -0700 Received: from satheeshpaullabpc.. (unknown [10.28.34.33]) by maili.marvell.com (Postfix) with ESMTP id 16A533F705D; Sun, 28 Aug 2022 23:24:54 -0700 (PDT) From: To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , Satheesh Paul Subject: [dpdk-dev] [PATCH v2 3/3] common/cnxk: update MKEX capability flags Date: Mon, 29 Aug 2022 11:54:42 +0530 Message-ID: <20220829062442.49728-3-psatheesh@marvell.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220829062442.49728-1-psatheesh@marvell.com> References: <20220801061629.1862969-1-psatheesh@marvell.com> <20220829062442.49728-1-psatheesh@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: bo3fj6HT6HIHeMkPuzbh5ZzSxdTyqKvm X-Proofpoint-GUID: bo3fj6HT6HIHeMkPuzbh5ZzSxdTyqKvm X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-08-29_03,2022-08-25_01,2022-06-22_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Satheesh Paul Update MKEX capability flags to enable parsing VLAN PCP, DSCP and GTPv1 TEID. Signed-off-by: Satheesh Paul Reviewed-by: Kiran Kumar K --- v2: * Fixed clang build issue drivers/common/cnxk/roc_npc_mcam.c | 86 ++++++++++++------------------ drivers/common/cnxk/roc_npc_priv.h | 12 +++-- 2 files changed, 44 insertions(+), 54 deletions(-) diff --git a/drivers/common/cnxk/roc_npc_mcam.c b/drivers/common/cnxk/roc_npc_mcam.c index 245eeb0107..82a9756189 100644 --- a/drivers/common/cnxk/roc_npc_mcam.c +++ b/drivers/common/cnxk/roc_npc_mcam.c @@ -232,80 +232,64 @@ npc_get_kex_capability(struct npc *npc) memset(&kex_cap, 0, sizeof(kex_cap)); /* Ethtype: Offset 12B, len 2B */ - kex_cap.bit.ethtype_0 = npc_is_kex_enabled( - npc, NPC_LID_LA, NPC_LT_LA_ETHER, 12 * 8, 2 * 8); + kex_cap.bit.ethtype_0 = npc_is_kex_enabled(npc, NPC_LID_LA, NPC_LT_LA_ETHER, 12 * 8, 2 * 8); /* QINQ VLAN Ethtype: offset 8B, len 2B */ - kex_cap.bit.ethtype_x = npc_is_kex_enabled( - npc, NPC_LID_LB, NPC_LT_LB_STAG_QINQ, 8 * 8, 2 * 8); + kex_cap.bit.ethtype_x = + npc_is_kex_enabled(npc, NPC_LID_LB, NPC_LT_LB_STAG_QINQ, 8 * 8, 2 * 8); /* VLAN ID0 : Outer VLAN: Offset 2B, len 2B */ - kex_cap.bit.vlan_id_0 = npc_is_kex_enabled( - npc, NPC_LID_LB, NPC_LT_LB_CTAG, 2 * 8, 2 * 8); - /* VLAN ID0 : Inner VLAN: offset 6B, len 2B */ - kex_cap.bit.vlan_id_x = npc_is_kex_enabled( - npc, NPC_LID_LB, NPC_LT_LB_STAG_QINQ, 6 * 8, 2 * 8); + kex_cap.bit.vlan_id_0 = npc_is_kex_enabled(npc, NPC_LID_LB, NPC_LT_LB_CTAG, 2 * 8, 2 * 8); + /* VLAN PCP0 : Outer VLAN: Offset 2B, len 1B */ + kex_cap.bit.vlan_pcp_0 = npc_is_kex_enabled(npc, NPC_LID_LB, NPC_LT_LB_CTAG, 2 * 8, 2 * 1); + /* VLAN IDX : Inner VLAN: offset 6B, len 2B */ + kex_cap.bit.vlan_id_x = + npc_is_kex_enabled(npc, NPC_LID_LB, NPC_LT_LB_STAG_QINQ, 6 * 8, 2 * 8); /* DMCA: offset 0B, len 6B */ - kex_cap.bit.dmac = npc_is_kex_enabled(npc, NPC_LID_LA, NPC_LT_LA_ETHER, - 0 * 8, 6 * 8); + kex_cap.bit.dmac = npc_is_kex_enabled(npc, NPC_LID_LA, NPC_LT_LA_ETHER, 0 * 8, 6 * 8); /* IP proto: offset 9B, len 1B */ - kex_cap.bit.ip_proto = - npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, 9 * 8, 1 * 8); + kex_cap.bit.ip_proto = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, 9 * 8, 1 * 8); + /* IPv4 dscp: offset 1B, len 1B, IPv6 dscp: offset 0B, len 2B */ + kex_cap.bit.ip_dscp = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, 1 * 8, 1 * 8) && + npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP6, 0, 2 * 8); /* UDP dport: offset 2B, len 2B */ - kex_cap.bit.udp_dport = npc_is_kex_enabled(npc, NPC_LID_LD, - NPC_LT_LD_UDP, 2 * 8, 2 * 8); + kex_cap.bit.udp_dport = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_UDP, 2 * 8, 2 * 8); /* UDP sport: offset 0B, len 2B */ - kex_cap.bit.udp_sport = npc_is_kex_enabled(npc, NPC_LID_LD, - NPC_LT_LD_UDP, 0 * 8, 2 * 8); + kex_cap.bit.udp_sport = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_UDP, 0 * 8, 2 * 8); /* TCP dport: offset 2B, len 2B */ - kex_cap.bit.tcp_dport = npc_is_kex_enabled(npc, NPC_LID_LD, - NPC_LT_LD_TCP, 2 * 8, 2 * 8); + kex_cap.bit.tcp_dport = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_TCP, 2 * 8, 2 * 8); /* TCP sport: offset 0B, len 2B */ - kex_cap.bit.tcp_sport = npc_is_kex_enabled(npc, NPC_LID_LD, - NPC_LT_LD_TCP, 0 * 8, 2 * 8); + kex_cap.bit.tcp_sport = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_TCP, 0 * 8, 2 * 8); /* IP SIP: offset 12B, len 4B */ - kex_cap.bit.sip_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, - 12 * 8, 4 * 8); + kex_cap.bit.sip_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, 12 * 8, 4 * 8); /* IP DIP: offset 14B, len 4B */ - kex_cap.bit.dip_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, - 14 * 8, 4 * 8); + kex_cap.bit.dip_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP, 14 * 8, 4 * 8); /* IP6 SIP: offset 8B, len 16B */ - kex_cap.bit.sip6_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP6, - 8 * 8, 16 * 8); + kex_cap.bit.sip6_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP6, 8 * 8, 16 * 8); /* IP6 DIP: offset 24B, len 16B */ - kex_cap.bit.dip6_addr = npc_is_kex_enabled( - npc, NPC_LID_LC, NPC_LT_LC_IP6, 24 * 8, 16 * 8); + kex_cap.bit.dip6_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP6, 24 * 8, 16 * 8); /* ESP SPI: offset 0B, len 4B */ - kex_cap.bit.ipsec_spi = npc_is_kex_enabled(npc, NPC_LID_LE, - NPC_LT_LE_ESP, 0 * 8, 4 * 8); + kex_cap.bit.ipsec_spi = npc_is_kex_enabled(npc, NPC_LID_LE, NPC_LT_LE_ESP, 0 * 8, 4 * 8); /* VXLAN VNI: offset 4B, len 3B */ - kex_cap.bit.ld_vni = npc_is_kex_enabled(npc, NPC_LID_LE, - NPC_LT_LE_VXLAN, 0 * 8, 3 * 8); + kex_cap.bit.ld_vni = npc_is_kex_enabled(npc, NPC_LID_LE, NPC_LT_LE_VXLAN, 0 * 8, 3 * 8); /* 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 |= (uint64_t)npc_is_kex_enabled(npc, NPC_LID_LC, - NPC_LT_LC_CUSTOM1, 0, 0); + kex_cap.bit.custom_l3 = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_CUSTOM0, 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); + kex_cap.bit.sctp_sport = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_SCTP, 0 * 8, 2 * 8); /* SCTP dport : offset 2B, len 2B */ - kex_cap.bit.sctp_dport = npc_is_kex_enabled( - npc, NPC_LID_LD, NPC_LT_LD_SCTP, 2 * 8, 2 * 8); + kex_cap.bit.sctp_dport = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_SCTP, 2 * 8, 2 * 8); /* ICMP type : offset 0B, len 1B */ - kex_cap.bit.icmp_type = npc_is_kex_enabled( - npc, NPC_LID_LD, NPC_LT_LD_ICMP, 0 * 8, 1 * 8); + kex_cap.bit.icmp_type = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_ICMP, 0 * 8, 1 * 8); /* ICMP code : offset 1B, len 1B */ - kex_cap.bit.icmp_code = npc_is_kex_enabled( - npc, NPC_LID_LD, NPC_LT_LD_ICMP, 1 * 8, 1 * 8); + kex_cap.bit.icmp_code = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_ICMP, 1 * 8, 1 * 8); /* ICMP id : offset 4B, len 2B */ - kex_cap.bit.icmp_id = npc_is_kex_enabled(npc, NPC_LID_LD, - NPC_LT_LD_ICMP, 4 * 8, 2 * 8); + kex_cap.bit.icmp_id = npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_ICMP, 4 * 8, 2 * 8); /* IGMP grp_addr : offset 4B, len 4B */ - kex_cap.bit.igmp_grp_addr = npc_is_kex_enabled( - npc, NPC_LID_LD, NPC_LT_LD_IGMP, 4 * 8, 4 * 8); + kex_cap.bit.igmp_grp_addr = + npc_is_kex_enabled(npc, NPC_LID_LD, NPC_LT_LD_IGMP, 4 * 8, 4 * 8); /* GTPU teid : offset 4B, len 4B */ - kex_cap.bit.gtpu_teid = npc_is_kex_enabled( - npc, NPC_LID_LE, NPC_LT_LE_GTPU, 4 * 8, 4 * 8); + kex_cap.bit.gtpv1_teid = npc_is_kex_enabled(npc, NPC_LID_LE, NPC_LT_LE_GTPU, 4 * 8, 4 * 8); return kex_cap.all_bits; } diff --git a/drivers/common/cnxk/roc_npc_priv.h b/drivers/common/cnxk/roc_npc_priv.h index b08539d8f8..1a597280d1 100644 --- a/drivers/common/cnxk/roc_npc_priv.h +++ b/drivers/common/cnxk/roc_npc_priv.h @@ -100,6 +100,7 @@ enum npc_err_status { enum npc_mcam_intf { NPC_MCAM_RX, NPC_MCAM_TX }; typedef union npc_kex_cap_terms_t { + /** Packet Matching Rule term fields */ struct { /** Total length of received packet */ uint64_t len : 1; @@ -111,10 +112,14 @@ typedef union npc_kex_cap_terms_t { uint64_t vlan_id_0 : 1; /** Last VLAN ID (inner) */ uint64_t vlan_id_x : 1; + /** PCP in the first VLAN header */ + uint64_t vlan_pcp_0 : 1; /** destination MAC address */ uint64_t dmac : 1; /** IP Protocol or IPv6 Next Header */ uint64_t ip_proto : 1; + /** DSCP in IP header */ + uint64_t ip_dscp : 1; /** Destination UDP port, implies IPPROTO=17 */ uint64_t udp_dport : 1; /** Destination TCP port implies IPPROTO=6 */ @@ -155,12 +160,13 @@ typedef union npc_kex_cap_terms_t { uint64_t sctp_sport : 1; /** Destination SCTP port */ uint64_t sctp_dport : 1; - /** GTPU Tunnel endpoint identifier */ - uint64_t gtpu_teid : 1; - + /** GTPv1 tunnel endpoint identifier */ + uint64_t gtpv1_teid : 1; } bit; + /** All bits of the bit field structure */ uint64_t all_bits; + } npc_kex_cap_terms_t; struct npc_parse_item_info { -- 2.35.3