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

Commit 2e6c6a86 authored by Jerry Snitselaar's avatar Jerry Snitselaar Committed by Joerg Roedel
Browse files

iommu/amd: Print reason for iommu_map_page failure in map_sg 



Since there are multiple possible failures in iommu_map_page
it would be useful to know which case is being hit when the
error message is printed in map_sg. While here, fix up checkpatch
complaint about using function name in a string instead of
__func__.

Cc: Joerg Roedel <joro@8bytes.org>
Signed-off-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent f17b5f06

drivers/iommu/amd_iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -2562,6 +2562,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, 
	struct scatterlist *s;

	unsigned long address;

	u64 dma_mask;

	int ret;



	domain = get_domain(dev);

	if (IS_ERR(domain))
@@ -2584,7 +2585,6 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, 


		for (j = 0; j < pages; ++j) {

			unsigned long bus_addr, phys_addr;

			int ret;



			bus_addr  = address + s->dma_address + (j << PAGE_SHIFT);

			phys_addr = (sg_phys(s) & PAGE_MASK) + (j << PAGE_SHIFT);
@@ -2605,8 +2605,8 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, 
	return nelems;



out_unmap:

	pr_err("%s: IOMMU mapping error in map_sg (io-pages: %d)\n",

	       dev_name(dev), npages);

	pr_err("%s: IOMMU mapping error in %s (io-pages: %d) reason: %d\n",

	       dev_name(dev), __func__, npages, ret);



	for_each_sg(sglist, s, nelems, i) {

		int j, pages = iommu_num_pages(sg_phys(s), s->length, PAGE_SIZE);