From 02bd8182658600ebf2cbe61168e80c19ce4cdaa5 Mon Sep 17 00:00:00 2001 Message-Id: <02bd8182658600ebf2cbe61168e80c19ce4cdaa5.1524241750.git.dcaratti@redhat.com> From: Ajit Khaparde Date: Fri, 20 Apr 2018 07:22:00 -0700 Subject: [PATCH 1/3] net/bnxt: cache address of doorbell to subsequent access While creating TX, Rx, CQ rings use cached DB address instead of getting it from the PCI memory resource. Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_cpr.c | 2 +- drivers/net/bnxt/bnxt_ethdev.c | 12 ++++++++++++ drivers/net/bnxt/bnxt_ring.c | 17 +++++------------ 4 files changed, 19 insertions(+), 13 deletions(-) backport notes: - use RTE_LOG in place of PMD_DRV_LOG (missing upstream commit 3e92fd4e4ec0 ("net/bnxt: use dynamic log type") --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -188,6 +188,7 @@ struct bnxt { struct rte_eth_dev *eth_dev; struct rte_eth_rss_conf rss_conf; struct rte_pci_device *pdev; + void *doorbell_base; uint32_t flags; #define BNXT_FLAG_REGISTERED (1 << 0) --- a/drivers/net/bnxt/bnxt_cpr.c +++ b/drivers/net/bnxt/bnxt_cpr.c @@ -163,7 +163,7 @@ int bnxt_alloc_def_cp_ring(struct bnxt * HWRM_NA_SIGNATURE); if (rc) goto err_out; - cpr->cp_doorbell = bp->pdev->mem_resource[2].addr; + cpr->cp_doorbell = (char *)bp->doorbell_base; B_CP_DIS_DB(cpr, cpr->cp_raw_cons); bp->grp_info[0].cp_fw_ring_id = cp_ring->fw_ring_id; if (BNXT_PF(bp)) --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -2769,11 +2769,23 @@ static int bnxt_init_board(struct rte_et rc = -ENOMEM; goto init_err_release; } + + if (!pci_dev->mem_resource[2].addr) { + RTE_LOG(ERR, PMD, + "Cannot find PCI device BAR 2 address, aborting\n"); + rc = -ENODEV; + goto init_err_release; + } else { + bp->doorbell_base = (void *)pci_dev->mem_resource[2].addr; + } + return 0; init_err_release: if (bp->bar0) bp->bar0 = NULL; + if (bp->doorbell_base) + bp->doorbell_base = NULL; init_err_disable: --- a/drivers/net/bnxt/bnxt_ring.c +++ b/drivers/net/bnxt/bnxt_ring.c @@ -281,7 +281,6 @@ int bnxt_alloc_rings(struct bnxt *bp, ui */ int bnxt_alloc_hwrm_rings(struct bnxt *bp) { - struct rte_pci_device *pci_dev = bp->pdev; unsigned int i; int rc = 0; @@ -303,8 +302,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *b HWRM_NA_SIGNATURE); if (rc) goto err_out; - cpr->cp_doorbell = (char *)pci_dev->mem_resource[2].addr + - idx * 0x80; + cpr->cp_doorbell = (char *)bp->doorbell_base + idx * 0x80; bp->grp_info[i].cp_fw_ring_id = cp_ring->fw_ring_id; B_CP_DIS_DB(cpr, cpr->cp_raw_cons); @@ -316,8 +314,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *b if (rc) goto err_out; rxr->rx_prod = 0; - rxr->rx_doorbell = (char *)pci_dev->mem_resource[2].addr + - idx * 0x80; + rxr->rx_doorbell = (char *)bp->doorbell_base + idx * 0x80; bp->grp_info[i].rx_fw_ring_id = ring->fw_ring_id; B_RX_DB(rxr->rx_doorbell, rxr->rx_prod); @@ -336,9 +333,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *b goto err_out; RTE_LOG(DEBUG, PMD, "Alloc AGG Done!\n"); rxr->ag_prod = 0; - rxr->ag_doorbell = - (char *)pci_dev->mem_resource[2].addr + - map_idx * 0x80; + rxr->ag_doorbell = (char *)bp->doorbell_base + map_idx * 0x80; bp->grp_info[i].ag_fw_ring_id = ring->fw_ring_id; B_RX_DB(rxr->ag_doorbell, rxr->ag_prod); @@ -373,8 +368,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *b if (rc) goto err_out; - cpr->cp_doorbell = (char *)pci_dev->mem_resource[2].addr + - idx * 0x80; + cpr->cp_doorbell = (char *)bp->doorbell_base + idx * 0x80; B_CP_DIS_DB(cpr, cpr->cp_raw_cons); /* Tx ring */ @@ -385,8 +379,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *b if (rc) goto err_out; - txr->tx_doorbell = (char *)pci_dev->mem_resource[2].addr + - idx * 0x80; + txr->tx_doorbell = (char *)bp->doorbell_base + idx * 0x80; txq->index = idx; }