Mali Valhall Android DDK r36p0 KMD

Provenance: 9f72c118d9 (ipdelivery/EAC/v_r36p0)
  VX504X08X-BU-00000-r36p0-01eac0 - Valhall Android DDK
  VX504X08X-BU-60000-r36p0-01eac0 - Valhall Android Document Bundle
  VX504X08X-DC-11001-r36p0-01eac0 - Valhall Android DDK Software Errata
  VX504X08X-SW-99006-r36p0-01eac0 - Valhall Android Renderscript AOSP parts

Signed-off-by: Siddharth Kapoor <ksiddharth@google.com>
Change-Id: I4a63b707fedc68d7b7d046596c7098da47a139cb

11 files changed, 81 insertions, 122 deletions

diff --git a/mali_kbase/tests/include/kutf/kutf_helpers.h b/mali_kbase/tests/include/kutf/kutf_helpers.h
index 79b1eac..c4c713c 100644
--- a/mali_kbase/tests/include/kutf/kutf_helpers.h
+++ b/mali_kbase/tests/include/kutf/kutf_helpers.h
@@ -81,17 +81,4 @@ int kutf_helper_input_enqueue(struct kutf_context *context,
  */
 void kutf_helper_input_enqueue_end_of_data(struct kutf_context *context);
 
-/* kutf_helper_external_reset_gpu() - Mimic power-on-reset using external reset
- *
- * Reset GPU using FPGA SYSCTL register.
- *
- * Note that
- * - It must be called on the platform that has FPGA SYSCTL
- *   register available such as Juno board.
- * - It won't reinitialize GPU related settings such as interrupt for kbase.
- *
- * Return:  0 on success, negative value otherwise.
- */
-int kutf_helper_external_reset_gpu(void);
-
 #endif	/* _KERNEL_UTF_HELPERS_H_ */
diff --git a/mali_kbase/tests/include/kutf/kutf_suite.h b/mali_kbase/tests/include/kutf/kutf_suite.h
index b9c333b..9e459c5 100644
--- a/mali_kbase/tests/include/kutf/kutf_suite.h
+++ b/mali_kbase/tests/include/kutf/kutf_suite.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *
- * (C) COPYRIGHT 2014, 2017, 2020-2021 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2014, 2017, 2020-2022 ARM Limited. All rights reserved.
  *
  * This program is free software and is provided to you under the terms of the
  * GNU General Public License version 2 as published by the Free Software
@@ -43,36 +43,36 @@
 #define KUTF_MAX_LINE_LENGTH (1024u)
 
 /**
- * Pseudo-flag indicating an absence of any specified test class. Note that
- * tests should not be annotated with this constant as it is simply a zero
+ * KUTF_F_TEST_NONE - Pseudo-flag indicating an absence of any specified test class.
+ * Note that tests should not be annotated with this constant as it is simply a zero
  * value; tests without a more specific class must be marked with the flag
  * KUTF_F_TEST_GENERIC.
  */
 #define KUTF_F_TEST_NONE                ((unsigned int)(0))
 
 /**
- * Class indicating this test is a smoke test.
+ * KUTF_F_TEST_SMOKETEST - Class indicating this test is a smoke test.
  * A given set of smoke tests should be quick to run, enabling rapid turn-around
  * of "regress-on-commit" test runs.
  */
 #define KUTF_F_TEST_SMOKETEST           ((unsigned int)(1 << 1))
 
 /**
- * Class indicating this test is a performance test.
+ * KUTF_F_TEST_PERFORMANCE - Class indicating this test is a performance test.
  * These tests typically produce a performance metric, such as "time to run" or
  * "frames per second",
  */
 #define KUTF_F_TEST_PERFORMANCE         ((unsigned int)(1 << 2))
 
 /**
- * Class indicating that this test is a deprecated test.
+ * KUTF_F_TEST_DEPRECATED - Class indicating that this test is a deprecated test.
  * These tests have typically been replaced by an alternative test which is
  * more efficient, or has better coverage.
  */
 #define KUTF_F_TEST_DEPRECATED          ((unsigned int)(1 << 3))
 
 /**
- * Class indicating that this test is a known failure.
+ * KUTF_F_TEST_EXPECTED_FAILURE - Class indicating that this test is a known failure.
  * These tests have typically been run and failed, but marking them as a known
  * failure means it is easier to triage results.
  *
@@ -83,68 +83,69 @@
 #define KUTF_F_TEST_EXPECTED_FAILURE    ((unsigned int)(1 << 4))
 
 /**
- * Class indicating that this test is a generic test, which is not a member of
- * a more specific test class. Tests which are not created with a specific set
+ * KUTF_F_TEST_GENERIC - Class indicating that this test is a generic test,
+ * which is not a member of a more specific test class.
+ * Tests which are not created with a specific set
  * of filter flags by the user are assigned this test class by default.
  */
 #define KUTF_F_TEST_GENERIC             ((unsigned int)(1 << 5))
 
 /**
- * Class indicating this test is a resource allocation failure test.
+ * KUTF_F_TEST_RESFAIL - Class indicating this test is a resource allocation failure test.
  * A resource allocation failure test will test that an error code is
  * correctly propagated when an allocation fails.
  */
 #define KUTF_F_TEST_RESFAIL             ((unsigned int)(1 << 6))
 
 /**
- * Additional flag indicating that this test is an expected failure when
- * run in resource failure mode. These tests are never run when running
- * the low resource mode.
+ * KUTF_F_TEST_EXPECTED_FAILURE_RF - Additional flag indicating that this test
+ * is an expected failure when run in resource failure mode.
+ * These tests are never run when running the low resource mode.
  */
 #define KUTF_F_TEST_EXPECTED_FAILURE_RF ((unsigned int)(1 << 7))
 
 /**
- * Flag reserved for user-defined filter zero.
+ * KUTF_F_TEST_USER_0 - Flag reserved for user-defined filter zero.
  */
 #define KUTF_F_TEST_USER_0 ((unsigned int)(1 << 24))
 
 /**
- * Flag reserved for user-defined filter one.
+ * KUTF_F_TEST_USER_1 - Flag reserved for user-defined filter one.
  */
 #define KUTF_F_TEST_USER_1 ((unsigned int)(1 << 25))
 
 /**
- * Flag reserved for user-defined filter two.
+ * KUTF_F_TEST_USER_2 - Flag reserved for user-defined filter two.
  */
 #define KUTF_F_TEST_USER_2 ((unsigned int)(1 << 26))
 
 /**
- * Flag reserved for user-defined filter three.
+ * KUTF_F_TEST_USER_3 - Flag reserved for user-defined filter three.
  */
 #define KUTF_F_TEST_USER_3 ((unsigned int)(1 << 27))
 
 /**
- * Flag reserved for user-defined filter four.
+ * KUTF_F_TEST_USER_4 - Flag reserved for user-defined filter four.
  */
 #define KUTF_F_TEST_USER_4 ((unsigned int)(1 << 28))
 
 /**
- * Flag reserved for user-defined filter five.
+ * KUTF_F_TEST_USER_5 - Flag reserved for user-defined filter five.
  */
 #define KUTF_F_TEST_USER_5 ((unsigned int)(1 << 29))
 
 /**
- * Flag reserved for user-defined filter six.
+ * KUTF_F_TEST_USER_6 - Flag reserved for user-defined filter six.
  */
 #define KUTF_F_TEST_USER_6 ((unsigned int)(1 << 30))
 
 /**
- * Flag reserved for user-defined filter seven.
+ * KUTF_F_TEST_USER_7 - Flag reserved for user-defined filter seven.
  */
 #define KUTF_F_TEST_USER_7 ((unsigned int)(1 << 31))
 
 /**
- * Pseudo-flag indicating that all test classes should be executed.
+ * KUTF_F_TEST_ALL - Pseudo-flag indicating that all test classes should be executed.
  */
 #define KUTF_F_TEST_ALL                 ((unsigned int)(0xFFFFFFFFU))
 
diff --git a/mali_kbase/tests/include/kutf/kutf_utils.h b/mali_kbase/tests/include/kutf/kutf_utils.h
index 5f6d769..f6e758b 100644
--- a/mali_kbase/tests/include/kutf/kutf_utils.h
+++ b/mali_kbase/tests/include/kutf/kutf_utils.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *
- * (C) COPYRIGHT 2014, 2017, 2020-2021 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2014, 2017, 2020-2022 ARM Limited. All rights reserved.
  *
  * This program is free software and is provided to you under the terms of the
  * GNU General Public License version 2 as published by the Free Software
@@ -33,8 +33,8 @@
 #include <kutf/kutf_mem.h>
 
 /**
- * Maximum size of the message strings within kernel UTF, messages longer then
- * this will be truncated.
+ * KUTF_MAX_DSPRINTF_LEN - Maximum size of the message strings within
+ * kernel UTF, messages longer then this will be truncated.
  */
 #define KUTF_MAX_DSPRINTF_LEN	1024
 
diff --git a/mali_kbase/tests/kutf/kutf_helpers.c b/mali_kbase/tests/kutf/kutf_helpers.c
index d76cebe..d207d1c 100644
--- a/mali_kbase/tests/kutf/kutf_helpers.c
+++ b/mali_kbase/tests/kutf/kutf_helpers.c
@@ -28,10 +28,6 @@
 #include <linux/wait.h>
 #include <linux/uaccess.h>
 #include <linux/export.h>
-#include <linux/io.h>
-#include <linux/delay.h>
-#include "gpu/mali_kbase_gpu_regmap.h"
-#include <device/mali_kbase_device.h>
 
 static DEFINE_SPINLOCK(kutf_input_lock);
 
@@ -131,44 +127,3 @@ void kutf_helper_input_enqueue_end_of_data(struct kutf_context *context)
 {
 	kutf_helper_input_enqueue(context, NULL, 0);
 }
-
-/* Values are taken from juno-fpga.dtsi */
-#define FPGA_SYSCTL_START_ADDR ((resource_size_t)0x6f020000)
-#define FPGA_SYSCTL_SIZE ((size_t)0xCC)
-
-/* Offset of FPGA_SYSCTL_GPU_RESET_REG register */
-#define FPGA_SYSCTL_GPU_RESET_REG 0x64
-#define GPU_RESET_HIGH 0x1
-#define GPU_RESET_LOW 0x0
-
-int kutf_helper_external_reset_gpu(void)
-{
-	void __iomem *regs = NULL;
-	void __iomem *gpu_reset_reg = NULL;
-	int error = -ENXIO;
-	int repeat = 100;
-
-	regs = ioremap(FPGA_SYSCTL_START_ADDR, FPGA_SYSCTL_SIZE);
-	if (!regs)
-		return -ENOMEM;
-
-	/* Reset GPU via SYSCTL_GPU_RESET by rising & falling the reset signal */
-	gpu_reset_reg = regs + FPGA_SYSCTL_GPU_RESET_REG;
-	while (error && repeat--) {
-		writel(GPU_RESET_HIGH, gpu_reset_reg);
-		if (readl(gpu_reset_reg) == GPU_RESET_HIGH) {
-			mdelay(100);
-			writel(GPU_RESET_LOW, gpu_reset_reg);
-			mdelay(100);
-
-			/* Succeed in resetting GPU */
-			if (readl(gpu_reset_reg) == GPU_RESET_LOW)
-				error = 0;
-		}
-	}
-
-	iounmap(regs);
-
-	return error;
-}
-EXPORT_SYMBOL(kutf_helper_external_reset_gpu);
diff --git a/mali_kbase/tests/kutf/kutf_helpers_user.c b/mali_kbase/tests/kutf/kutf_helpers_user.c
index a8b59f7..f88e138 100644
--- a/mali_kbase/tests/kutf/kutf_helpers_user.c
+++ b/mali_kbase/tests/kutf/kutf_helpers_user.c
@@ -368,7 +368,7 @@ int kutf_helper_receive_named_val(
 		named_val->u.val_str = strval;
 		break;
 	default:
-		pr_err("Unreachable, fix kutf_helper_receive_named_val\n");
+		pr_err("Unreachable, fix %s\n", __func__);
 		/* Coding error, report as though 'run' file failed */
 		return -EINVAL;
 	}
diff --git a/mali_kbase/tests/kutf/kutf_resultset.c b/mali_kbase/tests/kutf/kutf_resultset.c
index c7572bd..3a7ade2 100644
--- a/mali_kbase/tests/kutf/kutf_resultset.c
+++ b/mali_kbase/tests/kutf/kutf_resultset.c
@@ -89,7 +89,7 @@ int kutf_add_result(struct kutf_context *context,
 void kutf_destroy_result_set(struct kutf_result_set *set)
 {
 	if (!list_empty(&set->results))
-		pr_err("kutf_destroy_result_set: Unread results from test\n");
+		pr_err("%s: Unread results from test\n", __func__);
 
 	kfree(set);
 }
diff --git a/mali_kbase/tests/kutf/kutf_suite.c b/mali_kbase/tests/kutf/kutf_suite.c
index d45d9df..91065b5 100644
--- a/mali_kbase/tests/kutf/kutf_suite.c
+++ b/mali_kbase/tests/kutf/kutf_suite.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 /*
  *
- * (C) COPYRIGHT 2014, 2017-2021 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2014, 2017-2022 ARM Limited. All rights reserved.
  *
  * This program is free software and is provided to you under the terms of the
  * GNU General Public License version 2 as published by the Free Software
@@ -319,7 +319,8 @@ static void kutf_run_test(struct work_struct *data)
 }
 
 /**
- * kutf_debugfs_run_open() Debugfs open callback for the "run" entry.
+ * kutf_debugfs_run_open() - Debugfs open callback for the "run" entry.
+ *
  * @inode:	inode of the opened file
  * @file:	Opened file to read from
  *
@@ -493,7 +494,7 @@ exit:
 }
 
 /**
- * kutf_debugfs_run_write() Debugfs write callback for the "run" entry.
+ * kutf_debugfs_run_write() - Debugfs write callback for the "run" entry.
  * @file:	Opened file to write to
  * @buf:	User buffer to read the data from
  * @len:	Amount of data to write
@@ -589,7 +590,7 @@ static int create_fixture_variant(struct kutf_test_function *test_func,
 		goto fail_dir;
 	}
 
-	tmp = debugfs_create_file("type", S_IROTH, test_fix->dir, "fixture\n",
+	tmp = debugfs_create_file("type", 0004, test_fix->dir, "fixture\n",
 				  &kutf_debugfs_const_string_ops);
 	if (IS_ERR_OR_NULL(tmp)) {
 		pr_err("Failed to create debugfs file \"type\" when adding fixture\n");
@@ -671,7 +672,7 @@ void kutf_add_test_with_filters_and_data(
 		goto fail_dir;
 	}
 
-	tmp = debugfs_create_file("type", S_IROTH, test_func->dir, "test\n",
+	tmp = debugfs_create_file("type", 0004, test_func->dir, "test\n",
 				  &kutf_debugfs_const_string_ops);
 	if (IS_ERR_OR_NULL(tmp)) {
 		pr_err("Failed to create debugfs file \"type\" when adding test %s\n", name);
@@ -680,10 +681,10 @@ void kutf_add_test_with_filters_and_data(
 
 	test_func->filters = filters;
 #if KERNEL_VERSION(5, 5, 0) <= LINUX_VERSION_CODE
-	tmp = debugfs_create_file_unsafe("filters", S_IROTH, test_func->dir,
+	tmp = debugfs_create_file_unsafe("filters", 0004, test_func->dir,
 					 &test_func->filters, &kutfp_fops_x32_ro);
 #else
-	tmp = debugfs_create_x32("filters", S_IROTH, test_func->dir,
+	tmp = debugfs_create_x32("filters", 0004, test_func->dir,
 				 &test_func->filters);
 #endif
 	if (IS_ERR_OR_NULL(tmp)) {
@@ -693,10 +694,10 @@ void kutf_add_test_with_filters_and_data(
 
 	test_func->test_id = id;
 #if KERNEL_VERSION(5, 5, 0) <= LINUX_VERSION_CODE
-	debugfs_create_u32("test_id", S_IROTH, test_func->dir,
-                       &test_func->test_id);
+	debugfs_create_u32("test_id", 0004, test_func->dir,
+		&test_func->test_id);
 #else
-	tmp = debugfs_create_u32("test_id", S_IROTH, test_func->dir,
+	tmp = debugfs_create_u32("test_id", 0004, test_func->dir,
 				 &test_func->test_id);
 	if (IS_ERR_OR_NULL(tmp)) {
 		pr_err("Failed to create debugfs file \"test_id\" when adding test %s\n", name);
@@ -766,7 +767,7 @@ void kutf_add_test(struct kutf_suite *suite,
 EXPORT_SYMBOL(kutf_add_test);
 
 /**
- * kutf_remove_test(): Remove a previously added test function.
+ * kutf_remove_test() - Remove a previously added test function.
  * @test_func: Test function
  */
 static void kutf_remove_test(struct kutf_test_function *test_func)
@@ -810,7 +811,7 @@ struct kutf_suite *kutf_create_suite_with_filters_and_data(
 		goto fail_debugfs;
 	}
 
-	tmp = debugfs_create_file("type", S_IROTH, suite->dir, "suite\n",
+	tmp = debugfs_create_file("type", 0004, suite->dir, "suite\n",
 				  &kutf_debugfs_const_string_ops);
 	if (IS_ERR_OR_NULL(tmp)) {
 		pr_err("Failed to create debugfs file \"type\" when adding test %s\n", name);
@@ -918,7 +919,7 @@ struct kutf_application *kutf_create_application(const char *name)
 		goto fail_debugfs;
 	}
 
-	tmp = debugfs_create_file("type", S_IROTH, app->dir, "application\n",
+	tmp = debugfs_create_file("type", 0004, app->dir, "application\n",
 				  &kutf_debugfs_const_string_ops);
 	if (IS_ERR_OR_NULL(tmp)) {
 		pr_err("Failed to create debugfs file \"type\" when creating application %s\n", name);
@@ -1162,8 +1163,9 @@ EXPORT_SYMBOL(kutf_test_abort);
 
 /**
  * init_kutf_core() - Module entry point.
- *
  * Create the base entry point in debugfs.
+ *
+ * Return: 0 on success, error code otherwise.
  */
 static int __init init_kutf_core(void)
 {
@@ -1197,9 +1199,10 @@ static void __exit exit_kutf_core(void)
 #else	/* CONFIG_DEBUG_FS */
 
 /**
- * init_kutf_core() - Module entry point.
+ * init_kutf_core - Module entry point
+ * Stub for when build against a kernel without debugfs support.
  *
- * Stub for when build against a kernel without debugfs support
+ * Return: -ENODEV
  */
 static int __init init_kutf_core(void)
 {
diff --git a/mali_kbase/tests/kutf/kutf_utils.c b/mali_kbase/tests/kutf/kutf_utils.c
index c0fb3ba..2ae1510 100644
--- a/mali_kbase/tests/kutf/kutf_utils.c
+++ b/mali_kbase/tests/kutf/kutf_utils.c
@@ -47,12 +47,12 @@ const char *kutf_dsprintf(struct kutf_mempool *pool,
 	va_end(args);
 
 	if (len < 0) {
-		pr_err("kutf_dsprintf: Bad format dsprintf format %s\n", fmt);
+		pr_err("%s: Bad format dsprintf format %s\n", __func__, fmt);
 		goto fail_format;
 	}
 
 	if (len >= sizeof(tmp_buffer)) {
-		pr_warn("kutf_dsprintf: Truncated dsprintf message %s\n", fmt);
+		pr_warn("%s: Truncated dsprintf message %s\n", __func__, fmt);
 		size = sizeof(tmp_buffer);
 	} else {
 		size = len + 1;
diff --git a/mali_kbase/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c b/mali_kbase/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c
index 87bcb31..935f8ca 100644
--- a/mali_kbase/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c
+++ b/mali_kbase/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 /*
  *
- * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved.
  *
  * This program is free software and is provided to you under the terms of the
  * GNU General Public License version 2 as published by the Free Software
@@ -195,7 +195,7 @@ static void kutf_set_pm_ctx_idle(struct kutf_context *context)
 	kbase_pm_context_idle(data->kbdev);
 }
 
-static char const *kutf_clk_trace_do_change_pm_ctx(struct kutf_context *context,
+static const char *kutf_clk_trace_do_change_pm_ctx(struct kutf_context *context,
 				struct clk_trace_portal_input *cmd)
 {
 	struct kutf_clk_rate_trace_fixture_data *data = context->fixture;
@@ -232,7 +232,7 @@ static char const *kutf_clk_trace_do_change_pm_ctx(struct kutf_context *context,
 	return errmsg;
 }
 
-static char const *kutf_clk_trace_do_get_rate(struct kutf_context *context,
+static const char *kutf_clk_trace_do_get_rate(struct kutf_context *context,
 				struct clk_trace_portal_input *cmd)
 {
 	struct kutf_clk_rate_trace_fixture_data *data = context->fixture;
@@ -293,8 +293,10 @@ static char const *kutf_clk_trace_do_get_rate(struct kutf_context *context,
  * current snapshot record, and the start of the next one. The response
  * message contains the current snapshot record, with each clock's
  * data sequentially placed inside (array marker) [ ].
+ *
+ * Return: generated string
  */
-static char const *kutf_clk_trace_do_get_snapshot(struct kutf_context *context,
+static const char *kutf_clk_trace_do_get_snapshot(struct kutf_context *context,
 				struct clk_trace_portal_input *cmd)
 {
 	struct kutf_clk_rate_trace_fixture_data *data = context->fixture;
@@ -351,8 +353,10 @@ static char const *kutf_clk_trace_do_get_snapshot(struct kutf_context *context,
  *
  * Invokes frequency change notification callbacks with a fake
  * GPU frequency 42 kHz for the top clock domain.
+ *
+ * Return: generated string
  */
-static char const *kutf_clk_trace_do_invoke_notify_42k(
+static const char *kutf_clk_trace_do_invoke_notify_42k(
 	struct kutf_context *context,
 	struct clk_trace_portal_input *cmd)
 {
@@ -392,7 +396,7 @@ static char const *kutf_clk_trace_do_invoke_notify_42k(
 	return errmsg;
 }
 
-static char const *kutf_clk_trace_do_close_portal(struct kutf_context *context,
+static const char *kutf_clk_trace_do_close_portal(struct kutf_context *context,
 				struct clk_trace_portal_input *cmd)
 {
 	struct kutf_clk_rate_trace_fixture_data *data = context->fixture;
@@ -426,7 +430,7 @@ static char const *kutf_clk_trace_do_close_portal(struct kutf_context *context,
  *
  * Return: A string to indicate the platform (PV/PTM/GPU/UNKNOWN)
  */
-static char const *kutf_clk_trace_do_get_platform(
+static const char *kutf_clk_trace_do_get_platform(
 	struct kutf_context *context,
 	struct clk_trace_portal_input *cmd)
 {
@@ -570,6 +574,8 @@ static bool kutf_clk_trace_process_portal_cmd(struct kutf_context *context,
  *
  * This function deal with an erroneous input request, and respond with
  * a proper 'NACK' message.
+ *
+ * Return: 0 on success, non-zero on failure
  */
 static int kutf_clk_trace_do_nack_response(struct kutf_context *context,
 				struct clk_trace_portal_input *cmd)
@@ -871,8 +877,8 @@ static void *mali_kutf_clk_rate_trace_create_fixture(
 }
 
 /**
- * Destroy fixture data previously created by
- * mali_kutf_clk_rate_trace_create_fixture.
+ * mali_kutf_clk_rate_trace_remove_fixture - Destroy fixture data previously created by
+ *                                           mali_kutf_clk_rate_trace_create_fixture.
  *
  * @context:             KUTF context.
  */
@@ -896,6 +902,8 @@ static void mali_kutf_clk_rate_trace_remove_fixture(
 
 /**
  * mali_kutf_clk_rate_trace_test_module_init() - Entry point for test mdoule.
+ *
+ * Return: 0 on success, error code otherwise
  */
 static int __init mali_kutf_clk_rate_trace_test_module_init(void)
 {
diff --git a/mali_kbase/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h b/mali_kbase/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h
index f37efa8..a716b9f 100644
--- a/mali_kbase/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h
+++ b/mali_kbase/tests/mali_kutf_clk_rate_trace/mali_kutf_clk_rate_trace_test.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *
- * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved.
  *
  * This program is free software and is provided to you under the terms of the
  * GNU General Public License version 2 as published by the Free Software
@@ -88,8 +88,10 @@ enum kbasep_clk_rate_trace_req {
 };
 
 /**
- * Portal service request command names. The portal request consists of a kutf
- * named u64-value. For those above enumerated PORTAL_CMD, the names defined
+ * DOC: Portal service request command names.
+ *
+ * The portal request consists of a kutf named u64-value.
+ * For those above enumerated PORTAL_CMD, the names defined
  * here are used to mark the name and then followed with a sequence number
  * value. Example (manual script here for illustration):
  *   exec 5<>run                   # open the portal kutf run as fd-5
@@ -134,9 +136,10 @@ enum kbasep_clk_rate_trace_req {
 #define INVOKE_NOTIFY_42KHZ  "INVOKE_NOTIFY_42KHZ"
 
 /**
- * Portal service response tag names. The response consists of a kutf
- * named string-value. In case of a 'NACK' (negative acknowledgement), it
- * can be one of the two formats:
+ * DOC: Portal service response tag names.
+ *
+ * The response consists of a kutf named string-value.
+ * In case of a 'NACK' (negative acknowledgment), it can be one of the two formats:
  *   1. NACK="{SEQ:2, MSG:xyzed}"     # NACK on command with sequence tag-2.
  *      Note, the portal has received a valid name and valid sequence number
  *            but can't carry-out the request, reason in the MSG field.
diff --git a/mali_kbase/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c b/mali_kbase/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c
index 7799a68..5824a4c 100644
--- a/mali_kbase/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c
+++ b/mali_kbase/tests/mali_kutf_irq_test/mali_kutf_irq_test_main.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 /*
  *
- * (C) COPYRIGHT 2016-2018, 2020-2021 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2016-2018, 2020-2022 ARM Limited. All rights reserved.
  *
  * This program is free software and is provided to you under the terms of the
  * GNU General Public License version 2 as published by the Free Software
@@ -43,7 +43,7 @@
 struct kutf_application *irq_app;
 
 /**
- * struct kutf_irq_fixture data - test fixture used by the test functions.
+ * struct kutf_irq_fixture_data - test fixture used by the test functions.
  * @kbdev:	kbase device for the GPU.
  *
  */
@@ -234,7 +234,9 @@ static void mali_kutf_irq_latency(struct kutf_context *context)
 }
 
 /**
- * Module entry point for this test.
+ * mali_kutf_irq_test_main_init - Module entry point for this test.
+ *
+ * Return: 0 on success, error code otherwise
  */
 static int __init mali_kutf_irq_test_main_init(void)
 {
@@ -263,7 +265,7 @@ static int __init mali_kutf_irq_test_main_init(void)
 }
 
 /**
- * Module exit point for this test.
+ * mali_kutf_irq_test_main_exit - Module exit point for this test.
  */
 static void __exit mali_kutf_irq_test_main_exit(void)
 {