commit 0897a147e176c4804347348db1849abb70f3d6c7
author Ocean Chen <oceanchen@google.com> Tue Dec 24 16:01:12 2019 +0800
committer Cyan_Hsieh <cyanhsieh@google.com> Fri May 29 21:18:55 2020 +0800
tree 727475d14af40d3d809a24f0aa7348d41f040658
parent 36953228ad895b4205b0a45bf694960497df28d5

health: correct the path of ufs health values

   The path is changed from kernel 4.16.

Bug: 146417855
Test: boot to home

Change-Id: I9985131e0d0609700104f83851b3c9362fb499f9
Signed-off-by: Ocean Chen <oceanchen@google.com>

health/HealthService.cpp

diff --git a/health/HealthService.cpp b/health/HealthService.cpp
index c31ebfe..b9a9625 100644
--- a/health/HealthService.cpp
+++ b/health/HealthService.cpp
@@ -51,12 +51,9 @@
 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 kDiskStatsFile[]{"/sys/block/sda/stat"};
-constexpr char kUFSName[]{"UFS0"};
+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 kTCPMPSYName[]{"tcpm-source-psy-usbpd0"};
 
@@ -75,14 +72,6 @@
   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 +96,6 @@
   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);