Update Temperature APIs to get correct temperature

This change updates Temperature APIs to get correct current
temperature based on updated PMT interface.

Signed-off-by: Jitendra Sharma <[email protected]>

Author: jitendrasharma1989

level_zero/tools/source/sysman/fan/linux/os_fan_imp.cpp

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "level_zero/tools/source/sysman/fan/linux/os_fan_imp.h"
 
-#include "level_zero/tools/source/sysman/linux/pmt.h"
+#include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
 
 #include "sysman/linux/os_sysman_imp.h"
 

level_zero/tools/source/sysman/linux/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -9,8 +9,6 @@ set(L0_SRCS_TOOLS_SYSMAN_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.h
     ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/fs_access.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/pmt.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/pmt.h
 )
 
 if(UNIX)

level_zero/tools/source/sysman/linux/os_sysman_imp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -34,9 +34,14 @@ ze_result_t LinuxSysmanImp::init() {
     pSysfsAccess = SysfsAccess::create(myDeviceName);
     UNRECOVERABLE_IF(nullptr == pSysfsAccess);
 
-    pPmt = new PlatformMonitoringTech();
-    UNRECOVERABLE_IF(nullptr == pPmt);
-    pPmt->init(myDeviceName, pFsAccess);
+    std::string realRootPath;
+    result = pSysfsAccess->getRealPath("device", realRootPath);
+    if (ZE_RESULT_SUCCESS != result) {
+        return result;
+    }
+    auto rootPciPathOfGpuDevice = getPciRootPortDirectoryPath(realRootPath);
+    PlatformMonitoringTech::create(pParentSysmanDeviceImp->deviceHandles, pFsAccess, rootPciPathOfGpuDevice, mapOfSubDeviceIdToPmtObject);
+
     pPmuInterface = PmuInterface::create(this);
     UNRECOVERABLE_IF(nullptr == pPmuInterface);
 
@@ -83,9 +88,29 @@ SysmanDeviceImp *LinuxSysmanImp::getSysmanDeviceImp() {
     return pParentSysmanDeviceImp;
 }
 
-PlatformMonitoringTech &LinuxSysmanImp::getPlatformMonitoringTechAccess() {
-    UNRECOVERABLE_IF(nullptr == pPmt);
-    return *pPmt;
+std::string LinuxSysmanImp::getPciRootPortDirectoryPath(std::string realPciPath) {
+    size_t loc;
+    // we need to change the absolute path to two levels up to get
+    // the Discrete card's root port.
+    // the root port is always at a fixed distance as defined in HW
+    uint8_t nLevel = 2;
+    while (nLevel > 0) {
+        loc = realPciPath.find_last_of('/');
+        if (loc == std::string::npos) {
+            break;
+        }
+        realPciPath = realPciPath.substr(0, loc);
+        nLevel--;
+    }
+    return realPciPath;
+}
+
+PlatformMonitoringTech *LinuxSysmanImp::getPlatformMonitoringTechAccess(uint32_t subDeviceId) {
+    auto subDeviceIdToPmtEntry = mapOfSubDeviceIdToPmtObject.find(subDeviceId);
+    if (subDeviceIdToPmtEntry == mapOfSubDeviceIdToPmtObject.end()) {
+        return nullptr;
+    }
+    return subDeviceIdToPmtEntry->second;
 }
 
 LinuxSysmanImp::LinuxSysmanImp(SysmanDeviceImp *pParentSysmanDeviceImp) {
@@ -113,14 +138,13 @@ LinuxSysmanImp::~LinuxSysmanImp() {
         delete pFwUtilInterface;
         pFwUtilInterface = nullptr;
     }
-    if (nullptr != pPmt) {
-        delete pPmt;
-        pPmt = nullptr;
-    }
     if (nullptr != pPmuInterface) {
         delete pPmuInterface;
         pPmuInterface = nullptr;
     }
+    for (auto &subDeviceIdToPmtEntry : mapOfSubDeviceIdToPmtObject) {
+        delete subDeviceIdToPmtEntry.second;
+    }
 }
 
 OsSysman *OsSysman::create(SysmanDeviceImp *pParentSysmanDeviceImp) {

level_zero/tools/source/sysman/linux/os_sysman_imp.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,11 +13,13 @@
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/tools/source/sysman/linux/firmware_util/firmware_util.h"
 #include "level_zero/tools/source/sysman/linux/fs_access.h"
-#include "level_zero/tools/source/sysman/linux/pmt.h"
+#include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
 #include "level_zero/tools/source/sysman/linux/pmu/pmu_imp.h"
 #include "level_zero/tools/source/sysman/linux/xml_parser/xml_parser.h"
 #include "level_zero/tools/source/sysman/sysman_imp.h"
 
+#include <map>
+
 namespace L0 {
 class PmuInterface;
 
@@ -35,20 +37,21 @@ class LinuxSysmanImp : public OsSysman, NEO::NonCopyableOrMovableClass {
     ProcfsAccess &getProcfsAccess();
     SysfsAccess &getSysfsAccess();
     NEO::Drm &getDrm();
-    PlatformMonitoringTech &getPlatformMonitoringTechAccess();
+    PlatformMonitoringTech *getPlatformMonitoringTechAccess(uint32_t subDeviceId);
     Device *getDeviceHandle();
     SysmanDeviceImp *getSysmanDeviceImp();
+    std::string getPciRootPortDirectoryPath(std::string realPciPath);
 
   protected:
     XmlParser *pXmlParser = nullptr;
     FsAccess *pFsAccess = nullptr;
     ProcfsAccess *pProcfsAccess = nullptr;
     SysfsAccess *pSysfsAccess = nullptr;
-    PlatformMonitoringTech *pPmt = nullptr;
     NEO::Drm *pDrm = nullptr;
     Device *pDevice = nullptr;
     PmuInterface *pPmuInterface = nullptr;
     FirmwareUtil *pFwUtilInterface = nullptr;
+    std::map<uint32_t, L0::PlatformMonitoringTech *> mapOfSubDeviceIdToPmtObject;
 
   private:
     LinuxSysmanImp() = delete;

level_zero/tools/source/sysman/linux/pmt.cpp

@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2020-2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(L0_SRCS_TOOLS_SYSMAN_LINUX_PMT
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/pmt.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/pmt.h
+)
+if(UNIX)
+  target_sources(${L0_STATIC_LIB_NAME}
+                 PRIVATE
+                 ${L0_SRCS_TOOLS_SYSMAN_LINUX_PMT}
+  )
+endif()
+# Make our source files visible to parent
+set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_PMT_LINUX ${L0_SRCS_TOOLS_SYSMAN_PMT_LINUX})