Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/54123/?format=api
{ "id": 54123, "url": "http://patches.dpdk.org/api/patches/54123/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190602174247.32368-8-lance.richardson@broadcom.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20190602174247.32368-8-lance.richardson@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190602174247.32368-8-lance.richardson@broadcom.com", "date": "2019-06-02T17:42:42", "name": "[07/11] net/bnxt: refactor doorbell handling", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "83ec9dc3738aa516b5dae53b4f1b36010453a94e", "submitter": { "id": 1323, "url": "http://patches.dpdk.org/api/people/1323/?format=api", "name": "Lance Richardson", "email": "lance.richardson@broadcom.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190602174247.32368-8-lance.richardson@broadcom.com/mbox/", "series": [ { "id": 4850, "url": "http://patches.dpdk.org/api/series/4850/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4850", "date": "2019-06-02T17:42:35", "name": "add support for BCM57508 controller", "version": 1, "mbox": "http://patches.dpdk.org/series/4850/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/54123/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/54123/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 9F3CD1B9A2;\n\tSun, 2 Jun 2019 19:43:21 +0200 (CEST)", "from mail-yb1-f194.google.com (mail-yb1-f194.google.com\n\t[209.85.219.194]) by dpdk.org (Postfix) with ESMTP id E5A941B94B\n\tfor <dev@dpdk.org>; Sun, 2 Jun 2019 19:43:10 +0200 (CEST)", "by mail-yb1-f194.google.com with SMTP id p8so5719393ybo.13\n\tfor <dev@dpdk.org>; Sun, 02 Jun 2019 10:43:10 -0700 (PDT)", "from lrichardson-VirtualBox.attlocal.net\n\t(69-218-223-106.lightspeed.rlghnc.sbcglobal.net. [69.218.223.106])\n\tby smtp.gmail.com with ESMTPSA id\n\tn78sm1000819ywd.2.2019.06.02.10.43.09\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 02 Jun 2019 10:43:09 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=wHk/+MRirWD3kvYnCvzJf/XXJQHvRcoPBEca6oS3qGs=;\n\tb=hpNfd3LPZSP1EUq2xkzlFhvFsRUbFCKoSzRqh/WBhNnpbGBE4NC5+sOW5b8x8MPciF\n\tjXwi2kaMOJc5r5cm2/nB4IuAGZib/chha0DwPAV2lMFJtrobo+mmA7UeMLxUZpGb64qX\n\tcRyMqO9+nezlb1mekTFOpSZz/r3XjNk1MOC0g=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=wHk/+MRirWD3kvYnCvzJf/XXJQHvRcoPBEca6oS3qGs=;\n\tb=LrUkvlwWopqYWfAX/rJzb9Be0owsTZg0x4eE/+i8xn87Ixtbm6Iuhf7LXNB7YPvJ9v\n\te9mfZX9m5VVbiydmFY0KebqdwGgnvzs/FMJFiZ819WhrsFEZZ+G5hUVc4/D0cTv/UY+D\n\tLfDt1yEw+ZTI755JzBI8niWnz00cfZ6SusX1agr9AALQt2v3j9TQAhQUDLCDaluAwU3Y\n\tpPdafHGHX1Xv3Y2JCOLKPA0SaZ+x9tIovgZfuMBzrBGOTGj04hjY86PmyAAzpLKS0Zfr\n\tbZ7DeLYdnTRTmQYfEqXYCk2tA6By9AE3q9MGW4zGIL4upkclfXnEt/zm9OPHSYQuKi15\n\tnfJA==", "X-Gm-Message-State": "APjAAAWtkmDx4PGR+xs0/rl/XZ0duVEy2tc8VORtcY8843EX1jwr5r59\n\tB/F3MmzrrdKAnyvPeA4KhSulpH6zp1lD+8mNvgcssQw9P6s0GQyt0gp1Zn0NlSXuiegSyJQxHtg\n\tAMRoXiANglKGEvFjeQ2exbuVlhDGiWuwCQ13uiDvdw2Y3wIz/25IDRujUz73qptmB", "X-Google-Smtp-Source": "APXvYqxWyLEIP/isVR6XS0cCLQICYGBOSaM3I/5mUF9A51KP4KHWnf3mMMwxRbGISHzCgiOilP5m5w==", "X-Received": "by 2002:a25:bfc1:: with SMTP id\n\tq1mr10800383ybm.371.1559497389830; \n\tSun, 02 Jun 2019 10:43:09 -0700 (PDT)", "From": "Lance Richardson <lance.richardson@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ajit.khaparde@broadcom.com, ferruh.yigit@intel.com,\n\tLance Richardson <lance.richardson@broadcom.com>", "Date": "Sun, 2 Jun 2019 13:42:42 -0400", "Message-Id": "<20190602174247.32368-8-lance.richardson@broadcom.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20190602174247.32368-1-lance.richardson@broadcom.com>", "References": "<20190602174247.32368-1-lance.richardson@broadcom.com>", "Subject": "[dpdk-dev] [PATCH 07/11] net/bnxt: refactor doorbell handling", "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>,\n\t<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>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Reduce code duplication and prepare for newer controllers that\nuse different doorbell protocols by refactoring doorbell handling\ncode.\n\nSigned-off-by: Lance Richardson <lance.richardson@broadcom.com>\nReviewed-by: Ajit Kumar Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/bnxt_cpr.h | 27 ++++--\n drivers/net/bnxt/bnxt_irq.c | 4 +-\n drivers/net/bnxt/bnxt_ring.c | 132 +++++++++++++++------------\n drivers/net/bnxt/bnxt_ring.h | 11 +++\n drivers/net/bnxt/bnxt_rxr.c | 10 +-\n drivers/net/bnxt/bnxt_rxr.h | 4 +-\n drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 8 +-\n drivers/net/bnxt/bnxt_txr.c | 4 +-\n drivers/net/bnxt/bnxt_txr.h | 2 +-\n 9 files changed, 118 insertions(+), 84 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_cpr.h b/drivers/net/bnxt/bnxt_cpr.h\nindex ee5ca820e..77a22d241 100644\n--- a/drivers/net/bnxt/bnxt_cpr.h\n+++ b/drivers/net/bnxt/bnxt_cpr.h\n@@ -9,6 +9,8 @@\n \n #include <rte_io.h>\n \n+struct bnxt_db_info;\n+\n #define CMP_VALID(cmp, raw_cons, ring)\t\t\t\t\t\\\n \t(!!(rte_le_to_cpu_32(((struct cmpl_base *)(cmp))->info3_v) &\t\\\n \t CMPL_BASE_V) == !((raw_cons) & ((ring)->ring_size)))\n@@ -40,37 +42,44 @@\n #define B_CP_DB_REARM(cpr, raw_cons)\t\t\t\t\t\\\n \trte_write32((DB_CP_REARM_FLAGS |\t\t\t\t\\\n \t\t RING_CMP(((cpr)->cp_ring_struct), raw_cons)),\t\\\n-\t\t ((cpr)->cp_doorbell))\n+\t\t ((cpr)->cp_db.doorbell))\n+\n+#define B_CP_DB_ARM(cpr)\trte_write32((DB_KEY_CP),\t\t\\\n+\t\t\t\t\t ((cpr)->cp_db.doorbell))\n \n-#define B_CP_DB_ARM(cpr)\trte_write32((DB_KEY_CP), ((cpr)->cp_doorbell))\n-#define B_CP_DB_DISARM(cpr)\t(*(uint32_t *)((cpr)->cp_doorbell) = \\\n+#define B_CP_DB_DISARM(cpr)\t(*(uint32_t *)((cpr)->cp_db.doorbell) = \\\n \t\t\t\t DB_KEY_CP | DB_IRQ_DIS)\n \n #define B_CP_DB_IDX_ARM(cpr, cons)\t\t\t\t\t\\\n-\t\t(*(uint32_t *)((cpr)->cp_doorbell) = (DB_CP_REARM_FLAGS | \\\n+\t\t(*(uint32_t *)((cpr)->cp_db.doorbell) = (DB_CP_REARM_FLAGS | \\\n \t\t\t\t(cons)))\n \n #define B_CP_DB_IDX_DISARM(cpr, cons)\tdo {\t\t\t\t\\\n \t\trte_smp_wmb();\t\t\t\t\t\t\\\n-\t\t(*(uint32_t *)((cpr)->cp_doorbell) = (DB_CP_FLAGS |\t\\\n+\t\t(*(uint32_t *)((cpr)->cp_db.doorbell) = (DB_CP_FLAGS |\t\\\n \t\t\t\t(cons));\t\t\t\t\\\n } while (0)\n #define B_CP_DIS_DB(cpr, raw_cons)\t\t\t\t\t\\\n \trte_write32((DB_CP_FLAGS |\t\t\t\t\t\\\n \t\t RING_CMP(((cpr)->cp_ring_struct), raw_cons)),\t\\\n-\t\t ((cpr)->cp_doorbell))\n+\t\t ((cpr)->cp_db.doorbell))\n+\n #define B_CP_DB(cpr, raw_cons, ring_mask)\t\t\t\t\\\n \trte_write32((DB_CP_FLAGS |\t\t\t\t\t\\\n \t\t RING_CMPL((ring_mask), raw_cons)),\t\\\n-\t\t ((cpr)->cp_doorbell))\n+\t\t ((cpr)->cp_db.doorbell))\n+\n+struct bnxt_db_info {\n+\tvoid\t\t*doorbell;\n+\tuint32_t\tdb_key32;\n+};\n \n struct bnxt_ring;\n struct bnxt_cp_ring_info {\n \tuint32_t\t\tcp_raw_cons;\n-\tvoid\t\t\t*cp_doorbell;\n \n \tstruct cmpl_base\t*cp_desc_ring;\n-\n+\tstruct bnxt_db_info cp_db;\n \trte_iova_t\t\tcp_desc_mapping;\n \n \tstruct ctx_hw_stats\t*hw_stats;\ndiff --git a/drivers/net/bnxt/bnxt_irq.c b/drivers/net/bnxt/bnxt_irq.c\nindex 7ef7023eb..9f3c166a6 100644\n--- a/drivers/net/bnxt/bnxt_irq.c\n+++ b/drivers/net/bnxt/bnxt_irq.c\n@@ -71,7 +71,7 @@ void bnxt_disable_int(struct bnxt *bp)\n \tstruct bnxt_cp_ring_info *cpr = bp->def_cp_ring;\n \n \t/* Only the default completion ring */\n-\tif (cpr != NULL && cpr->cp_doorbell != NULL)\n+\tif (cpr != NULL && cpr->cp_db.doorbell != NULL)\n \t\tB_CP_DB_DISARM(cpr);\n }\n \n@@ -80,7 +80,7 @@ void bnxt_enable_int(struct bnxt *bp)\n \tstruct bnxt_cp_ring_info *cpr = bp->def_cp_ring;\n \n \t/* Only the default completion ring */\n-\tif (cpr != NULL && cpr->cp_doorbell != NULL)\n+\tif (cpr != NULL && cpr->cp_db.doorbell != NULL)\n \t\tB_CP_DB_ARM(cpr);\n }\n \ndiff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c\nindex 51fe35f3e..15d418977 100644\n--- a/drivers/net/bnxt/bnxt_ring.c\n+++ b/drivers/net/bnxt/bnxt_ring.c\n@@ -276,31 +276,48 @@ static void bnxt_init_dflt_coal(struct bnxt_coal *coal)\n \tcoal->cmpl_aggr_dma_tmr_during_int = BNXT_CMPL_AGGR_DMA_TMR_DURING_INT;\n }\n \n+static void bnxt_set_db(struct bnxt *bp,\n+\t\t\tstruct bnxt_db_info *db,\n+\t\t\tuint32_t ring_type,\n+\t\t\tuint32_t map_idx)\n+{\n+\tdb->doorbell = (char *)bp->doorbell_base + map_idx * 0x80;\n+\tswitch (ring_type) {\n+\tcase HWRM_RING_ALLOC_INPUT_RING_TYPE_TX:\n+\t\tdb->db_key32 = DB_KEY_TX;\n+\t\tbreak;\n+\tcase HWRM_RING_ALLOC_INPUT_RING_TYPE_RX:\n+\t\tdb->db_key32 = DB_KEY_RX;\n+\t\tbreak;\n+\tcase HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL:\n+\t\tdb->db_key32 = DB_KEY_CP;\n+\t\tbreak;\n+\t}\n+}\n+\n int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index)\n {\n-\tstruct rte_pci_device *pci_dev = bp->pdev;\n \tstruct bnxt_rx_queue *rxq = bp->rx_queues[queue_index];\n \tstruct bnxt_cp_ring_info *cpr = rxq->cp_ring;\n \tstruct bnxt_ring *cp_ring = cpr->cp_ring_struct;\n \tstruct bnxt_rx_ring_info *rxr = rxq->rx_ring;\n \tstruct bnxt_ring *ring = rxr->rx_ring_struct;\n \tunsigned int map_idx = queue_index + bp->rx_cp_nr_rings;\n+\tuint8_t ring_type;\n \tint rc = 0;\n \n \tbp->grp_info[queue_index].fw_stats_ctx = cpr->hw_stats_ctx_id;\n \n \t/* Rx cmpl */\n-\trc = bnxt_hwrm_ring_alloc(bp, cp_ring,\n-\t\t\t\t HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL,\n-\t\t\t\t queue_index, HWRM_NA_SIGNATURE,\n-\t\t\t\t HWRM_NA_SIGNATURE);\n+\tring_type = HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL;\n+\trc = bnxt_hwrm_ring_alloc(bp, cp_ring, ring_type, queue_index,\n+\t\t\t\t HWRM_NA_SIGNATURE, HWRM_NA_SIGNATURE);\n \tif (rc)\n \t\tgoto err_out;\n \n-\tcpr->cp_doorbell = (char *)pci_dev->mem_resource[2].addr +\n-\t\tqueue_index * BNXT_DB_SIZE;\n \tbp->grp_info[queue_index].cp_fw_ring_id = cp_ring->fw_ring_id;\n-\tB_CP_DIS_DB(cpr, cpr->cp_raw_cons);\n+\tbnxt_set_db(bp, &cpr->cp_db, ring_type, queue_index);\n+\tbnxt_db_cq(cpr);\n \n \tif (!queue_index) {\n \t\t/*\n@@ -314,35 +331,33 @@ int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index)\n \t\t\tgoto err_out;\n \t}\n \t/* Rx ring */\n-\trc = bnxt_hwrm_ring_alloc(bp, ring, HWRM_RING_ALLOC_INPUT_RING_TYPE_RX,\n-\t\t\t\t queue_index, cpr->hw_stats_ctx_id,\n-\t\t\t\t cp_ring->fw_ring_id);\n+\tring_type = HWRM_RING_ALLOC_INPUT_RING_TYPE_RX;\n+\trc = bnxt_hwrm_ring_alloc(bp, ring, ring_type, queue_index,\n+\t\t\t\t cpr->hw_stats_ctx_id, cp_ring->fw_ring_id);\n \tif (rc)\n \t\tgoto err_out;\n \n \trxr->rx_prod = 0;\n-\trxr->rx_doorbell = (char *)pci_dev->mem_resource[2].addr +\n-\t\tqueue_index * BNXT_DB_SIZE;\n \tbp->grp_info[queue_index].rx_fw_ring_id = ring->fw_ring_id;\n-\tB_RX_DB(rxr->rx_doorbell, rxr->rx_prod);\n+\tbnxt_set_db(bp, &rxr->rx_db, ring_type, queue_index);\n+\tbnxt_db_write(&rxr->rx_db, rxr->rx_prod);\n \n-\tring = rxr->ag_ring_struct;\n \t/* Agg ring */\n+\tring = rxr->ag_ring_struct;\n \tif (!ring)\n \t\tPMD_DRV_LOG(ERR, \"Alloc AGG Ring is NULL!\\n\");\n \n-\trc = bnxt_hwrm_ring_alloc(bp, ring, HWRM_RING_ALLOC_INPUT_RING_TYPE_RX,\n-\t\t\t\t map_idx, HWRM_NA_SIGNATURE,\n-\t\t\t\t cp_ring->fw_ring_id);\n+\tring_type = HWRM_RING_ALLOC_INPUT_RING_TYPE_RX;\n+\trc = bnxt_hwrm_ring_alloc(bp, ring, ring_type, map_idx,\n+\t\t\t\t HWRM_NA_SIGNATURE, cp_ring->fw_ring_id);\n \tif (rc)\n \t\tgoto err_out;\n \n \tPMD_DRV_LOG(DEBUG, \"Alloc AGG Done!\\n\");\n \trxr->ag_prod = 0;\n-\trxr->ag_doorbell = (char *)pci_dev->mem_resource[2].addr +\n-\t\tmap_idx * BNXT_DB_SIZE;\n \tbp->grp_info[queue_index].ag_fw_ring_id = ring->fw_ring_id;\n-\tB_RX_DB(rxr->ag_doorbell, rxr->ag_prod);\n+\tbnxt_set_db(bp, &rxr->ag_db, ring_type, map_idx);\n+\tbnxt_db_write(&rxr->ag_db, rxr->ag_prod);\n \n \trxq->rx_buf_use_size = BNXT_MAX_MTU + RTE_ETHER_HDR_LEN +\n \t\tRTE_ETHER_CRC_LEN + (2 * VLAN_TAG_SIZE);\n@@ -356,8 +371,8 @@ int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index)\n \t\t\trc = -ENOMEM;\n \t\t\tgoto err_out;\n \t\t}\n-\t\tB_RX_DB(rxr->rx_doorbell, rxr->rx_prod);\n-\t\tB_RX_DB(rxr->ag_doorbell, rxr->ag_prod);\n+\t\tbnxt_db_write(&rxr->rx_db, rxr->rx_prod);\n+\t\tbnxt_db_write(&rxr->ag_db, rxr->ag_prod);\n \t}\n \trxq->index = queue_index;\n \tPMD_DRV_LOG(INFO,\n@@ -368,6 +383,7 @@ int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index)\n err_out:\n \treturn rc;\n }\n+\n /* ring_grp usage:\n * [0] = default completion ring\n * [1 -> +rx_cp_nr_rings] = rx_cp, rx rings\n@@ -377,6 +393,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)\n {\n \tstruct bnxt_coal coal;\n \tunsigned int i;\n+\tuint8_t ring_type;\n \tint rc = 0;\n \n \tbnxt_init_dflt_coal(&coal);\n@@ -392,18 +409,16 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)\n \t\tbp->grp_info[i].fw_stats_ctx = cpr->hw_stats_ctx_id;\n \n \t\t/* Rx cmpl */\n-\t\trc = bnxt_hwrm_ring_alloc\n-\t\t\t(bp,\n-\t\t\t cp_ring,\n-\t\t\t HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL,\n-\t\t\t i,\n-\t\t\t HWRM_NA_SIGNATURE,\n-\t\t\t HWRM_NA_SIGNATURE);\n+\t\tring_type = HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL;\n+\t\trc = bnxt_hwrm_ring_alloc(bp, cp_ring, ring_type, i,\n+\t\t\t\t\t HWRM_NA_SIGNATURE,\n+\t\t\t\t\t HWRM_NA_SIGNATURE);\n \t\tif (rc)\n \t\t\tgoto err_out;\n-\t\tcpr->cp_doorbell = (char *)bp->doorbell_base + i * 0x80;\n \t\tbp->grp_info[i].cp_fw_ring_id = cp_ring->fw_ring_id;\n-\t\tB_CP_DIS_DB(cpr, cpr->cp_raw_cons);\n+\t\tbnxt_set_db(bp, &cpr->cp_db, ring_type, i);\n+\t\tbnxt_db_cq(cpr);\n+\n \t\tbnxt_hwrm_set_ring_coal(bp, &coal, cp_ring->fw_ring_id);\n \n \t\tif (!i) {\n@@ -420,37 +435,36 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)\n \t\t}\n \n \t\t/* Rx ring */\n-\t\trc = bnxt_hwrm_ring_alloc(bp,\n-\t\t\t\t\t ring,\n-\t\t\t\t\t HWRM_RING_ALLOC_INPUT_RING_TYPE_RX,\n-\t\t\t\t\t i,\n+\t\tring_type = HWRM_RING_ALLOC_INPUT_RING_TYPE_RX;\n+\t\trc = bnxt_hwrm_ring_alloc(bp, ring, ring_type, i,\n \t\t\t\t\t cpr->hw_stats_ctx_id,\n \t\t\t\t\t cp_ring->fw_ring_id);\n \t\tif (rc)\n \t\t\tgoto err_out;\n \t\trxr->rx_prod = 0;\n-\t\trxr->rx_doorbell = (char *)bp->doorbell_base + i * 0x80;\n \t\tbp->grp_info[i].rx_fw_ring_id = ring->fw_ring_id;\n-\t\tB_RX_DB(rxr->rx_doorbell, rxr->rx_prod);\n+\t\tbnxt_set_db(bp, &rxr->rx_db, ring_type, i);\n+\t\tbnxt_db_write(&rxr->rx_db, rxr->rx_prod);\n \n-\t\tring = rxr->ag_ring_struct;\n \t\t/* Agg ring */\n+\t\tring = rxr->ag_ring_struct;\n+\n \t\tif (ring == NULL) {\n \t\t\tPMD_DRV_LOG(ERR, \"Alloc AGG Ring is NULL!\\n\");\n \t\t\tgoto err_out;\n \t\t}\n \n-\t\trc = bnxt_hwrm_ring_alloc(bp, ring,\n-\t\t\t\tHWRM_RING_ALLOC_INPUT_RING_TYPE_RX,\n-\t\t\t\tmap_idx, HWRM_NA_SIGNATURE,\n-\t\t\t\tcp_ring->fw_ring_id);\n+\t\tring_type = HWRM_RING_ALLOC_INPUT_RING_TYPE_RX;\n+\t\trc = bnxt_hwrm_ring_alloc(bp, ring, ring_type, map_idx,\n+\t\t\t\t\t HWRM_NA_SIGNATURE,\n+\t\t\t\t\t cp_ring->fw_ring_id);\n \t\tif (rc)\n \t\t\tgoto err_out;\n-\t\tPMD_DRV_LOG(DEBUG, \"Alloc AGG Done!\\n\");\n+\n \t\trxr->ag_prod = 0;\n-\t\trxr->ag_doorbell = (char *)bp->doorbell_base + map_idx * 0x80;\n \t\tbp->grp_info[i].ag_fw_ring_id = ring->fw_ring_id;\n-\t\tB_RX_DB(rxr->ag_doorbell, rxr->ag_prod);\n+\t\tbnxt_set_db(bp, &rxr->ag_db, ring_type, map_idx);\n+\t\tbnxt_db_write(&rxr->ag_db, rxr->ag_prod);\n \n \t\trxq->rx_buf_use_size = BNXT_MAX_MTU + RTE_ETHER_HDR_LEN +\n \t\t\t\t\tRTE_ETHER_CRC_LEN + (2 * VLAN_TAG_SIZE);\n@@ -459,8 +473,8 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)\n \t\t\tbnxt_rx_queue_release_op(rxq);\n \t\t\treturn -ENOMEM;\n \t\t}\n-\t\tB_RX_DB(rxr->rx_doorbell, rxr->rx_prod);\n-\t\tB_RX_DB(rxr->ag_doorbell, rxr->ag_prod);\n+\t\tbnxt_db_write(&rxr->rx_db, rxr->rx_prod);\n+\t\tbnxt_db_write(&rxr->ag_db, rxr->ag_prod);\n \t\trxq->index = i;\n \t}\n \n@@ -473,25 +487,25 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)\n \t\tunsigned int idx = i + bp->rx_cp_nr_rings;\n \n \t\t/* Tx cmpl */\n-\t\trc = bnxt_hwrm_ring_alloc(bp, cp_ring,\n-\t\t\t\t\tHWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL,\n-\t\t\t\t\tidx, HWRM_NA_SIGNATURE,\n-\t\t\t\t\tHWRM_NA_SIGNATURE);\n+\t\tring_type = HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL;\n+\t\trc = bnxt_hwrm_ring_alloc(bp, cp_ring, ring_type, idx,\n+\t\t\t\t\t HWRM_NA_SIGNATURE,\n+\t\t\t\t\t HWRM_NA_SIGNATURE);\n \t\tif (rc)\n \t\t\tgoto err_out;\n \n-\t\tcpr->cp_doorbell = (char *)bp->doorbell_base + idx * 0x80;\n-\t\tB_CP_DIS_DB(cpr, cpr->cp_raw_cons);\n+\t\tbnxt_set_db(bp, &cpr->cp_db, ring_type, idx);\n+\t\tbnxt_db_cq(cpr);\n \n \t\t/* Tx ring */\n-\t\trc = bnxt_hwrm_ring_alloc(bp, ring,\n-\t\t\t\t\tHWRM_RING_ALLOC_INPUT_RING_TYPE_TX,\n-\t\t\t\t\tidx, cpr->hw_stats_ctx_id,\n-\t\t\t\t\tcp_ring->fw_ring_id);\n+\t\tring_type = HWRM_RING_ALLOC_INPUT_RING_TYPE_TX;\n+\t\trc = bnxt_hwrm_ring_alloc(bp, ring, ring_type, idx,\n+\t\t\t\t\t cpr->hw_stats_ctx_id,\n+\t\t\t\t\t cp_ring->fw_ring_id);\n \t\tif (rc)\n \t\t\tgoto err_out;\n \n-\t\ttxr->tx_doorbell = (char *)bp->doorbell_base + idx * 0x80;\n+\t\tbnxt_set_db(bp, &txr->tx_db, ring_type, idx);\n \t\ttxq->index = idx;\n \t\tbnxt_hwrm_set_ring_coal(bp, &coal, cp_ring->fw_ring_id);\n \t}\ndiff --git a/drivers/net/bnxt/bnxt_ring.h b/drivers/net/bnxt/bnxt_ring.h\nindex fd3d0bd73..8cb0e8eb0 100644\n--- a/drivers/net/bnxt/bnxt_ring.h\n+++ b/drivers/net/bnxt/bnxt_ring.h\n@@ -74,4 +74,15 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,\n int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index);\n int bnxt_alloc_hwrm_rings(struct bnxt *bp);\n \n+static inline void bnxt_db_write(struct bnxt_db_info *db, uint32_t idx)\n+{\n+\trte_write32(db->db_key32 | idx, db->doorbell);\n+}\n+\n+static inline void bnxt_db_cq(struct bnxt_cp_ring_info *cpr)\n+{\n+\trte_smp_wmb();\n+\tB_CP_DIS_DB(cpr, cpr->cp_raw_cons);\n+}\n+\n #endif\ndiff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c\nindex 303549b5d..75d2c76a5 100644\n--- a/drivers/net/bnxt/bnxt_rxr.c\n+++ b/drivers/net/bnxt/bnxt_rxr.c\n@@ -552,7 +552,7 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\tbreak;\n \t\t/* Post some Rx buf early in case of larger burst processing */\n \t\tif (nb_rx_pkts == BNXT_RX_POST_THRESH)\n-\t\t\tB_RX_DB(rxr->rx_doorbell, rxr->rx_prod);\n+\t\t\tbnxt_db_write(&rxr->rx_db, rxr->rx_prod);\n \t}\n \n \tcpr->cp_raw_cons = raw_cons;\n@@ -565,13 +565,13 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t}\n \n \tif (prod != rxr->rx_prod)\n-\t\tB_RX_DB(rxr->rx_doorbell, rxr->rx_prod);\n+\t\tbnxt_db_write(&rxr->rx_db, rxr->rx_prod);\n \n \t/* Ring the AGG ring DB */\n \tif (ag_prod != rxr->ag_prod)\n-\t\tB_RX_DB(rxr->ag_doorbell, rxr->ag_prod);\n+\t\tbnxt_db_write(&rxr->ag_db, rxr->ag_prod);\n \n-\tB_CP_DIS_DB(cpr, cpr->cp_raw_cons);\n+\tbnxt_db_cq(cpr);\n \n \t/* Attempt to alloc Rx buf in case of a previous allocation failure. */\n \tif (rc == -ENOMEM) {\n@@ -588,7 +588,7 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\t/* This slot is empty. Alloc buffer for Rx */\n \t\t\tif (!bnxt_alloc_rx_data(rxq, rxr, i)) {\n \t\t\t\trxr->rx_prod = i;\n-\t\t\t\tB_RX_DB(rxr->rx_doorbell, rxr->rx_prod);\n+\t\t\t\tbnxt_db_write(&rxr->rx_db, rxr->rx_prod);\n \t\t\t} else {\n \t\t\t\tPMD_DRV_LOG(ERR, \"Alloc mbuf failed\\n\");\n \t\t\t\tbreak;\ndiff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h\nindex d10cefb93..6523b94c6 100644\n--- a/drivers/net/bnxt/bnxt_rxr.h\n+++ b/drivers/net/bnxt/bnxt_rxr.h\n@@ -81,8 +81,8 @@ struct bnxt_sw_rx_bd {\n struct bnxt_rx_ring_info {\n \tuint16_t\t\trx_prod;\n \tuint16_t\t\tag_prod;\n-\tvoid\t\t\t*rx_doorbell;\n-\tvoid\t\t\t*ag_doorbell;\n+\tstruct bnxt_db_info rx_db;\n+\tstruct bnxt_db_info ag_db;\n \n \tstruct rx_prod_pkt_bd\t*rx_desc_ring;\n \tstruct rx_prod_pkt_bd\t*ag_desc_ring;\ndiff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c\nindex 1c32c986c..c358506f8 100644\n--- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c\n+++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c\n@@ -92,7 +92,7 @@ bnxt_rxq_rearm(struct bnxt_rx_queue *rxq, struct bnxt_rx_ring_info *rxr)\n \t}\n \n \trxq->rxrearm_start += RTE_BNXT_RXQ_REARM_THRESH;\n-\tB_RX_DB(rxr->rx_doorbell, rxq->rxrearm_start - 1);\n+\tbnxt_db_write(&rxr->rx_db, rxq->rxrearm_start - 1);\n \tif (rxq->rxrearm_start >= rxq->nb_rx_desc)\n \t\trxq->rxrearm_start = 0;\n \n@@ -272,7 +272,7 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,\n \trxq->rxrearm_nb += nb_rx_pkts;\n \tcpr->cp_raw_cons = raw_cons;\n \tif (nb_rx_pkts || evt)\n-\t\tB_CP_DIS_DB(cpr, cpr->cp_raw_cons);\n+\t\tbnxt_db_cq(cpr);\n \n \treturn nb_rx_pkts;\n }\n@@ -349,7 +349,7 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq)\n \tif (nb_tx_pkts) {\n \t\tbnxt_tx_cmp_vec(txq, nb_tx_pkts);\n \t\tcpr->cp_raw_cons = raw_cons;\n-\t\tB_CP_DB(cpr, raw_cons, ring_mask);\n+\t\tbnxt_db_cq(cpr);\n \t}\n }\n \n@@ -420,7 +420,7 @@ bnxt_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t}\n \n \trte_compiler_barrier();\n-\tB_TX_DB(txr->tx_doorbell, prod);\n+\tbnxt_db_write(&txr->tx_db, prod);\n \n \ttxr->tx_prod = prod;\n \ndiff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c\nindex 16598ba63..26dd384a6 100644\n--- a/drivers/net/bnxt/bnxt_txr.c\n+++ b/drivers/net/bnxt/bnxt_txr.c\n@@ -415,7 +415,7 @@ static int bnxt_handle_tx_cp(struct bnxt_tx_queue *txq)\n \tif (nb_tx_pkts) {\n \t\tbnxt_tx_cmp(txq, nb_tx_pkts);\n \t\tcpr->cp_raw_cons = raw_cons;\n-\t\tB_CP_DB(cpr, cpr->cp_raw_cons, ring_mask);\n+\t\tbnxt_db_cq(cpr);\n \t}\n \n \treturn nb_tx_pkts;\n@@ -452,7 +452,7 @@ uint16_t bnxt_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \tif (likely(nb_tx_pkts)) {\n \t\t/* Request a completion on the last packet */\n \t\tlast_txbd->flags_type &= ~TX_BD_LONG_FLAGS_NO_CMPL;\n-\t\tB_TX_DB(txq->tx_ring->tx_doorbell, txq->tx_ring->tx_prod);\n+\t\tbnxt_db_write(&txq->tx_ring->tx_db, txq->tx_ring->tx_prod);\n \t}\n \n \treturn nb_tx_pkts;\ndiff --git a/drivers/net/bnxt/bnxt_txr.h b/drivers/net/bnxt/bnxt_txr.h\nindex 58678a1c8..08fd2e014 100644\n--- a/drivers/net/bnxt/bnxt_txr.h\n+++ b/drivers/net/bnxt/bnxt_txr.h\n@@ -18,7 +18,7 @@\n struct bnxt_tx_ring_info {\n \tuint16_t\t\ttx_prod;\n \tuint16_t\t\ttx_cons;\n-\tvoid\t\t\t*tx_doorbell;\n+\tstruct bnxt_db_info tx_db;\n \n \tstruct tx_bd_long\t*tx_desc_ring;\n \tstruct bnxt_sw_tx_bd\t*tx_buf_ring;\n", "prefixes": [ "07/11" ] }