Update Huawei Mate 8 mock test

1 files changed, 376 insertions, 272 deletions

diff --git a/test/mock/huawei-mate-8.h b/test/mock/huawei-mate-8.h
index 4248b98..d1e049f 100644
--- a/test/mock/huawei-mate-8.h
+++ b/test/mock/huawei-mate-8.h
@@ -1,4 +1,5 @@
 struct cpuinfo_mock_file filesystem[] = {
+#if CPUINFO_ARCH_ARM64
 	{
 		.path = "/proc/cpuinfo",
 		.size = 1486,
@@ -77,6 +78,86 @@ struct cpuinfo_mock_file filesystem[] = {
 			"CPU revision\t: 0\n"
 			"\n",
 	},
+#elif CPUINFO_ARCH_ARM
+	{
+		.path = "/proc/cpuinfo",
+		.size = 1950,
+		.content =
+			"Processor\t: AArch64 Processor rev 0 (aarch64)\n"
+			"processor\t: 0\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 4\n"
+			"\n"
+			"processor\t: 1\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 4\n"
+			"\n"
+			"processor\t: 2\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 4\n"
+			"\n"
+			"processor\t: 3\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 4\n"
+			"\n"
+			"processor\t: 4\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd08\n"
+			"CPU revision\t: 0\n"
+			"\n"
+			"processor\t: 5\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd08\n"
+			"CPU revision\t: 0\n"
+			"\n"
+			"processor\t: 6\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd08\n"
+			"CPU revision\t: 0\n"
+			"\n"
+			"processor\t: 7\n"
+			"BogoMIPS\t: 3.84\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt lpae evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd08\n"
+			"CPU revision\t: 0\n"
+			"\n",
+	},
+#endif
 	{
 		.path = "/system/build.prop",
 		.size = 2038,
@@ -86,19 +167,19 @@ struct cpuinfo_mock_file filesystem[] = {
 			"# autogenerated by buildinfo.sh\n"
 			"ro.build.id=NRD90M\n"
 			"ro.build.display.id=NRD90M test-keys\n"
-			"ro.build.version.incremental=eng.jenkin.20170321.021213\n"
+			"ro.build.version.incremental=eng.jenkin.20170207.045244\n"
 			"ro.build.version.sdk=24\n"
 			"ro.build.version.preview_sdk=0\n"
 			"ro.build.version.codename=REL\n"
 			"ro.build.version.all_codenames=REL\n"
 			"ro.build.version.release=7.0\n"
-			"ro.build.version.security_patch=2017-03-01\n"
+			"ro.build.version.security_patch=2017-01-01\n"
 			"ro.build.version.base_os=\n"
-			"ro.build.date=Tue Mar 21 02:12:13 CST 2017\n"
-			"ro.build.date.utc=1490033533\n"
+			"ro.build.date=Tue Feb  7 04:52:44 CST 2017\n"
+			"ro.build.date.utc=1486414364\n"
 			"ro.build.type=user\n"
 			"ro.build.user=jenkins\n"
-			"ro.build.host=wuhjk0418cna\n"
+			"ro.build.host=wuhjk0113cna\n"
 			"ro.build.tags=test-keys\n"
 			"ro.build.flavor=generic_a15-user\n"
 			"ro.product.model=generic_a15\n"
@@ -118,8 +199,8 @@ struct cpuinfo_mock_file filesystem[] = {
 			"# ro.build.product is obsolete; use ro.product.device\n"
 			"ro.build.product=generic_a15\n"
 			"# Do not try to parse description, fingerprint, or thumbprint\n"
-			"ro.build.description=generic_a15-user 7.0 NRD90M eng.jenkin.20170321.021213 test-keys\n"
-			"ro.build.fingerprint=Huawei/generic_a15/generic_a15:7.0/NRD90M/jenkin03210212:user/test-keys\n"
+			"ro.build.description=generic_a15-user 7.0 NRD90M eng.jenkin.20170207.045244 test-keys\n"
+			"ro.build.fingerprint=Huawei/generic_a15/generic_a15:7.0/NRD90M/jenkin02070452:user/test-keys\n"
 			"ro.build.characteristics=default\n"
 			"# end build properties\n"
 			"\n"
@@ -154,14 +235,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/possible",
-		.size = 4,
-		.content = "0-7\n",
+		.path = "/sys/devices/system/cpu/modalias",
+		.size = 66,
+		.content = "cpu:type:aarch64:feature:,0000,0001,0002,0003,0004,0005,0006,0007\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/present",
-		.size = 4,
-		.content = "0-7\n",
+		.path = "/sys/devices/system/cpu/offline",
+		.size = 1,
+		.content = "\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/online",
@@ -169,14 +250,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/offline",
-		.size = 1,
-		.content = "\n",
+		.path = "/sys/devices/system/cpu/possible",
+		.size = 4,
+		.content = "0-7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/modalias",
-		.size = 66,
-		.content = "cpu:type:aarch64:feature:,0000,0001,0002,0003,0004,0005,0006,0007\n",
+		.path = "/sys/devices/system/cpu/present",
+		.size = 4,
+		.content = "0-7\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpuidle/current_driver",
@@ -189,6 +270,11 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "menu\n",
 	},
 	{
+		.path = "/sys/devices/system/cpu/cpu0/cpuidle/driver/name",
+		.size = 25,
+		.content = "hisi_little_cluster_idle\n",
+	},
+	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/affected_cpus",
 		.size = 8,
 		.content = "0 1 2 3\n",
@@ -245,19 +331,19 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state",
-		.size = 70,
+		.size = 66,
 		.content =
-			"480000 3150\n"
-			"807000 77\n"
-			"1018000 11\n"
-			"1306000 911\n"
-			"1517000 174\n"
-			"1805000 5153\n",
+			"480000 721\n"
+			"807000 5\n"
+			"1018000 0\n"
+			"1306000 641\n"
+			"1517000 53\n"
+			"1805000 3868\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/stats/total_trans",
 		.size = 3,
-		.content = "97\n",
+		.content = "62\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/stats/trans_table",
@@ -265,35 +351,30 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content =
 			"   From  :    To\n"
 			"         :    480000    807000   1018000   1306000   1517000   1805000 \n"
-			"   480000:         0         4         0        17         0         1 \n"
-			"   807000:         4         0         0         2         0         0 \n"
-			"  1018000:         0         0         0         2         0         0 \n"
-			"  1306000:        10         0         0         0        13         7 \n"
-			"  1517000:         5         0         1         4         0         9 \n"
-			"  1805000:         4         2         1         5         6         0 \n",
+			"   480000:         0         0         0        21         0         0 \n"
+			"   807000:         0         0         0         1         0         0 \n"
+			"  1018000:         0         0         0         0         0         0 \n"
+			"  1306000:        12         0         0         0         4         7 \n"
+			"  1517000:         1         1         0         1         0         3 \n"
+			"  1805000:         8         0         0         1         2         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu0/topology/core_id",
 		.size = 2,
 		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings_list",
-		.size = 4,
-		.content = "0-3\n",
-	},
-	{
 		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings",
 		.size = 3,
 		.content = "0f\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/core_id",
-		.size = 2,
-		.content = "0\n",
+		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings_list",
+		.size = 4,
+		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/thread_siblings_list",
+		.path = "/sys/devices/system/cpu/cpu0/topology/physical_package_id",
 		.size = 2,
 		.content = "0\n",
 	},
@@ -303,6 +384,16 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "01\n",
 	},
 	{
+		.path = "/sys/devices/system/cpu/cpu0/topology/thread_siblings_list",
+		.size = 2,
+		.content = "0\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu1/cpuidle/driver/name",
+		.size = 25,
+		.content = "hisi_little_cluster_idle\n",
+	},
+	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/affected_cpus",
 		.size = 8,
 		.content = "0 1 2 3\n",
@@ -359,19 +450,19 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/stats/time_in_state",
-		.size = 70,
+		.size = 66,
 		.content =
-			"480000 3325\n"
-			"807000 79\n"
-			"1018000 11\n"
-			"1306000 949\n"
-			"1517000 178\n"
-			"1805000 5180\n",
+			"480000 879\n"
+			"807000 5\n"
+			"1018000 0\n"
+			"1306000 685\n"
+			"1517000 53\n"
+			"1805000 3887\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "105\n",
+		.size = 3,
+		.content = "66\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/stats/trans_table",
@@ -379,17 +470,22 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content =
 			"   From  :    To\n"
 			"         :    480000    807000   1018000   1306000   1517000   1805000 \n"
-			"   480000:         0         4         0        19         0         1 \n"
-			"   807000:         4         0         0         3         0         0 \n"
-			"  1018000:         0         0         0         2         0         0 \n"
-			"  1306000:        10         1         0         0        14         8 \n"
-			"  1517000:         5         0         1         4         0        10 \n"
-			"  1805000:         5         2         1         5         6         0 \n",
+			"   480000:         0         0         0        22         0         0 \n"
+			"   807000:         0         0         0         1         0         0 \n"
+			"  1018000:         0         0         0         0         0         0 \n"
+			"  1306000:        13         0         0         0         4         8 \n"
+			"  1517000:         1         1         0         1         0         3 \n"
+			"  1805000:         9         0         0         1         2         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu1/topology/core_id",
 		.size = 2,
-		.content = "0\n",
+		.content = "1\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings",
+		.size = 3,
+		.content = "0f\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings_list",
@@ -397,14 +493,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings",
-		.size = 3,
-		.content = "0f\n",
+		.path = "/sys/devices/system/cpu/cpu1/topology/physical_package_id",
+		.size = 2,
+		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/core_id",
-		.size = 2,
-		.content = "1\n",
+		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings",
+		.size = 3,
+		.content = "02\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings_list",
@@ -412,9 +508,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "1\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings",
-		.size = 3,
-		.content = "02\n",
+		.path = "/sys/devices/system/cpu/cpu2/cpuidle/driver/name",
+		.size = 25,
+		.content = "hisi_little_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/affected_cpus",
@@ -473,19 +569,19 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/stats/time_in_state",
-		.size = 70,
+		.size = 67,
 		.content =
-			"480000 3564\n"
-			"807000 79\n"
-			"1018000 11\n"
-			"1306000 949\n"
-			"1517000 178\n"
-			"1805000 5189\n",
+			"480000 1044\n"
+			"807000 5\n"
+			"1018000 0\n"
+			"1306000 742\n"
+			"1517000 53\n"
+			"1805000 3887\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "106\n",
+		.size = 3,
+		.content = "70\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/stats/trans_table",
@@ -493,17 +589,22 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content =
 			"   From  :    To\n"
 			"         :    480000    807000   1018000   1306000   1517000   1805000 \n"
-			"   480000:         0         4         0        19         0         1 \n"
-			"   807000:         4         0         0         3         0         0 \n"
-			"  1018000:         0         0         0         2         0         0 \n"
-			"  1306000:        10         1         0         0        14         8 \n"
-			"  1517000:         5         0         1         4         0        10 \n"
-			"  1805000:         6         2         1         5         6         0 \n",
+			"   480000:         0         0         0        24         0         0 \n"
+			"   807000:         0         0         0         1         0         0 \n"
+			"  1018000:         0         0         0         0         0         0 \n"
+			"  1306000:        15         0         0         0         4         8 \n"
+			"  1517000:         1         1         0         1         0         3 \n"
+			"  1805000:         9         0         0         1         2         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu2/topology/core_id",
 		.size = 2,
-		.content = "0\n",
+		.content = "2\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu2/topology/core_siblings",
+		.size = 3,
+		.content = "0f\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/topology/core_siblings_list",
@@ -511,14 +612,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/core_siblings",
-		.size = 3,
-		.content = "0f\n",
+		.path = "/sys/devices/system/cpu/cpu2/topology/physical_package_id",
+		.size = 2,
+		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/core_id",
-		.size = 2,
-		.content = "2\n",
+		.path = "/sys/devices/system/cpu/cpu2/topology/thread_siblings",
+		.size = 3,
+		.content = "04\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/topology/thread_siblings_list",
@@ -526,9 +627,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "2\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/thread_siblings",
-		.size = 3,
-		.content = "04\n",
+		.path = "/sys/devices/system/cpu/cpu3/cpuidle/driver/name",
+		.size = 25,
+		.content = "hisi_little_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/affected_cpus",
@@ -587,19 +688,19 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/stats/time_in_state",
-		.size = 70,
+		.size = 67,
 		.content =
-			"480000 3774\n"
-			"807000 79\n"
-			"1018000 11\n"
-			"1306000 986\n"
-			"1517000 178\n"
-			"1805000 5189\n",
+			"480000 1205\n"
+			"807000 8\n"
+			"1018000 0\n"
+			"1306000 753\n"
+			"1517000 55\n"
+			"1805000 3937\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "108\n",
+		.size = 3,
+		.content = "79\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/stats/trans_table",
@@ -607,17 +708,22 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content =
 			"   From  :    To\n"
 			"         :    480000    807000   1018000   1306000   1517000   1805000 \n"
-			"   480000:         0         4         0        20         0         1 \n"
-			"   807000:         4         0         0         3         0         0 \n"
-			"  1018000:         0         0         0         2         0         0 \n"
-			"  1306000:        11         1         0         0        14         8 \n"
-			"  1517000:         5         0         1         4         0        10 \n"
-			"  1805000:         6         2         1         5         6         0 \n",
+			"   480000:         0         0         0        26         0         0 \n"
+			"   807000:         0         0         0         2         0         0 \n"
+			"  1018000:         0         0         0         0         0         0 \n"
+			"  1306000:        15         0         0         0         5        10 \n"
+			"  1517000:         1         1         0         1         0         4 \n"
+			"  1805000:        10         1         0         1         2         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu3/topology/core_id",
 		.size = 2,
-		.content = "0\n",
+		.content = "3\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu3/topology/core_siblings",
+		.size = 3,
+		.content = "0f\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/topology/core_siblings_list",
@@ -625,14 +731,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/core_siblings",
-		.size = 3,
-		.content = "0f\n",
+		.path = "/sys/devices/system/cpu/cpu3/topology/physical_package_id",
+		.size = 2,
+		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/core_id",
-		.size = 2,
-		.content = "3\n",
+		.path = "/sys/devices/system/cpu/cpu3/topology/thread_siblings",
+		.size = 3,
+		.content = "08\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/topology/thread_siblings_list",
@@ -640,9 +746,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/thread_siblings",
-		.size = 3,
-		.content = "08\n",
+		.path = "/sys/devices/system/cpu/cpu4/cpuidle/driver/name",
+		.size = 22,
+		.content = "hisi_big_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/cpufreq/affected_cpus",
@@ -706,20 +812,20 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/cpufreq/stats/time_in_state",
-		.size = 80,
+		.size = 79,
 		.content =
 			"480000 0\n"
-			"807000 7546\n"
-			"1210000 376\n"
-			"1517000 44\n"
-			"1805000 47\n"
-			"2016000 327\n"
-			"2304000 2134\n",
+			"807000 3016\n"
+			"1210000 349\n"
+			"1517000 46\n"
+			"1805000 5\n"
+			"2016000 140\n"
+			"2304000 2629\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "116\n",
+		.size = 3,
+		.content = "88\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/cpufreq/stats/trans_table",
@@ -728,17 +834,22 @@ struct cpuinfo_mock_file filesystem[] = {
 			"   From  :    To\n"
 			"         :    480000    807000   1210000   1517000   1805000   2016000   2304000 \n"
 			"   480000:         0         0         0         0         0         0         0 \n"
-			"   807000:         0         0        30         0         0         2         0 \n"
-			"  1210000:         0        17         0        14         0         1         0 \n"
-			"  1517000:         0         0         1         0         8         5         1 \n"
-			"  1805000:         0         3         0         0         0         5         0 \n"
-			"  2016000:         0         6         0         0         0         0        11 \n"
-			"  2304000:         0         7         1         0         0         4         0 \n",
+			"   807000:         0         0        20         0         0         2         0 \n"
+			"  1210000:         0         8         0        13         0         2         0 \n"
+			"  1517000:         0         1         1         0         2         9         1 \n"
+			"  1805000:         0         0         0         0         0         1         1 \n"
+			"  2016000:         0         6         1         0         0         0         9 \n"
+			"  2304000:         0         8         1         0         0         2         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu4/topology/core_id",
 		.size = 2,
-		.content = "1\n",
+		.content = "0\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu4/topology/core_siblings",
+		.size = 3,
+		.content = "f0\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/topology/core_siblings_list",
@@ -746,14 +857,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "4-7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/core_siblings",
-		.size = 3,
-		.content = "f0\n",
+		.path = "/sys/devices/system/cpu/cpu4/topology/physical_package_id",
+		.size = 2,
+		.content = "1\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/core_id",
-		.size = 2,
-		.content = "0\n",
+		.path = "/sys/devices/system/cpu/cpu4/topology/thread_siblings",
+		.size = 3,
+		.content = "10\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu4/topology/thread_siblings_list",
@@ -761,9 +872,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "4\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/thread_siblings",
-		.size = 3,
-		.content = "10\n",
+		.path = "/sys/devices/system/cpu/cpu5/cpuidle/driver/name",
+		.size = 22,
+		.content = "hisi_big_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu5/cpufreq/affected_cpus",
@@ -827,20 +938,20 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu5/cpufreq/stats/time_in_state",
-		.size = 80,
+		.size = 79,
 		.content =
 			"480000 0\n"
-			"807000 7772\n"
-			"1210000 388\n"
+			"807000 3229\n"
+			"1210000 359\n"
 			"1517000 46\n"
-			"1805000 47\n"
-			"2016000 329\n"
-			"2304000 2142\n",
+			"1805000 5\n"
+			"2016000 140\n"
+			"2304000 2629\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu5/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "121\n",
+		.size = 3,
+		.content = "90\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu5/cpufreq/stats/trans_table",
@@ -849,42 +960,47 @@ struct cpuinfo_mock_file filesystem[] = {
 			"   From  :    To\n"
 			"         :    480000    807000   1210000   1517000   1805000   2016000   2304000 \n"
 			"   480000:         0         0         0         0         0         0         0 \n"
-			"   807000:         0         0        31         0         0         2         0 \n"
-			"  1210000:         0        17         0        15         0         1         0 \n"
-			"  1517000:         0         0         1         0         8         6         1 \n"
-			"  1805000:         0         3         0         0         0         5         0 \n"
-			"  2016000:         0         6         0         0         0         0        12 \n"
-			"  2304000:         0         8         1         0         0         4         0 \n",
+			"   807000:         0         0        21         0         0         2         0 \n"
+			"  1210000:         0         9         0        13         0         2         0 \n"
+			"  1517000:         0         1         1         0         2         9         1 \n"
+			"  1805000:         0         0         0         0         0         1         1 \n"
+			"  2016000:         0         6         1         0         0         0         9 \n"
+			"  2304000:         0         8         1         0         0         2         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu5/topology/core_id",
 		.size = 2,
 		.content = "1\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/core_siblings_list",
-		.size = 4,
-		.content = "4-7\n",
-	},
-	{
 		.path = "/sys/devices/system/cpu/cpu5/topology/core_siblings",
 		.size = 3,
 		.content = "f0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/core_id",
+		.path = "/sys/devices/system/cpu/cpu5/topology/core_siblings_list",
+		.size = 4,
+		.content = "4-7\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu5/topology/physical_package_id",
 		.size = 2,
 		.content = "1\n",
 	},
 	{
+		.path = "/sys/devices/system/cpu/cpu5/topology/thread_siblings",
+		.size = 3,
+		.content = "20\n",
+	},
+	{
 		.path = "/sys/devices/system/cpu/cpu5/topology/thread_siblings_list",
 		.size = 2,
 		.content = "5\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/thread_siblings",
-		.size = 3,
-		.content = "20\n",
+		.path = "/sys/devices/system/cpu/cpu6/cpuidle/driver/name",
+		.size = 22,
+		.content = "hisi_big_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu6/cpufreq/affected_cpus",
@@ -948,20 +1064,20 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu6/cpufreq/stats/time_in_state",
-		.size = 80,
+		.size = 79,
 		.content =
 			"480000 0\n"
-			"807000 8033\n"
-			"1210000 388\n"
+			"807000 3456\n"
+			"1210000 360\n"
 			"1517000 46\n"
-			"1805000 47\n"
-			"2016000 329\n"
-			"2304000 2142\n",
+			"1805000 5\n"
+			"2016000 140\n"
+			"2304000 2629\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu6/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "121\n",
+		.size = 3,
+		.content = "90\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu6/cpufreq/stats/trans_table",
@@ -970,17 +1086,22 @@ struct cpuinfo_mock_file filesystem[] = {
 			"   From  :    To\n"
 			"         :    480000    807000   1210000   1517000   1805000   2016000   2304000 \n"
 			"   480000:         0         0         0         0         0         0         0 \n"
-			"   807000:         0         0        31         0         0         2         0 \n"
-			"  1210000:         0        17         0        15         0         1         0 \n"
-			"  1517000:         0         0         1         0         8         6         1 \n"
-			"  1805000:         0         3         0         0         0         5         0 \n"
-			"  2016000:         0         6         0         0         0         0        12 \n"
-			"  2304000:         0         8         1         0         0         4         0 \n",
+			"   807000:         0         0        21         0         0         2         0 \n"
+			"  1210000:         0         9         0        13         0         2         0 \n"
+			"  1517000:         0         1         1         0         2         9         1 \n"
+			"  1805000:         0         0         0         0         0         1         1 \n"
+			"  2016000:         0         6         1         0         0         0         9 \n"
+			"  2304000:         0         8         1         0         0         2         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu6/topology/core_id",
 		.size = 2,
-		.content = "1\n",
+		.content = "2\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu6/topology/core_siblings",
+		.size = 3,
+		.content = "f0\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu6/topology/core_siblings_list",
@@ -988,14 +1109,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "4-7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/core_siblings",
-		.size = 3,
-		.content = "f0\n",
+		.path = "/sys/devices/system/cpu/cpu6/topology/physical_package_id",
+		.size = 2,
+		.content = "1\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/core_id",
-		.size = 2,
-		.content = "2\n",
+		.path = "/sys/devices/system/cpu/cpu6/topology/thread_siblings",
+		.size = 3,
+		.content = "40\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu6/topology/thread_siblings_list",
@@ -1003,9 +1124,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "6\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/thread_siblings",
-		.size = 3,
-		.content = "40\n",
+		.path = "/sys/devices/system/cpu/cpu7/cpuidle/driver/name",
+		.size = 22,
+		.content = "hisi_big_cluster_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu7/cpufreq/affected_cpus",
@@ -1069,20 +1190,20 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu7/cpufreq/stats/time_in_state",
-		.size = 80,
+		.size = 79,
 		.content =
 			"480000 0\n"
-			"807000 8295\n"
-			"1210000 388\n"
+			"807000 3684\n"
+			"1210000 370\n"
 			"1517000 46\n"
-			"1805000 47\n"
-			"2016000 329\n"
-			"2304000 2142\n",
+			"1805000 5\n"
+			"2016000 140\n"
+			"2304000 2629\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu7/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "121\n",
+		.size = 3,
+		.content = "92\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu7/cpufreq/stats/trans_table",
@@ -1091,22 +1212,17 @@ struct cpuinfo_mock_file filesystem[] = {
 			"   From  :    To\n"
 			"         :    480000    807000   1210000   1517000   1805000   2016000   2304000 \n"
 			"   480000:         0         0         0         0         0         0         0 \n"
-			"   807000:         0         0        31         0         0         2         0 \n"
-			"  1210000:         0        17         0        15         0         1         0 \n"
-			"  1517000:         0         0         1         0         8         6         1 \n"
-			"  1805000:         0         3         0         0         0         5         0 \n"
-			"  2016000:         0         6         0         0         0         0        12 \n"
-			"  2304000:         0         8         1         0         0         4         0 \n",
+			"   807000:         0         0        22         0         0         2         0 \n"
+			"  1210000:         0        10         0        13         0         2         0 \n"
+			"  1517000:         0         1         1         0         2         9         1 \n"
+			"  1805000:         0         0         0         0         0         1         1 \n"
+			"  2016000:         0         6         1         0         0         0         9 \n"
+			"  2304000:         0         8         1         0         0         2         0 \n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu7/topology/core_id",
 		.size = 2,
-		.content = "1\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/core_siblings_list",
-		.size = 4,
-		.content = "4-7\n",
+		.content = "3\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu7/topology/core_siblings",
@@ -1114,23 +1230,27 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "f0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/core_id",
-		.size = 2,
-		.content = "3\n",
+		.path = "/sys/devices/system/cpu/cpu7/topology/core_siblings_list",
+		.size = 4,
+		.content = "4-7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/thread_siblings_list",
+		.path = "/sys/devices/system/cpu/cpu7/topology/physical_package_id",
 		.size = 2,
-		.content = "7\n",
+		.content = "1\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu7/topology/thread_siblings",
 		.size = 3,
 		.content = "80\n",
 	},
+	{
+		.path = "/sys/devices/system/cpu/cpu7/topology/thread_siblings_list",
+		.size = 2,
+		.content = "7\n",
+	},
 	{ NULL },
 };
-
 #ifdef __ANDROID__
 struct cpuinfo_mock_property properties[] = {
 	{
@@ -1247,7 +1367,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "debug.aps.current_battery",
-		.value = "88",
+		.value = "78",
 	},
 	{
 		.key = "debug.aps.enable",
@@ -1350,10 +1470,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "",
 	},
 	{
-		.key = "gsm.rssi.sim1",
-		.value = "-1",
-	},
-	{
 		.key = "gsm.sigcust.configured",
 		.value = "true",
 	},
@@ -1383,7 +1499,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "gsm.version.baseband",
-		.value = "21.258.03.00.030",
+		.value = "21.258.00.00.030",
 	},
 	{
 		.key = "gsm.version.ril-impl",
@@ -1415,7 +1531,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "hw.wifipro.dns_fail_count",
-		.value = "24",
+		.value = "19",
 	},
 	{
 		.key = "hw_chargemonitor.log",
@@ -2147,7 +2263,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ril.ecclist",
-		.value = "112,911,000,08,110,118,119,999,112,911",
+		.value = "112,911,000,08,110,118,119,999,911,112",
 	},
 	{
 		.key = "ril.force_to_set_ecc",
@@ -2167,7 +2283,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ril.operator.numeric",
-		.value = "310410",
+		.value = "310260",
 	},
 	{
 		.key = "rild.libargs",
@@ -2235,7 +2351,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.boot.serialno",
-		.value = "AXS0216C10000671",
+		.value = "AXS0216C15000540",
 	},
 	{
 		.key = "ro.boot.verifiedbootstate",
@@ -2247,15 +2363,15 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.bootimage.build.date",
-		.value = "Tue Mar 21 03:22:21 CST 2017",
+		.value = "Tue Feb 7 05:28:14 CST 2017",
 	},
 	{
 		.key = "ro.bootimage.build.date.utc",
-		.value = "1490037741",
+		.value = "1486416494",
 	},
 	{
 		.key = "ro.bootimage.build.fingerprint",
-		.value = "hi3650/hi3650/hi3650:7.0/NRD90M/jenkin03210320:user/test-keys",
+		.value = "hi3650/hi3650/hi3650:7.0/NRD90M/jenkin02070527:user/test-keys",
 	},
 	{
 		.key = "ro.bootloader",
@@ -2275,27 +2391,27 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.date",
-		.value = "Tue Mar 21 02:12:13 CST 2017",
+		.value = "Tue Feb  7 04:52:44 CST 2017",
 	},
 	{
 		.key = "ro.build.date.utc",
-		.value = "1490033533",
+		.value = "1486414364",
 	},
 	{
 		.key = "ro.build.description",
-		.value = "NXT-L09-user 7.0 HUAWEINXT-L09 C636B580 release-keys",
+		.value = "NXT-L09-user 7.0 HUAWEINXT-L09 C636B563 release-keys",
 	},
 	{
 		.key = "ro.build.diaplay.id",
-		.value = "System 5.0.0.48(0O2V)",
+		.value = "System 5.0.0.48(0IMA)",
 	},
 	{
 		.key = "ro.build.display.id",
-		.value = "NXT-L09C636B580",
+		.value = "NXT-L09C636B563",
 	},
 	{
 		.key = "ro.build.fingerprint",
-		.value = "HUAWEI/NXT-L09/HWNXT:7.0/HUAWEINXT-L09/C636B580:user/release-keys",
+		.value = "HUAWEI/NXT-L09/HWNXT:7.0/HUAWEINXT-L09/C636B563:user/release-keys",
 	},
 	{
 		.key = "ro.build.flavor",
@@ -2319,7 +2435,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.host",
-		.value = "wuhjk0046cna",
+		.value = "wuhjk0069cna",
 	},
 	{
 		.key = "ro.build.hw_emui_api_level",
@@ -2367,7 +2483,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.version.incremental",
-		.value = "C636B580",
+		.value = "C636B563",
 	},
 	{
 		.key = "ro.build.version.preview_sdk",
@@ -2383,7 +2499,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.version.security_patch",
-		.value = "2017-03-01",
+		.value = "2017-01-01",
 	},
 	{
 		.key = "ro.carrier",
@@ -2435,7 +2551,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.comp.chipset_version",
-		.value = "Chipset-austin 5.0.0.3(0934)",
+		.value = "Chipset-austin 5.0.0.3(079D)",
 	},
 	{
 		.key = "ro.comp.cust_version",
@@ -2455,27 +2571,27 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.comp.system_version",
-		.value = "System 5.0.0.48(0O2V)",
+		.value = "System 5.0.0.48(0IMA)",
 	},
 	{
 		.key = "ro.comp.version_version",
-		.value = "Version-NXT-L09-636000 5.0.0.1(000H)",
+		.value = "Version-NXT-L09-636000 5.0.0.1(000F)",
 	},
 	{
 		.key = "ro.confg.hw_bootversion",
-		.value = "Chipset-austin 5.0.0.3(0934)_BOOT",
+		.value = "Chipset-austin 5.0.0.3(079D)_BOOT",
 	},
 	{
 		.key = "ro.confg.hw_fastbootversion",
-		.value = "Chipset-austin 5.0.0.3(0934)_FASTBOOT",
+		.value = "Chipset-austin 5.0.0.3(079D)_FASTBOOT",
 	},
 	{
 		.key = "ro.confg.hw_systemversion",
-		.value = "System 5.0.0.48(0O2V)",
+		.value = "System 5.0.0.48(0IMA)",
 	},
 	{
 		.key = "ro.confg.hw_userdataversion",
-		.value = "NXT-L09C636B580_DATA_hw_spcseas",
+		.value = "NXT-L09C636B563_DATA_hw_spcseas",
 	},
 	{
 		.key = "ro.config.DelaySwitchUserDlg",
@@ -2503,7 +2619,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.config.c2dmdelay",
-		.value = "10000",
+		.value = "30000",
 	},
 	{
 		.key = "ro.config.ca_withoutcat",
@@ -2683,7 +2799,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.config.hw_em_solution_ver",
-		.value = "B065",
+		.value = "B060",
 	},
 	{
 		.key = "ro.config.hw_enable_merge",
@@ -2798,10 +2914,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "false",
 	},
 	{
-		.key = "ro.config.hw_protect_iwa_apps",
-		.value = "false",
-	},
-	{
 		.key = "ro.config.hw_rcm_cert",
 		.value = "true",
 	},
@@ -3391,7 +3503,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.runtime.firstboot",
-		.value = "1505266044886",
+		.value = "1524187056955",
 	},
 	{
 		.key = "ro.secure",
@@ -3399,7 +3511,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.serialno",
-		.value = "AXS0216C10000671",
+		.value = "AXS0216C15000540",
 	},
 	{
 		.key = "ro.setupwizard.mode",
@@ -3467,11 +3579,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.vendor.build.date",
-		.value = "Tue Mar 21 03:28:25 CST 2017",
+		.value = "Tue Feb 7 05:34:17 CST 2017",
 	},
 	{
 		.key = "ro.vendor.build.date.utc",
-		.value = "1490038105",
+		.value = "1486416857",
 	},
 	{
 		.key = "ro.vr_display.service",
@@ -3506,14 +3618,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "1",
 	},
 	{
-		.key = "sys.aps.facedown.sleep",
-		.value = "0",
-	},
-	{
-		.key = "sys.aps.facedownDetectionOn",
-		.value = "0",
-	},
-	{
 		.key = "sys.aps.gameProcessName",
 		.value = "",
 	},
@@ -3527,7 +3631,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "sys.aps.version",
-		.value = "3.3.10-3.2.10.2",
+		.value = "3.3.10-3.2.10.1",
 	},
 	{
 		.key = "sys.boot_completed",
@@ -3563,7 +3667,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "sys.resettype",
-		.value = "normal:coldboot",
+		.value = "normal:press1s",
 	},
 	{
 		.key = "sys.show_google_nlp",