Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90ad1dc9 authored by Liviu Dudau's avatar Liviu Dudau Committed by Greg Kroah-Hartman
Browse files

nvme-pci: use the same attributes when freeing host_mem_desc_bufs. 



[ Upstream commit cc667f6d5de023ee131e96bb88e5cddca23272bd ]

When using HMB the PCIe host driver allocates host_mem_desc_bufs using
dma_alloc_attrs() but frees them using dma_free_coherent(). Use the
correct dma_free_attrs() function to free the buffers.

Signed-off-by: default avatarLiviu Dudau <liviu@dudau.co.uk>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a928c675

drivers/nvme/host/pci.c

+6 −4
Original line number Diff line number Diff line
@@ -1624,8 +1624,9 @@ static void nvme_free_host_mem(struct nvme_dev *dev) 
		struct nvme_host_mem_buf_desc *desc = &dev->host_mem_descs[i];

		size_t size = le32_to_cpu(desc->size) * dev->ctrl.page_size;



		dma_free_coherent(dev->dev, size, dev->host_mem_desc_bufs[i],

				le64_to_cpu(desc->addr));

		dma_free_attrs(dev->dev, size, dev->host_mem_desc_bufs[i],

			       le64_to_cpu(desc->addr),

			       DMA_ATTR_NO_KERNEL_MAPPING | DMA_ATTR_NO_WARN);

	}



	kfree(dev->host_mem_desc_bufs);
@@ -1691,8 +1692,9 @@ static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred, 
	while (--i >= 0) {

		size_t size = le32_to_cpu(descs[i].size) * dev->ctrl.page_size;



		dma_free_coherent(dev->dev, size, bufs[i],

				le64_to_cpu(descs[i].addr));

		dma_free_attrs(dev->dev, size, bufs[i],

			       le64_to_cpu(descs[i].addr),

			       DMA_ATTR_NO_KERNEL_MAPPING | DMA_ATTR_NO_WARN);

	}



	kfree(bufs);