Commit 39489553 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-5.7' of git://git.infradead.org/nvme into block-5.7 

Pull NVMe fix from Christoph.

* 'nvme-5.7' of git://git.infradead.org/nvme:
  nvme-pci: dma read memory barrier for completions
parents 59c7c3ca b69e2ef2

drivers/nvme/host/pci.c

+5 −0
Original line number Diff line number Diff line
@@ -989,6 +989,11 @@ static inline int nvme_process_cq(struct nvme_queue *nvmeq) 


	while (nvme_cqe_pending(nvmeq)) {

		found++;

		/*

		 * load-load control dependency between phase and the rest of

		 * the cqe requires a full read memory barrier

		 */

		dma_rmb();

		nvme_handle_cqe(nvmeq, nvmeq->cq_head);

		nvme_update_cq_head(nvmeq);

	}