Commit 97a18f54 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Revert "iommu/amd: Flush not present cache in iommu_map_page" 



This reverts commit 1a107901.

This commit caused a NULL-ptr deference bug and must be
reverted for now.

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 89736a0e

drivers/iommu/amd_iommu.c

+4 −15
Original line number Diff line number Diff line
@@ -1307,16 +1307,6 @@ static void domain_flush_complete(struct protection_domain *domain) 
	}

}



/* Flush the not present cache if it exists */

static void domain_flush_np_cache(struct protection_domain *domain,

		dma_addr_t iova, size_t size)

{

	if (unlikely(amd_iommu_np_cache)) {

		domain_flush_pages(domain, iova, size);

		domain_flush_complete(domain);

	}

}





/*

 * This function flushes the DTEs for all devices in domain
@@ -2399,7 +2389,10 @@ static dma_addr_t __map_single(struct device *dev, 
	}

	address += offset;



	domain_flush_np_cache(&dma_dom->domain, address, size);

	if (unlikely(amd_iommu_np_cache)) {

		domain_flush_pages(&dma_dom->domain, address, size);

		domain_flush_complete(&dma_dom->domain);

	}



out:

	return address;
@@ -2578,8 +2571,6 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, 
		s->dma_length   = s->length;

	}



	domain_flush_np_cache(domain, s->dma_address, s->dma_length);



	return nelems;



out_unmap:
@@ -3060,8 +3051,6 @@ static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova, 
	ret = iommu_map_page(domain, iova, paddr, page_size, prot, GFP_KERNEL);

	mutex_unlock(&domain->api_lock);



	domain_flush_np_cache(domain, iova, page_size);



	return ret;

}