Commit eb281c82 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Jens Axboe
Browse files

nvme-pci: Introduce nvme_ring_cq_doorbell 



Nice abstraction of the actual mechanics of how to do it.
Note the change that we call it after we assign nvmeq->cq_head
to avoid passing it.

Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5657cb07

drivers/nvme/host/pci.c

+13 −4
Original line number Diff line number Diff line
@@ -730,6 +730,17 @@ static inline bool nvme_cqe_valid(struct nvme_queue *nvmeq, u16 head, 
	return (le16_to_cpu(nvmeq->cqes[head].status) & 1) == phase;

}



static inline void nvme_ring_cq_doorbell(struct nvme_queue *nvmeq)

{

	u16 head = nvmeq->cq_head;



	if (likely(nvmeq->cq_vector >= 0)) {

		if (nvme_dbbuf_update_and_check_event(head, nvmeq->dbbuf_cq_db,

						      nvmeq->dbbuf_cq_ei))

			writel(head, nvmeq->q_db + nvmeq->dev->db_stride);

	}

}



static void __nvme_process_cq(struct nvme_queue *nvmeq, unsigned int *tag)

{

	u16 head, phase;
@@ -776,13 +787,11 @@ static void __nvme_process_cq(struct nvme_queue *nvmeq, unsigned int *tag) 
	if (head == nvmeq->cq_head && phase == nvmeq->cq_phase)

		return;



	if (likely(nvmeq->cq_vector >= 0))

		if (nvme_dbbuf_update_and_check_event(head, nvmeq->dbbuf_cq_db,

						      nvmeq->dbbuf_cq_ei))

			writel(head, nvmeq->q_db + nvmeq->dev->db_stride);

	nvmeq->cq_head = head;

	nvmeq->cq_phase = phase;



	nvme_ring_cq_doorbell(nvmeq);



	nvmeq->cqe_seen = 1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE