Skip to content

Commit 0cc7182

Browse files
mraghuwaCompute-Runtime-Automation
mraghuwa
authored and
Compute-Runtime-Automation
committed
Update pmt telemetry node
Signed-off-by: Mayank Raghuwanshi <[email protected]>
1 parent edf066a commit 0cc7182

File tree

4 files changed

+26
-28
lines changed

4 files changed

+26
-28
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
#include <sys/mman.h>
1717

1818
namespace L0 {
19-
const std::string PlatformMonitoringTech::devfs("/dev/");
20-
const std::string PlatformMonitoringTech::baseTelemSysFS("/sys/class/pmt_telemetry");
19+
const std::string PlatformMonitoringTech::baseTelemSysFS("/sys/class/intel_pmt");
2120
const std::string PlatformMonitoringTech::telem("telem");
2221
uint32_t PlatformMonitoringTech::rootDeviceTelemNodeIndex = 0;
2322

@@ -35,7 +34,7 @@ ze_result_t PlatformMonitoringTech::enumerateRootTelemIndex(FsAccess *pFsAccess,
3534
}
3635

3736
// Exmaple: For below directory
38-
// # /sys/class/pmt_telemetry$ ls
37+
// # /sys/class/intel_pmt$ ls
3938
// telem1 telem2 telem3
4039
// Then listOfTelemNodes would contain telem1, telem2, telem3
4140
std::sort(listOfTelemNodes.begin(), listOfTelemNodes.end()); // sort listOfTelemNodes, to arange telem nodes in ascending order
@@ -49,7 +48,7 @@ ze_result_t PlatformMonitoringTech::enumerateRootTelemIndex(FsAccess *pFsAccess,
4948
if (realPathOfTelemNode.compare(0, rootPciPathOfGpuDevice.size(), rootPciPathOfGpuDevice) == 0) {
5049
// Example: If
5150
// rootPciPathOfGpuDevice = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0";
52-
// realPathOfTelemNode = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry/telem1";
51+
// realPathOfTelemNode = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry.1.auto/intel_pmt/telem1";
5352
// Thus As realPathOfTelemNode consists of rootPciPathOfGpuDevice, hence both telemNode and GPU device share same PCI Root.
5453
auto indexString = telemNode.substr(telem.size(), telemNode.size());
5554
rootDeviceTelemNodeIndex = stoi(indexString); // if telemNode is telemN, then rootDeviceTelemNodeIndex = N
@@ -80,7 +79,7 @@ void PlatformMonitoringTech::init(FsAccess *pFsAccess) {
8079
telemNode = telem + std::to_string(telemNodeIndex);
8180
}
8281
std::string baseTelemSysFSNode = baseTelemSysFS + "/" + telemNode;
83-
std::string telemetryDeviceEntry = devfs + telemNode;
82+
std::string telemetryDeviceEntry = baseTelemSysFSNode + "/" + telem;
8483
if (!pFsAccess->fileExists(telemetryDeviceEntry)) {
8584
NEO::printDebugString(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr,
8685
"Telemetry support not available. No file %s\n", telemetryDeviceEntry.c_str());

‎level_zero/tools/source/sysman/linux/pmt/pmt.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class PlatformMonitoringTech : NEO::NonCopyableOrMovableClass {
3535

3636
private:
3737
void init(FsAccess *pFsAccess);
38-
static const std::string devfs;
3938
static const std::string baseTelemSysFS;
4039
static const std::string telem;
4140
uint64_t size = 0;

‎level_zero/tools/test/unit_tests/sources/sysman/power/linux/mock_sysfs_power.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ constexpr uint64_t setEnergyCounter = 83456;
2121
constexpr uint64_t offset = 0x400;
2222
constexpr uint64_t mappedLength = 2048;
2323
const std::string deviceName("device");
24-
const std::string baseTelemSysFS("/sys/class/pmt_telemetry");
24+
const std::string baseTelemSysFS("/sys/class/intel_pmt");
2525

2626
class PowerPmt : public PlatformMonitoringTech {
2727
public:
@@ -76,16 +76,16 @@ struct Mock<PowerFsAccess> : public PowerFsAccess {
7676
}
7777

7878
ze_result_t getRealPathSuccess(const std::string path, std::string &buf) {
79-
if (path.compare("/sys/class/pmt_telemetry/telem1") == 0) {
80-
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:86:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry/telem1";
81-
} else if (path.compare("/sys/class/pmt_telemetry/telem2") == 0) {
82-
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:86:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry/telem2";
83-
} else if (path.compare("/sys/class/pmt_telemetry/telem3") == 0) {
84-
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry/telem3";
85-
} else if (path.compare("/sys/class/pmt_telemetry/telem4") == 0) {
86-
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry/telem4";
87-
} else if (path.compare("/sys/class/pmt_telemetry/telem5") == 0) {
88-
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry/telem5";
79+
if (path.compare("/sys/class/intel_pmt/telem1") == 0) {
80+
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:86:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry.1.auto/intel_pmt/telem1";
81+
} else if (path.compare("/sys/class/intel_pmt/telem2") == 0) {
82+
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:86:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry.1.auto/intel_pmt/telem2";
83+
} else if (path.compare("/sys/class/intel_pmt/telem3") == 0) {
84+
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry.1.auto/intel_pmt/telem3";
85+
} else if (path.compare("/sys/class/intel_pmt/telem4") == 0) {
86+
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry.1.auto/intel_pmt/telem4";
87+
} else if (path.compare("/sys/class/intel_pmt/telem5") == 0) {
88+
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry.1.auto/intel_pmt/telem5";
8989
} else {
9090
return ZE_RESULT_ERROR_NOT_AVAILABLE;
9191
}

‎level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/mock_sysfs_temperature.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ constexpr uint8_t computeIndexForNoSubDevices = 9;
2929
constexpr uint8_t globalIndexForNoSubDevices = 3;
3030

3131
constexpr uint64_t mappedLength = 256;
32-
const std::string baseTelemSysFS("/sys/class/pmt_telemetry");
32+
const std::string baseTelemSysFS("/sys/class/intel_pmt");
3333
class TemperaturePmt : public PlatformMonitoringTech {
3434
public:
3535
TemperaturePmt(FsAccess *pFsAccess, ze_bool_t onSubdevice, uint32_t subdeviceId) : PlatformMonitoringTech(pFsAccess, onSubdevice, subdeviceId) {}
@@ -92,16 +92,16 @@ struct Mock<TemperatureFsAccess> : public TemperatureFsAccess {
9292
return ZE_RESULT_ERROR_NOT_AVAILABLE;
9393
}
9494
ze_result_t getRealPathSuccess(const std::string path, std::string &buf) {
95-
if (path.compare("/sys/class/pmt_telemetry/telem1") == 0) {
96-
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:86:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry/telem1";
97-
} else if (path.compare("/sys/class/pmt_telemetry/telem2") == 0) {
98-
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:86:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry/telem2";
99-
} else if (path.compare("/sys/class/pmt_telemetry/telem3") == 0) {
100-
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry/telem3";
101-
} else if (path.compare("/sys/class/pmt_telemetry/telem4") == 0) {
102-
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry/telem4";
103-
} else if (path.compare("/sys/class/pmt_telemetry/telem5") == 0) {
104-
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry/telem5";
95+
if (path.compare("/sys/class/intel_pmt/telem1") == 0) {
96+
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:86:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry.1.auto/intel_pmt/telem1";
97+
} else if (path.compare("/sys/class/intel_pmt/telem2") == 0) {
98+
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:86:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry.1.auto/intel_pmt/telem2";
99+
} else if (path.compare("/sys/class/intel_pmt/telem3") == 0) {
100+
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry.1.auto/intel_pmt/telem3";
101+
} else if (path.compare("/sys/class/intel_pmt/telem4") == 0) {
102+
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry.1.auto/intel_pmt/telem4";
103+
} else if (path.compare("/sys/class/intel_pmt/telem5") == 0) {
104+
buf = "/sys/devices/pci0000:89/0000:89:02.0/0000:8a:00.0/0000:8b:02.0/0000:8e:00.1/pmt_telemetry.1.auto/intel_pmt/telem5";
105105
} else {
106106
return ZE_RESULT_ERROR_NOT_AVAILABLE;
107107
}

0 commit comments

Comments
 (0)