From f083d5e5a30cbd846712ac895766d673cf767350 Mon Sep 17 00:00:00 2001
From: Rex-BC Chen <rex-bc.chen@mediatek.corp-partner.google.com>
Date: Thu, 25 Nov 2021 17:44:02 +0800
Subject: soc/mediatek: move bustracker_init before watchdog resets again

The checking register will be cleared after EC resets, so we move
bustracker dump from ramstage to bootblock, before triggering EC reset.

TEST=bustracker shows status before watchdog resets
BUG=b:207743045

Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
Change-Id: Ic18dc9742cd9f657a035a374e28371dfc5f04ac3
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59667
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
---
 src/soc/mediatek/mt8192/Makefile.inc | 2 +-
 src/soc/mediatek/mt8192/bootblock.c  | 2 ++
 src/soc/mediatek/mt8192/soc.c        | 2 --
 src/soc/mediatek/mt8195/Makefile.inc | 3 ++-
 src/soc/mediatek/mt8195/bootblock.c  | 2 ++
 src/soc/mediatek/mt8195/soc.c        | 2 --
 6 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/soc/mediatek/mt8192/Makefile.inc b/src/soc/mediatek/mt8192/Makefile.inc
index a75ac28b08..b04acb56f1 100644
--- a/src/soc/mediatek/mt8192/Makefile.inc
+++ b/src/soc/mediatek/mt8192/Makefile.inc
@@ -10,6 +10,7 @@ bootblock-y += ../common/mmu_operations.c
 bootblock-y += ../common/pll.c pll.c
 bootblock-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
 bootblock-y += ../common/timer.c
+bootblock-y += ../common/tracker.c
 bootblock-y += ../common/uart.c
 bootblock-y += ../common/wdt.c
 
@@ -63,7 +64,6 @@ ramstage-y += ../common/rtc.c ../common/rtc_mt6359p.c
 ramstage-y += soc.c
 ramstage-y += ../common/spm.c spm.c
 ramstage-y += ../common/sspm.c
-ramstage-y += ../common/tracker.c
 ramstage-y += ../common/timer.c
 ramstage-y += ../common/uart.c
 ramstage-y += ../common/ufs.c
diff --git a/src/soc/mediatek/mt8192/bootblock.c b/src/soc/mediatek/mt8192/bootblock.c
index 17fd27e53f..3adf5c17bd 100644
--- a/src/soc/mediatek/mt8192/bootblock.c
+++ b/src/soc/mediatek/mt8192/bootblock.c
@@ -4,11 +4,13 @@
 #include <soc/eint_event.h>
 #include <soc/mmu_operations.h>
 #include <soc/pll.h>
+#include <soc/tracker_common.h>
 #include <soc/wdt.h>
 
 void bootblock_soc_init(void)
 {
 	mtk_mmu_init();
+	bustracker_init();
 	mtk_wdt_init();
 	mt_pll_init();
 	unmask_eint_event_mask();
diff --git a/src/soc/mediatek/mt8192/soc.c b/src/soc/mediatek/mt8192/soc.c
index 355827ac27..006a212da9 100644
--- a/src/soc/mediatek/mt8192/soc.c
+++ b/src/soc/mediatek/mt8192/soc.c
@@ -9,7 +9,6 @@
 #include <soc/mcupm.h>
 #include <soc/mmu_operations.h>
 #include <soc/sspm.h>
-#include <soc/tracker_common.h>
 #include <soc/ufs.h>
 #include <symbols.h>
 
@@ -34,7 +33,6 @@ static void soc_init(struct device *dev)
 	if (CONFIG(MTK_DFD))
 		dfd_init();
 	ufs_disable_refclk();
-	bustracker_init();
 }
 
 static struct device_operations soc_ops = {
diff --git a/src/soc/mediatek/mt8195/Makefile.inc b/src/soc/mediatek/mt8195/Makefile.inc
index c6f4226ae3..a7ada28054 100644
--- a/src/soc/mediatek/mt8195/Makefile.inc
+++ b/src/soc/mediatek/mt8195/Makefile.inc
@@ -7,6 +7,7 @@ bootblock-y += ../common/flash_controller.c
 bootblock-y += ../common/gpio.c gpio.c
 bootblock-y += ../common/i2c.c i2c.c
 bootblock-y += ../common/mmu_operations.c
+bootblock-y += ../common/tracker.c
 bootblock-y += ../common/pll.c pll.c
 bootblock-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
 bootblock-y += ../common/timer.c timer.c
@@ -50,7 +51,7 @@ romstage-y += ../common/mt6359p.c mt6359p.c
 romstage-y += mt6691.c
 romstage-y += mt6360.c
 romstage-y += ../common/rtc.c ../common/rtc_osc_init.c ../common/rtc_mt6359p.c
-ramstage-y += ../common/tracker.c
+
 ramstage-y += ../common/auxadc.c
 ramstage-y += ../common/ddp.c ddp.c
 ramstage-y += devapc.c
diff --git a/src/soc/mediatek/mt8195/bootblock.c b/src/soc/mediatek/mt8195/bootblock.c
index 17fd27e53f..3adf5c17bd 100644
--- a/src/soc/mediatek/mt8195/bootblock.c
+++ b/src/soc/mediatek/mt8195/bootblock.c
@@ -4,11 +4,13 @@
 #include <soc/eint_event.h>
 #include <soc/mmu_operations.h>
 #include <soc/pll.h>
+#include <soc/tracker_common.h>
 #include <soc/wdt.h>
 
 void bootblock_soc_init(void)
 {
 	mtk_mmu_init();
+	bustracker_init();
 	mtk_wdt_init();
 	mt_pll_init();
 	unmask_eint_event_mask();
diff --git a/src/soc/mediatek/mt8195/soc.c b/src/soc/mediatek/mt8195/soc.c
index 80ca3d9d11..d28f668579 100644
--- a/src/soc/mediatek/mt8195/soc.c
+++ b/src/soc/mediatek/mt8195/soc.c
@@ -10,7 +10,6 @@
 #include <soc/mcupm.h>
 #include <soc/mmu_operations.h>
 #include <soc/sspm.h>
-#include <soc/tracker_common.h>
 #include <soc/ufs.h>
 #include <symbols.h>
 
@@ -38,7 +37,6 @@ static void soc_init(struct device *dev)
 
 	ufs_disable_refclk();
 	hdmi_low_power_setting();
-	bustracker_init();
 }
 
 static struct device_operations soc_ops = {
-- 
cgit v1.2.3