Add firmware util interface for sysman windows

Related-To: LOCI-3132

Signed-off-by: Mayank Raghuwanshi <mayank.raghuwanshi@intel.com>

Author: mraghuwa

level_zero/CMakeLists.txt

@@ -75,25 +75,23 @@ if(BUILD_WITH_L0)
     endif()
   endif()
 
-  if(UNIX)
-    # Firmware Update Library
-    get_filename_component(IGSC_DIR_tmp "${NEO_SOURCE_DIR}/../igsc" ABSOLUTE)
+  # Firmware Update Library
+  get_filename_component(IGSC_DIR_tmp "${NEO_SOURCE_DIR}/../igsc" ABSOLUTE)
+  if(EXISTS "${IGSC_DIR_tmp}/lib/cmake")
+    find_package(igsc HINTS "${IGSC_DIR_tmp}/lib/cmake")
+  else()
+    find_package(igsc)
+  endif()
+  if(igsc_FOUND)
+    add_definitions(-DIGSC_PRESENT=1)
     if(EXISTS "${IGSC_DIR_tmp}/lib/cmake")
-      find_package(igsc HINTS "${IGSC_DIR_tmp}/lib/cmake")
-    else()
-      find_package(igsc)
-    endif()
-    if(igsc_FOUND)
-      add_definitions(-DIGSC_PRESENT=1)
-      if(EXISTS "${IGSC_DIR_tmp}/lib/cmake")
-        get_filename_component(igsc_INCLUDE_DIR "${NEO_SOURCE_DIR}/../igsc/include" ABSOLUTE)
-      endif()
-      message(STATUS "igsc Library headers directory: ${igsc_INCLUDE_DIR}")
-      message(STATUS "igsc version: ${igsc_VERSION}")
-      include_directories(SYSTEM ${igsc_INCLUDE_DIR})
-    else()
-      message(STATUS "igsc Library headers not available. Building without")
+      get_filename_component(igsc_INCLUDE_DIR "${NEO_SOURCE_DIR}/../igsc/include" ABSOLUTE)
     endif()
+    message(STATUS "igsc Library headers directory: ${igsc_INCLUDE_DIR}")
+    message(STATUS "igsc version: ${igsc_VERSION}")
+    include_directories(SYSTEM ${igsc_INCLUDE_DIR})
+  else()
+    message(STATUS "igsc Library headers not available. Building without")
   endif()
 
   if(UNIX)

level_zero/tools/source/sysman/diagnostics/linux/os_diagnostics_imp.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/helpers/string.h"
 
 #include "level_zero/core/source/device/device_imp.h"
+#include "level_zero/tools/source/sysman/firmware_util/firmware_util.h"
 
 #include <linux/pci_regs.h>
 

level_zero/tools/source/sysman/diagnostics/linux/os_diagnostics_imp.h

@@ -13,6 +13,7 @@
 #include "sysman/linux/os_sysman_imp.h"
 
 namespace L0 {
+class FirmwareUtil;
 
 class LinuxDiagnosticsImp : public OsDiagnostics, NEO::NonCopyableOrMovableClass {
   public:

level_zero/tools/source/sysman/ecc/linux/os_ecc_imp.cpp

@@ -8,6 +8,7 @@
 #include "level_zero/tools/source/sysman/ecc/linux/os_ecc_imp.h"
 
 #include "level_zero/tools/source/sysman/ecc/ecc_imp.h"
+#include "level_zero/tools/source/sysman/firmware_util/firmware_util.h"
 
 namespace L0 {
 

level_zero/tools/source/sysman/firmware/linux/os_firmware_imp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,8 @@
 
 #include "shared/source/helpers/string.h"
 
+#include "level_zero/tools/source/sysman/firmware_util/firmware_util.h"
+
 namespace L0 {
 
 static const std::string mtdDescriptor("/proc/mtd");

level_zero/tools/source/sysman/firmware/linux/os_firmware_imp.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,6 +13,7 @@
 #include "sysman/linux/os_sysman_imp.h"
 
 namespace L0 {
+class FirmwareUtil;
 
 class LinuxFirmwareImp : public OsFirmware, NEO::NonCopyableOrMovableClass {
   public:

level_zero/tools/source/sysman/firmware/linux/os_firmware_imp_helper.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "level_zero/tools/source/sysman/firmware/linux/os_firmware_imp.h"
+#include "level_zero/tools/source/sysman/firmware_util/firmware_util.h"
 
 namespace L0 {
 

level_zero/tools/source/sysman/firmware/linux/os_firmware_imp_helper_prelim.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "level_zero/tools/source/sysman/firmware/linux/os_firmware_imp.h"
+#include "level_zero/tools/source/sysman/firmware_util/firmware_util.h"
 
 const std::string iafPath = "device/";
 const std::string iafDirectory = "iaf.";

…ysman/linux/firmware_util/CMakeLists.txt …urce/sysman/firmware_util/CMakeLists.txtlevel_zero/tools/source/sysman/linux/firmware_util/CMakeLists.txt renamed to level_zero/tools/source/sysman/firmware_util/CMakeLists.txt level_zero/tools/source/sysman/linux/firmware_util/CMakeLists.txt renamed to level_zero/tools/source/sysman/firmware_util/CMakeLists.txt

@@ -1,40 +1,41 @@
 #
-# Copyright (C) 2020-2021 Intel Corporation
+# Copyright (C) 2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(igsc_FOUND)
-  set(L0_SRCS_TOOLS_SYSMAN_LINUX_FIRMWARE_UTIL
+  set(L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL
       ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp.h
       ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util.h
+      ${CMAKE_CURRENT_SOURCE_DIR}/igsc_wrapper.h
   )
   if(igsc_VERSION VERSION_LESS 0.3)
     message(STATUS "default igsc version: ${igsc_VERSION}")
-    set(L0_SRCS_TOOLS_SYSMAN_LINUX_FIRMWARE_UTIL_HELPER
+    set(L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL_HELPER
         ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp_helper.cpp
     )
   else()
     message(STATUS "IGSC version: ${igsc_VERSION}")
-    set(L0_SRCS_TOOLS_SYSMAN_LINUX_FIRMWARE_UTIL_HELPER
+    set(L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL_HELPER
         ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}firmware_util_imp_helper.cpp
     )
   endif()
+  add_subdirectories()
 else()
-  set(L0_SRCS_TOOLS_SYSMAN_LINUX_FIRMWARE_UTIL
+  set(L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL
       ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp_stub.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util.h
+      ${CMAKE_CURRENT_SOURCE_DIR}/igsc_wrapper.h
   )
 endif()
 
-if(UNIX)
-  target_sources(${L0_STATIC_LIB_NAME}
-                 PRIVATE
-                 ${L0_SRCS_TOOLS_SYSMAN_LINUX_FIRMWARE_UTIL}
-                 ${L0_SRCS_TOOLS_SYSMAN_LINUX_FIRMWARE_UTIL_HELPER}
-  )
-endif()
+target_sources(${L0_STATIC_LIB_NAME}
+               PRIVATE
+               ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL}
+               ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL_HELPER}
+)
 
 # Make our source files visible to parent
-set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL_LINUX ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL_LINUX})
+set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTILITY ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTILITY})

…sman/linux/firmware_util/firmware_util.h …rce/sysman/firmware_util/firmware_util.hlevel_zero/tools/source/sysman/linux/firmware_util/firmware_util.h renamed to level_zero/tools/source/sysman/firmware_util/firmware_util.h level_zero/tools/source/sysman/linux/firmware_util/firmware_util.h renamed to level_zero/tools/source/sysman/firmware_util/firmware_util.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,21 +10,16 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include "level_zero/core/source/device/device.h"
+#include "level_zero/tools/source/sysman/firmware_util/igsc_wrapper.h"
 #include <level_zero/zes_api.h>
 
-#ifdef IGSC_PRESENT
-#include "igsc_lib.h"
-#else
-typedef struct igsc_device_info {
-} igsc_device_info_t;
-#endif
 #include <string>
 #include <vector>
 
 namespace L0 {
 class FirmwareUtil {
   public:
-    static FirmwareUtil *create(const std::string &pciBDF);
+    static FirmwareUtil *create(uint16_t domain, uint8_t bus, uint8_t device, uint8_t function);
     virtual ze_result_t fwDeviceInit() = 0;
     virtual ze_result_t getFirstDevice(igsc_device_info *) = 0;
     virtual ze_result_t getFwVersion(std::string fwType, std::string &firmwareVersion) = 0;