Merge aosp/android-gs-raviole-5.10-android14-qpr2 into aosp/android14-gs-pixel-6.1

* aosp/android-gs-raviole-5.10-android14-qpr2: (354 commits)
  [Official] MIDCET-5090, GPUCORE-40350: Flushes for L2 powerdown
  Fix invalid page table entries from occuring.
  Fix deadlock BTW user thread and page fault worker
  Fix deadlock BTW user thread and page fault worker
  csf: Fix kbase_kcpu_command_queue UaF due to bad queue creation
  Fix kernel build warnings
  Fix kernel build warnings
  Add firmware core dump error code in sscd
  GPUCORE-39469 Error handling for invalid slot when parsing trace data
  mali_kbase: platform: Add missing bounds check
  mali_kbase: Zero-initialize the dump_bufs_meta array
  mali_kbase: Fix OOB write in kbase_csf_cpu_queue_dump()
  mali_kbase: Move epoll-consumed waitqueue to struct kbase_file
  Integrate firmware core dump into sscd
  MIDCET-4870: Fix GPU page fault issue due to reclaiming of Tiler heap chunks
  mali_kbase: platform: Fix integer overflow
  mali_kbase: Tracepoints for governor recommendation
  mali_kbase: Add tracepoints to hint_min_freq / hint_max_freq
  mali_kbase: Enable mali_kutf_clk_rate_trace_test_portal build
  mali_kbase: restore CSF ftrace events
  Refactor helpers for creating RT threads
  Update KMD to 'mini release: update r44p1-00dev2 to r44p1-00dev3'
  mali_kbase: Use kthread for protm_event_worker
  GPUCORE-34589 jit_lock all JIT operations
  [Official] MIDCET-4458, GPUCORE-36765: Stop the use of tracking page for GPU memory accounting
  mali_kbase: Unmask RESET_COMPLETED irq before resetting the GPU
  [Official] MIDCET-4820,GPUCORE-36255 Sync whole USER_BUFFER pages upon GPU mapping
  mali_kbase: Use rt_mutex for scheduler lock
  mali_kbase: fix incorrect auto-merger change
  mali_pixel: Disable mgm debugfs by default
  mali_kbase: platform: Batch MMU flushes after liveness update
  mali_kbase: refactor kbase_mmu_update_pages
  [Official] MIDCET-4806,GPUCORE-38732 Continue FLUSH_MEM after power transition timeout
  mali_pixel: mgm: Compensate for group migration
  mali_pixel: mgm: Remove race condition
  mali_pixel: mgm: Refactor update_size
  mali_kbase: add missing deinitialization
  [Official] MIDCET-4458, GPUCORE-36765: Stop the use of tracking page for GPU memory accounting
  mali_kbase: restore hysteresis time.
  Update KMD to 'mini release: update r44p1-01bet1 to r44p1-00dev2'
  mali_kbase: Reduce kernel log spam.
  csf: Setup kcpu_fence->metadata before accessing it
  mali_kbase: Add an ITMON notifier callback to check GPU page tables.
  mali_kbase: shorten 'mali_kbase_*' thread names
  Constrain protected memory allocation during FW initialization
  Merge upstream DDK R43P0 KMD
  Mali allocations: unconditionally check for pending kill signals
  pixel_gpu_uevent: Increase uevent ratelimiting timeout to 20mins
  GPUCORE-38292 Fix Use-After-Free Race with Memory-Pool Grow
  kbase: csf: Reboot on failed GPU reset
  Add missing hwaccess_lock around atom_flags updates.
  GPUCORE-35754: Add barrier before updating GLB_DB_REQ to ring CSG DB
  mali_kbase: Enable kutf modules
  GPUCORE-36682 Lock MMU while disabling AS to prevent use after free
  kbase_mem: Reduce per-memory-group pool size to 4.
  mali_pixel: mgm: Ensure partition size is set to 0 when disabled.
  GPUCORE-37961 Deadlock issue due to lock ordering issue
  Make sure jobs are flushed before kbasep_platform_context_term
  [Official] MIDCET-4546, GPUCORE-37946: Synchronize GPU cache flush cmds with silent reset on GPU power up
  mali_kbase: hold GPU utilization for premature update.
  mali_kbase: Remove incorrect WARN()
  MIDCET-4324/GPUCORE-35611 Unmapping of aliased sink-page memory
  [Official] MIDCET-4458, GPUCORE-36402: Check for process exit before page alloc from kthread
  Revert "Revert "GPUCORE-36748 Fix kbase_gpu_mmap() error handling""
  Mali Valhall Android DDK r43p0-01eac0 KMD
  Mali Valhall Android DDK r42p0-01eac0 KMD
  mali_kbase: platform: [SLC-VK] Add new MGM group id for explicit SLC allocations.
  mali_kbase: [SLC-VK] Add new BASE_MEM_GROUP for explicit SLC allocations.
  mali_kbase: [SLC-VK] Add CCTX memory class for explicit SLC allocations.
  platform: Fix mgm_term_data behavior
  platform: Disable the GPU SLC partition when not in demand
  Revert "GPUCORE-36748 Fix kbase_gpu_mmap() error handling"
  Revert "GPUCORE-36682 Lock MMU while disabling AS to prevent use after free"
  Revert "GPUCORE-36748 Fix kbase_gpu_mmap() error handling"
  Revert "GPUCORE-36682 Lock MMU while disabling AS to prevent use after free"
  [Official] MIDCET-4458, GPUCORE-36429: Prevent JIT allocations following unmap of tracking page
  [Official] MIDCET-4458, GPUCORE-36635 Fix memory leak via GROUP_SUSPEND
  Flush mmu updates regardless of coherency mode
  kbase: Add a debugfs file to test GPU uevents
  kbase: Add new GPU uevents to kbase
  pixel: Introduce GPU uevents to notify userspace of GPU failures
  [Official] MIDCET-4458, GPUCORE-36654 Use %pK on GPU bus fault
  mali_kbase: platform: Init GPU SLC context
  Add partial term support to pixel gpu init
  mali_kbase: Add missing wake_up(poweroff_wait) when cancelling poweroff.
  mali_pixel: mgm: Factor out common code between enabling/mutating partitions
  mali_pixel: mgm: Get accurate size from slc pt mutate
  mali_kbase: platform: mgm: Get accurate SLC partition size
  mali_kbase: Remove redundant if check to unblock suspend
  mali_kbase: reset: Flush SSCD worker before resetting the GPU
  pixel_gpu_sscd: Prevent dumping multiple SSCDs when the GPU hangs
  mali_kbase: reset: Add a helper to check GPU reset failure
  mali-pma: Defer probing until the dma_heap is found
  Revert "mali_kbase: mem: Prevent vma splits"
  GPUCORE-36682 Lock MMU while disabling AS to prevent use after free
  GPUCORE-36748 Fix kbase_gpu_mmap() error handling
  Powercycle mali to recover from a PM timeout
  mali_pixel: Downgrade invalid region warning to dev_dbg
  mali_pixel: Fix PBHA bit pos for ZUMA and PRO
  mali_kbase: platform: Perform partition resize and region migration
  ...

Test: Verify `git diff aosp/android-gs-raviole-5.10-android14-qpr2..HEAD`
Change-Id: I0711654dd45ae2996e837ce3353f0790394d7c72
Signed-off-by: Will McVicker <willmcvicker@google.com>

1 files changed, 97 insertions, 2 deletions

diff --git a/mali_kbase/mali_kbase_hwaccess_time.h b/mali_kbase/mali_kbase_hwaccess_time.h
index 27e2cb7..f16348f 100644
--- a/mali_kbase/mali_kbase_hwaccess_time.h
+++ b/mali_kbase/mali_kbase_hwaccess_time.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *
- * (C) COPYRIGHT 2014, 2018-2021 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2014, 2018-2021, 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
@@ -23,6 +23,56 @@
 #define _KBASE_BACKEND_TIME_H_
 
 /**
+ * struct kbase_backend_time - System timestamp attributes.
+ *
+ * @multiplier:		Numerator of the converter's fraction.
+ * @divisor:		Denominator of the converter's fraction.
+ * @offset:		Converter's offset term.
+ * @device_scaled_timeouts: Timeouts in milliseconds that were scaled to be
+ *                          consistent with the minimum MCU frequency. This
+ *                          array caches the results of all of the conversions
+ *                          for ease of use later on.
+ *
+ * According to Generic timer spec, system timer:
+ * - Increments at a fixed frequency
+ * - Starts operating from zero
+ *
+ * Hence CPU time is a linear function of System Time.
+ *
+ * CPU_ts = alpha * SYS_ts + beta
+ *
+ * Where
+ * - alpha = 10^9/SYS_ts_freq
+ * - beta is calculated by two timer samples taken at the same time:
+ *   beta = CPU_ts_s - SYS_ts_s * alpha
+ *
+ * Since alpha is a rational number, we minimizing possible
+ * rounding error by simplifying the ratio. Thus alpha is stored
+ * as a simple `multiplier / divisor` ratio.
+ *
+ */
+struct kbase_backend_time {
+#if MALI_USE_CSF
+	u64 multiplier;
+	u64 divisor;
+	s64 offset;
+#endif
+	unsigned int device_scaled_timeouts[KBASE_TIMEOUT_SELECTOR_COUNT];
+};
+
+#if MALI_USE_CSF
+/**
+ * kbase_backend_time_convert_gpu_to_cpu() - Convert GPU timestamp to CPU timestamp.
+ *
+ * @kbdev:	Kbase device pointer
+ * @gpu_ts:	System timestamp value to converter.
+ *
+ * Return: The CPU timestamp.
+ */
+u64 __maybe_unused kbase_backend_time_convert_gpu_to_cpu(struct kbase_device *kbdev, u64 gpu_ts);
+#endif
+
+/**
  * kbase_backend_get_gpu_time() - Get current GPU time
  * @kbdev:              Device pointer
  * @cycle_counter:      Pointer to u64 to store cycle counter in.
@@ -47,7 +97,38 @@ void kbase_backend_get_gpu_time_norequest(struct kbase_device *kbdev,
 					  u64 *system_time,
 					  struct timespec64 *ts);
 
-#endif /* _KBASE_BACKEND_TIME_H_ */
+/**
+ * kbase_device_set_timeout_ms - Set an unscaled device timeout in milliseconds,
+ *                               subject to the maximum timeout constraint.
+ *
+ * @kbdev:            KBase device pointer.
+ * @selector:         The specific timeout that should be scaled.
+ * @timeout_ms:    The timeout in cycles which should be scaled.
+ *
+ * This function writes the absolute timeout in milliseconds to the table of
+ * precomputed device timeouts, while estabilishing an upped bound on the individual
+ * timeout of UINT_MAX milliseconds.
+ */
+void kbase_device_set_timeout_ms(struct kbase_device *kbdev, enum kbase_timeout_selector selector,
+				 unsigned int timeout_ms);
+
+/**
+ * kbase_device_set_timeout - Calculate the given timeout using the provided
+ *                            timeout cycles and multiplier.
+ *
+ * @kbdev:            KBase device pointer.
+ * @selector:         The specific timeout that should be scaled.
+ * @timeout_cycles:    The timeout in cycles which should be scaled.
+ * @cycle_multiplier: A multiplier applied to the number of cycles, allowing
+ *                    the callsite to scale the minimum timeout based on the
+ *                    host device.
+ *
+ * This function writes the scaled timeout to the per-device table to avoid
+ * having to recompute the timeouts every single time that the related methods
+ * are called.
+ */
+void kbase_device_set_timeout(struct kbase_device *kbdev, enum kbase_timeout_selector selector,
+			      u64 timeout_cycles, u32 cycle_multiplier);
 
 /**
  * kbase_get_timeout_ms - Choose a timeout value to get a timeout scaled
@@ -70,3 +151,17 @@ unsigned int kbase_get_timeout_ms(struct kbase_device *kbdev,
  * Return: Snapshot of the GPU cycle count register.
  */
 u64 kbase_backend_get_cycle_cnt(struct kbase_device *kbdev);
+
+/**
+ * kbase_backend_time_init() - Initialize system timestamp converter.
+ *
+ * @kbdev:	Kbase device pointer
+ *
+ * This function should only be called after GPU is powered-up and
+ * L2 cached power-up has been initiated.
+ *
+ * Return: Zero on success, error code otherwise.
+ */
+int kbase_backend_time_init(struct kbase_device *kbdev);
+
+#endif /* _KBASE_BACKEND_TIME_H_ */