Commit b7f9b9b6 authored by Jacek Lawrynowicz's avatar Jacek Lawrynowicz
Browse files

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: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Reviewed-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240214081305.290108-9-jacek.lawrynowicz@linux.intel.com
parent 42328003

drivers/accel/ivpu/ivpu_drv.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

}

drivers/accel/ivpu/ivpu_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

}

drivers/accel/ivpu/ivpu_fw.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/accel/ivpu/ivpu_fw_log.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

drivers/accel/ivpu/ivpu_hw_37xx.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}