From e43c8c26e6ebad3cadabda9d5d4fecba84333078 Mon Sep 17 00:00:00 2001 From: Mikael Olsson Date: Tue, 20 Feb 2024 15:48:47 +0100 Subject: Fix UAPI device type naming and validation The device types in the UAPI have been renamed to follow the UAPI namespacing and driver library validation has been added to ensure the driver library and UAPI device enum values match. The kernel and driver library version have been given a major bump for the introduction of the device type in the capabilities. Change-Id: Ib782b0bd7a8641db88521f8be399f709d2d73816 Signed-off-by: Mikael Olsson --- driver_library/include/ethosu.hpp | 6 +++--- driver_library/src/ethosu.cpp | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'driver_library') diff --git a/driver_library/include/ethosu.hpp b/driver_library/include/ethosu.hpp index d0e391c..fe43689 100644 --- a/driver_library/include/ethosu.hpp +++ b/driver_library/include/ethosu.hpp @@ -39,12 +39,12 @@ namespace EthosU { -constexpr uint32_t DRIVER_LIBRARY_VERSION_MAJOR = 3; +constexpr uint32_t DRIVER_LIBRARY_VERSION_MAJOR = 4; constexpr uint32_t DRIVER_LIBRARY_VERSION_MINOR = 0; constexpr uint32_t DRIVER_LIBRARY_VERSION_PATCH = 0; -constexpr uint32_t MAX_SUPPORTED_KERNEL_DRIVER_MAJOR_VERSION = 3; -constexpr uint32_t MIN_SUPPORTED_KERNEL_DRIVER_MAJOR_VERSION = 3; +constexpr uint32_t MAX_SUPPORTED_KERNEL_DRIVER_MAJOR_VERSION = 4; +constexpr uint32_t MIN_SUPPORTED_KERNEL_DRIVER_MAJOR_VERSION = 4; class Exception : public std::exception { public: diff --git a/driver_library/src/ethosu.cpp b/driver_library/src/ethosu.cpp index 0166f0a..c00f69f 100644 --- a/driver_library/src/ethosu.cpp +++ b/driver_library/src/ethosu.cpp @@ -288,6 +288,11 @@ ostream &operator<<(ostream &out, const HardwareConfiguration::DeviceType &devic } } +static_assert(static_cast(HardwareConfiguration::DeviceType::UNKNOWN) == ETHOSU_UAPI_DEVICE_UNKNOWN && + static_cast(HardwareConfiguration::DeviceType::SUBSYSTEM) == ETHOSU_UAPI_DEVICE_SUBSYSTEM && + static_cast(HardwareConfiguration::DeviceType::DIRECT) == ETHOSU_UAPI_DEVICE_DIRECT, + "DeviceType enums values doesn't match UAPI"); + /**************************************************************************** * Buffer ****************************************************************************/ -- cgit v1.2.1