accel/ivpu: Rename VPU to NPU in message strings

VPU was renamed to NPU but due to large overhead of renaming
all the sources only user visible messages are being updated.

Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240214081305.290108-9-jacek.lawrynowicz@linux.intel.com

diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c
index a0461e3caeeccc44b3e90748b99edfe4bcbc4c31..3f2439117582c1278aa1e74af015f5159707ed97 100644 (file)
--- a/drivers/accel/ivpu/ivpu_drv.c
+++ b/drivers/accel/ivpu/ivpu_drv.c
@@ -45,11 +45,11 @@ MODULE_PARM_DESC(test_mode, "Test mode mask. See IVPU_TEST_MODE_* macros.");
 
 u8 ivpu_pll_min_ratio;
 module_param_named(pll_min_ratio, ivpu_pll_min_ratio, byte, 0644);
-MODULE_PARM_DESC(pll_min_ratio, "Minimum PLL ratio used to set VPU frequency");
+MODULE_PARM_DESC(pll_min_ratio, "Minimum PLL ratio used to set NPU frequency");
 
 u8 ivpu_pll_max_ratio = U8_MAX;
 module_param_named(pll_max_ratio, ivpu_pll_max_ratio, byte, 0644);
-MODULE_PARM_DESC(pll_max_ratio, "Maximum PLL ratio used to set VPU frequency");
+MODULE_PARM_DESC(pll_max_ratio, "Maximum PLL ratio used to set NPU frequency");
 
 bool ivpu_disable_mmu_cont_pages;
 module_param_named(disable_mmu_cont_pages, ivpu_disable_mmu_cont_pages, bool, 0644);
@@ -328,13 +328,13 @@ static int ivpu_wait_for_ready(struct ivpu_device *vdev)
        ivpu_ipc_consumer_del(vdev, &cons);
 
        if (!ret && ipc_hdr.data_addr != IVPU_IPC_BOOT_MSG_DATA_ADDR) {
-               ivpu_err(vdev, "Invalid VPU ready message: 0x%x\n",
+               ivpu_err(vdev, "Invalid NPU ready message: 0x%x\n",
                         ipc_hdr.data_addr);
                return -EIO;
        }
 
        if (!ret)
-               ivpu_dbg(vdev, PM, "VPU ready message received successfully\n");
+               ivpu_dbg(vdev, PM, "NPU ready message received successfully\n");
 
        return ret;
 }

diff --git a/drivers/accel/ivpu/ivpu_drv.h b/drivers/accel/ivpu/ivpu_drv.h
index 03454f16a535bba0fbf256be679b34eb8adc1caa..7be0500d9bb8919574b02066b8389c56c6c83f05 100644 (file)
--- a/drivers/accel/ivpu/ivpu_drv.h
+++ b/drivers/accel/ivpu/ivpu_drv.h
@@ -194,7 +194,7 @@ static inline int ivpu_hw_gen(struct ivpu_device *vdev)
        case PCI_DEVICE_ID_LNL:
                return IVPU_HW_40XX;
        default:
-               ivpu_err(vdev, "Unknown VPU device\n");
+               ivpu_err(vdev, "Unknown NPU device\n");
                return 0;
        }
 }

diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c
index 21c4082ea68cf2d3e70126ccc748609a84aa564d..dfa91d48f901f031dcfdf32d80771fcaf9b5b620 100644 (file)
--- a/drivers/accel/ivpu/ivpu_fw.c
+++ b/drivers/accel/ivpu/ivpu_fw.c
@@ -46,7 +46,7 @@
 
 static char *ivpu_firmware;
 module_param_named_unsafe(firmware, ivpu_firmware, charp, 0644);
-MODULE_PARM_DESC(firmware, "VPU firmware binary in /lib/firmware/..");
+MODULE_PARM_DESC(firmware, "NPU firmware binary in /lib/firmware/..");
 
 static struct {
        int gen;

diff --git a/drivers/accel/ivpu/ivpu_fw_log.c b/drivers/accel/ivpu/ivpu_fw_log.c
index f6770f5e82a29571e769b162af22aa7ca54f7e0d..ef0adb5e0fbeb3416c1f7cbc374200de045405af 100644 (file)
--- a/drivers/accel/ivpu/ivpu_fw_log.c
+++ b/drivers/accel/ivpu/ivpu_fw_log.c
@@ -20,7 +20,7 @@
 unsigned int ivpu_log_level = IVPU_FW_LOG_ERROR;
 module_param(ivpu_log_level, uint, 0444);
 MODULE_PARM_DESC(ivpu_log_level,
-                "VPU firmware default trace level: debug=" __stringify(IVPU_FW_LOG_DEBUG)
+                "NPU firmware default trace level: debug=" __stringify(IVPU_FW_LOG_DEBUG)
                 " info=" __stringify(IVPU_FW_LOG_INFO)
                 " warn=" __stringify(IVPU_FW_LOG_WARN)
                 " error=" __stringify(IVPU_FW_LOG_ERROR)
@@ -121,11 +121,11 @@ void ivpu_fw_log_print(struct ivpu_device *vdev, bool only_new_msgs, struct drm_
        u32 next = 0;
 
        while (fw_log_ptr(vdev, vdev->fw->mem_log_crit, &next, &log_header) == 0)
-               fw_log_print_buffer(vdev, log_header, "VPU critical", only_new_msgs, p);
+               fw_log_print_buffer(vdev, log_header, "NPU critical", only_new_msgs, p);
 
        next = 0;
        while (fw_log_ptr(vdev, vdev->fw->mem_log_verb, &next, &log_header) == 0)
-               fw_log_print_buffer(vdev, log_header, "VPU verbose", only_new_msgs, p);
+               fw_log_print_buffer(vdev, log_header, "NPU verbose", only_new_msgs, p);
 }
 
 void ivpu_fw_log_clear(struct ivpu_device *vdev)

diff --git a/drivers/accel/ivpu/ivpu_hw_37xx.c b/drivers/accel/ivpu/ivpu_hw_37xx.c
index 0e7cde1bb422b8c8068158c9f7709ebc68cf0133..be91c6744b129449c00cfdf1f41f62dc8cad08e9 100644 (file)
--- a/drivers/accel/ivpu/ivpu_hw_37xx.c
+++ b/drivers/accel/ivpu/ivpu_hw_37xx.c
@@ -228,7 +228,7 @@ static int ivpu_pll_drive(struct ivpu_device *vdev, bool enable)
 
                ret = ivpu_hw_37xx_wait_for_vpuip_bar(vdev);
                if (ret) {
-                       ivpu_err(vdev, "Timed out waiting for VPUIP bar\n");
+                       ivpu_err(vdev, "Timed out waiting for NPU IP bar\n");
                        return ret;
                }
        }
@@ -742,10 +742,10 @@ static int ivpu_hw_37xx_power_down(struct ivpu_device *vdev)
        ivpu_hw_37xx_save_d0i3_entry_timestamp(vdev);
 
        if (!ivpu_hw_37xx_is_idle(vdev))
-               ivpu_warn(vdev, "VPU not idle during power down\n");
+               ivpu_warn(vdev, "NPU not idle during power down\n");
 
        if (ivpu_hw_37xx_reset(vdev)) {
-               ivpu_err(vdev, "Failed to reset VPU\n");
+               ivpu_err(vdev, "Failed to reset NPU\n");
                ret = -EIO;
        }
 

diff --git a/drivers/accel/ivpu/ivpu_hw_40xx.c b/drivers/accel/ivpu/ivpu_hw_40xx.c
index 704288084f37379eb6c7a1a5beb8f58ec3cea4a2..d4663a42416b7ad3ae24cf68bef1983616ae948d 100644 (file)
--- a/drivers/accel/ivpu/ivpu_hw_40xx.c
+++ b/drivers/accel/ivpu/ivpu_hw_40xx.c
@@ -80,11 +80,11 @@ static char *ivpu_platform_to_str(u32 platform)
 {
        switch (platform) {
        case IVPU_PLATFORM_SILICON:
-               return "IVPU_PLATFORM_SILICON";
+               return "SILICON";
        case IVPU_PLATFORM_SIMICS:
-               return "IVPU_PLATFORM_SIMICS";
+               return "SIMICS";
        case IVPU_PLATFORM_FPGA:
-               return "IVPU_PLATFORM_FPGA";
+               return "FPGA";
        default:
                return "Invalid platform";
        }
@@ -773,7 +773,7 @@ static int ivpu_hw_40xx_reset(struct ivpu_device *vdev)
        int ret = 0;
 
        if (ivpu_hw_40xx_ip_reset(vdev)) {
-               ivpu_err(vdev, "Failed to reset VPU IP\n");
+               ivpu_err(vdev, "Failed to reset NPU IP\n");
                ret = -EIO;
        }
 
@@ -931,7 +931,7 @@ static int ivpu_hw_40xx_power_down(struct ivpu_device *vdev)
        ivpu_hw_40xx_save_d0i3_entry_timestamp(vdev);
 
        if (!ivpu_hw_40xx_is_idle(vdev) && ivpu_hw_40xx_ip_reset(vdev))
-               ivpu_warn(vdev, "Failed to reset the VPU\n");
+               ivpu_warn(vdev, "Failed to reset the NPU\n");
 
        if (ivpu_pll_disable(vdev)) {
                ivpu_err(vdev, "Failed to disable PLL\n");

diff --git a/drivers/accel/ivpu/ivpu_pm.c b/drivers/accel/ivpu/ivpu_pm.c
index f501f27ebafdf6687b5a46ca7e2387faa931af3e..280fd3936f602da29f68d259504973557841f278 100644 (file)
--- a/drivers/accel/ivpu/ivpu_pm.c
+++ b/drivers/accel/ivpu/ivpu_pm.c
@@ -22,7 +22,7 @@
 
 static bool ivpu_disable_recovery;
 module_param_named_unsafe(disable_recovery, ivpu_disable_recovery, bool, 0644);
-MODULE_PARM_DESC(disable_recovery, "Disables recovery when VPU hang is detected");
+MODULE_PARM_DESC(disable_recovery, "Disables recovery when NPU hang is detected");
 
 static unsigned long ivpu_tdr_timeout_ms;
 module_param_named(tdr_timeout_ms, ivpu_tdr_timeout_ms, ulong, 0644);
@@ -112,11 +112,11 @@ static void ivpu_pm_recovery_work(struct work_struct *work)
        char *evt[2] = {"IVPU_PM_EVENT=IVPU_RECOVER", NULL};
        int ret;
 
-       ivpu_err(vdev, "Recovering the VPU (reset #%d)\n", atomic_read(&vdev->pm->reset_counter));
+       ivpu_err(vdev, "Recovering the NPU (reset #%d)\n", atomic_read(&vdev->pm->reset_counter));
 
        ret = pm_runtime_resume_and_get(vdev->drm.dev);
        if (ret)
-               ivpu_err(vdev, "Failed to resume VPU: %d\n", ret);
+               ivpu_err(vdev, "Failed to resume NPU: %d\n", ret);
 
        ivpu_fw_log_dump(vdev);
 
@@ -255,10 +255,10 @@ int ivpu_pm_runtime_suspend_cb(struct device *dev)
 
        ret = ivpu_suspend(vdev);
        if (ret)
-               ivpu_err(vdev, "Failed to set suspend VPU: %d\n", ret);
+               ivpu_err(vdev, "Failed to suspend NPU: %d\n", ret);
 
        if (!hw_is_idle) {
-               ivpu_err(vdev, "VPU failed to enter idle, force suspended.\n");
+               ivpu_err(vdev, "NPU failed to enter idle, force suspended.\n");
                ivpu_fw_log_dump(vdev);
                ivpu_pm_prepare_cold_boot(vdev);
        } else {