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

Commit 4f572efd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-4.18-3' of git://git.infradead.org/users/hch/dma-mapping 

Pull dma-mapping fix from Christoph Hellwig:
 "Revert an incorrect dma-mapping commit for 4.18-rc"

* tag 'dma-mapping-4.18-3' of git://git.infradead.org/users/hch/dma-mapping:
  Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()"
parents 89ac2233 7ec916f8

drivers/iommu/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -142,7 +142,6 @@ config DMAR_TABLE 
config INTEL_IOMMU

config INTEL_IOMMU

	bool "Support for Intel IOMMU using DMA Remapping Devices"

	bool "Support for Intel IOMMU using DMA Remapping Devices"

	depends on PCI_MSI && ACPI && (X86 || IA64_GENERIC)

	depends on PCI_MSI && ACPI && (X86 || IA64_GENERIC)

	select DMA_DIRECT_OPS

	select IOMMU_API

	select IOMMU_API

	select IOMMU_IOVA

	select IOMMU_IOVA

	select NEED_DMA_MAP_STATE

	select NEED_DMA_MAP_STATE

drivers/iommu/intel-iommu.c

+46 −16
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/dmar.h>

#include <linux/dmar.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/dma-direct.h>

#include <linux/mempool.h>

#include <linux/mempool.h>

#include <linux/memory.h>

#include <linux/memory.h>

#include <linux/cpu.h>

#include <linux/cpu.h>
@@ -3713,30 +3712,61 @@ static void *intel_alloc_coherent(struct device *dev, size_t size, 
				  dma_addr_t *dma_handle, gfp_t flags,

				  dma_addr_t *dma_handle, gfp_t flags,

				  unsigned long attrs)

				  unsigned long attrs)

{

{

	void *vaddr;

	struct page *page = NULL;

	int order;





	vaddr = dma_direct_alloc(dev, size, dma_handle, flags, attrs);

	size = PAGE_ALIGN(size);

	if (iommu_no_mapping(dev) || !vaddr)

	order = get_order(size);

		return vaddr;



	if (!iommu_no_mapping(dev))

		flags &= ~(GFP_DMA | GFP_DMA32);

	else if (dev->coherent_dma_mask < dma_get_required_mask(dev)) {

		if (dev->coherent_dma_mask < DMA_BIT_MASK(32))

			flags |= GFP_DMA;

		else

			flags |= GFP_DMA32;

	}



	if (gfpflags_allow_blocking(flags)) {

		unsigned int count = size >> PAGE_SHIFT;



		page = dma_alloc_from_contiguous(dev, count, order, flags);

		if (page && iommu_no_mapping(dev) &&

		    page_to_phys(page) + size > dev->coherent_dma_mask) {

			dma_release_from_contiguous(dev, page, count);

			page = NULL;

		}

	}



	if (!page)

		page = alloc_pages(flags, order);

	if (!page)

		return NULL;

	memset(page_address(page), 0, size);





	*dma_handle = __intel_map_single(dev, virt_to_phys(vaddr),

	*dma_handle = __intel_map_single(dev, page_to_phys(page), size,

			PAGE_ALIGN(size), DMA_BIDIRECTIONAL,

					 DMA_BIDIRECTIONAL,

					 dev->coherent_dma_mask);

					 dev->coherent_dma_mask);

	if (!*dma_handle)

	if (*dma_handle)

		goto out_free_pages;

		return page_address(page);

	return vaddr;

	if (!dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT))

		__free_pages(page, order);





out_free_pages:

	dma_direct_free(dev, size, vaddr, *dma_handle, attrs);

	return NULL;

	return NULL;

}

}





static void intel_free_coherent(struct device *dev, size_t size, void *vaddr,

static void intel_free_coherent(struct device *dev, size_t size, void *vaddr,

				dma_addr_t dma_handle, unsigned long attrs)

				dma_addr_t dma_handle, unsigned long attrs)

{

{

	if (!iommu_no_mapping(dev))

	int order;

		intel_unmap(dev, dma_handle, PAGE_ALIGN(size));

	struct page *page = virt_to_page(vaddr);

	dma_direct_free(dev, size, vaddr, dma_handle, attrs);



	size = PAGE_ALIGN(size);

	order = get_order(size);



	intel_unmap(dev, dma_handle, size);

	if (!dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT))

		__free_pages(page, order);

}

}





static void intel_unmap_sg(struct device *dev, struct scatterlist *sglist,

static void intel_unmap_sg(struct device *dev, struct scatterlist *sglist,