mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
lib/swiotlb.c: Fix strange panic message selection logic when swiotlb fills up
swiotlb_full() in lib/swiotlb.c throws one of two panic messages based on whether the direction of transfer is from the device or to the device. The logic around this is somewhat weird in the case of bidirectional transfers. It appears to want to throw both in succession, but since its a panic only the first makes it. This patch adds a third, separate error for DMA_BIDIRECTIONAL to make things a bit clearer. Signed-off-by: Casey Dahlin <[email protected]> Cc: FUJITA Tomonori <[email protected]> Cc: Becky Bruce <[email protected]> [ further fixed the error message ] Signed-off-by: Andrew Morton <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
parent
451d7400a3
commit
c7084b35eb
1 changed files with 9 additions and 6 deletions
|
|
@ -581,12 +581,15 @@ swiotlb_full(struct device *dev, size_t size, int dir, int do_panic)
|
|||
printk(KERN_ERR "DMA: Out of SW-IOMMU space for %zu bytes at "
|
||||
"device %s\n", size, dev ? dev_name(dev) : "?");
|
||||
|
||||
if (size > io_tlb_overflow && do_panic) {
|
||||
if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)
|
||||
panic("DMA: Memory would be corrupted\n");
|
||||
if (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL)
|
||||
panic("DMA: Random memory would be DMAed\n");
|
||||
}
|
||||
if (size <= io_tlb_overflow || !do_panic)
|
||||
return;
|
||||
|
||||
if (dir == DMA_BIDIRECTIONAL)
|
||||
panic("DMA: Random memory could be DMA accessed\n");
|
||||
if (dir == DMA_FROM_DEVICE)
|
||||
panic("DMA: Random memory could be DMA written\n");
|
||||
if (dir == DMA_TO_DEVICE)
|
||||
panic("DMA: Random memory could be DMA read\n");
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue