aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2013-10-25 06:33:26 -0400
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2013-10-25 06:33:26 -0400
commit783d0281043b9a1111d81d11ed0610b83d8857ed (patch)
tree1d838be8915a500134122baa5b7e16894ca5015b
parent6cf054636261ca5c88f3c2984058d51f927b8a2e (diff)
swiotlb: print a warning when the swiotlb is full
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Changes in v7: - use dev_warn instead of pr_warn.
-rw-r--r--drivers/xen/swiotlb-xen.c1
-rw-r--r--lib/swiotlb.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 4221cb52387d..4d50058d9630 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -542,6 +542,7 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
542 sg->length, 542 sg->length,
543 dir); 543 dir);
544 if (map == SWIOTLB_MAP_ERROR) { 544 if (map == SWIOTLB_MAP_ERROR) {
545 dev_warn(hwdev, "swiotlb buffer is full\n");
545 /* Don't panic here, we expect map_sg users 546 /* Don't panic here, we expect map_sg users
546 to do proper error handling. */ 547 to do proper error handling. */
547 xen_swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir, 548 xen_swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir,
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 4e8686c7e5a4..cdc051eaf667 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -502,6 +502,7 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev,
502 502
503not_found: 503not_found:
504 spin_unlock_irqrestore(&io_tlb_lock, flags); 504 spin_unlock_irqrestore(&io_tlb_lock, flags);
505 dev_warn(hwdev, "swiotlb buffer is full\n");
505 return SWIOTLB_MAP_ERROR; 506 return SWIOTLB_MAP_ERROR;
506found: 507found:
507 spin_unlock_irqrestore(&io_tlb_lock, flags); 508 spin_unlock_irqrestore(&io_tlb_lock, flags);