Upstream 5.0.0

CHANGELOG.md

@@ -1,3 +1,25 @@
+## [5.0.0]
+
+**Note:** Backward incompatible API change:
+ The HECI_DEVICE_KIND_* enums and kind field in struct tee_device_address 
+ are renamed to HECI_HW_TYPE_* and hw_type field to avoid clash with
+ device kind  value provided by OS drivers.
+
+### Changed
+ - EFI: Decrease HW register polling timeout
+ - EFI: Refactor HECI_DEVICE_KIND
+ - Linux: pull libmei 1.6.4
+
+### Fixed
+ - EFI: Change propertyMap array type to CHAR8*
+ - EFI: Fixing compilation errors with GCC
+ - account for old Windows driver
+
+### Added
+ - CMake: Windows: add release 64 static preset
+ - Add cpp wrapper
+ - TeeGetKind API
+
 ## [4.3.1]
 
 ### Fixed

CMakePresets.json

@@ -33,7 +33,7 @@
     },
     {
       "name": "Debug32AllStatic",
-      "displayName": "Windows x86 Debug All",
+      "displayName": "Windows x86 Debug Static All",
       "description": "Build x86 Debug, VS2019, including test and samples",
       "inherits": "base32",
       "binaryDir": "${sourceDir}/Debug",
@@ -46,7 +46,7 @@
     },
     {
       "name": "Release32AllStatic",
-      "displayName": "Windows x86 Release All",
+      "displayName": "Windows x86 Release Static All",
       "description": "Build x86 Release, VS2019, including test and samples",
       "inherits": "base32",
       "binaryDir": "${sourceDir}/Release",
@@ -59,7 +59,7 @@
     },
     {
       "name": "Release32Static",
-      "displayName": "Windows x86 Release",
+      "displayName": "Windows x86 Release Static",
       "description": "Build x86 Release, VS2019",
       "inherits": "base32",
       "binaryDir": "${sourceDir}/Release",
@@ -88,6 +88,17 @@
         "CMAKE_BUILD_TYPE": "Release"
       }
     },
+    {
+      "name": "Release64Static",
+      "displayName": "Windows x86-64 Release Static",
+      "description": "Build x86-64 Release, VS2019",
+      "inherits": "base64",
+      "binaryDir": "${sourceDir}/Release",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "BUILD_SHARED_LIBS": "NO"
+      }
+    },
     {
       "name": "Debug64All",
       "displayName": "Windows x86-64 Debug All",
@@ -127,6 +138,11 @@
       "configurePreset": "Release64",
       "configuration": "Release"
     },
+    {
+      "name": "Release64Static",
+      "configurePreset": "Release64Static",
+      "configuration": "Release"
+    },
     {
       "name": "Debug64All",
       "configurePreset": "Debug64All",

VERSION

@@ -1 +1 @@
-4.3.1
+5.0.0

conanfile.py

@@ -46,4 +46,4 @@ def package(self):
         cmake.install()
 
     def package_info(self):
-        self.cpp_info.libs = ["metee"]
+        self.cpp_info.components["libmetee"].libs = ["metee"]

include/Doxyfile.in

@@ -936,7 +936,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = @DOXYGEN_INPUT_DIRECTORY@/include/metee.h
+INPUT                  = @DOXYGEN_INPUT_DIRECTORY@/include/metee.h @DOXYGEN_INPUT_DIRECTORY@/include/meteepp.h
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

include/metee.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 /*
- * Copyright (C) 2014-2024 Intel Corporation
+ * Copyright (C) 2014-2025 Intel Corporation
  */
 /*! \file metee.h
  *  \brief metee library API
@@ -138,12 +138,12 @@ struct tee_device_address {
 				uint32_t device;                      /** HECI device Device */
 				uint32_t function;                    /** HECI device Function */
 			} value;
-			/*! Specify HW layout: HECI, FWSTS registers locations  */			
-			enum  { 
-				HECI_DEVICE_KIND_PCH, 
-				HECI_DEVICE_KIND_GFX_GSC, 
-				HECI_DEVICE_KIND_GFX_CSC, 
-			} kind;									/** HECI device kind */
+			/*! Specifies HW layout: HECI, FWSTS registers locations  */
+			enum HECI_HW_TYPE {
+				HECI_HW_TYPE_PCH,
+				HECI_HW_TYPE_GFX_GSC,
+				HECI_HW_TYPE_GFX_CSC,
+			} hw_type;				   /** HECI device HW type */
 		} bdf;
 	} data;
 };
@@ -347,6 +347,16 @@ uint32_t TEEAPI TeeGetMaxMsgLen(IN const PTEEHANDLE handle);
  */
 uint8_t TEEAPI TeeGetProtocolVer(IN const PTEEHANDLE handle);
 
+
+/*! Obtains kind of the TEE device 
+ *  \param handle The handle of the session.
+ *  \param kind Buffer to fill with device kind null terminated string, may be NULL.
+ *  \param kindSize Pointer to kind buffer size in bytes, updated to number of bytes filled in buffer, including null character, on out.
+ *          If buffer is NULL, required size is returned anyway.
+ *  \return 0 if successful, otherwise error code.
+ */
+TEESTATUS TEEAPI TeeGetKind(IN PTEEHANDLE handle, IN OUT char *kind, IN OUT size_t *kindSize);
+
 #ifdef __cplusplus
 }
 #endif