From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B844CA04B6; Mon, 24 Aug 2020 21:39:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9ADD3F04; Mon, 24 Aug 2020 21:39:04 +0200 (CEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70085.outbound.protection.outlook.com [40.107.7.85]) by dpdk.org (Postfix) with ESMTP id 9C6512AB for ; Mon, 24 Aug 2020 21:39:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gawzlQv8yE2RpAILmdz8evsvwelD7W3fCgfCrx/FtE4=; b=DAv9jIrKrvSDIFFYZ24G/79/MbDCdphQ57TwpYPkPuZVNslJ+cs64kbDEL9fBc2jya1jdgPbxjwXYsOrojRD30cqk3LAe8X+kDKvsiCklFFPNg2t1N8xFDa7QtLIrtNYQrkijFBtt01YlkAebSr0eOPQX/eOmysY56BFQyjGfR0= Received: from AM6P194CA0009.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:90::22) by AM0PR08MB4996.eurprd08.prod.outlook.com (2603:10a6:208:15a::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.25; Mon, 24 Aug 2020 19:39:01 +0000 Received: from VE1EUR03FT025.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:90:cafe::84) by AM6P194CA0009.outlook.office365.com (2603:10a6:209:90::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24 via Frontend Transport; Mon, 24 Aug 2020 19:39:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dpdk.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dpdk.org; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT025.mail.protection.outlook.com (10.152.18.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24 via Frontend Transport; Mon, 24 Aug 2020 19:38:59 +0000 Received: ("Tessian outbound a0bffebca527:v64"); Mon, 24 Aug 2020 19:38:59 +0000 X-CR-MTA-TID: 64aa7808 Received: from 853814e542c6.3 by 64aa7808-outbound-1.mta.getcheckrecipient.com id F5920436-1314-40CF-987A-33F6CB39080D.1; Mon, 24 Aug 2020 19:38:54 +0000 Received: from EUR01-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 853814e542c6.3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 24 Aug 2020 19:38:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UOlarHaJjJvpaEa5Gh6cx2qa5Z0hQIIBcwnp+SVNBl3XEZxFq4BudaeMq0cNXgyL9OBNaZHfjmVDnnQg3odXNXu2uiQP4vxJxzeWKs9HGRJiz7ixqNOs738tou9I07TyLfz1cyZtpvIcP/MPurtrP/ElY6HrGLMp3VziOyjyuUSc12rx0H9tkrkRUUFcCkCnye5CV7IDaZSbqJfOjMBoXtrtJs1M631Qk1/mfuiRmDQXUkCsCPC9bvaS2pp7EgyMHPi2yHoclQQkwTAuf/xQqoOehW3UJ4NgmOqU90loP1WXZw61Cw5Nvx7Hy1d5WQ8DEIYW3xc2nli51GmwQLmBEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gawzlQv8yE2RpAILmdz8evsvwelD7W3fCgfCrx/FtE4=; b=Wkn+F3Mx2sxkNaNtFHO6GQWYu6qHkOENhmvZvsmINv8I7NCT7SIjsR1Mj4Z6mLFDWp9LFSaV+LFN9nwGo5LjOrVi9an2Y8QCXbixqbFAMGt72yjzF57fTIrfcp92NNP1LF++Rr50yM3js/U8ABqKyoHAScBmRTcs3hHOGU0XnvyUWf1YcVYV0VV0RV933PY69ucY768/v6WyozuV6Gu9oQj3KQuAzEEeemn4b2ae9wRLZgcbMk5bwAyVMsGAKekZ7Z4Fd0jiIEXXnwg8PH2JPYKpS2VbmTKOG+CqUlD/VP3mvQuO9kV/yKl1qf5/HOsRE4HSKhcybg0sp8KamU8XLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gawzlQv8yE2RpAILmdz8evsvwelD7W3fCgfCrx/FtE4=; b=DAv9jIrKrvSDIFFYZ24G/79/MbDCdphQ57TwpYPkPuZVNslJ+cs64kbDEL9fBc2jya1jdgPbxjwXYsOrojRD30cqk3LAe8X+kDKvsiCklFFPNg2t1N8xFDa7QtLIrtNYQrkijFBtt01YlkAebSr0eOPQX/eOmysY56BFQyjGfR0= Received: from VI1PR0802MB2447.eurprd08.prod.outlook.com (2603:10a6:800:af::16) by VI1PR0802MB2288.eurprd08.prod.outlook.com (2603:10a6:800:a6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24; Mon, 24 Aug 2020 19:38:48 +0000 Received: from VI1PR0802MB2447.eurprd08.prod.outlook.com ([fe80::c5f0:1990:8514:3b73]) by VI1PR0802MB2447.eurprd08.prod.outlook.com ([fe80::c5f0:1990:8514:3b73%7]) with mapi id 15.20.3305.026; Mon, 24 Aug 2020 19:38:48 +0000 From: Honnappa Nagarahalli To: Phil Yang , "dev@dpdk.org" CC: "jerinj@marvell.com" , "drc@linux.vnet.ibm.com" , "Ajit Khaparde (ajit.khaparde@broadcom.com)" , "konstantin.ananyev@intel.com" , Joyce Kong , nd , Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko , Ankur Dwivedi , Anoob Joseph , Pavan Nikhilesh , Somnath Kotur , Wei Zhao , Jeff Guo , Beilei Xing , Ruifeng Wang , Harman Kalra , Nithin Dabilpuram , Kiran Kumar K , Maxime Coquelin , Chenbo Xia , Zhihong Wang , Honnappa Nagarahalli , Mahipal Challa , Ori Kam , nd , nd Thread-Topic: [PATCH 1/2] drivers: replace RTE CIO barriers with RTE IO barriers Thread-Index: AQHWefKb2mg9YIR4dEOvNqddZV//c6lHowxw Date: Mon, 24 Aug 2020 19:38:48 +0000 Message-ID: References: <1598258441-15696-1-git-send-email-phil.yang@arm.com> In-Reply-To: <1598258441-15696-1-git-send-email-phil.yang@arm.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ts-tracking-id: 28EC7BEB39E9A643AF400AC80B0069E9.0 x-checkrecipientchecked: true Authentication-Results-Original: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=arm.com; x-originating-ip: [70.112.90.121] x-ms-publictraffictype: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 786504d5-6480-4be6-74ec-08d84865595c x-ms-traffictypediagnostic: VI1PR0802MB2288:|AM0PR08MB4996: x-ld-processed: f34e5979-57d9-4aaa-ad4d-b122a662184d,ExtAddr x-ms-exchange-transport-forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:2582;OLM:2582; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: ZBgDwgtfItaqf16E50C/kMkvV8X14siBJT8WzOirrzVw/iCMM8uKccaepavFE3H0JZ2h0VJKuUefwZERnv4eoJ49ywpheVMZ9dCZwGslhHW+FAEO3vgzC7GC6FNS4Rt69L2+sT+233ALG9PWWodLfsuhKsVmgkB6/QUYkDu+zClS63obVQPpzsTVyXj3b3/wwMse8/g6PiC4Teq7ATITx+a5aA/GUDtjl8EhkDVqXcVd1O/BPoKBT9/yJhByx8oGJiFVIxs+4lpQ1Xt0XzGsSemV96oVjFC11ZezaH/tSXlgGVh2exT7sTrklQujuPQ0 X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR0802MB2447.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(346002)(376002)(396003)(136003)(366004)(30864003)(7416002)(4326008)(53546011)(9686003)(6506007)(5660300002)(8936002)(26005)(83380400001)(110136005)(76116006)(66446008)(478600001)(66556008)(64756008)(33656002)(71200400001)(7696005)(186003)(316002)(86362001)(2906002)(54906003)(55016002)(66476007)(66946007)(8676002)(52536014)(559001)(579004); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: YNcDLLyNSoM7YYQzW7vYCjd9lupm8RQbfMSlgoWuxHZ6AgkcBxeF4seTJb3VUoIQI2dTTrCu1qPbms7XoYERjLPbnG+hd3deUgMKPsNnfm1LhGhKX/54Ar9IOMgmPZZyE3cLOLYl0VWG4F2Iqb8vQ/6lXDPkSbogNVF7ZXkj1IlWHTH1jbip7kyslN4akSMj9vFQP9u0KeVfxgcgZBZPmI+jFepH3iOl+dujNsxmfwPPfB5F2QZlZ/2uqX+XfjcWamtG80m3Pw3WgpFXo3RP888kilUUWCYZrNTvpbSEyubFQf9n70KYSRT42yxQq1a+WmB/pBF2VOzxXMiq1j3oY18RNJ7f0H71Wsq00QbAEq5BYkyPcPK/AO33pkd5G8jFtTx+SGxPRUtITCk0c7nhfbh2n3RVzOv1nO93SX8fkhFlg/Xl7P6S+8QxgDR8snuPKrcZMl/Dz8lwKP1QrGFuX8DwEGRer5cHbWQ2+wqVbKypbAnhEBVrYRTQ/38l1seSKjZdi6hVun/C4NefgSjc58YcXK+serxhkngkgAWjzJ/FlKr/mtJP9UXWyK+MoVnyvyK6E8BYfuLBqPAbzJDmyeBYW87zpFHy6NG+p2g09q0i7q99v00FlHbfoTDcJZ1vDuUQw7gGto2BXZCginyJXw== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2288 Original-Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT025.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 2e430cb6-8dbb-4fd5-4b92-08d848655257 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TzKFq0qC39m470WWxuY+5nPkjZgXNezVcXlnwkZfX6/yJnwbk5aKIlqAbUxQwf9hUH/zANGfsK5HSZzgtmBdlOw5zRx7HpuS73brP4n9C+QnB7WqyOqOqaqgd6bdt3rh1KkcAwn7aCOsrp4stJXI/wf1Hx+5nT7I35fo+g5GmQGUbMzB368fsO458PxwiREGj3eW8aIy4bA+Jk6rRQ2i0niWICuqnq4Vzq8ThXeb3w9Q2xSmDsIx4XHoRwK2LyWr8Qa8/OJa0u3Oe1FxfNeQQS9Bhtxw9haud6JkoCHndBvm2Jl6kRxphXfiO5QOaDg4WalrGIt7pBxvUr6A4/iYRkZxHJSWQL4bi3eIhho2HWTDa+zmRBwpu8gdIDgB9zL/XJsoOCD+/EWEzYIVTIBeUQ== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(39860400002)(396003)(346002)(136003)(376002)(46966005)(8936002)(53546011)(36906005)(316002)(55016002)(9686003)(6506007)(336012)(70206006)(83380400001)(110136005)(8676002)(70586007)(54906003)(2906002)(82310400002)(356005)(47076004)(86362001)(4326008)(478600001)(81166007)(82740400003)(26005)(5660300002)(7696005)(52536014)(186003)(30864003)(33656002); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2020 19:38:59.9614 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 786504d5-6480-4be6-74ec-08d84865595c X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT025.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB4996 Subject: Re: [dpdk-dev] [PATCH 1/2] drivers: replace RTE CIO barriers with RTE IO barriers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi Phil, Can you please add a statement in release notes indicating that these APIs= are removed. Thank you, Honnappa > -----Original Message----- > From: Phil Yang > Sent: Monday, August 24, 2020 3:41 AM > To: dev@dpdk.org > Cc: jerinj@marvell.com; drc@linux.vnet.ibm.com; Ajit Khaparde > (ajit.khaparde@broadcom.com) ; > konstantin.ananyev@intel.com; Honnappa Nagarahalli > ; Joyce Kong ; nd > ; Matan Azrad ; Shahaf Shuler > ; Viacheslav Ovsiienko > ; Ankur Dwivedi ; > Anoob Joseph ; Pavan Nikhilesh > ; Somnath Kotur > ; Wei Zhao ; Jeff > Guo ; Beilei Xing ; Ruifeng Wan= g > ; Harman Kalra ; Nithin > Dabilpuram ; Kiran Kumar K > ; Maxime Coquelin > ; Chenbo Xia ; > Zhihong Wang ; Mahipal Challa > ; Ori Kam > Subject: [PATCH 1/2] drivers: replace RTE CIO barriers with RTE IO barrie= rs >=20 > Replace the deprecated rte_cio_[rw]mb barriers with rte_io_[rw]mb barrier= s. >=20 > Signed-off-by: Phil Yang > Signed-off-by: Joyce Kong > --- > drivers/common/mlx5/mlx5_common.h | 2 +- > drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 2 +- > drivers/crypto/octeontx2/otx2_cryptodev_sec.c | 4 ++-- > drivers/event/octeontx/ssovf_worker.c | 6 +++--- > drivers/event/octeontx2/otx2_worker.h | 2 +- > drivers/net/bnxt/bnxt_hwrm.c | 2 +- > drivers/net/bnxt/bnxt_ring.h | 6 +++--- > drivers/net/e1000/em_rxtx.c | 2 +- > drivers/net/i40e/i40e_rxtx.c | 2 +- > drivers/net/i40e/i40e_rxtx_vec_neon.c | 4 ++-- > drivers/net/mlx5/mlx5_flow.c | 2 +- > drivers/net/mlx5/mlx5_flow_dv.c | 2 +- > drivers/net/mlx5/mlx5_rxq.c | 12 ++++++------ > drivers/net/mlx5/mlx5_rxtx.c | 16 ++++++++-------- > drivers/net/mlx5/mlx5_rxtx.h | 2 +- > drivers/net/mlx5/mlx5_rxtx_vec.h | 2 +- > drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 2 +- > drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 4 ++-- > drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 2 +- > drivers/net/mlx5/mlx5_txq.c | 4 ++-- > drivers/net/octeontx/octeontx_rxtx.h | 2 +- > drivers/net/octeontx2/otx2_ethdev_sec.c | 2 +- > drivers/net/octeontx2/otx2_ethdev_sec_tx.h | 2 +- > drivers/net/octeontx2/otx2_rx.c | 2 +- > drivers/net/octeontx2/otx2_tx.c | 6 +++--- > drivers/net/virtio/virtio_rxtx.c | 2 +- > drivers/net/virtio/virtio_rxtx_simple_neon.c | 2 +- > drivers/net/virtio/virtqueue.h | 26 +++++++++++++--------= ----- > drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c | 4 ++-- > drivers/regex/mlx5/mlx5_regex_fastpath.c | 4 ++-- > 30 files changed, 66 insertions(+), 66 deletions(-) >=20 > diff --git a/drivers/common/mlx5/mlx5_common.h > b/drivers/common/mlx5/mlx5_common.h > index 2cdb226..ed44a45 100644 > --- a/drivers/common/mlx5/mlx5_common.h > +++ b/drivers/common/mlx5/mlx5_common.h > @@ -193,7 +193,7 @@ check_cqe(volatile struct mlx5_cqe *cqe, const > uint16_t cqes_n, >=20 > if (unlikely((op_owner !=3D (!!(idx))) || (op_code =3D=3D > MLX5_CQE_INVALID))) > return MLX5_CQE_STATUS_HW_OWN; > - rte_cio_rmb(); > + rte_io_rmb(); > if (unlikely(op_code =3D=3D MLX5_CQE_RESP_ERR || > op_code =3D=3D MLX5_CQE_REQ_ERR)) > return MLX5_CQE_STATUS_ERR; > diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c > b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c > index 9d51b17..df39cde 100644 > --- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c > +++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c > @@ -469,7 +469,7 @@ otx2_cpt_enqueue_req(const struct otx2_cpt_qp *qp, > * buffer immediately, a DMB is not required to push out > * LMTSTs. > */ > - rte_cio_wmb(); > + rte_io_wmb(); > lmt_status =3D otx2_lmt_submit(qp->lf_nq_reg); > } while (lmt_status =3D=3D 0); >=20 > diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_sec.c > b/drivers/crypto/octeontx2/otx2_cryptodev_sec.c > index 0741a59..72e6c41 100644 > --- a/drivers/crypto/octeontx2/otx2_cryptodev_sec.c > +++ b/drivers/crypto/octeontx2/otx2_cryptodev_sec.c > @@ -107,7 +107,7 @@ otx2_cpt_enq_sa_write(struct > otx2_sec_session_ipsec_lp *lp, > inst.u64[3] =3D 0; > inst.res_addr =3D rte_mempool_virt2iova(res); >=20 > - rte_cio_wmb(); > + rte_io_wmb(); >=20 > do { > /* Copy CPT command to LMTLINE */ > @@ -124,7 +124,7 @@ otx2_cpt_enq_sa_write(struct > otx2_sec_session_ipsec_lp *lp, > otx2_err("Request timed out"); > return -ETIMEDOUT; > } > - rte_cio_rmb(); > + rte_io_rmb(); > } >=20 > if (unlikely(res->compcode !=3D CPT_9X_COMP_E_GOOD)) { diff --git > a/drivers/event/octeontx/ssovf_worker.c > b/drivers/event/octeontx/ssovf_worker.c > index 18b7926..3dfe665 100644 > --- a/drivers/event/octeontx/ssovf_worker.c > +++ b/drivers/event/octeontx/ssovf_worker.c > @@ -286,17 +286,17 @@ __sso_event_tx_adapter_enqueue(void *port, > struct rte_event ev[], > switch (ev->sched_type) { > case SSO_SYNC_ORDERED: > ssows_swtag_norm(ws, ev->event, SSO_SYNC_ATOMIC); > - rte_cio_wmb(); > + rte_io_wmb(); > ssows_swtag_wait(ws); > break; > case SSO_SYNC_UNTAGGED: > ssows_swtag_full(ws, ev->u64, ev->event, SSO_SYNC_ATOMIC, > ev->queue_id); > - rte_cio_wmb(); > + rte_io_wmb(); > ssows_swtag_wait(ws); > break; > case SSO_SYNC_ATOMIC: > - rte_cio_wmb(); > + rte_io_wmb(); > break; > } >=20 > diff --git a/drivers/event/octeontx2/otx2_worker.h > b/drivers/event/octeontx2/otx2_worker.h > index 924ff7f..cde1288 100644 > --- a/drivers/event/octeontx2/otx2_worker.h > +++ b/drivers/event/octeontx2/otx2_worker.h > @@ -256,7 +256,7 @@ otx2_ssogws_order(struct otx2_ssogws *ws, const > uint8_t wait_flag) > if (wait_flag) > otx2_ssogws_head_wait(ws); >=20 > - rte_cio_wmb(); > + rte_io_wmb(); > } >=20 > static __rte_always_inline const struct otx2_eth_txq * diff --git > a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index > 8296d1d..0c7fa2d 100644 > --- a/drivers/net/bnxt/bnxt_hwrm.c > +++ b/drivers/net/bnxt/bnxt_hwrm.c > @@ -148,7 +148,7 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, > void *msg, > /* Poll for the valid bit */ > for (i =3D 0; i < timeout; i++) { > /* Sanity check on the resp->resp_len */ > - rte_cio_rmb(); > + rte_io_rmb(); > if (resp->resp_len && resp->resp_len <=3D bp->max_resp_len) { > /* Last byte of resp contains the valid key */ > valid =3D (uint8_t *)resp + resp->resp_len - 1; diff --git > a/drivers/net/bnxt/bnxt_ring.h b/drivers/net/bnxt/bnxt_ring.h index > 9913aed..daf9804 100644 > --- a/drivers/net/bnxt/bnxt_ring.h > +++ b/drivers/net/bnxt/bnxt_ring.h > @@ -82,7 +82,7 @@ void bnxt_free_rxtx_nq_ring(struct bnxt *bp); >=20 > static inline void bnxt_db_write(struct bnxt_db_info *db, uint32_t idx) = { > - rte_cio_wmb(); > + rte_io_wmb(); >=20 > if (db->db_64) > rte_write64_relaxed(db->db_key64 | idx, db->doorbell); @@ - > 96,7 +96,7 @@ static inline void bnxt_db_nq(struct bnxt_cp_ring_info *cpr= ) > if (unlikely(!cpr->cp_db.db_64)) > return; >=20 > - rte_cio_wmb(); > + rte_io_wmb(); > rte_write64_relaxed(cpr->cp_db.db_key64 | DBR_TYPE_NQ | > RING_CMP(cpr->cp_ring_struct, cpr->cp_raw_cons), > cpr->cp_db.doorbell); > @@ -108,7 +108,7 @@ static inline void bnxt_db_nq_arm(struct > bnxt_cp_ring_info *cpr) > if (unlikely(!cpr->cp_db.db_64)) > return; >=20 > - rte_cio_wmb(); > + rte_io_wmb(); > rte_write64_relaxed(cpr->cp_db.db_key64 | DBR_TYPE_NQ_ARM | > RING_CMP(cpr->cp_ring_struct, cpr->cp_raw_cons), > cpr->cp_db.doorbell); > diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c in= dex > 67a271e..19e3bff 100644 > --- a/drivers/net/e1000/em_rxtx.c > +++ b/drivers/net/e1000/em_rxtx.c > @@ -2051,7 +2051,7 @@ e1000_flush_tx_ring(struct rte_eth_dev *dev) > tx_desc->lower.data =3D rte_cpu_to_le_32(txd_lower | size); > tx_desc->upper.data =3D 0; >=20 > - rte_cio_wmb(); > + rte_io_wmb(); > txq->tx_tail++; > if (txq->tx_tail =3D=3D txq->nb_tx_desc) > txq->tx_tail =3D 0; > diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c = index > fe7f920..2aaef24 100644 > --- a/drivers/net/i40e/i40e_rxtx.c > +++ b/drivers/net/i40e/i40e_rxtx.c > @@ -1248,7 +1248,7 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf > **tx_pkts, uint16_t nb_pkts) > (unsigned) txq->port_id, (unsigned) txq->queue_id, > (unsigned) tx_id, (unsigned) nb_tx); >=20 > - rte_cio_wmb(); > + rte_io_wmb(); > I40E_PCI_REG_WRITE_RELAXED(txq->qtx_tail, tx_id); > txq->tx_tail =3D tx_id; >=20 > diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c > b/drivers/net/i40e/i40e_rxtx_vec_neon.c > index 6f874e4..543ecad 100644 > --- a/drivers/net/i40e/i40e_rxtx_vec_neon.c > +++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c > @@ -72,7 +72,7 @@ i40e_rxq_rearm(struct i40e_rx_queue *rxq) > rx_id =3D (uint16_t)((rxq->rxrearm_start =3D=3D 0) ? > (rxq->nb_rx_desc - 1) : (rxq->rxrearm_start - 1)); >=20 > - rte_cio_wmb(); > + rte_io_wmb(); > /* Update the tail pointer on the NIC */ > I40E_PCI_REG_WRITE_RELAXED(rxq->qrx_tail, rx_id); } @@ -566,7 > +566,7 @@ i40e_xmit_fixed_burst_vec(void *__rte_restrict tx_queue, >=20 > txq->tx_tail =3D tx_id; >=20 > - rte_cio_wmb(); > + rte_io_wmb(); > I40E_PCI_REG_WRITE_RELAXED(txq->qtx_tail, tx_id); >=20 > return nb_pkts; > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c > index 7150173..2accb2f 100644 > --- a/drivers/net/mlx5/mlx5_flow.c > +++ b/drivers/net/mlx5/mlx5_flow.c > @@ -6114,7 +6114,7 @@ mlx5_flow_async_pool_query_handle(struct > mlx5_dev_ctx_shared *sh, > pool->raw =3D pool->raw_hw; > rte_spinlock_unlock(&pool->sl); > /* Be sure the new raw counters data is updated in memory. > */ > - rte_cio_wmb(); > + rte_io_wmb(); > if (!TAILQ_EMPTY(&pool->counters[query_gen])) { > rte_spinlock_lock(&cont->csl); > TAILQ_CONCAT(&cont->counters, > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c index 5339980..dcff5bf 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -4398,7 +4398,7 @@ flow_dv_pool_create(struct rte_eth_dev *dev, > struct mlx5_devx_obj *dcs, > cont->last_pool_idx =3D pool->index; > } > /* Pool initialization must be updated before host thread access. */ > - rte_cio_wmb(); > + rte_io_wmb(); > rte_atomic16_add(&cont->n_valid, 1); > return pool; > } > diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c in= dex > 79eb8f8..004a451 100644 > --- a/drivers/net/mlx5/mlx5_rxq.c > +++ b/drivers/net/mlx5/mlx5_rxq.c > @@ -465,11 +465,11 @@ rxq_sync_cq(struct mlx5_rxq_data *rxq) > cqe->op_own =3D MLX5_CQE_INVALIDATE; > } > /* Resync CQE and WQE (WQ in RESET state). */ > - rte_cio_wmb(); > + rte_io_wmb(); > *rxq->cq_db =3D rte_cpu_to_be_32(rxq->cq_ci); > - rte_cio_wmb(); > + rte_io_wmb(); > *rxq->rq_db =3D rte_cpu_to_be_32(0); > - rte_cio_wmb(); > + rte_io_wmb(); > } >=20 > /** > @@ -601,12 +601,12 @@ mlx5_rx_queue_start_primary(struct rte_eth_dev > *dev, uint16_t idx) > rte_errno =3D errno; > return ret; > } > - rte_cio_wmb(); > + rte_io_wmb(); > *rxq->cq_db =3D rte_cpu_to_be_32(rxq->cq_ci); > - rte_cio_wmb(); > + rte_io_wmb(); > /* Reset RQ consumer before moving queue ro READY state. */ > *rxq->rq_db =3D rte_cpu_to_be_32(0); > - rte_cio_wmb(); > + rte_io_wmb(); > if (rxq_ctrl->obj->type =3D=3D MLX5_RXQ_OBJ_TYPE_IBV) { > struct ibv_wq_attr mod =3D { > .attr_mask =3D IBV_WQ_ATTR_STATE, > diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c = index > 1b71e94..101555e 100644 > --- a/drivers/net/mlx5/mlx5_rxtx.c > +++ b/drivers/net/mlx5/mlx5_rxtx.c > @@ -873,7 +873,7 @@ mlx5_rxq_initialize(struct mlx5_rxq_data *rxq) > }; > /* Update doorbell counter. */ > rxq->rq_ci =3D wqe_n >> rxq->sges_n; > - rte_cio_wmb(); > + rte_io_wmb(); > *rxq->rq_db =3D rte_cpu_to_be_32(rxq->rq_ci); } >=20 > @@ -1113,15 +1113,15 @@ mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, > uint8_t vec) > case MLX5_RXQ_ERR_STATE_NEED_READY: > ret =3D check_cqe(u.cqe, cqe_n, rxq->cq_ci); > if (ret =3D=3D MLX5_CQE_STATUS_HW_OWN) { > - rte_cio_wmb(); > + rte_io_wmb(); > *rxq->cq_db =3D rte_cpu_to_be_32(rxq->cq_ci); > - rte_cio_wmb(); > + rte_io_wmb(); > /* > * The RQ consumer index must be zeroed while > moving > * from RESET state to RDY state. > */ > *rxq->rq_db =3D rte_cpu_to_be_32(0); > - rte_cio_wmb(); > + rte_io_wmb(); > sm.is_wq =3D 1; > sm.queue_id =3D rxq->idx; > sm.state =3D IBV_WQS_RDY; > @@ -1515,9 +1515,9 @@ mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf > **pkts, uint16_t pkts_n) > return 0; > /* Update the consumer index. */ > rxq->rq_ci =3D rq_ci >> sges_n; > - rte_cio_wmb(); > + rte_io_wmb(); > *rxq->cq_db =3D rte_cpu_to_be_32(rxq->cq_ci); > - rte_cio_wmb(); > + rte_io_wmb(); > *rxq->rq_db =3D rte_cpu_to_be_32(rxq->rq_ci); #ifdef > MLX5_PMD_SOFT_COUNTERS > /* Increment packets counter. */ > @@ -1893,11 +1893,11 @@ mlx5_rx_burst_mprq(void *dpdk_rxq, struct > rte_mbuf **pkts, uint16_t pkts_n) > out: > /* Update the consumer indexes. */ > rxq->consumed_strd =3D consumed_strd; > - rte_cio_wmb(); > + rte_io_wmb(); > *rxq->cq_db =3D rte_cpu_to_be_32(rxq->cq_ci); > if (rq_ci !=3D rxq->rq_ci) { > rxq->rq_ci =3D rq_ci; > - rte_cio_wmb(); > + rte_io_wmb(); > *rxq->rq_db =3D rte_cpu_to_be_32(rxq->rq_ci); > } > #ifdef MLX5_PMD_SOFT_COUNTERS > diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h > index c02a007..c74fa57 100644 > --- a/drivers/net/mlx5/mlx5_rxtx.h > +++ b/drivers/net/mlx5/mlx5_rxtx.h > @@ -691,7 +691,7 @@ mlx5_tx_dbrec_cond_wmb(struct mlx5_txq_data *txq, > volatile struct mlx5_wqe *wqe, > uint64_t *dst =3D MLX5_TX_BFREG(txq); > volatile uint64_t *src =3D ((volatile uint64_t *)wqe); >=20 > - rte_cio_wmb(); > + rte_io_wmb(); > *txq->qp_db =3D rte_cpu_to_be_32(txq->wqe_ci); > /* Ensure ordering between DB record and BF copy. */ > rte_wmb(); > diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.h > b/drivers/net/mlx5/mlx5_rxtx_vec.h > index 6ddcbfb..a8d6c4f 100644 > --- a/drivers/net/mlx5/mlx5_rxtx_vec.h > +++ b/drivers/net/mlx5/mlx5_rxtx_vec.h > @@ -118,7 +118,7 @@ mlx5_rx_replenish_bulk_mbuf(struct mlx5_rxq_data > *rxq, uint16_t n) > elts_idx =3D rxq->rq_ci & q_mask; > for (i =3D 0; i < MLX5_VPMD_DESCS_PER_LOOP; ++i) > (*rxq->elts)[elts_idx + i] =3D &rxq->fake_mbuf; > - rte_cio_wmb(); > + rte_io_wmb(); > *rxq->rq_db =3D rte_cpu_to_be_32(rxq->rq_ci); } >=20 > diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h > b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h > index cb4ce1a..6bf0c9b 100644 > --- a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h > +++ b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h > @@ -788,7 +788,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct > rte_mbuf **pkts, uint16_t pkts_n, > /* B.2 copy mbuf pointers. */ > *(vector unsigned char *)&pkts[pos] =3D mbp1; > *(vector unsigned char *)&pkts[pos + 2] =3D mbp2; > - rte_cio_rmb(); > + rte_io_rmb(); >=20 > /* C.1 load remaining CQE data and extract necessary fields. > */ > cqe_tmp2 =3D *(vector unsigned char *) > diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h > b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h > index af924b7..d122dad 100644 > --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h > +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h > @@ -554,7 +554,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct > rte_mbuf **pkts, uint16_t pkts_n, > /* B.0 (CQE 0) load a block having op_own. */ > c0 =3D vld1q_u64((uint64_t *)(p0 + 48)); > /* Synchronize for loading the rest of blocks. */ > - rte_cio_rmb(); > + rte_io_rmb(); > /* Prefetch next 4 CQEs. */ > if (pkts_n - pos >=3D 2 * MLX5_VPMD_DESCS_PER_LOOP) { > unsigned int next =3D pos + > MLX5_VPMD_DESCS_PER_LOOP; @@ -803,7 +803,7 @@ rxq_burst_v(struct > mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n, > rxq->decompressed -=3D n; > } > } > - rte_cio_wmb(); > + rte_io_wmb(); > *rxq->cq_db =3D rte_cpu_to_be_32(rxq->cq_ci); > *no_cq =3D !rcvd_pkt; > return rcvd_pkt; > diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h > b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h > index 554924d..0bbcbee 100644 > --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h > +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h > @@ -552,7 +552,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct > rte_mbuf **pkts, uint16_t pkts_n, > /* B.2 copy mbuf pointers. */ > _mm_storeu_si128((__m128i *)&pkts[pos], mbp1); > _mm_storeu_si128((__m128i *)&pkts[pos + 2], mbp2); > - rte_cio_rmb(); > + rte_io_rmb(); > /* C.1 load remained CQE data and extract necessary fields. */ > cqe_tmp2 =3D _mm_load_si128((__m128i *)&cq[pos + p3]); > cqe_tmp1 =3D _mm_load_si128((__m128i *)&cq[pos + p2]); diff - > -git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index > 21fe16b..207fa22 100644 > --- a/drivers/net/mlx5/mlx5_txq.c > +++ b/drivers/net/mlx5/mlx5_txq.c > @@ -155,9 +155,9 @@ txq_sync_cq(struct mlx5_txq_data *txq) > cqe->op_own =3D MLX5_CQE_INVALIDATE; > } > /* Resync CQE and WQE (WQ in reset state). */ > - rte_cio_wmb(); > + rte_io_wmb(); > *txq->cq_db =3D rte_cpu_to_be_32(txq->cq_ci); > - rte_cio_wmb(); > + rte_io_wmb(); > } >=20 > /** > diff --git a/drivers/net/octeontx/octeontx_rxtx.h > b/drivers/net/octeontx/octeontx_rxtx.h > index 8b46105..af596cd 100644 > --- a/drivers/net/octeontx/octeontx_rxtx.h > +++ b/drivers/net/octeontx/octeontx_rxtx.h > @@ -418,7 +418,7 @@ __octeontx_xmit_pkts(void *tx_queue, struct > rte_mbuf **tx_pkts, > struct octeontx_txq *txq =3D tx_queue; > octeontx_dq_t *dq =3D &txq->dq; > uint16_t count =3D 0, nb_desc; > - rte_cio_wmb(); > + rte_io_wmb(); >=20 > while (count < nb_pkts) { > if (unlikely(*((volatile int64_t *)dq->fc_status_va) < 0)) diff -- > git a/drivers/net/octeontx2/otx2_ethdev_sec.c > b/drivers/net/octeontx2/otx2_ethdev_sec.c > index a155594..0cbeed0 100644 > --- a/drivers/net/octeontx2/otx2_ethdev_sec.c > +++ b/drivers/net/octeontx2/otx2_ethdev_sec.c > @@ -312,7 +312,7 @@ hmac_init(struct otx2_ipsec_fp_sa_ctl *ctl, struct > otx2_cpt_qp *qp, >=20 > timeout =3D rte_get_timer_cycles() + 5 * rte_get_timer_hz(); >=20 > - rte_cio_wmb(); > + rte_io_wmb(); >=20 > do { > otx2_lmt_mov(qp->lmtline, &inst, 2); > diff --git a/drivers/net/octeontx2/otx2_ethdev_sec_tx.h > b/drivers/net/octeontx2/otx2_ethdev_sec_tx.h > index f8130ca..e30f382 100644 > --- a/drivers/net/octeontx2/otx2_ethdev_sec_tx.h > +++ b/drivers/net/octeontx2/otx2_ethdev_sec_tx.h > @@ -160,7 +160,7 @@ otx2_sec_event_tx(struct otx2_ssogws *ws, struct > rte_event *ev, > sess->ip_id++; > sess->esn++; >=20 > - rte_cio_wmb(); > + rte_io_wmb(); >=20 > do { > otx2_lmt_mov(sess->cpt_lmtline, &inst, 2); diff --git > a/drivers/net/octeontx2/otx2_rx.c b/drivers/net/octeontx2/otx2_rx.c index > ac40704..2da8efe 100644 > --- a/drivers/net/octeontx2/otx2_rx.c > +++ b/drivers/net/octeontx2/otx2_rx.c > @@ -303,7 +303,7 @@ nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf > **rx_pkts, > rxq->head =3D head; > rxq->available -=3D packets; >=20 > - rte_cio_wmb(); > + rte_io_wmb(); > /* Free all the CQs that we've processed */ > otx2_write64((rxq->wdata | packets), rxq->cq_door); >=20 > diff --git a/drivers/net/octeontx2/otx2_tx.c b/drivers/net/octeontx2/otx2= _tx.c > index 1af6fa6..1b75cd5 100644 > --- a/drivers/net/octeontx2/otx2_tx.c > +++ b/drivers/net/octeontx2/otx2_tx.c > @@ -39,7 +39,7 @@ nix_xmit_pkts(void *tx_queue, struct rte_mbuf > **tx_pkts, > } >=20 > /* Lets commit any changes in the packet */ > - rte_cio_wmb(); > + rte_io_wmb(); >=20 > for (i =3D 0; i < pkts; i++) { > otx2_nix_xmit_prepare(tx_pkts[i], cmd, flags); @@ -75,7 +75,7 > @@ nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts, > } >=20 > /* Lets commit any changes in the packet */ > - rte_cio_wmb(); > + rte_io_wmb(); >=20 > for (i =3D 0; i < pkts; i++) { > otx2_nix_xmit_prepare(tx_pkts[i], cmd, flags); @@ -128,7 > +128,7 @@ nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts, > txq->fc_cache_pkts -=3D pkts; >=20 > /* Lets commit any changes in the packet */ > - rte_cio_wmb(); > + rte_io_wmb(); >=20 > senddesc01_w0 =3D vld1q_dup_u64(&txq->cmd[0]); > senddesc23_w0 =3D senddesc01_w0; > diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio= _rxtx.c > index f915b8a..0ade352 100644 > --- a/drivers/net/virtio/virtio_rxtx.c > +++ b/drivers/net/virtio/virtio_rxtx.c > @@ -147,7 +147,7 @@ virtqueue_dequeue_burst_rx_packed(struct virtqueue > *vq, >=20 > for (i =3D 0; i < num; i++) { > used_idx =3D vq->vq_used_cons_idx; > - /* desc_is_used has a load-acquire or rte_cio_rmb inside > + /* desc_is_used has a load-acquire or rte_io_rmb inside > * and wait for used desc in virtqueue. > */ > if (!desc_is_used(&desc[used_idx], vq)) diff --git > a/drivers/net/virtio/virtio_rxtx_simple_neon.c > b/drivers/net/virtio/virtio_rxtx_simple_neon.c > index 02520fd..12e034d 100644 > --- a/drivers/net/virtio/virtio_rxtx_simple_neon.c > +++ b/drivers/net/virtio/virtio_rxtx_simple_neon.c > @@ -84,7 +84,7 @@ virtio_recv_pkts_vec(void *rx_queue, > if (unlikely(nb_pkts < RTE_VIRTIO_DESC_PER_LOOP)) > return 0; >=20 > - /* virtqueue_nused has a load-acquire or rte_cio_rmb inside */ > + /* virtqueue_nused has a load-acquire or rte_io_rmb inside */ > nb_used =3D virtqueue_nused(vq); >=20 > if (unlikely(nb_used =3D=3D 0)) > diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueu= e.h > index 105a9c0..d4c21e9 100644 > --- a/drivers/net/virtio/virtqueue.h > +++ b/drivers/net/virtio/virtqueue.h > @@ -47,7 +47,7 @@ virtio_rmb(uint8_t weak_barriers) > if (weak_barriers) > rte_smp_rmb(); > else > - rte_cio_rmb(); > + rte_io_rmb(); > } >=20 > static inline void > @@ -56,7 +56,7 @@ virtio_wmb(uint8_t weak_barriers) > if (weak_barriers) > rte_smp_wmb(); > else > - rte_cio_wmb(); > + rte_io_wmb(); > } >=20 > static inline uint16_t > @@ -68,7 +68,7 @@ virtqueue_fetch_flags_packed(struct vring_packed_desc > *dp, > if (weak_barriers) { > /* x86 prefers to using rte_smp_rmb over __atomic_load_n as it reports > * a better perf(~1.5%), which comes from the saved branch by the compil= er. > - * The if and else branch are identical with the smp and cio barriers bo= th > + * The if and else branch are identical with the smp and io barriers > + both > * defined as compiler barriers on x86. > */ > #ifdef RTE_ARCH_X86_64 > @@ -79,7 +79,7 @@ virtqueue_fetch_flags_packed(struct vring_packed_desc > *dp, #endif > } else { > flags =3D dp->flags; > - rte_cio_rmb(); > + rte_io_rmb(); > } >=20 > return flags; > @@ -92,7 +92,7 @@ virtqueue_store_flags_packed(struct vring_packed_desc > *dp, > if (weak_barriers) { > /* x86 prefers to using rte_smp_wmb over __atomic_store_n as it reports > * a better perf(~1.5%), which comes from the saved branch by the compil= er. > - * The if and else branch are identical with the smp and cio barriers bo= th > + * The if and else branch are identical with the smp and io barriers > + both > * defined as compiler barriers on x86. > */ > #ifdef RTE_ARCH_X86_64 > @@ -102,7 +102,7 @@ virtqueue_store_flags_packed(struct > vring_packed_desc *dp, > __atomic_store_n(&dp->flags, flags, __ATOMIC_RELEASE); > #endif > } else { > - rte_cio_wmb(); > + rte_io_wmb(); > dp->flags =3D flags; > } > } > @@ -469,7 +469,7 @@ virtio_get_queue_type(struct virtio_hw *hw, uint16_t > vtpci_queue_idx) > return VTNET_TQ; > } >=20 > -/* virtqueue_nused has load-acquire or rte_cio_rmb insed */ > +/* virtqueue_nused has load-acquire or rte_io_rmb insed */ > static inline uint16_t > virtqueue_nused(const struct virtqueue *vq) { @@ -480,7 +480,7 @@ > virtqueue_nused(const struct virtqueue *vq) > * x86 prefers to using rte_smp_rmb over __atomic_load_n as it > * reports a slightly better perf, which comes from the saved > * branch by the compiler. > - * The if and else branches are identical with the smp and cio > + * The if and else branches are identical with the smp and io > * barriers both defined as compiler barriers on x86. > */ > #ifdef RTE_ARCH_X86_64 > @@ -492,7 +492,7 @@ virtqueue_nused(const struct virtqueue *vq) #endif > } else { > idx =3D vq->vq_split.ring.used->idx; > - rte_cio_rmb(); > + rte_io_rmb(); > } > return idx - vq->vq_used_cons_idx; > } > @@ -510,7 +510,7 @@ vq_update_avail_idx(struct virtqueue *vq) > * it reports a slightly better perf, which comes from the > * saved branch by the compiler. > * The if and else branches are identical with the smp and > - * cio barriers both defined as compiler barriers on x86. > + * io barriers both defined as compiler barriers on x86. > */ > #ifdef RTE_ARCH_X86_64 > rte_smp_wmb(); > @@ -520,7 +520,7 @@ vq_update_avail_idx(struct virtqueue *vq) > vq->vq_avail_idx, __ATOMIC_RELEASE); > #endif > } else { > - rte_cio_wmb(); > + rte_io_wmb(); > vq->vq_split.ring.avail->idx =3D vq->vq_avail_idx; > } > } > @@ -793,7 +793,7 @@ virtio_xmit_cleanup_inorder_packed(struct virtqueue > *vq, int num) > struct vq_desc_extra *dxp; >=20 > used_idx =3D vq->vq_used_cons_idx; > - /* desc_is_used has a load-acquire or rte_cio_rmb inside > + /* desc_is_used has a load-acquire or rte_io_rmb inside > * and wait for used desc in virtqueue. > */ > while (num > 0 && desc_is_used(&desc[used_idx], vq)) { @@ -827,7 > +827,7 @@ virtio_xmit_cleanup_normal_packed(struct virtqueue *vq, int > num) > struct vq_desc_extra *dxp; >=20 > used_idx =3D vq->vq_used_cons_idx; > - /* desc_is_used has a load-acquire or rte_cio_rmb inside > + /* desc_is_used has a load-acquire or rte_io_rmb inside > * and wait for used desc in virtqueue. > */ > while (num-- && desc_is_used(&desc[used_idx], vq)) { diff --git > a/drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c > b/drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c > index 9f1e5ed..d04e957 100644 > --- a/drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c > +++ b/drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c > @@ -475,7 +475,7 @@ sdp_ring_doorbell(struct sdp_device *sdpvf > __rte_unused, > otx2_write64(iq->fill_cnt, iq->doorbell_reg); >=20 > /* Make sure doorbell writes observed by HW */ > - rte_cio_wmb(); > + rte_io_wmb(); > iq->fill_cnt =3D 0; >=20 > } > @@ -812,7 +812,7 @@ sdp_rawdev_dequeue(struct rte_rawdev *rawdev, >=20 > /* Ack the h/w with no# of pkts read by Host */ > rte_write32(pkts, droq->pkts_sent_reg); > - rte_cio_wmb(); > + rte_io_wmb(); >=20 > droq->last_pkt_count -=3D pkts; >=20 > diff --git a/drivers/regex/mlx5/mlx5_regex_fastpath.c > b/drivers/regex/mlx5/mlx5_regex_fastpath.c > index 2c6c9e1..8685c03 100644 > --- a/drivers/regex/mlx5/mlx5_regex_fastpath.c > +++ b/drivers/regex/mlx5/mlx5_regex_fastpath.c > @@ -135,7 +135,7 @@ send_doorbell(struct mlx5dv_devx_uar *uar, struct > mlx5_regex_sq *sq) > ((struct mlx5_wqe_ctrl_seg *)wqe)->fm_ce_se =3D > MLX5_WQE_CTRL_CQ_UPDATE; > uint64_t *doorbell_addr =3D > (uint64_t *)((uint8_t *)uar->base_addr + 0x800); > - rte_cio_wmb(); > + rte_io_wmb(); > sq->dbr[MLX5_SND_DBR] =3D rte_cpu_to_be_32((sq->db_pi + 1) & >=20 > MLX5_REGEX_MAX_WQE_INDEX); > rte_wmb(); > @@ -219,7 +219,7 @@ poll_one(struct mlx5_regex_cq *cq) >=20 > next_cqe_offset =3D (cq->ci & (cq_size_get(cq) - 1)); > cqe =3D (volatile struct mlx5_cqe *)(cq->cqe + next_cqe_offset); > - rte_cio_wmb(); > + rte_io_wmb(); >=20 > int ret =3D check_cqe(cqe, cq_size_get(cq), cq->ci); >=20 > -- > 2.7.4