drm/lima: standardize debug messages by ip name

Some debug messages carried the ip name, or included "lima", or
included both the ip name and then the numbered ip name again.
Make the messages more consistent by always looking up and showing
the ip name first.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240124025947.2110659-9-nunes.erico@gmail.com

diff --git a/drivers/gpu/drm/lima/lima_gp.c b/drivers/gpu/drm/lima/lima_gp.c
index 4355fa7b17f48d8c40a5eadbe55822a4c97ee909..6b354e2fb61d43438becf1483ab71ac16bf8dbed 100644 (file)
--- a/drivers/gpu/drm/lima/lima_gp.c
+++ b/drivers/gpu/drm/lima/lima_gp.c
@@ -34,11 +34,11 @@ static irqreturn_t lima_gp_irq_handler(int irq, void *data)
        if (state & LIMA_GP_IRQ_MASK_ERROR) {
                if ((state & LIMA_GP_IRQ_MASK_ERROR) ==
                    LIMA_GP_IRQ_PLBU_OUT_OF_MEM) {
-                       dev_dbg(dev->dev, "gp out of heap irq status=%x\n",
-                               status);
+                       dev_dbg(dev->dev, "%s out of heap irq status=%x\n",
+                               lima_ip_name(ip), status);
                } else {
-                       dev_err(dev->dev, "gp error irq state=%x status=%x\n",
-                               state, status);
+                       dev_err(dev->dev, "%s error irq state=%x status=%x\n",
+                               lima_ip_name(ip), state, status);
                        if (task)
                                task->recoverable = false;
                }
@@ -89,7 +89,8 @@ static int lima_gp_soft_reset_async_wait(struct lima_ip *ip)
                                 v & LIMA_GP_IRQ_RESET_COMPLETED,
                                 0, 100);
        if (err) {
-               dev_err(dev->dev, "gp soft reset time out\n");
+               dev_err(dev->dev, "%s soft reset time out\n",
+                       lima_ip_name(ip));
                return err;
        }
 
@@ -194,7 +195,7 @@ static int lima_gp_hard_reset(struct lima_ip *ip)
        gp_write(LIMA_GP_CMD, LIMA_GP_CMD_RESET);
        ret = lima_poll_timeout(ip, lima_gp_hard_reset_poll, 10, 100);
        if (ret) {
-               dev_err(dev->dev, "gp hard reset timeout\n");
+               dev_err(dev->dev, "%s hard reset timeout\n", lima_ip_name(ip));
                return ret;
        }
 
@@ -220,8 +221,9 @@ static void lima_gp_task_error(struct lima_sched_pipe *pipe)
 {
        struct lima_ip *ip = pipe->processor[0];
 
-       dev_err(ip->dev->dev, "gp task error int_state=%x status=%x\n",
-               gp_read(LIMA_GP_INT_STAT), gp_read(LIMA_GP_STATUS));
+       dev_err(ip->dev->dev, "%s task error int_state=%x status=%x\n",
+               lima_ip_name(ip), gp_read(LIMA_GP_INT_STAT),
+               gp_read(LIMA_GP_STATUS));
 
        lima_gp_hard_reset(ip);
 }
@@ -324,7 +326,7 @@ int lima_gp_init(struct lima_ip *ip)
        err = devm_request_irq(dev->dev, ip->irq, lima_gp_irq_handler,
                               IRQF_SHARED, lima_ip_name(ip), ip);
        if (err) {
-               dev_err(dev->dev, "gp %s fail to request irq\n",
+               dev_err(dev->dev, "%s fail to request irq\n",
                        lima_ip_name(ip));
                return err;
        }

diff --git a/drivers/gpu/drm/lima/lima_l2_cache.c b/drivers/gpu/drm/lima/lima_l2_cache.c
index c4080a02957ba808307d31190babae70ed116aa1..184106ce55f8cd01c62a731fc88c18a8fe2cdf31 100644 (file)
--- a/drivers/gpu/drm/lima/lima_l2_cache.c
+++ b/drivers/gpu/drm/lima/lima_l2_cache.c
@@ -21,7 +21,8 @@ static int lima_l2_cache_wait_idle(struct lima_ip *ip)
                                 !(v & LIMA_L2_CACHE_STATUS_COMMAND_BUSY),
                                 0, 1000);
        if (err) {
-               dev_err(dev->dev, "l2 cache wait command timeout\n");
+               dev_err(dev->dev, "%s wait command timeout\n",
+                       lima_ip_name(ip));
                return err;
        }
        return 0;
@@ -83,7 +84,8 @@ int lima_l2_cache_init(struct lima_ip *ip)
        spin_lock_init(&ip->data.lock);
 
        size = l2_cache_read(LIMA_L2_CACHE_SIZE);
-       dev_info(dev->dev, "l2 cache %uK, %u-way, %ubyte cache line, %ubit external bus\n",
+       dev_info(dev->dev, "%s %uK, %u-way, %ubyte cache line, %ubit external bus\n",
+                lima_ip_name(ip),
                 1 << (((size >> 16) & 0xff) - 10),
                 1 << ((size >> 8) & 0xff),
                 1 << (size & 0xff),

diff --git a/drivers/gpu/drm/lima/lima_mmu.c b/drivers/gpu/drm/lima/lima_mmu.c
index a1ae6c252dc2b546bad5f12226cad197ff006808..e18317c5ca8c19eafc32f8b4e4950f5a7d414a3d 100644 (file)
--- a/drivers/gpu/drm/lima/lima_mmu.c
+++ b/drivers/gpu/drm/lima/lima_mmu.c
@@ -22,7 +22,8 @@
                                  cond, 0, 100);             \
        if (__ret)                                           \
                dev_err(dev->dev,                            \
-                       "mmu command %x timeout\n", cmd);    \
+                       "%s command %x timeout\n",           \
+                       lima_ip_name(ip), cmd);              \
        __ret;                                               \
 })
 
@@ -40,14 +41,13 @@ static irqreturn_t lima_mmu_irq_handler(int irq, void *data)
        if (status & LIMA_MMU_INT_PAGE_FAULT) {
                u32 fault = mmu_read(LIMA_MMU_PAGE_FAULT_ADDR);
 
-               dev_err(dev->dev, "mmu page fault at 0x%x from bus id %d of type %s on %s\n",
-                       fault, LIMA_MMU_STATUS_BUS_ID(status),
-                       status & LIMA_MMU_STATUS_PAGE_FAULT_IS_WRITE ? "write" : "read",
-                       lima_ip_name(ip));
+               dev_err(dev->dev, "%s page fault at 0x%x from bus id %d of type %s\n",
+                       lima_ip_name(ip), fault, LIMA_MMU_STATUS_BUS_ID(status),
+                       status & LIMA_MMU_STATUS_PAGE_FAULT_IS_WRITE ? "write" : "read");
        }
 
        if (status & LIMA_MMU_INT_READ_BUS_ERROR)
-               dev_err(dev->dev, "mmu %s irq bus error\n", lima_ip_name(ip));
+               dev_err(dev->dev, "%s irq bus error\n", lima_ip_name(ip));
 
        /* mask all interrupts before resume */
        mmu_write(LIMA_MMU_INT_MASK, 0);
@@ -102,14 +102,14 @@ int lima_mmu_init(struct lima_ip *ip)
 
        mmu_write(LIMA_MMU_DTE_ADDR, 0xCAFEBABE);
        if (mmu_read(LIMA_MMU_DTE_ADDR) != 0xCAFEB000) {
-               dev_err(dev->dev, "mmu %s dte write test fail\n", lima_ip_name(ip));
+               dev_err(dev->dev, "%s dte write test fail\n", lima_ip_name(ip));
                return -EIO;
        }
 
        err = devm_request_irq(dev->dev, ip->irq, lima_mmu_irq_handler,
                               IRQF_SHARED, lima_ip_name(ip), ip);
        if (err) {
-               dev_err(dev->dev, "mmu %s fail to request irq\n", lima_ip_name(ip));
+               dev_err(dev->dev, "%s fail to request irq\n", lima_ip_name(ip));
                return err;
        }
 
@@ -152,7 +152,7 @@ void lima_mmu_page_fault_resume(struct lima_ip *ip)
        u32 v;
 
        if (status & LIMA_MMU_STATUS_PAGE_FAULT_ACTIVE) {
-               dev_info(dev->dev, "mmu resume\n");
+               dev_info(dev->dev, "%s resume\n", lima_ip_name(ip));
 
                mmu_write(LIMA_MMU_INT_MASK, 0);
                mmu_write(LIMA_MMU_DTE_ADDR, 0xCAFEBABE);

diff --git a/drivers/gpu/drm/lima/lima_pmu.c b/drivers/gpu/drm/lima/lima_pmu.c
index e397e1146e96314808b4964576fc419988b11053..113cb9b215cd4678bf45367110de849041b6dd75 100644 (file)
--- a/drivers/gpu/drm/lima/lima_pmu.c
+++ b/drivers/gpu/drm/lima/lima_pmu.c
@@ -21,7 +21,8 @@ static int lima_pmu_wait_cmd(struct lima_ip *ip)
                                 v, v & LIMA_PMU_INT_CMD_MASK,
                                 100, 100000);
        if (err) {
-               dev_err(dev->dev, "timeout wait pmu cmd\n");
+               dev_err(dev->dev, "%s timeout wait pmu cmd\n",
+                       lima_ip_name(ip));
                return err;
        }
 

diff --git a/drivers/gpu/drm/lima/lima_pp.c b/drivers/gpu/drm/lima/lima_pp.c
index ac097dd75072f2b73aad470100cc96676b685056..d0d2db0ef1ce8060e704d7d0ab2a6637f7750f4f 100644 (file)
--- a/drivers/gpu/drm/lima/lima_pp.c
+++ b/drivers/gpu/drm/lima/lima_pp.c
@@ -26,8 +26,8 @@ static void lima_pp_handle_irq(struct lima_ip *ip, u32 state)
        if (state & LIMA_PP_IRQ_MASK_ERROR) {
                u32 status = pp_read(LIMA_PP_STATUS);
 
-               dev_err(dev->dev, "pp error irq state=%x status=%x\n",
-                       state, status);
+               dev_err(dev->dev, "%s error irq state=%x status=%x\n",
+                       lima_ip_name(ip), state, status);
 
                pipe->error = true;
 
@@ -125,7 +125,7 @@ static int lima_pp_soft_reset_async_wait_one(struct lima_ip *ip)
 
        ret = lima_poll_timeout(ip, lima_pp_soft_reset_poll, 0, 100);
        if (ret) {
-               dev_err(dev->dev, "pp %s reset time out\n", lima_ip_name(ip));
+               dev_err(dev->dev, "%s reset time out\n", lima_ip_name(ip));
                return ret;
        }
 
@@ -190,14 +190,14 @@ static int lima_pp_hard_reset(struct lima_ip *ip)
        pp_write(LIMA_PP_CTRL, LIMA_PP_CTRL_STOP_BUS);
        ret = lima_poll_timeout(ip, lima_pp_bus_stop_poll, 10, 100);
        if (ret) {
-               dev_err(dev->dev, "pp %s bus stop timeout\n", lima_ip_name(ip));
+               dev_err(dev->dev, "%s bus stop timeout\n", lima_ip_name(ip));
                return ret;
        }
 
        pp_write(LIMA_PP_CTRL, LIMA_PP_CTRL_FORCE_RESET);
        ret = lima_poll_timeout(ip, lima_pp_hard_reset_poll, 10, 100);
        if (ret) {
-               dev_err(dev->dev, "pp hard reset timeout\n");
+               dev_err(dev->dev, "%s hard reset timeout\n", lima_ip_name(ip));
                return ret;
        }
 
@@ -274,7 +274,7 @@ int lima_pp_init(struct lima_ip *ip)
        err = devm_request_irq(dev->dev, ip->irq, lima_pp_irq_handler,
                               IRQF_SHARED, lima_ip_name(ip), ip);
        if (err) {
-               dev_err(dev->dev, "pp %s fail to request irq\n",
+               dev_err(dev->dev, "%s fail to request irq\n",
                        lima_ip_name(ip));
                return err;
        }
@@ -309,7 +309,7 @@ int lima_pp_bcast_init(struct lima_ip *ip)
        err = devm_request_irq(dev->dev, ip->irq, lima_pp_bcast_irq_handler,
                               IRQF_SHARED, lima_ip_name(ip), ip);
        if (err) {
-               dev_err(dev->dev, "pp %s fail to request irq\n",
+               dev_err(dev->dev, "%s fail to request irq\n",
                        lima_ip_name(ip));
                return err;
        }
@@ -423,8 +423,9 @@ static void lima_pp_task_error(struct lima_sched_pipe *pipe)
        for (i = 0; i < pipe->num_processor; i++) {
                struct lima_ip *ip = pipe->processor[i];
 
-               dev_err(ip->dev->dev, "pp task error %d int_state=%x status=%x\n",
-                       i, pp_read(LIMA_PP_INT_STATUS), pp_read(LIMA_PP_STATUS));
+               dev_err(ip->dev->dev, "%s task error %d int_state=%x status=%x\n",
+                       lima_ip_name(ip), i, pp_read(LIMA_PP_INT_STATUS),
+                       pp_read(LIMA_PP_STATUS));
 
                lima_pp_hard_reset(ip);
        }