Merge branch 'upstream' into HEAD

Update KMD to R47P0

Bug: 315267052
Test: Outlined in go/pixel-gpu-kmd-r47p0

Change-Id: I89454c4c862033fe330b260a9bc6cc777a3ca231
Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>

11 files changed, 75 insertions, 81 deletions

diff --git a/mali_kbase/platform/devicetree/mali_kbase_clk_rate_trace.c b/mali_kbase/platform/devicetree/mali_kbase_clk_rate_trace.c
index 4bcd585..f0995a4 100644
--- a/mali_kbase/platform/devicetree/mali_kbase_clk_rate_trace.c
+++ b/mali_kbase/platform/devicetree/mali_kbase_clk_rate_trace.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 /*
  *
- * (C) COPYRIGHT 2015, 2017-2021 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2015-2023 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
@@ -28,8 +28,7 @@
 #include <asm/arch_timer.h>
 #endif
 
-static void *enumerate_gpu_clk(struct kbase_device *kbdev,
-		unsigned int index)
+static void *enumerate_gpu_clk(struct kbase_device *kbdev, unsigned int index)
 {
 	if (index >= kbdev->nr_clocks)
 		return NULL;
@@ -42,9 +41,9 @@ static void *enumerate_gpu_clk(struct kbase_device *kbdev,
 	return kbdev->clocks[index];
 }
 
-static unsigned long get_gpu_clk_rate(struct kbase_device *kbdev,
-		void *gpu_clk_handle)
+static unsigned long get_gpu_clk_rate(struct kbase_device *kbdev, void *gpu_clk_handle)
 {
+	CSTD_UNUSED(kbdev);
 #if MALI_USE_CSF
 	/* On Juno fpga platforms, the GPU clock rate is reported as 600 MHZ at
 	 * the boot time. Then after the first call to kbase_devfreq_target()
@@ -66,16 +65,19 @@ static unsigned long get_gpu_clk_rate(struct kbase_device *kbdev,
 	return clk_get_rate((struct clk *)gpu_clk_handle);
 }
 
-static int gpu_clk_notifier_register(struct kbase_device *kbdev,
-		void *gpu_clk_handle, struct notifier_block *nb)
+static int gpu_clk_notifier_register(struct kbase_device *kbdev, void *gpu_clk_handle,
+				     struct notifier_block *nb)
 {
+	CSTD_UNUSED(kbdev);
+
 	compiletime_assert(offsetof(struct clk_notifier_data, clk) ==
-		offsetof(struct kbase_gpu_clk_notifier_data, gpu_clk_handle),
-		"mismatch in the offset of clk member");
+				   offsetof(struct kbase_gpu_clk_notifier_data, gpu_clk_handle),
+			   "mismatch in the offset of clk member");
 
-	compiletime_assert(sizeof(((struct clk_notifier_data *)0)->clk) ==
-	     sizeof(((struct kbase_gpu_clk_notifier_data *)0)->gpu_clk_handle),
-	     "mismatch in the size of clk member");
+	compiletime_assert(
+		sizeof(((struct clk_notifier_data *)0)->clk) ==
+			sizeof(((struct kbase_gpu_clk_notifier_data *)0)->gpu_clk_handle),
+		"mismatch in the size of clk member");
 
 #if MALI_USE_CSF
 	/* Frequency is fixed on Juno platforms */
@@ -86,9 +88,11 @@ static int gpu_clk_notifier_register(struct kbase_device *kbdev,
 	return clk_notifier_register((struct clk *)gpu_clk_handle, nb);
 }
 
-static void gpu_clk_notifier_unregister(struct kbase_device *kbdev,
-		void *gpu_clk_handle, struct notifier_block *nb)
+static void gpu_clk_notifier_unregister(struct kbase_device *kbdev, void *gpu_clk_handle,
+					struct notifier_block *nb)
 {
+	CSTD_UNUSED(kbdev);
+
 #if MALI_USE_CSF
 	if (of_machine_is_compatible("arm,juno"))
 		return;
diff --git a/mali_kbase/platform/devicetree/mali_kbase_config_devicetree.c b/mali_kbase/platform/devicetree/mali_kbase_config_devicetree.c
index 61ef697..fba351b 100644
--- a/mali_kbase/platform/devicetree/mali_kbase_config_devicetree.c
+++ b/mali_kbase/platform/devicetree/mali_kbase_config_devicetree.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 /*
  *
- * (C) COPYRIGHT 2015, 2017, 2020-2021 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2015-2023 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
@@ -45,7 +45,8 @@ void kbase_platform_unregister(void)
 #if MALI_USE_CSF
 int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation)
 #else
-int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share, u32 util_cl_share[2])
+int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share,
+			      u32 util_cl_share[2])
 #endif
 {
 	return 1;
diff --git a/mali_kbase/platform/devicetree/mali_kbase_runtime_pm.c b/mali_kbase/platform/devicetree/mali_kbase_runtime_pm.c
index a019229..59ad094 100644
--- a/mali_kbase/platform/devicetree/mali_kbase_runtime_pm.c
+++ b/mali_kbase/platform/devicetree/mali_kbase_runtime_pm.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 /*
  *
- * (C) COPYRIGHT 2015-2022 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2015-2023 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
@@ -61,7 +61,6 @@ static void disable_gpu_power_control(struct kbase_device *kbdev)
 			clk_disable_unprepare(kbdev->clocks[i]);
 			WARN_ON(__clk_is_enabled(kbdev->clocks[i]));
 		}
-
 	}
 
 #if defined(CONFIG_REGULATOR)
@@ -135,7 +134,7 @@ static void pm_callback_power_off(struct kbase_device *kbdev)
 
 	/* Power down the GPU immediately */
 	disable_gpu_power_control(kbdev);
-#else  /* MALI_USE_CSF */
+#else /* MALI_USE_CSF */
 	spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags);
 
 #ifdef KBASE_PM_RUNTIME
@@ -217,9 +216,8 @@ static int kbase_device_runtime_init(struct kbase_device *kbdev)
 		dev_warn(kbdev->dev, "pm_runtime not enabled");
 		ret = -EINVAL;
 	} else if (atomic_read(&kbdev->dev->power.usage_count)) {
-		dev_warn(kbdev->dev,
-			 "%s: Device runtime usage count unexpectedly non zero %d",
-			__func__, atomic_read(&kbdev->dev->power.usage_count));
+		dev_warn(kbdev->dev, "%s: Device runtime usage count unexpectedly non zero %d",
+			 __func__, atomic_read(&kbdev->dev->power.usage_count));
 		ret = -EINVAL;
 	}
 
@@ -231,9 +229,8 @@ static void kbase_device_runtime_disable(struct kbase_device *kbdev)
 	dev_dbg(kbdev->dev, "%s\n", __func__);
 
 	if (atomic_read(&kbdev->dev->power.usage_count))
-		dev_warn(kbdev->dev,
-			 "%s: Device runtime usage count unexpectedly non zero %d",
-			__func__, atomic_read(&kbdev->dev->power.usage_count));
+		dev_warn(kbdev->dev, "%s: Device runtime usage count unexpectedly non zero %d",
+			 __func__, atomic_read(&kbdev->dev->power.usage_count));
 
 	pm_runtime_disable(kbdev->dev);
 }
@@ -292,12 +289,12 @@ struct kbase_pm_callback_conf pm_callbacks = {
 	.power_runtime_term_callback = kbase_device_runtime_disable,
 	.power_runtime_on_callback = pm_callback_runtime_on,
 	.power_runtime_off_callback = pm_callback_runtime_off,
-#else				/* KBASE_PM_RUNTIME */
+#else /* KBASE_PM_RUNTIME */
 	.power_runtime_init_callback = NULL,
 	.power_runtime_term_callback = NULL,
 	.power_runtime_on_callback = NULL,
 	.power_runtime_off_callback = NULL,
-#endif				/* KBASE_PM_RUNTIME */
+#endif /* KBASE_PM_RUNTIME */
 
 #if MALI_USE_CSF && defined(KBASE_PM_RUNTIME)
 	.power_runtime_gpu_idle_callback = pm_callback_runtime_gpu_idle,
diff --git a/mali_kbase/platform/meson/mali_kbase_config_meson.c b/mali_kbase/platform/meson/mali_kbase_config_meson.c
index c999a52..fba351b 100644
--- a/mali_kbase/platform/meson/mali_kbase_config_meson.c
+++ b/mali_kbase/platform/meson/mali_kbase_config_meson.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 /*
  *
- * (C) COPYRIGHT 2015, 2017, 2019, 2021, 2022 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2015-2023 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
@@ -45,7 +45,8 @@ void kbase_platform_unregister(void)
 #if MALI_USE_CSF
 int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation)
 #else
-int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share, u32 util_cl_share[2])
+int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share,
+			      u32 util_cl_share[2])
 #endif
 {
 	return 1;
diff --git a/mali_kbase/platform/meson/mali_kbase_runtime_pm.c b/mali_kbase/platform/meson/mali_kbase_runtime_pm.c
index a9b380c..d3df393 100644
--- a/mali_kbase/platform/meson/mali_kbase_runtime_pm.c
+++ b/mali_kbase/platform/meson/mali_kbase_runtime_pm.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 /*
  *
- * (C) COPYRIGHT 2015, 2017-2022 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2015-2023 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
@@ -32,7 +32,6 @@
 
 #include "mali_kbase_config_platform.h"
 
-
 static struct reset_control **resets;
 static int nr_resets;
 
@@ -50,14 +49,12 @@ static int resets_init(struct kbase_device *kbdev)
 		return nr_resets;
 	}
 
-	resets = devm_kcalloc(kbdev->dev, nr_resets, sizeof(*resets),
-			GFP_KERNEL);
+	resets = devm_kcalloc(kbdev->dev, (size_t)nr_resets, sizeof(*resets), GFP_KERNEL);
 	if (!resets)
 		return -ENOMEM;
 
 	for (i = 0; i < nr_resets; ++i) {
-		resets[i] = devm_reset_control_get_exclusive_by_index(
-				kbdev->dev, i);
+		resets[i] = devm_reset_control_get_exclusive_by_index(kbdev->dev, i);
 		if (IS_ERR(resets[i])) {
 			err = PTR_ERR(resets[i]);
 			nr_resets = i;
@@ -89,9 +86,8 @@ static int pm_callback_soft_reset(struct kbase_device *kbdev)
 	udelay(10);
 
 	/* Override Power Management Settings, values from manufacturer's defaults */
-	kbase_reg_write(kbdev, GPU_CONTROL_REG(PWR_KEY), 0x2968A819);
-	kbase_reg_write(kbdev, GPU_CONTROL_REG(PWR_OVERRIDE1),
-			0xfff | (0x20 << 16));
+	kbase_reg_write32(kbdev, GPU_CONTROL_ENUM(PWR_KEY), 0x2968A819);
+	kbase_reg_write32(kbdev, GPU_CONTROL_ENUM(PWR_OVERRIDE1), 0xfff | (0x20 << 16));
 
 	/*
 	 * RESET_COMPLETED interrupt will be raised, so continue with
@@ -203,6 +199,10 @@ static int kbase_device_runtime_init(struct kbase_device *kbdev)
 		ret = -EINVAL;
 	}
 
+	/* allocate resources for reset */
+	if (!ret)
+		ret = resets_init(kbdev);
+
 	return ret;
 }
 
@@ -268,7 +268,7 @@ struct kbase_pm_callback_conf pm_callbacks = {
 	.power_runtime_term_callback = kbase_device_runtime_disable,
 	.power_runtime_on_callback = pm_callback_runtime_on,
 	.power_runtime_off_callback = pm_callback_runtime_off,
-#else				/* KBASE_PM_RUNTIME */
+#else /* KBASE_PM_RUNTIME */
 	.power_runtime_init_callback = NULL,
 	.power_runtime_term_callback = NULL,
 	.power_runtime_on_callback = NULL,
diff --git a/mali_kbase/platform/pixel/pixel_gpu.c b/mali_kbase/platform/pixel/pixel_gpu.c
index 57c8ea4..0435f4a 100644
--- a/mali_kbase/platform/pixel/pixel_gpu.c
+++ b/mali_kbase/platform/pixel/pixel_gpu.c
@@ -25,6 +25,9 @@
 #include <csf/mali_kbase_csf_firmware_cfg.h>
 #endif
 
+/* We need this include due to the removal from mali_kbase.h */
+#include <mali_kbase_hwaccess_pm.h>
+
 /* Pixel integration includes */
 #include "mali_kbase_config_platform.h"
 #include "pixel_gpu_control.h"
diff --git a/mali_kbase/platform/pixel/pixel_gpu_debug.c b/mali_kbase/platform/pixel/pixel_gpu_debug.c
index f08f0b0..4d1d311 100644
--- a/mali_kbase/platform/pixel/pixel_gpu_debug.c
+++ b/mali_kbase/platform/pixel/pixel_gpu_debug.c
@@ -12,7 +12,6 @@
 /* Pixel integration includes */
 #include "pixel_gpu_debug.h"
 
-#define GPU_DBG_LO               0x00000FE8
 #define PIXEL_STACK_PDC_ADDR     0x000770DB
 #define PIXEL_CG_PDC_ADDR        0x000760DB
 #define PIXEL_SC_PDC_ADDR        0x000740DB
@@ -30,7 +29,7 @@ static bool gpu_debug_check_dbg_active(struct kbase_device *kbdev)
 
 	/* Wait for the active bit to drop, indicating the DBG command completed */
 	do {
-		val = kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_STATUS));
+		val = kbase_reg_read32(kbdev, GPU_CONTROL_ENUM(GPU_STATUS));
 	} while ((val & GPU_DBG_ACTIVE_BIT) && i++ < GPU_DBG_ACTIVE_MAX_LOOPS);
 
 	if (val & GPU_DBG_ACTIVE_BIT) {
@@ -48,13 +47,13 @@ static u32 gpu_debug_read_pdc(struct kbase_device *kbdev, u32 pdc_offset)
 	lockdep_assert_held(&kbdev->hwaccess_lock);
 
 	/* Write the debug command */
-	kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), pdc_offset);
+	kbase_reg_write32(kbdev, GPU_CONTROL_ENUM(GPU_COMMAND), pdc_offset);
 	/* Wait for the debug command to complete */
 	if (!gpu_debug_check_dbg_active(kbdev))
 		return GPU_DBG_INVALID;
 
 	/* Read the result */
-	return kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_DBG_LO));
+	return kbase_reg_read32(kbdev, GPU_CONTROL_ENUM(GPU_DBG));
 }
 
 static void gpu_debug_read_sparse_pdcs(struct kbase_device *kbdev, u32 *out, u64 available,
@@ -76,8 +75,7 @@ static void gpu_debug_read_sparse_pdcs(struct kbase_device *kbdev, u32 *out, u64
 
 void gpu_debug_read_pdc_status(struct kbase_device *kbdev, struct pixel_gpu_pdc_status *status)
 {
-	struct gpu_raw_gpu_props *raw_props;
-
+	struct kbase_gpu_props *raw_props;
 	lockdep_assert_held(&kbdev->hwaccess_lock);
 
 	status->meta = (struct pixel_gpu_pdc_status_metadata) {
@@ -93,7 +91,7 @@ void gpu_debug_read_pdc_status(struct kbase_device *kbdev, struct pixel_gpu_pdc_
 		return;
 	}
 
-	raw_props = &kbdev->gpu_props.props.raw_props;
+	raw_props = &kbdev->gpu_props;
 
 	status->state.core_group = gpu_debug_read_pdc(kbdev, PIXEL_CG_PDC_ADDR);
 	gpu_debug_read_sparse_pdcs(kbdev, status->state.shader_cores, raw_props->shader_present,
diff --git a/mali_kbase/platform/pixel/pixel_gpu_sscd.c b/mali_kbase/platform/pixel/pixel_gpu_sscd.c
index b374b00..ed1f973 100644
--- a/mali_kbase/platform/pixel/pixel_gpu_sscd.c
+++ b/mali_kbase/platform/pixel/pixel_gpu_sscd.c
@@ -332,7 +332,7 @@ static int get_and_init_contexts(struct kbase_device *kbdev,
 
 	context_snapshot->meta = (struct pixel_context_metadata) {
 		.magic = "c@tx",
-		.platform = kbdev->gpu_props.props.raw_props.gpu_id,
+		.platform = kbdev->gpu_props.gpu_id.product_id,
 		.version = 1,
 	};
 
diff --git a/mali_kbase/platform/vexpress/mali_kbase_config_vexpress.c b/mali_kbase/platform/vexpress/mali_kbase_config_vexpress.c
index ff1ee65..699d533 100644
--- a/mali_kbase/platform/vexpress/mali_kbase_config_vexpress.c
+++ b/mali_kbase/platform/vexpress/mali_kbase_config_vexpress.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 /*
  *
- * (C) COPYRIGHT 2011-2017, 2020-2021 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2011-2023 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
@@ -32,10 +32,7 @@ static struct kbase_io_resources io_resources = {
 	.job_irq_number = 68,
 	.mmu_irq_number = 69,
 	.gpu_irq_number = 70,
-	.io_memory_region = {
-	.start = 0xFC010000,
-	.end = 0xFC010000 + (4096 * 4) - 1
-	}
+	.io_memory_region = { .start = 0xFC010000, .end = 0xFC010000 + (4096 * 4) - 1 }
 };
 #endif /* CONFIG_OF */
 
@@ -49,12 +46,10 @@ static void pm_callback_power_off(struct kbase_device *kbdev)
 {
 }
 
-struct kbase_pm_callback_conf pm_callbacks = {
-	.power_on_callback = pm_callback_power_on,
-	.power_off_callback = pm_callback_power_off,
-	.power_suspend_callback  = NULL,
-	.power_resume_callback = NULL
-};
+struct kbase_pm_callback_conf pm_callbacks = { .power_on_callback = pm_callback_power_on,
+					       .power_off_callback = pm_callback_power_off,
+					       .power_suspend_callback = NULL,
+					       .power_resume_callback = NULL };
 
 static struct kbase_platform_config versatile_platform_config = {
 #ifndef CONFIG_OF
@@ -71,7 +66,8 @@ struct kbase_platform_config *kbase_get_platform_config(void)
 #if MALI_USE_CSF
 int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation)
 #else
-int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share, u32 util_cl_share[2])
+int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share,
+			      u32 util_cl_share[2])
 #endif
 {
 	return 1;
diff --git a/mali_kbase/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c b/mali_kbase/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c
index fee6a36..b0cc588 100644
--- a/mali_kbase/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c
+++ b/mali_kbase/platform/vexpress_1xv7_a57/mali_kbase_config_vexpress.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 /*
  *
- * (C) COPYRIGHT 2011-2014, 2017, 2020-2021 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2011-2023 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
@@ -31,9 +31,7 @@ static struct kbase_io_resources io_resources = {
 	.job_irq_number = 68,
 	.mmu_irq_number = 69,
 	.gpu_irq_number = 70,
-	.io_memory_region = {
-			     .start = 0x2f010000,
-			     .end = 0x2f010000 + (4096 * 4) - 1}
+	.io_memory_region = { .start = 0x2f010000, .end = 0x2f010000 + (4096 * 4) - 1 }
 };
 #endif
 
@@ -47,12 +45,10 @@ static void pm_callback_power_off(struct kbase_device *kbdev)
 {
 }
 
-struct kbase_pm_callback_conf pm_callbacks = {
-	.power_on_callback = pm_callback_power_on,
-	.power_off_callback = pm_callback_power_off,
-	.power_suspend_callback  = NULL,
-	.power_resume_callback = NULL
-};
+struct kbase_pm_callback_conf pm_callbacks = { .power_on_callback = pm_callback_power_on,
+					       .power_off_callback = pm_callback_power_off,
+					       .power_suspend_callback = NULL,
+					       .power_resume_callback = NULL };
 
 static struct kbase_platform_config versatile_platform_config = {
 #ifndef CONFIG_OF
@@ -69,7 +65,8 @@ struct kbase_platform_config *kbase_get_platform_config(void)
 #if MALI_USE_CSF
 int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation)
 #else
-int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share, u32 util_cl_share[2])
+int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share,
+			      u32 util_cl_share[2])
 #endif
 {
 	return 1;
diff --git a/mali_kbase/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c b/mali_kbase/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c
index f6fb9aa..70f6a83 100644
--- a/mali_kbase/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c
+++ b/mali_kbase/platform/vexpress_6xvirtex7_10mhz/mali_kbase_config_vexpress.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
 /*
  *
- * (C) COPYRIGHT 2011-2014, 2017, 2020-2021 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2011-2023 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
@@ -31,9 +31,7 @@ static struct kbase_io_resources io_resources = {
 	.job_irq_number = 75,
 	.mmu_irq_number = 76,
 	.gpu_irq_number = 77,
-	.io_memory_region = {
-			     .start = 0x2F000000,
-			     .end = 0x2F000000 + (4096 * 4) - 1}
+	.io_memory_region = { .start = 0x2F000000, .end = 0x2F000000 + (4096 * 4) - 1 }
 };
 #endif
 
@@ -47,12 +45,10 @@ static void pm_callback_power_off(struct kbase_device *kbdev)
 {
 }
 
-struct kbase_pm_callback_conf pm_callbacks = {
-	.power_on_callback = pm_callback_power_on,
-	.power_off_callback = pm_callback_power_off,
-	.power_suspend_callback  = NULL,
-	.power_resume_callback = NULL
-};
+struct kbase_pm_callback_conf pm_callbacks = { .power_on_callback = pm_callback_power_on,
+					       .power_off_callback = pm_callback_power_off,
+					       .power_suspend_callback = NULL,
+					       .power_resume_callback = NULL };
 
 static struct kbase_platform_config versatile_platform_config = {
 #ifndef CONFIG_OF
@@ -69,7 +65,8 @@ struct kbase_platform_config *kbase_get_platform_config(void)
 #if MALI_USE_CSF
 int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation)
 #else
-int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share, u32 util_cl_share[2])
+int kbase_platform_dvfs_event(struct kbase_device *kbdev, u32 utilisation, u32 util_gl_share,
+			      u32 util_cl_share[2])
 #endif
 {
 	return 1;