Skip to content

Commit 89244b1

Browse files
mraghuwaCompute-Runtime-Automation
mraghuwa
authored and
Compute-Runtime-Automation
committed
fix: Revert spec 1.5 RAS changes from Sysman
Related-To: LOCI-4351 Signed-off-by: Mayank Raghuwanshi <mayank.raghuwanshi@intel.com> Source: 9cc5763
1 parent 6262eed commit 89244b1

36 files changed

+36
-1050
lines changed

‎level_zero/api/sysman/ze_sysman_loader.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ zesGetFabricPortProcAddrTable(
205205
pDdiTable->pfnSetConfig = L0::zesFabricPortSetConfig;
206206
pDdiTable->pfnGetState = L0::zesFabricPortGetState;
207207
pDdiTable->pfnGetThroughput = L0::zesFabricPortGetThroughput;
208-
pDdiTable->pfnGetFabricErrorCounters = L0::zesFabricPortGetFabricErrorCounters;
209208

210209
return result;
211210
}

‎level_zero/api/sysman/zes_sysman_api_entrypoints.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,12 +1026,6 @@ ze_result_t zesOverclockSetVFPointValues(
10261026
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
10271027
}
10281028

1029-
ze_result_t zesFabricPortGetFabricErrorCounters(
1030-
zes_fabric_port_handle_t hPort,
1031-
zes_fabric_port_error_counters_t *pErrors) {
1032-
return L0::FabricPort::fromHandle(hPort)->fabricPortGetErrorCounters(pErrors);
1033-
}
1034-
10351029
ze_result_t zesDeviceSetOverclockWaiver(
10361030
zes_device_handle_t hDevice) {
10371031
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
@@ -2108,14 +2102,6 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zesOverclockSetVFPointValues(
21082102
pointValue);
21092103
}
21102104

2111-
ZE_APIEXPORT ze_result_t ZE_APICALL zesFabricPortGetFabricErrorCounters(
2112-
zes_fabric_port_handle_t hPort,
2113-
zes_fabric_port_error_counters_t *pErrors) {
2114-
return L0::zesFabricPortGetFabricErrorCounters(
2115-
hPort,
2116-
pErrors);
2117-
}
2118-
21192105
ZE_APIEXPORT ze_result_t ZE_APICALL zesInit(
21202106
zes_init_flags_t flags) {
21212107
return L0::zesInit(

‎level_zero/sysman/source/fabric_port/fabric_port.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class FabricPort : _zes_fabric_port_handle_t {
3636
virtual ze_result_t fabricPortSetConfig(const zes_fabric_port_config_t *pConfig) = 0;
3737
virtual ze_result_t fabricPortGetState(zes_fabric_port_state_t *pState) = 0;
3838
virtual ze_result_t fabricPortGetThroughput(zes_fabric_port_throughput_t *pThroughput) = 0;
39-
virtual ze_result_t fabricPortGetErrorCounters(zes_fabric_port_error_counters_t *pErrors) = 0;
4039

4140
inline zes_fabric_port_handle_t toZesHandle() { return this; }
4241

‎level_zero/sysman/source/fabric_port/fabric_port_imp.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ ze_result_t FabricPortImp::fabricPortGetState(zes_fabric_port_state_t *pState) {
5454
return pOsFabricPort->getState(pState);
5555
}
5656

57-
ze_result_t FabricPortImp::fabricPortGetErrorCounters(zes_fabric_port_error_counters_t *pErrors) {
58-
return pOsFabricPort->getErrorCounters(pErrors);
59-
}
60-
6157
ze_result_t FabricPortImp::fabricPortGetThroughput(zes_fabric_port_throughput_t *pThroughput) {
6258
fabricPortGetTimestamp(pThroughput->timestamp);
6359
return pOsFabricPort->getThroughput(pThroughput);

‎level_zero/sysman/source/fabric_port/fabric_port_imp.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class FabricPortImp : public FabricPort, NEO::NonCopyableOrMovableClass {
3636
ze_result_t fabricPortSetConfig(const zes_fabric_port_config_t *pConfig) override;
3737
ze_result_t fabricPortGetState(zes_fabric_port_state_t *pState) override;
3838
ze_result_t fabricPortGetThroughput(zes_fabric_port_throughput_t *pThroughput) override;
39-
ze_result_t fabricPortGetErrorCounters(zes_fabric_port_error_counters_t *pErrors) override;
4039

4140
FabricPortImp() = delete;
4241
FabricPortImp(FabricDevice *pFabricDevice, uint32_t portNum);

‎level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ ze_result_t LinuxFabricPortImp::getThroughput(zes_fabric_port_throughput_t *pThr
5757
return ZE_RESULT_SUCCESS;
5858
}
5959

60-
ze_result_t LinuxFabricPortImp::getErrorCounters(zes_fabric_port_error_counters_t *pErrors) {
61-
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
62-
}
63-
6460
ze_result_t LinuxFabricPortImp::getProperties(zes_fabric_port_properties_t *pProperties) {
6561
::snprintf(pProperties->model, ZES_MAX_FABRIC_PORT_MODEL_SIZE, "%s", this->model.c_str());
6662
pProperties->onSubdevice = false;

‎level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class LinuxFabricPortImp : public OsFabricPort, NEO::NonCopyableOrMovableClass {
3535
ze_result_t setConfig(const zes_fabric_port_config_t *pConfig) override;
3636
ze_result_t getState(zes_fabric_port_state_t *pState) override;
3737
ze_result_t getThroughput(zes_fabric_port_throughput_t *pThroughput) override;
38-
ze_result_t getErrorCounters(zes_fabric_port_error_counters_t *pErrors) override;
3938

4039
LinuxFabricPortImp() = delete;
4140
LinuxFabricPortImp(OsFabricDevice *pOsFabricDevice, uint32_t portNum);

‎level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp_prelim.cpp

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -40,78 +40,6 @@ ze_result_t LinuxFabricDeviceImp::getThroughput(const zes_fabric_port_id_t portI
4040
return pFabricDeviceAccess->getThroughput(portId, *pThroughput);
4141
}
4242

43-
ze_result_t LinuxFabricDeviceImp::getErrorCounters(const zes_fabric_port_id_t portId, zes_fabric_port_error_counters_t *pErrors) {
44-
FsAccess *pFsAccess = &pLinuxSysmanImp->getFsAccess();
45-
SysfsAccess *pSysfsAccess = &pLinuxSysmanImp->getSysfsAccess();
46-
std::string devicePciPath("");
47-
ze_result_t result = pSysfsAccess->getRealPath("device/", devicePciPath);
48-
if (result != ZE_RESULT_SUCCESS) {
49-
NEO::printDebugString(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr,
50-
"error@<%s> <failed to get device path> <result: 0x%x>\n", __func__, result);
51-
return result;
52-
}
53-
std::string path("");
54-
std::vector<std::string> list;
55-
result = pFsAccess->listDirectory(devicePciPath, list);
56-
if (result != ZE_RESULT_SUCCESS) {
57-
NEO::printDebugString(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr,
58-
"error@<%s> <failed to get list of files in device directory> <result: 0x%x>\n", __func__, result);
59-
return result;
60-
}
61-
62-
for (auto entry : list) {
63-
if ((entry.find("i915.iaf.") != std::string::npos) ||
64-
(entry.find("iaf.") != std::string::npos)) {
65-
path = devicePciPath + "/" + entry;
66-
break;
67-
}
68-
}
69-
if (path.empty()) {
70-
// This device does not have a fabric
71-
NEO::printDebugString(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr,
72-
"error@<%s> <Device does not have fabric>\n", __func__);
73-
return ZE_RESULT_ERROR_NOT_AVAILABLE;
74-
}
75-
std::string fabricFwErrorPath = path + "/sd." + std::to_string(portId.attachId);
76-
std::string fabricLinkErrorPath = path + "/sd." + std::to_string(portId.attachId) + "/port." + std::to_string(portId.portNumber);
77-
uint64_t linkErrorCount = 0;
78-
std::string linkFailureFile = fabricLinkErrorPath + "/link_failures";
79-
result = pFsAccess->read(linkFailureFile, linkErrorCount);
80-
if (result != ZE_RESULT_SUCCESS) {
81-
NEO::printDebugString(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr,
82-
"error@<%s> <failed to read file %s> <result: 0x%x>\n", __func__, linkFailureFile.c_str(), result);
83-
linkErrorCount = 0;
84-
}
85-
uint64_t linkDegradeCount = 0;
86-
std::string linkDegradeFile = fabricLinkErrorPath + "/link_degrades";
87-
result = pFsAccess->read(linkDegradeFile, linkDegradeCount);
88-
if (result != ZE_RESULT_SUCCESS) {
89-
NEO::printDebugString(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr,
90-
"error@<%s> <failed to read file %s> <result: 0x%x>\n", __func__, linkDegradeFile.c_str(), result);
91-
linkDegradeCount = 0;
92-
}
93-
uint64_t fwErrorCount = 0;
94-
std::string fwErrorFile = fabricFwErrorPath + "/fw_error";
95-
result = pFsAccess->read(fwErrorFile, fwErrorCount);
96-
if (result != ZE_RESULT_SUCCESS) {
97-
NEO::printDebugString(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr,
98-
"error@<%s> <failed to read file %s> <result: 0x%x>\n", __func__, fwErrorFile.c_str(), result);
99-
fwErrorCount = 0;
100-
}
101-
uint64_t fwCommErrorCount = 0;
102-
std::string fwCommErrorFile = fabricFwErrorPath + "/fw_comm_errors";
103-
result = pFsAccess->read(fwCommErrorFile, fwCommErrorCount);
104-
if (result != ZE_RESULT_SUCCESS) {
105-
NEO::printDebugString(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr,
106-
"error@<%s> <failed to read file %s> <result: 0x%x>\n", __func__, fwCommErrorFile.c_str(), result);
107-
fwCommErrorCount = 0;
108-
}
109-
pErrors->linkFailureCount = linkErrorCount;
110-
pErrors->linkDegradeCount = linkDegradeCount;
111-
pErrors->fwErrorCount = fwErrorCount;
112-
pErrors->fwCommErrorCount = fwCommErrorCount;
113-
return ZE_RESULT_SUCCESS;
114-
}
11543
ze_result_t LinuxFabricDeviceImp::performSweep() {
11644
uint32_t start = 0U;
11745
uint32_t end = 0U;
@@ -283,10 +211,6 @@ ze_result_t LinuxFabricPortImp::getThroughput(zes_fabric_port_throughput_t *pThr
283211
return pLinuxFabricDeviceImp->getThroughput(portId, pThroughput);
284212
}
285213

286-
ze_result_t LinuxFabricPortImp::getErrorCounters(zes_fabric_port_error_counters_t *pErrors) {
287-
return pLinuxFabricDeviceImp->getErrorCounters(portId, pErrors);
288-
}
289-
290214
ze_result_t LinuxFabricPortImp::getProperties(zes_fabric_port_properties_t *pProperties) {
291215
::snprintf(pProperties->model, ZES_MAX_FABRIC_PORT_MODEL_SIZE, "%s", this->model.c_str());
292216
pProperties->onSubdevice = this->onSubdevice;

‎level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp_prelim.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ class LinuxFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableOrMovableCla
3030
ze_result_t disablePortBeaconing(const zes_fabric_port_id_t portId);
3131
ze_result_t getState(const zes_fabric_port_id_t portId, zes_fabric_port_state_t *pState);
3232
ze_result_t getThroughput(const zes_fabric_port_id_t portId, zes_fabric_port_throughput_t *pThroughput);
33-
ze_result_t getErrorCounters(const zes_fabric_port_id_t portId, zes_fabric_port_error_counters_t *pErrors);
3433

3534
void getPortId(const uint32_t portNumber, zes_fabric_port_id_t &portId);
3635
void getProperties(const zes_fabric_port_id_t portId, std::string &model, bool &onSubdevice,
@@ -63,7 +62,6 @@ class LinuxFabricPortImp : public OsFabricPort, NEO::NonCopyableOrMovableClass {
6362
ze_result_t setConfig(const zes_fabric_port_config_t *pConfig) override;
6463
ze_result_t getState(zes_fabric_port_state_t *pState) override;
6564
ze_result_t getThroughput(zes_fabric_port_throughput_t *pThroughput) override;
66-
ze_result_t getErrorCounters(zes_fabric_port_error_counters_t *pErrors) override;
6765

6866
LinuxFabricPortImp() = delete;
6967
LinuxFabricPortImp(OsFabricDevice *pOsFabricDevice, uint32_t portNum);

‎level_zero/sysman/source/fabric_port/os_fabric_port.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ class OsFabricPort {
3030
virtual ze_result_t setConfig(const zes_fabric_port_config_t *pConfig) = 0;
3131
virtual ze_result_t getState(zes_fabric_port_state_t *pState) = 0;
3232
virtual ze_result_t getThroughput(zes_fabric_port_throughput_t *pThroughput) = 0;
33-
virtual ze_result_t getErrorCounters(zes_fabric_port_error_counters_t *pErrors) = 0;
3433

3534
static OsFabricPort *create(OsFabricDevice *pOsFabricDevice, uint32_t portNum);
3635

‎level_zero/sysman/source/fabric_port/windows/os_fabric_port_imp.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ ze_result_t WddmFabricPortImp::getThroughput(zes_fabric_port_throughput_t *pThro
4242
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
4343
}
4444

45-
ze_result_t WddmFabricPortImp::getErrorCounters(zes_fabric_port_error_counters_t *pErrors) {
46-
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
47-
}
48-
4945
ze_result_t WddmFabricPortImp::getProperties(zes_fabric_port_properties_t *pProperties) {
5046
::memset(pProperties->model, '\0', ZES_MAX_FABRIC_PORT_MODEL_SIZE);
5147
pProperties->onSubdevice = false;

‎level_zero/sysman/source/fabric_port/windows/os_fabric_port_imp.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class WddmFabricPortImp : public OsFabricPort, NEO::NonCopyableOrMovableClass {
3434
ze_result_t setConfig(const zes_fabric_port_config_t *pConfig) override;
3535
ze_result_t getState(zes_fabric_port_state_t *pState) override;
3636
ze_result_t getThroughput(zes_fabric_port_throughput_t *pThroughput) override;
37-
ze_result_t getErrorCounters(zes_fabric_port_error_counters_t *pErrors) override;
3837

3938
WddmFabricPortImp() = delete;
4039
WddmFabricPortImp(OsFabricDevice *pOsFabricDevice, uint32_t portNum);

0 commit comments

Comments
 (0)