[PATCH v11 27/27] iommu/exynos: enhanced error messages

[Cho KyongHo]

Some redundant error message is removed and some error messages
are changed to error level from debug level.

Signed-off-by: Cho KyongHo <pullip....@samsung.com>
---
 drivers/iommu/exynos-iommu.c |   23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 4888383..b7f7731 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1012,7 +1012,7 @@ static void exynos_iommu_detach_device(struct 
iommu_domain *domain,
                dev_dbg(dev, "%s: Detached IOMMU with pgtable %pa\n",
                                        __func__, &pgtable);
        } else {
-               dev_dbg(dev, "%s: No IOMMU is attached\n", __func__);
+               dev_err(dev, "%s: No IOMMU is attached\n", __func__);
        }
 }
 
@@ -1112,10 +1112,8 @@ static int lv2set_page(sysmmu_pte_t *pent, phys_addr_t 
paddr, size_t size,
                                                                short *pgcnt)
 {
        if (size == SPAGE_SIZE) {
-               if (!lv2ent_fault(pent)) {
-                       WARN(1, "Trying mapping on 4KiB where mapping exists");
+               if (WARN_ON(!lv2ent_fault(pent)))
                        return -EADDRINUSE;
-               }
 
                *pent = mk_lv2ent_spage(paddr);
                pgtable_flush(pent, pent + 1);
@@ -1123,9 +1121,7 @@ static int lv2set_page(sysmmu_pte_t *pent, phys_addr_t 
paddr, size_t size,
        } else { /* size == LPAGE_SIZE */
                int i;
                for (i = 0; i < SPAGES_PER_LPAGE; i++, pent++) {
-                       if (!lv2ent_fault(pent)) {
-                               WARN(1,
-                               "Trying mapping on 64KiB where mapping exists");
+                       if (WARN_ON(!lv2ent_fault(pent))) {
                                if (i > 0)
                                        memset(pent - i, 0, sizeof(*pent) * i);
                                return -EADDRINUSE;
@@ -1198,8 +1194,8 @@ static int exynos_iommu_map(struct iommu_domain *domain, 
unsigned long l_iova,
        }
 
        if (ret)
-               pr_debug("%s: Failed to map iova %#x/%#zx bytes\n",
-                                                       __func__, iova, size);
+               pr_err("%s: Failed(%d) to map %#zx bytes @ %#x\n",
+                       __func__, ret, size, iova);
 
        spin_unlock_irqrestore(&priv->pgtablelock, flags);
 
@@ -1236,7 +1232,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
        ent = section_entry(priv->pgtable, iova);
 
        if (lv1ent_section(ent)) {
-               if (size < SECT_SIZE) {
+               if (WARN_ON(size < SECT_SIZE)) {
                        err_pgsize = SECT_SIZE;
                        goto err;
                }
@@ -1271,7 +1267,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
        }
 
        /* lv1ent_large(ent) == true here */
-       if (size < LPAGE_SIZE) {
+       if (WARN_ON(size < LPAGE_SIZE)) {
                err_pgsize = LPAGE_SIZE;
                goto err;
        }
@@ -1290,9 +1286,8 @@ done:
 err:
        spin_unlock_irqrestore(&priv->pgtablelock, flags);
 
-       WARN(1,
-       "%s: Failed due to size(%#zx) @ %#x is smaller than page size %#zx\n",
-       __func__, size, iova, err_pgsize);
+       pr_err("%s: Failed: size(%#zx) @ %#x is smaller than page size %#zx\n",
+               __func__, size, iova, err_pgsize);
 
        return 0;
 }
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/