Commit 498859e3 authored by Luis Henriques's avatar Luis Henriques

Revert "powerpc: implement the DMA_ATTR_NO_WARN attribute"

BugLink: https://bugs.launchpad.net/bugs/1644596

This reverts commit 96530c8a.

The backports that fix bug #1633128 for xenial, in particular the backport
of upstream commit a9a62c93 ("dma-mapping: introduce the
DMA_ATTR_NO_WARN attribute"), introduce a regression.
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent a3d623dc
......@@ -479,8 +479,7 @@ int ppc_iommu_map_sg(struct device *dev, struct iommu_table *tbl,
/* Handle failure */
if (unlikely(entry == DMA_ERROR_CODE)) {
if (!(dma_get_attr(DMA_ATTR_NO_WARN, attrs)) &&
printk_ratelimit())
if (printk_ratelimit())
dev_info(dev, "iommu_alloc failed, tbl %p "
"vaddr %lx npages %lu\n", tbl, vaddr,
npages);
......@@ -777,8 +776,7 @@ dma_addr_t iommu_map_page(struct device *dev, struct iommu_table *tbl,
mask >> tbl->it_page_shift, align,
attrs);
if (dma_handle == DMA_ERROR_CODE) {
if (!(dma_get_attr(DMA_ATTR_NO_WARN, attrs)) &&
printk_ratelimit()) {
if (printk_ratelimit()) {
dev_info(dev, "iommu_alloc failed, tbl %p "
"vaddr %p npages %d\n", tbl, vaddr,
npages);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment