GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-06 14:48:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

powerpc: iommu: Add device name to iommu error printks

Browse source 
Right now its difficult to see which device is running out of iommu space:

iommu_alloc failed, tbl c00000076e096660 vaddr c000000768806600 npages 1

Use dev_info() so we get the device name and location:

ipr 0000:00:01.0: iommu_alloc failed, tbl c00000076e096660 vaddr c000000768806600 npages 1

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Anton Blanchard 2010-12-07 14:36:05 +00:00 • committed by Benjamin Herrenschmidt
parent 7a9d12568e
commit 4dfa9c4748
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/powerpc/kernel/iommu.c
View file

@ -311,8 +311,9 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl,
/* Handle failure */ /* Handle failure */
if (unlikely(entry == DMA_ERROR_CODE)) { if (unlikely(entry == DMA_ERROR_CODE)) {
if (printk_ratelimit()) if (printk_ratelimit())
printk(KERN_INFO "iommu_alloc failed, tbl %p vaddr %lx" dev_info(dev, "iommu_alloc failed, tbl %p "
" npages %lx\n", tbl, vaddr, npages); "vaddr %lx npages %lu\n", tbl, vaddr,
npages);
goto failure; goto failure;
} }
@ -579,9 +580,9 @@ dma_addr_t iommu_map_page(struct device *dev, struct iommu_table *tbl,
attrs); attrs);
if (dma_handle == DMA_ERROR_CODE) { if (dma_handle == DMA_ERROR_CODE) {
if (printk_ratelimit()) { if (printk_ratelimit()) {
printk(KERN_INFO "iommu_alloc failed, " dev_info(dev, "iommu_alloc failed, tbl %p "
"tbl %p vaddr %p npages %d\n", "vaddr %p npages %d\n", tbl, vaddr,
tbl, vaddr, npages); npages);
} }
} else } else
dma_handle |= (uaddr & ~IOMMU_PAGE_MASK); dma_handle |= (uaddr & ~IOMMU_PAGE_MASK);
@ -627,7 +628,8 @@ void *iommu_alloc_coherent(struct device *dev, struct iommu_table *tbl,
* the tce tables. * the tce tables.
*/ */
if (order >= IOMAP_MAX_ORDER) { if (order >= IOMAP_MAX_ORDER) {
printk("iommu_alloc_consistent size too large: 0x%lx\n", size); dev_info(dev, "iommu_alloc_consistent size too large: 0x%lx\n",
size);
return NULL; return NULL;
} }