From patchwork Wed Oct 4 12:24:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerin Jacob Kollanukkaran X-Patchwork-Id: 132301 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 96DED426B6; Wed, 4 Oct 2023 14:24:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 845E34067B; Wed, 4 Oct 2023 14:24:58 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id DB6F04067A; Wed, 4 Oct 2023 14:24:56 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3945tsqV016836; Wed, 4 Oct 2023 05:24:56 -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=BoVl/+2if66GfQe+7WQccP/A/gtMb9ILWa3aUByuN8A=; b=cE+C8Ltyz+2sqdvBV+OwmCe6h7IvNXYptWaO+kUi4J4iChXNylWiKfWMREUgLQdv3+/k lX0LRKd+dCzIlnl2ikCoeBpLtR+4WHQv2jow09JsjIvJ6ecjLnFCEtP4BIRKiiu+xDYK YK2IBRswmMxY4kd4dZh5YyXCv86eRG0ASYlSCatNwyxml4CNrsZK5EHXmXeqnEVkBhjp 5LVYstvsf3Qo5vS51ZEvAD4+DFM40ye8nMOOy4woVqQbDX/7EFF8Yvbm+2wIfFjbv2wB fhPAefg8ytKZyY5zahDWP3RbSuXMSgSITcZBf4mPmH+/li4ioDcRjRfzIo6060a/KSKg BQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3th2b6h3nh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 04 Oct 2023 05:24:55 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Wed, 4 Oct 2023 05:24:54 -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.48 via Frontend Transport; Wed, 4 Oct 2023 05:24:53 -0700 Received: from jerin-lab.marvell.com (jerin-lab.marvell.com [10.28.34.14]) by maili.marvell.com (Postfix) with ESMTP id E757B3F7044; Wed, 4 Oct 2023 05:24:46 -0700 (PDT) From: To: , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Liron Himi , Jerin Jacob CC: , Subject: [dpdk-dev] [PATCH v2 2/2] common/cnxk: fix direct rte symbol usage in REE Date: Wed, 4 Oct 2023 17:54:32 +0530 Message-ID: <20231004122432.3255418-2-jerinj@marvell.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231004122432.3255418-1-jerinj@marvell.com> References: <20231003183956.1270510-1-jerinj@marvell.com> <20231004122432.3255418-1-jerinj@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: StkQWG-moqd0z2nnGpurzCcOUSURGtbW X-Proofpoint-GUID: StkQWG-moqd0z2nnGpurzCcOUSURGtbW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-04_04,2023-10-02_01,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: Jerin Jacob The common code is shared between different driver environments, introduce missing plt_ abstractions of missing rte_ symbols and use plt symbols to avoid changing roc_* files. Fixes: c88d3638c7fc ("common/cnxk: support REE") Cc: stable@dpdk.org Signed-off-by: Jerin Jacob --- v2: - Move REE specific changes to seperate patch to enable backporting as this change introduced in old release (David) drivers/common/cnxk/roc_ree.c | 4 ++-- drivers/common/cnxk/roc_ree.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/common/cnxk/roc_ree.c b/drivers/common/cnxk/roc_ree.c index 1eb2ae7272..b6392658c3 100644 --- a/drivers/common/cnxk/roc_ree.c +++ b/drivers/common/cnxk/roc_ree.c @@ -441,7 +441,7 @@ static void roc_ree_lf_err_intr_unregister(struct roc_ree_vf *vf, uint16_t msix_off, uintptr_t base) { - struct rte_pci_device *pci_dev = vf->pci_dev; + struct plt_pci_device *pci_dev = vf->pci_dev; /* Disable error interrupts */ plt_write64(~0ull, base + REE_LF_MISC_INT_ENA_W1C); @@ -468,7 +468,7 @@ static int roc_ree_lf_err_intr_register(struct roc_ree_vf *vf, uint16_t msix_off, uintptr_t base) { - struct rte_pci_device *pci_dev = vf->pci_dev; + struct plt_pci_device *pci_dev = vf->pci_dev; int ret; /* Disable error interrupts */ diff --git a/drivers/common/cnxk/roc_ree.h b/drivers/common/cnxk/roc_ree.h index e138e4de66..bf994e7124 100644 --- a/drivers/common/cnxk/roc_ree.h +++ b/drivers/common/cnxk/roc_ree.h @@ -68,7 +68,7 @@ struct roc_ree_qp { /**< Base address where BAR is mapped */ struct roc_ree_pending_queue pend_q; /**< Pending queue */ - rte_iova_t iq_dma_addr; + plt_iova_t iq_dma_addr; /**< Instruction queue address */ uint32_t roc_regexdev_jobid; /**< Job ID */