Commit d7637d01 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm 

Pull libnvdimm fixes from Dan Williams:

 - Two bug fixes for misuse of PAGE_MASK in scatterlist and dma-debug.
   These are tagged for -stable.  The scatterlist impact is potentially
  corrupted dma addresses on HIGHMEM enabled platforms.

 - A minor locking fix for the NFIT hot-add implementation that is new
   in 4.4-rc.  This would only trigger in the case a hot-add raced
   driver removal.

* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  dma-debug: Fix dma_debug_entry offset calculation
  Revert "scatterlist: use sg_phys()"
  nfit: acpi_nfit_notify(): Do not leave device locked
parents a5e90b1b 0354aec1

arch/arm/mm/dma-mapping.c

+1 −1
Original line number Diff line number Diff line
@@ -1521,7 +1521,7 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, 
		return -ENOMEM;



	for (count = 0, s = sg; count < (size >> PAGE_SHIFT); s = sg_next(s)) {

		phys_addr_t phys = sg_phys(s) & PAGE_MASK;

		phys_addr_t phys = page_to_phys(sg_page(s));

		unsigned int len = PAGE_ALIGN(s->offset + s->length);



		if (!is_coherent &&

arch/microblaze/kernel/dma.c

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, 
	/* FIXME this part of code is untested */

	for_each_sg(sgl, sg, nents, i) {

		sg->dma_address = sg_phys(sg);

		__dma_sync(sg_phys(sg), sg->length, direction);

		__dma_sync(page_to_phys(sg_page(sg)) + sg->offset,

							sg->length, direction);

	}



	return nents;

drivers/acpi/nfit.c

+1 −1
Original line number Diff line number Diff line
@@ -1810,7 +1810,7 @@ static void acpi_nfit_notify(struct acpi_device *adev, u32 event) 
	if (!dev->driver) {

		/* dev->driver may be null if we're being removed */

		dev_dbg(dev, "%s: no driver found for dev\n", __func__);

		return;

		goto out_unlock;

	}



	if (!acpi_desc) {

drivers/iommu/intel-iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -2159,7 +2159,7 @@ static int __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn, 
			sg_res = aligned_nrpages(sg->offset, sg->length);

			sg->dma_address = ((dma_addr_t)iov_pfn << VTD_PAGE_SHIFT) + sg->offset;

			sg->dma_length = sg->length;

			pteval = (sg_phys(sg) & PAGE_MASK) | prot;

			pteval = page_to_phys(sg_page(sg)) | prot;

			phys_pfn = pteval >> VTD_PAGE_SHIFT;

		}
@@ -3704,7 +3704,7 @@ static int intel_nontranslate_map_sg(struct device *hddev, 


	for_each_sg(sglist, sg, nelems, i) {

		BUG_ON(!sg_page(sg));

		sg->dma_address = sg_phys(sg);

		sg->dma_address = page_to_phys(sg_page(sg)) + sg->offset;

		sg->dma_length = sg->length;

	}

	return nelems;

drivers/iommu/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -1430,7 +1430,7 @@ size_t default_iommu_map_sg(struct iommu_domain *domain, unsigned long iova, 
	min_pagesz = 1 << __ffs(domain->ops->pgsize_bitmap);



	for_each_sg(sg, s, nents, i) {

		phys_addr_t phys = sg_phys(s);

		phys_addr_t phys = page_to_phys(sg_page(s)) + s->offset;



		/*

		 * We are mapping on IOMMU page boundaries, so offset within

CRA Git | Maintained and supported by SUSTech CRA and CCSE