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

Commit b31387a0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: io-pgtable-arm: Correctly update *size in map_sg"

parents 46d6cd8b e6704fab

drivers/iommu/io-pgtable-arm.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static int arm_lpae_map_sg(struct io_pgtable_ops *ops, unsigned long iova, 


	/* If no access, then nothing to do */

	if (!(iommu_prot & (IOMMU_READ | IOMMU_WRITE)))

		return 0;

		goto out_err;



	prot = arm_lpae_prot_to_pte(data, iommu_prot);

drivers/iommu/io-pgtable.h

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ struct io_pgtable_cfg { 
 * struct io_pgtable_ops - Page table manipulation API for IOMMU drivers.

 *

 * @map:          Map a physically contiguous memory region.

 * @map_sg:	  Map a scatterlist. The size parameter contains the size

 * @map_sg:	  Map a scatterlist.  Returns the number of bytes mapped,

 *		  or 0 on failure.  The size parameter contains the size

 *		  of the partial mapping in case of failure.

 * @unmap:        Unmap a physically contiguous memory region.

 * @iova_to_phys: Translate iova to physical address.