From patchwork Tue Nov 7 06:40:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Satheesh Paul Antonysamy X-Patchwork-Id: 133929 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2A7D3432C1; Tue, 7 Nov 2023 07:40:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A695E402BC; Tue, 7 Nov 2023 07:40:19 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 841884003C; Tue, 7 Nov 2023 07:40:18 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3A72F3VB024448; Mon, 6 Nov 2023 22:40:17 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=CHdbcuWhkYhBBSi4sU67oVN4YMuuK3kjzlJrfILiIM0=; b=Azgr2TnU8O+dP6+YTdJRqSf3Ygu/sSfjDd5ZLBUlT55ifIgzsZy4N0763gR+g6zdehbt C4wq3LH2n+UEnAX+dg2pHZDJSpmcjCS1LF8zJXWxaJtROYmmzh6KiGi8tm5+VhZ0q+O1 sgcZMltLt6dWi5q/bV2rr2Rtb2w7UIseYv2ZigFf9XU3MY57rI0sp8NKnKOoKfUtndcB cauq6WSidenbQvLln4vhMUsbNgjXW7pmn3C4shs2wvca10exiFVh0sm+LFYNZ1Zus/zF yphzbshAQRC71tFwawiIaespcJjb6OfepbUT8eLiP9pi6eHw7y3m3wLTDAR8++JYps+V 8Q== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3u5nfm07ku-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 06 Nov 2023 22:40:17 -0800 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.48; Mon, 6 Nov 2023 22:40:15 -0800 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.48 via Frontend Transport; Mon, 6 Nov 2023 22:40:15 -0800 Received: from satheeshpaullabpc.. (unknown [10.28.34.33]) by maili.marvell.com (Postfix) with ESMTP id 4D74E3F7087; Mon, 6 Nov 2023 22:40:13 -0800 (PST) From: To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Satheesh Paul CC: , Subject: [dpdk-dev] [PATCH] common/cnxk: fix setting channel mask for SDP interfaces Date: Tue, 7 Nov 2023 12:10:09 +0530 Message-ID: <20231107064010.1396308-1-psatheesh@marvell.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Proofpoint-GUID: zROCXLgbLmjP_QuiZda1ZwHDeIiTmwlb X-Proofpoint-ORIG-GUID: zROCXLgbLmjP_QuiZda1ZwHDeIiTmwlb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-06_15,2023-11-02_03,2023-05-22_02 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 Channel mask field is incorrectly returned as 16 bits. Fixing it by truncating to 12 bits. Fixes: 2703f1fa3200 ("common/cnxk: fix setting channel mask for SDP interfaces") Cc: stable@dpdk.org Signed-off-by: Satheesh Paul --- drivers/common/cnxk/roc_npc.c | 5 +++-- drivers/common/cnxk/roc_npc.h | 2 ++ drivers/common/cnxk/version.map | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c index 4173dd2933..0fd1081d43 100644 --- a/drivers/common/cnxk/roc_npc.c +++ b/drivers/common/cnxk/roc_npc.c @@ -1439,7 +1439,7 @@ npc_inline_dev_ipsec_action_free(struct npc *npc, struct roc_npc_flow *flow) return 1; } -static void +void roc_npc_sdp_channel_get(struct roc_npc *roc_npc, uint16_t *chan_base, uint16_t *chan_mask) { struct roc_nix *roc_nix = roc_npc->roc_nix; @@ -1454,8 +1454,9 @@ roc_npc_sdp_channel_get(struct roc_npc *roc_npc, uint16_t *chan_base, uint16_t * num_bits = (sizeof(uint32_t) * 8) - plt_clz32(range) - 1; /* Set mask for (15 - numbits) MSB bits */ *chan_mask = (uint16_t)~GENMASK(num_bits, 0); + *chan_mask &= 0xFFF; } else { - *chan_mask = (uint16_t)GENMASK(15, 0); + *chan_mask = (uint16_t)GENMASK(11, 0); } mask = (uint16_t)GENMASK(num_bits, 0); diff --git a/drivers/common/cnxk/roc_npc.h b/drivers/common/cnxk/roc_npc.h index ad88cf34a4..e9870a162a 100644 --- a/drivers/common/cnxk/roc_npc.h +++ b/drivers/common/cnxk/roc_npc.h @@ -451,4 +451,6 @@ int __roc_api roc_npc_validate_portid_action(struct roc_npc *roc_npc_src, int __roc_api roc_npc_mcam_init(struct roc_npc *roc_npc, struct roc_npc_flow *flow, int mcam_id); int __roc_api roc_npc_mcam_move(struct roc_npc *roc_npc, uint16_t old_ent, uint16_t new_ent); void *__roc_api roc_npc_aged_flow_ctx_get(struct roc_npc *roc_npc, uint32_t mcam_id); +void __roc_api roc_npc_sdp_channel_get(struct roc_npc *roc_npc, uint16_t *chan_base, + uint16_t *chan_mask); #endif /* _ROC_NPC_H_ */ diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map index fffd2064be..aa884a8fe2 100644 --- a/drivers/common/cnxk/version.map +++ b/drivers/common/cnxk/version.map @@ -459,6 +459,7 @@ INTERNAL { roc_npc_mcam_read_counter; roc_npc_inl_mcam_read_counter; roc_npc_profile_name_get; + roc_npc_sdp_channel_get; roc_npc_validate_portid_action; roc_ot_ipsec_inb_sa_init; roc_ot_ipsec_outb_sa_init;