intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove use of device sysfs paths after unbind

Browse Source 
Signed-off-by: Bellekallu Rajkiran <bellekallu.rajkiran@intel.com>
This commit is contained in:
Bellekallu Rajkiran
2023-11-08 10:27:24 +00:00
committed by Compute-Runtime-Automation
parent ff480efe7a
commit 0e8c3bf473
6 changed files with 52 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
level_zero/sysman/source/api/global_operations/linux/sysman_os_global_operations_imp.cpp
View File

@@ -35,7 +35,7 @@ const std::string LinuxGlobalOperationsImp::deviceDir("device");
const std::string LinuxGlobalOperationsImp::vendorFile("device/vendor");
const std::string LinuxGlobalOperationsImp::subsystemVendorFile("device/subsystem_vendor");
const std::string LinuxGlobalOperationsImp::driverFile("device/driver");
const std::string LinuxGlobalOperationsImp::functionLevelReset("device/reset");
const std::string LinuxGlobalOperationsImp::functionLevelReset("/reset");
const std::string LinuxGlobalOperationsImp::clientsDir("clients");
const std::string LinuxGlobalOperationsImp::srcVersionFile("/sys/module/i915/srcversion");
const std::string LinuxGlobalOperationsImp::agamaVersionFile("/sys/module/i915/agama_version");
@@ -301,7 +301,12 @@ ze_result_t LinuxGlobalOperationsImp::resetImpl(ze_bool_t force, zes_reset_type_
}
std::string resetName;
pSysfsAccess->getRealPath(deviceDir, resetName);
result = pSysfsAccess->getRealPath(deviceDir, resetName);
if (result != ZE_RESULT_SUCCESS) {
NEO::printDebugString(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr, "Error@ %s(): Failed to get reset sysfs path and returning error:0x%x \n", __FUNCTION__, result);
return result;
}
std::string flrPath = resetName + functionLevelReset;
resetName = pFsAccess->getBaseName(resetName);
// Unbind the device from the kernel driver.
@@ -346,7 +351,6 @@ ze_result_t LinuxGlobalOperationsImp::resetImpl(ze_bool_t force, zes_reset_type_
}
}
std::string resetPath = {};
switch (resetType) {
case ZES_RESET_TYPE_WARM:
result = pLinuxSysmanImp->osWarmReset();
@@ -355,8 +359,7 @@ ze_result_t LinuxGlobalOperationsImp::resetImpl(ze_bool_t force, zes_reset_type_
result = pLinuxSysmanImp->osColdReset();
break;
case ZES_RESET_TYPE_FLR:
pSysfsAccess->getRealPath(functionLevelReset, resetPath);
result = pFsAccess->write(resetPath, "1");
result = pFsAccess->write(flrPath, "1");
break;
default:
return ZE_RESULT_ERROR_INVALID_ARGUMENT;