From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 31E8AA050F;
Wed, 18 Dec 2019 07:01:42 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 3D8581BF71;
Wed, 18 Dec 2019 07:01:11 +0100 (CET)
Received: from foss.arm.com (foss.arm.com [217.140.110.172])
by dpdk.org (Postfix) with ESMTP id A6AD01BF73
for <dev@dpdk.org>; Wed, 18 Dec 2019 07:01:09 +0100 (CET)
Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14])
by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3B01F113E;
Tue, 17 Dec 2019 22:01:09 -0800 (PST)
Received: from net-arm-thunderx2-01.test.ast.arm.com
(net-arm-thunderx2-01.shanghai.arm.com [10.169.40.68])
by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 221BA3F718;
Tue, 17 Dec 2019 22:01:03 -0800 (PST)
From: Joyce Kong <joyce.kong@arm.com>
To: thomas@monjalon.net, stephen@networkplumber.org, david.marchand@redhat.com,
mb@smartsharesystems.com, jerinj@marvell.com, bruce.richardson@intel.com,
ravi1.kumar@amd.com, rmody@marvell.com, shshaikh@marvell.com,
xuanziyang2@huawei.com, cloud.wangxiaoyun@huawei.com,
zhouguoyang@huawei.com, honnappa.nagarahalli@arm.com, phil.yang@arm.com,
gavin.hu@arm.com
Cc: nd@arm.com,
dev@dpdk.org
Date: Wed, 18 Dec 2019 14:00:08 +0800
Message-Id: <1576648808-24765-7-git-send-email-joyce.kong@arm.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1576648808-24765-1-git-send-email-joyce.kong@arm.com>
References: <1576648808-24765-1-git-send-email-joyce.kong@arm.com>
In-Reply-To: <1571125801-45773-1-git-send-email-joyce.kong@arm.com>
References: <1571125801-45773-1-git-send-email-joyce.kong@arm.com>
Subject: [dpdk-dev] [PATCH v6 6/6] net/hinic: use common rte bit operation
APIs instead
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Remove its own bit operation APIs and use the common one,
this can reduce the code duplication largely.
Signed-off-by: Joyce Kong <joyce.kong@arm.com>
Reviewed-by: Gavin Hu <gavin.hu@arm.com>
---
drivers/net/hinic/Makefile | 1 +
drivers/net/hinic/base/hinic_compat.h | 33 +--------------------------------
drivers/net/hinic/hinic_pmd_ethdev.c | 16 ++++++++--------
drivers/net/hinic/hinic_pmd_ethdev.h | 2 +-
drivers/net/hinic/meson.build | 2 ++
5 files changed, 13 insertions(+), 41 deletions(-)
diff --git a/drivers/net/hinic/Makefile b/drivers/net/hinic/Makefile
index 87fd843..f087baa 100644
--- a/drivers/net/hinic/Makefile
+++ b/drivers/net/hinic/Makefile
@@ -9,6 +9,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
LIB = librte_pmd_hinic.a
CFLAGS += -O3
+CFLAGS += -DALLOW_EXPERIMENTAL_API
CFLAGS += $(WERROR_FLAGS)
ifeq ($(CONFIG_RTE_ARCH_ARM64),y)
diff --git a/drivers/net/hinic/base/hinic_compat.h b/drivers/net/hinic/base/hinic_compat.h
index e4a7f12..c0a0b3e 100644
--- a/drivers/net/hinic/base/hinic_compat.h
+++ b/drivers/net/hinic/base/hinic_compat.h
@@ -11,6 +11,7 @@
#include <pthread.h>
#include <rte_common.h>
#include <rte_byteorder.h>
+#include <rte_bitops.h>
#include <rte_memzone.h>
#include <rte_memcpy.h>
#include <rte_malloc.h>
@@ -117,38 +118,6 @@ extern int hinic_logtype;
#define HINIC_PAGE_SIZE_DPDK 6
-static inline int hinic_test_bit(int nr, volatile unsigned long *addr)
-{
- int res;
-
- res = ((*addr) & (1UL << nr)) != 0;
- return res;
-}
-
-static inline void hinic_set_bit(unsigned int nr, volatile unsigned long *addr)
-{
- __sync_fetch_and_or(addr, (1UL << nr));
-}
-
-static inline void hinic_clear_bit(int nr, volatile unsigned long *addr)
-{
- __sync_fetch_and_and(addr, ~(1UL << nr));
-}
-
-static inline int hinic_test_and_clear_bit(int nr, volatile unsigned long *addr)
-{
- unsigned long mask = (1UL << nr);
-
- return __sync_fetch_and_and(addr, ~mask) & mask;
-}
-
-static inline int hinic_test_and_set_bit(int nr, volatile unsigned long *addr)
-{
- unsigned long mask = (1UL << nr);
-
- return __sync_fetch_and_or(addr, mask) & mask;
-}
-
void *dma_zalloc_coherent(void *dev, size_t size, dma_addr_t *dma_handle,
gfp_t flag);
void *dma_zalloc_coherent_aligned(void *dev, size_t size,
diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c
index 803a39e..17f235f 100644
--- a/drivers/net/hinic/hinic_pmd_ethdev.c
+++ b/drivers/net/hinic/hinic_pmd_ethdev.c
@@ -269,7 +269,7 @@ static void hinic_dev_interrupt_handler(void *param)
struct rte_eth_dev *dev = param;
struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
- if (!hinic_test_bit(HINIC_DEV_INTR_EN, &nic_dev->dev_status)) {
+ if (!rte_get_bit32(HINIC_DEV_INTR_EN, &nic_dev->dev_status)) {
PMD_DRV_LOG(WARNING, "Device's interrupt is disabled, ignore interrupt event, dev_name: %s, port_id: %d",
nic_dev->proc_dev_name, dev->data->port_id);
return;
@@ -1076,7 +1076,7 @@ static int hinic_dev_start(struct rte_eth_dev *dev)
if (dev->data->dev_conf.intr_conf.lsc != 0)
(void)hinic_link_update(dev, 0);
- hinic_set_bit(HINIC_DEV_START, &nic_dev->dev_status);
+ rte_set_bit32(HINIC_DEV_START, &nic_dev->dev_status);
return 0;
@@ -1201,7 +1201,7 @@ static void hinic_dev_stop(struct rte_eth_dev *dev)
name = dev->data->name;
port_id = dev->data->port_id;
- if (!hinic_test_and_clear_bit(HINIC_DEV_START, &nic_dev->dev_status)) {
+ if (!rte_test_and_clear_bit32(HINIC_DEV_START, &nic_dev->dev_status)) {
PMD_DRV_LOG(INFO, "Device %s already stopped", name);
return;
}
@@ -1246,7 +1246,7 @@ static void hinic_disable_interrupt(struct rte_eth_dev *dev)
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
int ret, retries = 0;
- hinic_clear_bit(HINIC_DEV_INTR_EN, &nic_dev->dev_status);
+ rte_clear_bit32(HINIC_DEV_INTR_EN, &nic_dev->dev_status);
/* disable msix interrupt in hardware */
hinic_set_msix_state(nic_dev->hwdev, 0, HINIC_MSIX_DISABLE);
@@ -2845,7 +2845,7 @@ static void hinic_dev_close(struct rte_eth_dev *dev)
{
struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
- if (hinic_test_and_set_bit(HINIC_DEV_CLOSE, &nic_dev->dev_status)) {
+ if (rte_test_and_set_bit32(HINIC_DEV_CLOSE, &nic_dev->dev_status)) {
PMD_DRV_LOG(WARNING, "Device %s already closed",
dev->data->name);
return;
@@ -3042,7 +3042,7 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev)
eth_dev->data->name);
goto enable_intr_fail;
}
- hinic_set_bit(HINIC_DEV_INTR_EN, &nic_dev->dev_status);
+ rte_set_bit32(HINIC_DEV_INTR_EN, &nic_dev->dev_status);
/* initialize filter info */
filter_info = &nic_dev->filter;
@@ -3054,7 +3054,7 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev)
TAILQ_INIT(&nic_dev->filter_fdir_rule_list);
TAILQ_INIT(&nic_dev->hinic_flow_list);
- hinic_set_bit(HINIC_DEV_INIT, &nic_dev->dev_status);
+ rte_set_bit32(HINIC_DEV_INIT, &nic_dev->dev_status);
PMD_DRV_LOG(INFO, "Initialize %s in primary successfully",
eth_dev->data->name);
@@ -3110,7 +3110,7 @@ static int hinic_dev_uninit(struct rte_eth_dev *dev)
struct hinic_nic_dev *nic_dev;
nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
- hinic_clear_bit(HINIC_DEV_INIT, &nic_dev->dev_status);
+ rte_clear_bit32(HINIC_DEV_INIT, &nic_dev->dev_status);
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
diff --git a/drivers/net/hinic/hinic_pmd_ethdev.h b/drivers/net/hinic/hinic_pmd_ethdev.h
index 3e3f3b3..114f1df 100644
--- a/drivers/net/hinic/hinic_pmd_ethdev.h
+++ b/drivers/net/hinic/hinic_pmd_ethdev.h
@@ -171,7 +171,7 @@ struct hinic_nic_dev {
unsigned int flags;
struct nic_service_cap nic_cap;
u32 rx_mode_status; /* promisc or allmulticast */
- unsigned long dev_status;
+ u32 dev_status;
char proc_dev_name[HINIC_DEV_NAME_LEN];
/* PF0->COS4, PF1->COS5, PF2->COS6, PF3->COS7,
diff --git a/drivers/net/hinic/meson.build b/drivers/net/hinic/meson.build
index bc7e246..8c7ee9d 100644
--- a/drivers/net/hinic/meson.build
+++ b/drivers/net/hinic/meson.build
@@ -1,6 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Huawei Technologies Co., Ltd
+allow_experimental_apis = true
+
subdir('base')
objs = [base_objs]
--
2.7.4