From 6e44d2ee0c233ac7bfba06195734f7ef70f4025d Mon Sep 17 00:00:00 2001
From: Badhri Jagan Sridharan <badhri@google.com>
Date: Thu, 17 Jun 2021 16:04:47 -0700
Subject: [PATCH] dumpstate: dump logbuffer tcpm logs in bugreport

Bug: 189792358
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Change-Id: I64cf665985226c81ff23b32bda25c303d8031d5f
---
 conf/init.gs101.rc            | 1 +
 dumpstate/DumpstateDevice.cpp | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index efd8695d..70b00e53 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -162,6 +162,7 @@ on init
     chown system system /dev/logbuffer_rtx
     chown system system /dev/logbuffer_ssoc
     chown system system /dev/logbuffer_ttf
+    chown system system /dev/logbuffer_tcpm
     chown system system /dev/logbuffer_usbpd
     chown system system /dev/logbuffer_wireless
 
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 4d643ee1..77ff3bba 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -334,7 +334,9 @@ void DumpstateDevice::dumpPowerSection(int fd) {
         DumpFileToFd(fd, "maxfg_flip", "/dev/logbuffer_maxfg_flip");
     }
 
-    if (!PropertiesHelper::IsUserBuild()) {
+    if (!stat("/dev/logbuffer_tcpm", &buffer)) {
+        DumpFileToFd(fd, "Logbuffer TCPM", "/dev/logbuffer_tcpm");
+    } else if (!PropertiesHelper::IsUserBuild()) {
         if (!stat("/sys/kernel/debug/tcpm", &buffer)) {
             RunCommandToFd(fd, "TCPM logs", {"/vendor/bin/sh", "-c", "cat /sys/kernel/debug/tcpm/*"});
         } else {