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

refactor: code cleanup in sysman firmware_util

Browse Source 
Move methods and variables not required to be public as protected.

Related-To: NEO-8555

Signed-off-by: Jitendra Sharma <jitendra.sharma@intel.com>
This commit is contained in:
Jitendra Sharma
2023-10-09 11:43:53 +00:00
committed by Compute-Runtime-Automation
parent 8b4242eb32
commit 3e06ccac37
12 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
level_zero/sysman/source/firmware_util/sysman_firmware_util.h
View File

@@ -21,7 +21,6 @@ class FirmwareUtil {
public:
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;
virtual ze_result_t flashFirmware(std::string fwType, void *pImage, uint32_t size) = 0;
virtual ze_result_t fwIfrApplied(bool &ifrStatus) = 0;

18
level_zero/sysman/source/firmware_util/sysman_firmware_util_imp.h
View File

@@ -108,7 +108,6 @@ class FirmwareUtilImp : public FirmwareUtil, NEO::NonCopyableOrMovableClass {
FirmwareUtilImp(uint16_t domain, uint8_t bus, uint8_t device, uint8_t function);
~FirmwareUtilImp() override;
ze_result_t fwDeviceInit() override;
ze_result_t getFirstDevice(igsc_device_info *) override;
ze_result_t getFwVersion(std::string fwType, std::string &firmwareVersion) override;
ze_result_t flashFirmware(std::string fwType, void *pImage, uint32_t size) override;
ze_result_t fwIfrApplied(bool &ifrStatus) override;
@@ -120,6 +119,16 @@ class FirmwareUtilImp : public FirmwareUtil, NEO::NonCopyableOrMovableClass {
void getDeviceSupportedFwTypes(std::vector<std::string> &fwTypes) override;
void fwGetMemoryHealthIndicator(zes_mem_health_t *health) override;
using OsLibraryLoadPtr = std::add_pointer<NEO::OsLibrary *(const std::string &)>::type;
static OsLibraryLoadPtr osLibraryLoadFunction;
static std::string fwUtilLibraryName;
bool loadEntryPoints();
bool loadEntryPointsExt();
NEO::OsLibrary *libraryHandle = nullptr;
protected:
ze_result_t getFirstDevice(igsc_device_info *);
ze_result_t fwGetVersion(std::string &fwVersion);
ze_result_t opromGetVersion(std::string &fwVersion);
ze_result_t pscGetVersion(std::string &fwVersion);
@@ -128,15 +137,8 @@ class FirmwareUtilImp : public FirmwareUtil, NEO::NonCopyableOrMovableClass {
ze_result_t fwFlashIafPsc(void *pImage, uint32_t size);
ze_result_t fwCallGetstatusExt(uint32_t &supportedTests, uint32_t &ifrApplied, uint32_t &prevErrors, uint32_t &pendingReset);
using OsLibraryLoadPtr = std::add_pointer<NEO::OsLibrary *(const std::string &)>::type;
static OsLibraryLoadPtr osLibraryLoadFunction;
static std::string fwUtilLibraryName;
std::string fwDevicePath{};
struct igsc_device_handle fwDeviceHandle = {};
bool loadEntryPoints();
bool loadEntryPointsExt();
NEO::OsLibrary *libraryHandle = nullptr;
template <class T>
bool getSymbolAddr(const std::string name, T &proc) {
void *addr = libraryHandle->getProcAddress(name);

3
level_zero/sysman/test/unit_tests/sources/diagnostics/linux/mock_zes_sysman_diagnostics.h
View File

@@ -40,9 +40,6 @@ struct MockDiagnosticsFwInterface : public L0::Sysman::FirmwareUtil {
void setFwInitRetVal(ze_result_t val) {
mockFwInitResult = val;
}
ze_result_t getFirstDevice(igsc_device_info *info) override {
return ZE_RESULT_SUCCESS;
}
ze_result_t fwSupportedDiagTests(std::vector<std::string> &supportedDiagTests) override {
supportedDiagTests.push_back(mockSupportedDiagTypes[0]);
supportedDiagTests.push_back(mockSupportedDiagTypes[1]);

1
level_zero/sysman/test/unit_tests/sources/ecc/linux/mock_ecc.h
View File

@@ -50,7 +50,6 @@ struct MockEccFwInterface : public L0::Sysman::FirmwareUtil {
return ZE_RESULT_SUCCESS;
}
ADDMETHOD_NOBASE(getFirstDevice, ze_result_t, ZE_RESULT_SUCCESS, (igsc_device_info * info));
ADDMETHOD_NOBASE(getFwVersion, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, std::string &firmwareVersion));
ADDMETHOD_NOBASE(flashFirmware, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, void *pImage, uint32_t size));
ADDMETHOD_NOBASE(fwIfrApplied, ze_result_t, ZE_RESULT_SUCCESS, (bool &ifrStatus));

1
level_zero/sysman/test/unit_tests/sources/ecc/windows/mock_ecc.h
View File

@@ -54,7 +54,6 @@ struct EccFwInterface : public L0::Sysman::FirmwareUtil {
return ZE_RESULT_SUCCESS;
}
ADDMETHOD_NOBASE(getFirstDevice, ze_result_t, ZE_RESULT_SUCCESS, (igsc_device_info * info));
ADDMETHOD_NOBASE(getFwVersion, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, std::string &firmwareVersion));
ADDMETHOD_NOBASE(flashFirmware, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, void *pImage, uint32_t size));
ADDMETHOD_NOBASE(fwIfrApplied, ze_result_t, ZE_RESULT_SUCCESS, (bool &ifrStatus));

1
level_zero/sysman/test/unit_tests/sources/events/linux/mock_events.h
View File

@@ -246,7 +246,6 @@ struct MockEventsFwInterface : public L0::Sysman::FirmwareUtil {
MockEventsFwInterface() = default;
ADDMETHOD_NOBASE(fwDeviceInit, ze_result_t, ZE_RESULT_SUCCESS, (void));
ADDMETHOD_NOBASE(getFirstDevice, ze_result_t, ZE_RESULT_SUCCESS, (igsc_device_info * info));
ADDMETHOD_NOBASE(getFwVersion, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, std::string &firmwareVersion));
ADDMETHOD_NOBASE(flashFirmware, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, void *pImage, uint32_t size));
ADDMETHOD_NOBASE(fwSupportedDiagTests, ze_result_t, ZE_RESULT_SUCCESS, (std::vector<std::string> & supportedDiagTests));

1
level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware.h
View File

@@ -70,7 +70,6 @@ struct MockFirmwareInterface : public L0::Sysman::FirmwareUtil {
MockFirmwareInterface() = default;
ADDMETHOD_NOBASE(fwDeviceInit, ze_result_t, ZE_RESULT_SUCCESS, ());
ADDMETHOD_NOBASE(getFirstDevice, ze_result_t, ZE_RESULT_SUCCESS, (igsc_device_info * info));
ADDMETHOD_NOBASE(flashFirmware, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, void *pImage, uint32_t size));
ADDMETHOD_NOBASE(fwIfrApplied, ze_result_t, ZE_RESULT_SUCCESS, (bool &ifrStatus));
ADDMETHOD_NOBASE(fwSupportedDiagTests, ze_result_t, ZE_RESULT_SUCCESS, (std::vector<std::string> & supportedDiagTests));

1
level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware_prelim.h
View File

@@ -118,7 +118,6 @@ struct MockFirmwareInterface : public FirmwareInterface {
MockFirmwareInterface() = default;
ADDMETHOD_NOBASE(fwDeviceInit, ze_result_t, ZE_RESULT_SUCCESS, ());
ADDMETHOD_NOBASE(getFirstDevice, ze_result_t, ZE_RESULT_SUCCESS, (igsc_device_info * info));
ADDMETHOD_NOBASE(flashFirmware, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, void *pImage, uint32_t size));
ADDMETHOD_NOBASE(fwIfrApplied, ze_result_t, ZE_RESULT_SUCCESS, (bool &ifrStatus));
ADDMETHOD_NOBASE(fwSupportedDiagTests, ze_result_t, ZE_RESULT_SUCCESS, (std::vector<std::string> & supportedDiagTests));

1
level_zero/sysman/test/unit_tests/sources/firmware/windows/mock_zes_sysman_firmware.h
View File

@@ -54,7 +54,6 @@ struct FirmwareInterface : public L0::Sysman::FirmwareUtil {
}
ADDMETHOD_NOBASE(fwDeviceInit, ze_result_t, ZE_RESULT_SUCCESS, ());
ADDMETHOD_NOBASE(getFirstDevice, ze_result_t, ZE_RESULT_SUCCESS, (igsc_device_info * info));
ADDMETHOD_NOBASE(flashFirmware, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, void *pImage, uint32_t size));
ADDMETHOD_NOBASE(fwIfrApplied, ze_result_t, ZE_RESULT_SUCCESS, (bool &ifrStatus));
ADDMETHOD_NOBASE(fwSupportedDiagTests, ze_result_t, ZE_RESULT_SUCCESS, (std::vector<std::string> & supportedDiagTests));

1
level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h
View File

@@ -26,7 +26,6 @@ struct MockFwUtilInterface : public L0::Sysman::FirmwareUtil {
MockFwUtilInterface() = default;
ADDMETHOD_NOBASE(fwDeviceInit, ze_result_t, ZE_RESULT_SUCCESS, ());
ADDMETHOD_NOBASE(getFirstDevice, ze_result_t, ZE_RESULT_SUCCESS, (igsc_device_info * info));
ADDMETHOD_NOBASE(getFwVersion, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, std::string &firmwareVersion));
ADDMETHOD_NOBASE(flashFirmware, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, void *pImage, uint32_t size));
ADDMETHOD_NOBASE(fwIfrApplied, ze_result_t, ZE_RESULT_SUCCESS, (bool &ifrStatus));

1
level_zero/sysman/test/unit_tests/sources/global_operations/linux/mock_global_operations.h
View File

@@ -560,7 +560,6 @@ struct MockGlobalOpsFwInterface : public L0::Sysman::FirmwareUtil {
MockGlobalOpsFwInterface() = default;
ADDMETHOD_NOBASE(fwDeviceInit, ze_result_t, ZE_RESULT_SUCCESS, (void));
ADDMETHOD_NOBASE(getFirstDevice, ze_result_t, ZE_RESULT_SUCCESS, (igsc_device_info * info));
ADDMETHOD_NOBASE(getFwVersion, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, std::string &firmwareVersion));
ADDMETHOD_NOBASE(flashFirmware, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, void *pImage, uint32_t size));
ADDMETHOD_NOBASE(fwSupportedDiagTests, ze_result_t, ZE_RESULT_SUCCESS, (std::vector<std::string> & supportedDiagTests));

1
level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras_prelim.h
View File

@@ -638,7 +638,6 @@ struct MockRasFwInterface : public L0::Sysman::FirmwareUtil {
MockRasFwInterface() = default;
ADDMETHOD_NOBASE(fwDeviceInit, ze_result_t, ZE_RESULT_SUCCESS, ());
ADDMETHOD_NOBASE(getFirstDevice, ze_result_t, ZE_RESULT_SUCCESS, (igsc_device_info * info));
ADDMETHOD_NOBASE(getFwVersion, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, std::string &firmwareVersion));
ADDMETHOD_NOBASE(flashFirmware, ze_result_t, ZE_RESULT_SUCCESS, (std::string fwType, void *pImage, uint32_t size));
ADDMETHOD_NOBASE(fwIfrApplied, ze_result_t, ZE_RESULT_SUCCESS, (bool &ifrStatus));