Commit 349895a2 authored by Changpeng Liu's avatar Changpeng Liu Committed by Jim Harris
Browse files

nvme/pcie: set doorbell base when allocating the bar 



Change-Id: Id40f03f1bc4e90113dad6326dbeb9a7b5af5c1b1
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5960


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatar <dongx.yi@intel.com>
parent 6b4b2d29

lib/nvme/nvme_pcie.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

lib/nvme/nvme_pcie_common.c

+2 −4
Original line number Diff line number Diff line
@@ -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.

lib/nvme/nvme_pcie_internal.h

+2 −0
Original line number Diff line number Diff line
@@ -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 {