Add support for CSF GPU versioning ioctl (#55)

Author: solidpixel

vendor/arm/mali/hwc.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 ARM Limited.
+ * Copyright (c) 2017-2022 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -307,7 +307,8 @@ struct kbase_ioctl_hwcnt_reader_setup
 
 #define KBASE_IOCTL_TYPE 0x80
 #define KBASE_IOCTL_GET_GPUPROPS MALI_IOW(KBASE_IOCTL_TYPE, 3, struct mali_userspace::kbase_ioctl_get_gpuprops)
-#define KBASE_IOCTL_VERSION_CHECK _IOWR(KBASE_IOCTL_TYPE, 0, struct mali_userspace::kbase_ioctl_version_check)
+#define KBASE_IOCTL_VERSION_CHECK_JM _IOWR(KBASE_IOCTL_TYPE, 0, struct mali_userspace::kbase_ioctl_version_check)
+#define KBASE_IOCTL_VERSION_CHECK_CSF _IOWR(KBASE_IOCTL_TYPE, 52, struct mali_userspace::kbase_ioctl_version_check)
 #define KBASE_IOCTL_SET_FLAGS _IOW(KBASE_IOCTL_TYPE, 1, struct mali_userspace::kbase_ioctl_set_flags)
 #define KBASE_IOCTL_HWCNT_READER_SETUP _IOW(KBASE_IOCTL_TYPE, 8, struct mali_userspace::kbase_ioctl_hwcnt_reader_setup)
 
@@ -348,7 +349,9 @@ struct uku_version_check_args
 
 enum
 {
-	UKP_FUNC_ID_CHECK_VERSION = 0,
+	UKP_FUNC_ID_CHECK_VERSION_JM = 0,
+	UKP_FUNC_ID_CHECK_VERSION_CSF = 52,
+
 	/* Related to mali0 ioctl interface */
 	LINUX_UK_BASE_MAGIC              = 0x80,
 	BASE_CONTEXT_CREATE_KERNEL_FLAGS = 0x2,

vendor/arm/mali/mali_profiler.cpp

@@ -57,18 +57,38 @@ MaliHWInfo get_mali_hw_info(const char *path)
 	}
 
 	{
+		// Try matching Job Manager version IOCTL
+		bool checked_version = true;
 		mali_userspace::kbase_uk_hwcnt_reader_version_check_args version_check_args;
-		version_check_args.header.id = mali_userspace::UKP_FUNC_ID_CHECK_VERSION;        // NOLINT
+		version_check_args.header.id = mali_userspace::UKP_FUNC_ID_CHECK_VERSION_JM;
 		version_check_args.major     = 10;
 		version_check_args.minor     = 2;
 
 		if (mali_userspace::mali_ioctl(fd, version_check_args) != 0)
 		{
 			mali_userspace::kbase_ioctl_version_check _version_check_args = {0, 0};
-			if (ioctl(fd, KBASE_IOCTL_VERSION_CHECK, &_version_check_args) < 0)
+			if (ioctl(fd, KBASE_IOCTL_VERSION_CHECK_JM, &_version_check_args) < 0)
 			{
-				close(fd);
-				throw std::runtime_error("Failed to check version.");
+				checked_version = false;
+			}
+		}
+
+		// Try matching CSF version IOCTL
+		if (!checked_version)
+		{
+			mali_userspace::kbase_uk_hwcnt_reader_version_check_args version_check_args;
+			version_check_args.header.id = mali_userspace::UKP_FUNC_ID_CHECK_VERSION_CSF;
+			version_check_args.major     = 1;
+			version_check_args.minor     = 4;
+
+			if (mali_userspace::mali_ioctl(fd, version_check_args) != 0)
+			{
+				mali_userspace::kbase_ioctl_version_check _version_check_args = {0, 0};
+				if (ioctl(fd, KBASE_IOCTL_VERSION_CHECK_CSF, &_version_check_args) < 0)
+				{
+					close(fd);
+					throw std::runtime_error("Failed to check version.");
+				}
 			}
 		}
 	}
@@ -459,24 +479,6 @@ void MaliProfiler::init()
 		throw std::runtime_error("Failed to open /dev/mali0.");
 	}
 
-	{
-		mali_userspace::kbase_uk_hwcnt_reader_version_check_args check;        // NOLINT
-		memset(&check, 0, sizeof(check));
-
-		if (mali_userspace::mali_ioctl(fd_, check) != 0)
-		{
-			mali_userspace::kbase_ioctl_version_check _check = {0, 0};
-			if (ioctl(fd_, KBASE_IOCTL_VERSION_CHECK, &_check) < 0)
-			{
-				throw std::runtime_error("Failed to get ABI version.");
-			}
-		}
-		else if (check.major < 10)
-		{
-			throw std::runtime_error("Unsupported ABI version 10.");
-		}
-	}
-
 	{
 		mali_userspace::kbase_uk_hwcnt_reader_set_flags flags;        // NOLINT
 		memset(&flags, 0, sizeof(flags));