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

Commit 15aedea4 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Joerg Roedel
Browse files

dma-debug: use sg_dma_address accessor instead of using dma_address directly 



Architectures might not have dma_address in struct scatterlist (PARISC
doesn't). Directly accessing to dma_address in struct scatterlist is
wrong; we need to use sg_dma_address() accesssor instead.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent ed888aef

lib/dma-debug.c

+6 −6
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg, 
		entry->dev            = dev;

		entry->paddr          = sg_phys(s);

		entry->size           = s->length;

		entry->dev_addr       = s->dma_address;

		entry->dev_addr       = sg_dma_address(s);

		entry->direction      = direction;

		entry->sg_call_ents   = nents;

		entry->sg_mapped_ents = mapped_ents;
@@ -872,7 +872,7 @@ void debug_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, 
			.type           = dma_debug_sg,

			.dev            = dev,

			.paddr          = sg_phys(s),

			.dev_addr       = s->dma_address,

			.dev_addr       = sg_dma_address(s),

			.size           = s->length,

			.direction      = dir,

			.sg_call_ents   = 0,
@@ -996,7 +996,7 @@ void debug_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, 
		return;



	for_each_sg(sg, s, nelems, i) {

		check_sync(dev, s->dma_address, s->dma_length, 0,

		check_sync(dev, sg_dma_address(s), s->dma_length, 0,

			   direction, true);

	}

}
@@ -1012,7 +1012,7 @@ void debug_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, 
		return;



	for_each_sg(sg, s, nelems, i) {

		check_sync(dev, s->dma_address, s->dma_length, 0,

		check_sync(dev, sg_dma_address(s), s->dma_length, 0,

			   direction, false);

	}

}