Evolution-X-Devices/device_google_bramble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "health: correct the path of ufs health values" into qt-qpr1-dev am: 619195f40f

Browse Source 
Change-Id: Ifdc1029bef188d4661deaadebf3bd8b12b20a2fe
This commit is contained in:
Automerger Merge Worker
2019-12-25 02:58:34 +00:00
parent b446edf550 619195f40f
commit 1abe7c5063
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
health/HealthService.cpp
View File

@@ -51,10 +51,9 @@ static LowBatteryShutdownMetrics shutdownMetrics(kVoltageAvg);
static DeviceHealth deviceHealth;
#define UFS_DIR "/sys/devices/platform/soc/1d84000.ufshc"
constexpr char kUfsHealthEol[]{UFS_DIR "/health/eol"};
constexpr char kUfsHealthLifetimeA[]{UFS_DIR "/health/lifetimeA"};
constexpr char kUfsHealthLifetimeB[]{UFS_DIR "/health/lifetimeB"};
constexpr char kUfsVersion[]{UFS_DIR "/version"};
constexpr char kUfsHealthEol[]{UFS_DIR "/health_descriptor/eol_info"};
constexpr char kUfsHealthLifetimeA[]{UFS_DIR "/health_descriptor/life_time_estimation_a"};
constexpr char kUfsHealthLifetimeB[]{UFS_DIR "/health_descriptor/life_time_estimation_b"};
constexpr char kDiskStatsFile[]{"/sys/block/sda/stat"};
constexpr char kUFSName[]{"UFS0"};
@@ -75,14 +74,6 @@ void read_value_from_file(const std::string &path, T *field) {
stream >> *field;
}
void read_ufs_version(StorageInfo *info) {
uint64_t value;
read_value_from_file(kUfsVersion, &value);
std::stringstream ss;
ss << "ufs " << std::hex << value;
info->version = ss.str();
}
void fill_ufs_storage_attribute(StorageAttribute *attr) {
attr->isInternal = true;
attr->isBootDevice = true;
@@ -107,7 +98,6 @@ void get_storage_info(std::vector<StorageInfo> &vec_storage_info) {
StorageInfo *storage_info = &vec_storage_info[0];
fill_ufs_storage_attribute(&storage_info->attr);
read_ufs_version(storage_info);
read_value_from_file(kUfsHealthEol, &storage_info->eol);
read_value_from_file(kUfsHealthLifetimeA, &storage_info->lifetimeA);
read_value_from_file(kUfsHealthLifetimeB, &storage_info->lifetimeB);