From: Joyce Kong <joyce.kong@arm.com> To: dev@dpdk.org Cc: nd@arm.com, thomas@monjalon.net, jerinj@marvell.com, stephen@networkplumber.org, mb@smartsharesystems.com, honnappa.nagarahalli@arm.com, gavin.hu@arm.com, ravi1.kumar@amd.com, rmody@marvell.com, shshaikh@marvell.com, xuanziyang2@huawei.com, cloud.wangxiaoyun@huawei.com, zhouguoyang@huawei.com Subject: [dpdk-dev] [PATCH v2 3/6] net/axgbe: use common rte bit operation APIs instead Date: Wed, 23 Oct 2019 10:54:55 +0800 Message-ID: <1571799298-18873-4-git-send-email-joyce.kong@arm.com> (raw) In-Reply-To: <1571799298-18873-1-git-send-email-joyce.kong@arm.com> In-Reply-To: <1571125801-45773-1-git-send-email-joyce.kong@arm.com> 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/axgbe/axgbe_common.h | 29 +---------------------------- drivers/net/axgbe/axgbe_ethdev.c | 14 +++++++------- drivers/net/axgbe/axgbe_mdio.c | 14 +++++++------- 3 files changed, 15 insertions(+), 42 deletions(-) diff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h index 34f60f1..e44ec7d 100644 --- a/drivers/net/axgbe/axgbe_common.h +++ b/drivers/net/axgbe/axgbe_common.h @@ -22,6 +22,7 @@ #include <pthread.h> #include <rte_byteorder.h> +#include <rte_io_bitops.h> #include <rte_memory.h> #include <rte_malloc.h> #include <rte_hexdump.h> @@ -1674,34 +1675,6 @@ do { \ #define time_after_eq(a, b) ((long)((a) - (b)) >= 0) #define time_before_eq(a, b) time_after_eq(b, a) -/*---bitmap support apis---*/ -static inline int axgbe_test_bit(int nr, volatile unsigned long *addr) -{ - int res; - - rte_mb(); - res = ((*addr) & (1UL << nr)) != 0; - rte_mb(); - return res; -} - -static inline void axgbe_set_bit(unsigned int nr, volatile unsigned long *addr) -{ - __sync_fetch_and_or(addr, (1UL << nr)); -} - -static inline void axgbe_clear_bit(int nr, volatile unsigned long *addr) -{ - __sync_fetch_and_and(addr, ~(1UL << nr)); -} - -static inline int axgbe_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 unsigned long msecs_to_timer_cycles(unsigned int m) { return rte_get_timer_hz() * (m / 1000); diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c index d1f160e..8c8e5ff 100644 --- a/drivers/net/axgbe/axgbe_ethdev.c +++ b/drivers/net/axgbe/axgbe_ethdev.c @@ -201,8 +201,8 @@ axgbe_dev_start(struct rte_eth_dev *dev) axgbe_dev_enable_tx(dev); axgbe_dev_enable_rx(dev); - axgbe_clear_bit(AXGBE_STOPPED, &pdata->dev_state); - axgbe_clear_bit(AXGBE_DOWN, &pdata->dev_state); + rte_io_clear_bit(AXGBE_STOPPED, &pdata->dev_state); + rte_io_clear_bit(AXGBE_DOWN, &pdata->dev_state); return 0; } @@ -216,17 +216,17 @@ axgbe_dev_stop(struct rte_eth_dev *dev) rte_intr_disable(&pdata->pci_dev->intr_handle); - if (axgbe_test_bit(AXGBE_STOPPED, &pdata->dev_state)) + if (rte_io_test_bit(AXGBE_STOPPED, &pdata->dev_state)) return; - axgbe_set_bit(AXGBE_STOPPED, &pdata->dev_state); + rte_io_set_bit(AXGBE_STOPPED, &pdata->dev_state); axgbe_dev_disable_tx(dev); axgbe_dev_disable_rx(dev); pdata->phy_if.phy_stop(pdata); pdata->hw_if.exit(pdata); memset(&dev->data->dev_link, 0, sizeof(struct rte_eth_link)); - axgbe_set_bit(AXGBE_DOWN, &pdata->dev_state); + rte_io_set_bit(AXGBE_DOWN, &pdata->dev_state); } /* Clear all resources like TX/RX queues. */ @@ -598,8 +598,8 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev) pdata = eth_dev->data->dev_private; /* initial state */ - axgbe_set_bit(AXGBE_DOWN, &pdata->dev_state); - axgbe_set_bit(AXGBE_STOPPED, &pdata->dev_state); + rte_io_set_bit(AXGBE_DOWN, &pdata->dev_state); + rte_io_set_bit(AXGBE_STOPPED, &pdata->dev_state); pdata->eth_dev = eth_dev; pci_dev = RTE_DEV_TO_PCI(eth_dev->device); diff --git a/drivers/net/axgbe/axgbe_mdio.c b/drivers/net/axgbe/axgbe_mdio.c index 2721e5c..4164564 100644 --- a/drivers/net/axgbe/axgbe_mdio.c +++ b/drivers/net/axgbe/axgbe_mdio.c @@ -743,7 +743,7 @@ static int __axgbe_phy_config_aneg(struct axgbe_port *pdata) { int ret; - axgbe_set_bit(AXGBE_LINK_INIT, &pdata->dev_state); + rte_io_set_bit(AXGBE_LINK_INIT, &pdata->dev_state); pdata->link_check = rte_get_timer_cycles(); ret = pdata->phy_if.phy_impl.an_config(pdata); @@ -807,9 +807,9 @@ static int axgbe_phy_config_aneg(struct axgbe_port *pdata) ret = __axgbe_phy_config_aneg(pdata); if (ret) - axgbe_set_bit(AXGBE_LINK_ERR, &pdata->dev_state); + rte_io_set_bit(AXGBE_LINK_ERR, &pdata->dev_state); else - axgbe_clear_bit(AXGBE_LINK_ERR, &pdata->dev_state); + rte_io_clear_bit(AXGBE_LINK_ERR, &pdata->dev_state); pthread_mutex_unlock(&pdata->an_mutex); @@ -880,7 +880,7 @@ static void axgbe_phy_status(struct axgbe_port *pdata) unsigned int link_aneg; int an_restart; - if (axgbe_test_bit(AXGBE_LINK_ERR, &pdata->dev_state)) { + if (rte_io_test_bit(AXGBE_LINK_ERR, &pdata->dev_state)) { pdata->phy.link = 0; goto adjust_link; } @@ -900,10 +900,10 @@ static void axgbe_phy_status(struct axgbe_port *pdata) return; } axgbe_phy_status_result(pdata); - if (axgbe_test_bit(AXGBE_LINK_INIT, &pdata->dev_state)) - axgbe_clear_bit(AXGBE_LINK_INIT, &pdata->dev_state); + if (rte_io_test_bit(AXGBE_LINK_INIT, &pdata->dev_state)) + rte_io_clear_bit(AXGBE_LINK_INIT, &pdata->dev_state); } else { - if (axgbe_test_bit(AXGBE_LINK_INIT, &pdata->dev_state)) { + if (rte_io_test_bit(AXGBE_LINK_INIT, &pdata->dev_state)) { axgbe_check_link_timeout(pdata); if (link_aneg) -- 2.7.4
next prev parent reply index Thread overview: 139+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-15 7:49 [dpdk-dev] [PATCH v1 0/5] implement common rte bit operation APIs in PMDs Joyce Kong 2019-10-15 7:49 ` [dpdk-dev] [PATCH v1 1/5] lib/eal: implement the family of rte bit operation APIs Joyce Kong 2019-10-15 16:53 ` Stephen Hemminger 2019-10-18 9:00 ` Joyce Kong (Arm Technology China) 2019-10-16 7:54 ` Jerin Jacob 2019-10-18 9:02 ` Joyce Kong (Arm Technology China) 2019-10-23 3:12 ` Joyce Kong (Arm Technology China) 2019-10-16 19:05 ` Stephen Hemminger 2019-10-17 13:32 ` [dpdk-dev] [PATCH v1 1/5] lib/eal: implement the family of rte bitoperation APIs Morten Brørup 2019-10-18 8:58 ` Joyce Kong (Arm Technology China) 2019-10-23 3:07 ` Joyce Kong (Arm Technology China) 2019-10-23 7:45 ` Morten Brørup 2019-10-23 17:30 ` Honnappa Nagarahalli 2019-10-24 3:38 ` Gavin Hu (Arm Technology China) 2019-11-01 13:48 ` Honnappa Nagarahalli 2019-11-03 15:45 ` Gavin Hu (Arm Technology China) 2019-10-15 7:49 ` [dpdk-dev] [PATCH v1 2/5] net/axgbe: use common rte bit operation APIs instead Joyce Kong 2019-10-15 7:49 ` [dpdk-dev] [PATCH v1 3/5] net/bnx2x: " Joyce Kong 2019-10-15 7:50 ` [dpdk-dev] [PATCH v1 4/5] net/hinic: " Joyce Kong 2019-10-15 7:50 ` [dpdk-dev] [PATCH v1 5/5] net/qede: " Joyce Kong 2019-10-15 16:51 ` [dpdk-dev] [PATCH v1 0/5] implement common rte bit operation APIs in PMDs Stephen Hemminger 2019-10-18 9:01 ` Joyce Kong (Arm Technology China) 2019-10-23 2:54 ` [dpdk-dev] [PATCH v2 0/6] " Joyce Kong 2019-10-25 13:14 ` David Marchand 2019-10-29 16:42 ` Thomas Monjalon 2019-10-30 9:55 ` Gavin Hu (Arm Technology China) 2019-10-30 10:17 ` Thomas Monjalon 2019-10-30 12:32 ` Jerin Jacob 2019-10-30 13:02 ` Morten Brørup 2019-10-31 10:39 ` Gavin Hu (Arm Technology China) 2019-10-23 2:54 ` [dpdk-dev] [PATCH v2 1/6] lib/eal: implement the family of rte bit operation APIs Joyce Kong 2019-10-23 3:09 ` Honnappa Nagarahalli 2019-10-23 4:56 ` Jerin Jacob 2019-10-23 7:46 ` Morten Brørup 2019-10-23 2:54 ` [dpdk-dev] [PATCH v2 2/6] test/iobitops: add io bit operation test case Joyce Kong 2019-10-23 2:54 ` Joyce Kong [this message] 2019-10-23 3:16 ` [dpdk-dev] [PATCH v2 3/6] net/axgbe: use common rte bit operation APIs instead Honnappa Nagarahalli 2019-10-23 2:54 ` [dpdk-dev] [PATCH v2 4/6] net/bnx2x: " Joyce Kong 2019-10-23 2:54 ` [dpdk-dev] [PATCH v2 5/6] net/hinic: " Joyce Kong 2019-10-23 2:54 ` [dpdk-dev] [PATCH v2 6/6] net/qede: " Joyce Kong 2019-11-18 10:06 ` [dpdk-dev] [PATCH v3 0/6] implement common rte bit operation APIs in PMDs Joyce Kong 2019-11-18 10:06 ` [dpdk-dev] [PATCH v3 1/6] lib/eal: implement the family of rte bit operation APIs Joyce Kong 2019-11-18 10:52 ` [dpdk-dev] [PATCH v3 1/6] lib/eal: implement the family of rte bitoperation APIs Morten Brørup 2019-11-19 9:22 ` Joyce Kong (Arm Technology China) 2019-11-18 10:06 ` [dpdk-dev] [PATCH v3 2/6] test/bitops: add bit operation test case Joyce Kong 2019-11-18 10:06 ` [dpdk-dev] [PATCH v3 3/6] net/axgbe: use common rte bit operation APIs instead Joyce Kong 2019-11-18 10:06 ` [dpdk-dev] [PATCH v3 4/6] net/bnx2x: " Joyce Kong 2019-11-18 10:06 ` [dpdk-dev] [PATCH v3 5/6] net/qede: " Joyce Kong 2019-11-18 10:06 ` [dpdk-dev] [PATCH v3 6/6] net/hinic: " Joyce Kong 2019-11-20 10:12 ` [dpdk-dev] [PATCH v4 0/6] implement common rte bit operation APIs in PMDs Joyce Kong 2019-11-20 10:12 ` [dpdk-dev] [PATCH v4 1/6] lib/eal: implement the family of rte bit operation APIs Joyce Kong 2019-11-20 13:40 ` [dpdk-dev] [PATCH v4 1/6] lib/eal: implement the family of rte bitoperation APIs Morten Brørup 2019-11-20 10:12 ` [dpdk-dev] [PATCH v4 2/6] test/bitops: add bit operation test case Joyce Kong 2019-11-20 10:12 ` [dpdk-dev] [PATCH v4 3/6] net/axgbe: use common rte bit operation APIs instead Joyce Kong 2019-11-20 10:12 ` [dpdk-dev] [PATCH v4 4/6] net/bnx2x: " Joyce Kong 2019-11-20 10:12 ` [dpdk-dev] [PATCH v4 5/6] net/qede: " Joyce Kong 2019-11-20 10:12 ` [dpdk-dev] [PATCH v4 6/6] net/hinic: " Joyce Kong 2019-11-28 6:44 ` [dpdk-dev] [PATCH v5 0/6] implement common rte bit operation APIs in PMDs Joyce Kong 2019-11-28 6:44 ` [dpdk-dev] [PATCH v5 1/6] lib/eal: implement the family of rte bit operation APIs Joyce Kong 2019-11-28 6:44 ` [dpdk-dev] [PATCH v5 2/6] test/bitops: add bit operation test case Joyce Kong 2019-11-28 6:44 ` [dpdk-dev] [PATCH v5 3/6] net/axgbe: use common rte bit operation APIs instead Joyce Kong 2019-12-02 6:09 ` Gavin Hu (Arm Technology China) 2019-12-02 9:12 ` Thomas Monjalon 2019-12-02 9:24 ` [dpdk-dev] [PATCH v5 3/6] net/axgbe: use common rte bitoperation " Morten Brørup 2019-12-02 9:30 ` Thomas Monjalon 2019-12-02 16:53 ` Stephen Hemminger 2019-12-03 6:52 ` Gavin Hu (Arm Technology China) 2019-11-28 6:44 ` [dpdk-dev] [PATCH v5 4/6] net/bnx2x: use common rte bit operation " Joyce Kong 2019-11-28 6:44 ` [dpdk-dev] [PATCH v5 5/6] net/qede: " Joyce Kong 2019-11-28 6:44 ` [dpdk-dev] [PATCH v5 6/6] net/hinic: " Joyce Kong 2019-12-18 6:00 ` [dpdk-dev] [PATCH v6 0/6] implement common rte bit operation APIs in PMDs Joyce Kong 2019-12-18 6:55 ` Gavin Hu 2020-01-17 13:03 ` David Marchand 2019-12-18 6:00 ` [dpdk-dev] [PATCH v6 1/6] lib/eal: implement the family of rte bit operation APIs Joyce Kong 2019-12-20 6:52 ` Honnappa Nagarahalli 2019-12-21 16:07 ` Honnappa Nagarahalli 2019-12-21 18:07 ` Stephen Hemminger 2019-12-23 5:04 ` Honnappa Nagarahalli 2019-12-23 16:36 ` Stephen Hemminger 2019-12-30 3:02 ` Gavin Hu 2020-01-07 0:44 ` Honnappa Nagarahalli 2020-01-07 1:26 ` Stephen Hemminger 2020-01-07 4:41 ` Honnappa Nagarahalli 2020-01-07 0:41 ` Honnappa Nagarahalli 2019-12-21 18:08 ` Stephen Hemminger 2019-12-23 5:45 ` Honnappa Nagarahalli 2019-12-23 8:59 ` Jerin Jacob 2019-12-18 6:00 ` [dpdk-dev] [PATCH v6 2/6] test/bitops: add bit operation test case Joyce Kong 2019-12-18 6:00 ` [dpdk-dev] [PATCH v6 3/6] net/axgbe: use common rte bit operation APIs instead Joyce Kong 2019-12-18 6:00 ` [dpdk-dev] [PATCH v6 4/6] net/bnx2x: " Joyce Kong 2019-12-18 6:00 ` [dpdk-dev] [PATCH v6 5/6] net/qede: " Joyce Kong 2019-12-18 6:00 ` [dpdk-dev] [PATCH v6 6/6] net/hinic: " Joyce Kong 2020-03-09 9:54 ` [dpdk-dev] [PATCH v7 0/6] implement common rte bit operation APIs in PMDs Joyce Kong 2020-03-09 9:54 ` [dpdk-dev] [PATCH v7 1/6] lib/eal: implement the family of PMD bit operation APIs Joyce Kong 2020-03-09 15:50 ` Stephen Hemminger 2020-03-31 22:35 ` Thomas Monjalon 2020-04-01 8:27 ` Gavin Hu 2020-04-01 9:45 ` Thomas Monjalon 2020-04-02 7:20 ` Gavin Hu 2020-04-02 8:07 ` Thomas Monjalon 2020-04-02 8:11 ` Jerin Jacob 2020-04-02 9:02 ` Gavin Hu 2020-03-09 9:54 ` [dpdk-dev] [PATCH v7 2/6] test/pmdbitops: add PMD bit operation test case Joyce Kong 2020-03-09 9:54 ` [dpdk-dev] [PATCH v7 3/6] net/axgbe: use common rte bit operation APIs instead Joyce Kong 2020-03-09 9:54 ` [dpdk-dev] [PATCH v7 4/6] net/bnx2x: " Joyce Kong 2020-03-09 9:54 ` [dpdk-dev] [PATCH v7 5/6] net/qede: " Joyce Kong 2020-03-09 9:54 ` [dpdk-dev] [PATCH v7 6/6] net/hinic: " Joyce Kong 2020-04-16 5:38 ` [dpdk-dev] [PATCH v8 0/6] implement common bit operation APIs Joyce Kong 2020-04-16 5:38 ` [dpdk-dev] [PATCH v8 1/6] lib/eal: implement the family of " Joyce Kong 2020-04-16 18:55 ` [dpdk-dev] [PATCH v8 1/6] lib/eal: implement the family of commonbit " Morten Brørup 2020-04-17 8:18 ` Joyce Kong 2020-04-17 9:38 ` [dpdk-dev] [PATCH v8 1/6] lib/eal: implement the family of common bit " Jerin Jacob 2020-04-20 2:46 ` Joyce Kong 2020-04-16 5:38 ` [dpdk-dev] [PATCH v8 2/6] test/bitops: add bit operation test case Joyce Kong 2020-04-16 5:38 ` [dpdk-dev] [PATCH v8 3/6] net/axgbe: use common rte bit operation APIs instead Joyce Kong 2020-04-16 5:38 ` [dpdk-dev] [PATCH v8 4/6] net/bnx2x: " Joyce Kong 2020-04-16 5:38 ` [dpdk-dev] [PATCH v8 5/6] net/qede: " Joyce Kong 2020-04-16 5:38 ` [dpdk-dev] [PATCH v8 6/6] net/hinic: " Joyce Kong 2020-04-24 3:21 ` [dpdk-dev] [PATCH v9 0/6] implement common bit operation APIs Joyce Kong 2020-04-24 3:21 ` [dpdk-dev] [PATCH v9 1/6] lib/eal: implement the family of " Joyce Kong 2020-04-24 8:08 ` Thomas Monjalon 2020-04-26 2:07 ` Joyce Kong 2020-04-25 19:59 ` Thomas Monjalon 2020-04-26 7:18 ` Joyce Kong 2020-04-26 9:23 ` Thomas Monjalon 2020-04-24 3:21 ` [dpdk-dev] [PATCH v9 2/6] test/bitops: add bit operation test case Joyce Kong 2020-04-24 3:21 ` [dpdk-dev] [PATCH v9 3/6] net/axgbe: use common rte bit operation APIs instead Joyce Kong 2020-04-24 3:21 ` [dpdk-dev] [PATCH v9 4/6] net/bnx2x: " Joyce Kong 2020-04-24 3:21 ` [dpdk-dev] [PATCH v9 5/6] net/qede: " Joyce Kong 2020-04-24 3:21 ` [dpdk-dev] [PATCH v9 6/6] net/hinic: " Joyce Kong 2020-04-27 7:58 ` [dpdk-dev] [PATCH v10 0/6] implement common bit operation APIs Joyce Kong 2020-06-16 12:36 ` Thomas Monjalon 2020-04-27 7:58 ` [dpdk-dev] [PATCH v10 1/6] lib/eal: implement the family of " Joyce Kong 2020-04-27 7:58 ` [dpdk-dev] [PATCH v10 2/6] test/bitops: add bit operation test case Joyce Kong 2020-04-27 7:58 ` [dpdk-dev] [PATCH v10 3/6] net/axgbe: use common rte bit operation APIs instead Joyce Kong 2020-04-27 7:58 ` [dpdk-dev] [PATCH v10 4/6] net/bnx2x: " Joyce Kong 2020-04-27 7:58 ` [dpdk-dev] [PATCH v10 5/6] net/qede: " Joyce Kong 2020-04-27 7:58 ` [dpdk-dev] [PATCH v10 6/6] net/hinic: " Joyce Kong 2020-06-16 12:31 ` Thomas Monjalon
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1571799298-18873-4-git-send-email-joyce.kong@arm.com \ --to=joyce.kong@arm.com \ --cc=cloud.wangxiaoyun@huawei.com \ --cc=dev@dpdk.org \ --cc=gavin.hu@arm.com \ --cc=honnappa.nagarahalli@arm.com \ --cc=jerinj@marvell.com \ --cc=mb@smartsharesystems.com \ --cc=nd@arm.com \ --cc=ravi1.kumar@amd.com \ --cc=rmody@marvell.com \ --cc=shshaikh@marvell.com \ --cc=stephen@networkplumber.org \ --cc=thomas@monjalon.net \ --cc=xuanziyang2@huawei.com \ --cc=zhouguoyang@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK-dev Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/dpdk-dev/0 dpdk-dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dpdk-dev dpdk-dev/ https://lore.kernel.org/dpdk-dev \ dev@dpdk.org public-inbox-index dpdk-dev Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git