github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: saa7146: use sg_dma_len when building pgtable

Browse Source 
[ Upstream commit e56429b09d ]

The new AMD IOMMU DMA implementation concatenates sglist entries under
certain conditions, and because saa7146 accessed the length member
directly, it did not support this scenario.

This fixes IO_PAGE_FAULTs by using the sg_dma_len macro.

Fixes: be62dbf554 ("iommu/amd: Convert AMD iommu driver to the dma-iommu api")
Signed-off-by: Tasos Sahanidis <tasos@tasossah.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Tasos Sahanidis 2021-03-03 19:52:53 +01:00 committed by Greg Kroah-Hartman
parent a250df336a
commit 3ad6a6288c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/common/saa7146/saa7146_core.c
View File

@ -253,7 +253,7 @@ int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt
i, sg_dma_address(list), sg_dma_len(list), i, sg_dma_address(list), sg_dma_len(list),
list->offset); list->offset);
*/ */
for (p = 0; p * 4096 < list->length; p++, ptr++) { for (p = 0; p * 4096 < sg_dma_len(list); p++, ptr++) {
*ptr = cpu_to_le32(sg_dma_address(list) + p * 4096); *ptr = cpu_to_le32(sg_dma_address(list) + p * 4096);
nr_pages++; nr_pages++;
} }

3
drivers/media/common/saa7146/saa7146_video.c
View File

@ -247,9 +247,8 @@ static int saa7146_pgtable_build(struct saa7146_dev *dev, struct saa7146_buf *bu
/* walk all pages, copy all page addresses to ptr1 */ /* walk all pages, copy all page addresses to ptr1 */
for (i = 0; i < length; i++, list++) { for (i = 0; i < length; i++, list++) {
for (p = 0; p * 4096 < list->length; p++, ptr1++) { for (p = 0; p * 4096 < sg_dma_len(list); p++, ptr1++)
*ptr1 = cpu_to_le32(sg_dma_address(list) - list->offset); *ptr1 = cpu_to_le32(sg_dma_address(list) - list->offset);
}
} }
/* /*
ptr1 = pt1->cpu; ptr1 = pt1->cpu;