From 3d46be281db650ce98b16dfc2f086a2a1cd5572a Mon Sep 17 00:00:00 2001 From: Jenny Ho Date: Wed, 14 Apr 2021 05:08:07 +0800 Subject: [PATCH] dumpstate: update dump eeprom path avoid using * for sysfs permission Bug: 182531832 Signed-off-by: Jenny Ho Change-Id: I8346bc09e82811a9006aae6d1b2d83d31a7e0a62 --- dumpstate/DumpstateDevice.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index e3965257..6cb5c746 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -358,11 +358,12 @@ void DumpstateDevice::dumpPowerSection(int fd) { "regs=`cat $f/registers`; echo $f: ;" "echo \"$regs\"; done"}); - /* Nvmem State */ - RunCommandToFd(fd, "nvmem dump", {"/vendor/bin/sh", "-c", - "for f in /sys/devices/platform/10970000.hsi2c/i2c-*/*-0050 ; do " - "regs=`cat $f/eeprom | xxd`; echo $f: ;" - "echo \"$regs\"; done"}); + /* EEPROM State */ + if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-4/4-0050/eeprom", &buffer)) { + RunCommandToFd(fd, "Battery EEPROM", {"/vendor/bin/sh", "-c", "xxd /sys/devices/platform/10970000.hsi2c/i2c-4/4-0050/eeprom"}); + } else { + RunCommandToFd(fd, "Battery EEPROM", {"/vendor/bin/sh", "-c", "xxd /sys/devices/platform/10970000.hsi2c/i2c-5/5-0050/eeprom"}); + } DumpFileToFd(fd, "Charger Stats", "/sys/class/power_supply/battery/charge_details"); RunCommandToFd(fd, "Google Charger", {"/vendor/bin/sh", "-c", "cd /sys/kernel/debug/google_charger/; "