From 349895a25f06ac5e95207d4b63129c3b7f686edd Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Mon, 18 Jan 2021 23:12:13 +0800 Subject: [PATCH] nvme/pcie: set doorbell base when allocating the bar Change-Id: Id40f03f1bc4e90113dad6326dbeb9a7b5af5c1b1 Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5960 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris Reviewed-by: --- lib/nvme/nvme_pcie.c | 1 + lib/nvme/nvme_pcie_common.c | 6 ++---- lib/nvme/nvme_pcie_internal.h | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c index 216d90206..ff5daa46c 100644 --- a/lib/nvme/nvme_pcie.c +++ b/lib/nvme/nvme_pcie.c @@ -498,6 +498,7 @@ nvme_pcie_ctrlr_allocate_bars(struct nvme_pcie_ctrlr *pctrlr) pctrlr->regs = (volatile struct spdk_nvme_registers *)addr; pctrlr->regs_size = size; + pctrlr->doorbell_base = (volatile uint32_t *)&pctrlr->regs->doorbell[0].sq_tdbl; nvme_pcie_ctrlr_map_cmb(pctrlr); return 0; diff --git a/lib/nvme/nvme_pcie_common.c b/lib/nvme/nvme_pcie_common.c index 2ebc9a688..fd97161d2 100644 --- a/lib/nvme/nvme_pcie_common.c +++ b/lib/nvme/nvme_pcie_common.c @@ -108,7 +108,6 @@ nvme_pcie_qpair_construct(struct spdk_nvme_qpair *qpair, struct nvme_pcie_qpair *pqpair = nvme_pcie_qpair(qpair); struct nvme_tracker *tr; uint16_t i; - volatile uint32_t *doorbell_base; uint16_t num_trackers; size_t page_align = sysconf(_SC_PAGESIZE); size_t queue_align, queue_len; @@ -204,9 +203,8 @@ nvme_pcie_qpair_construct(struct spdk_nvme_qpair *qpair, } } - doorbell_base = &pctrlr->regs->doorbell[0].sq_tdbl; - pqpair->sq_tdbl = doorbell_base + (2 * qpair->id + 0) * pctrlr->doorbell_stride_u32; - pqpair->cq_hdbl = doorbell_base + (2 * qpair->id + 1) * pctrlr->doorbell_stride_u32; + pqpair->sq_tdbl = pctrlr->doorbell_base + (2 * qpair->id + 0) * pctrlr->doorbell_stride_u32; + pqpair->cq_hdbl = pctrlr->doorbell_base + (2 * qpair->id + 1) * pctrlr->doorbell_stride_u32; /* * Reserve space for all of the trackers in a single allocation. diff --git a/lib/nvme/nvme_pcie_internal.h b/lib/nvme/nvme_pcie_internal.h index 217b2d6e2..01be5b330 100644 --- a/lib/nvme/nvme_pcie_internal.h +++ b/lib/nvme/nvme_pcie_internal.h @@ -83,6 +83,8 @@ struct nvme_pcie_ctrlr { /* Flag to indicate the MMIO register has been remapped */ bool is_remapped; + + volatile uint32_t *doorbell_base; }; struct nvme_tracker {