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 30C34A034C; Sat, 4 Jun 2022 18:27:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8F89427F0; Sat, 4 Jun 2022 18:27:22 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id A6E9640041 for ; Sat, 4 Jun 2022 18:27:20 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 254GRJMw012868; Sat, 4 Jun 2022 09:27:19 -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=jJIpj+zzFcJ26pNpFT9h5xe7kY1VJuS/liv+vyR1jSA=; b=WSuTcdOmcLPiK+GZRb8pFC01+YisA/0yUrulTsp3p1Zl1NyLvcZbkH262QYwllcbrJ4T jKJ4XDRbums0LoKtGjWGss9cDq40RXD+L0duiikWXFFT1wx9OSu1NwfrxV1HHJjYOiSL ZVMfPvH7GLulch7Ki5Vwx81XIVILxFsYvMpp6glB5ZzAXgMZC1StbxLGwo0DOyClMNwG kcUNb6G0Ep/jFUsGtIfB9KlUQ4a6LpidXpZWFe4nUYGH2J3SHhxLGMYMsp3Nn6SbzBnX JBB4gJfa3F12JBR2VVL8T2pUVTr0DVwp58Z/+ralExHRQJcVH6f6uka7fptxUFrH16VE Gg== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3gg9ndg4g7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Sat, 04 Jun 2022 09:27:19 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 4 Jun 2022 09:27:18 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sat, 4 Jun 2022 09:27:18 -0700 Received: from localhost.localdomain (unknown [10.28.34.39]) by maili.marvell.com (Postfix) with ESMTP id 0BBC33F70AC; Sat, 4 Jun 2022 09:27:13 -0700 (PDT) From: Tomasz Duszynski To: , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , , Tomasz Duszynski , Jakub Palider Subject: [PATCH 02/10] common/cnxk: use wider mask to extract RPM ID Date: Sat, 4 Jun 2022 18:26:43 +0200 Message-ID: <20220604162651.3503338-3-tduszynski@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220604162651.3503338-1-tduszynski@marvell.com> References: <20220604162651.3503338-1-tduszynski@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: QYZBM0PIt8LeWDhOzTzcOOj_ElMfKHBP X-Proofpoint-GUID: QYZBM0PIt8LeWDhOzTzcOOj_ElMfKHBP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-04_05,2022-06-03_01,2022-02-23_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 Some platforms have more RPMs available than the others. Take than into account when retrieving id of a particular RPM. Signed-off-by: Tomasz Duszynski Reviewed-by: Jakub Palider Reviewed-by: Jerin Jacob Kollanukkaran Tested-by: Jerin Jacob Kollanukkaran --- drivers/common/cnxk/roc_bphy_cgx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/common/cnxk/roc_bphy_cgx.c b/drivers/common/cnxk/roc_bphy_cgx.c index 19baaa6757..a0a0d22f85 100644 --- a/drivers/common/cnxk/roc_bphy_cgx.c +++ b/drivers/common/cnxk/roc_bphy_cgx.c @@ -173,8 +173,14 @@ roc_bphy_cgx_intf_req(struct roc_bphy_cgx *roc_cgx, unsigned int lmac, static unsigned int roc_bphy_cgx_dev_id(struct roc_bphy_cgx *roc_cgx) { - uint64_t cgx_id = roc_model_is_cn10k() ? GENMASK_ULL(26, 24) : - GENMASK_ULL(25, 24); + uint64_t cgx_id; + + if (roc_model_is_cnf10kb()) + cgx_id = GENMASK_ULL(27, 24); + else if (roc_model_is_cn10k()) + cgx_id = GENMASK_ULL(26, 24); + else + cgx_id = GENMASK_ULL(25, 24); return FIELD_GET(cgx_id, roc_cgx->bar0_pa); } -- 2.25.1