From 1b9156fbd645c05316c363e10f0dbb2f6cf3a106 Mon Sep 17 00:00:00 2001
From: souldbminersmwc <souldbyt@gmail.com>
Date: Tue, 25 Aug 2026 18:54:58 -0400
Subject: [PATCH] soctherm coldboot fix

---
 Source/hoc-clk/bpmpfw/out/bpmpfw.bin  | Bin 2920 -> 2912 bytes
 Source/hoc-clk/bpmpfw/source/main.cpp |  33 +++++++++++++++++++-------
 Source/hoc-clk/bpmpfw/source/regs.hpp |  25 ++++++++++++-------
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/Source/hoc-clk/bpmpfw/out/bpmpfw.bin b/Source/hoc-clk/bpmpfw/out/bpmpfw.bin
index bb044fdeb9d40ab74f7d8e8381c11087e2885c08..3ac590debb7b3214ac017937e0764872ab8c9476 100644
GIT binary patch
delta 447
zcmXw#Jxjw-6oyY?ixNMGN$4O2Z<9d>#kh%!X<Y(VEEd$UEusj11QDEyP3R~t0mt^b
z>D)iiQ6z#xf4~iw3tFdcZt;Zbfx~;w<>k4Y_cO<G<wqHY&)BN7`jrRxUWTrCK_!H8
zP$|#jeuX>WuHvlPU6COz0d`B|()S&3pbt)Ew^9mi$-S%LgNtn=aM16H0qcs_LPwZ+
z8vCU>%gp=CpQo{$)wt=RF4MTV=xY)f+$_^LTJMPV{xJi!u4RjD)-H~{Q))|?=(Uj3
z+-sv><GxvEGV;JV*2YZzj$3G&*!YKP+*+aWjMEZ9slhUZfCU8_r*Ju|b1U_&1qjo5
za|<sf4Nb+547@ObDxV;9Jt5R88UdH>D$A(%;wMQK-jZYp9@K!$c^)1LHDtnv0O&nP
z4N0o?M)KjLVPOvMQ4|qWlnAiGBgK^t!Y5^WHjT=|PUCXJk)rFHq<T}ozB#)*B@OSw
VJGoULT$)}r$_}RdSLZk<Sig9|rVs!C

delta 455
zcmXAkO-mb56o${-7z{Dg>m*1Q1#c1x0S!*ODqT&QjnoPQ3N4hvBz{GRdhr8SAs@^#
zi<YUIZsx9(uKfeimBL8-6Ygbt!P<2}Xkk2~2VTxO?|I(Ek<&NR-LC|0Pf*;h{)Sqh
zR{;L}hd`fVXG}yuMKlINZQ~A>h<>p^=fJy>PN1a~=*yz7OV5PrlZGT|GlHqUEM<fu
z74)WrDuqIYFMQpZ>6-@7Xh_-;&W93c!yKNAu1Z4X9D*3={1_r+M!k|NiP4iiLns)v
z%`)CdIv=H8Av4)~V9Iks<wl+!Tr_2_IFN%Pvf!EtS5CP30dn~WSkuf<PgC%8fqB}(
z=QutyM*~gS%VSNgV@<5OG+<f%i{o!saeNCSu<zc2?JPNOzyTN76aI7&?9V?_@a5e?
zriHVEI`a%}7_GCv<o!6EMdLaQ!wPn6q3>oFj1T_zY`vcF9F=4e*)H&pt=-jXlW+5l
wqfc!4ps{zbwX?|{jVu7H?62?a@9w>3b$-a6ulX|*)q+(68&41A;2dM!10EKvFaQ7m

diff --git a/Source/hoc-clk/bpmpfw/source/main.cpp b/Source/hoc-clk/bpmpfw/source/main.cpp
index 72a25d0f..af007fe3 100644
--- a/Source/hoc-clk/bpmpfw/source/main.cpp
+++ b/Source/hoc-clk/bpmpfw/source/main.cpp
@@ -32,6 +32,21 @@ namespace {
 
 } // namespace
 
+void MainLoop(HocClkBpmpSharedInfo &info) {
+    for (;;) {
+        const u32 temp1 = MMIO32(SocthermBase + SocthermSensorTemp1);
+        const u32 temp2 = MMIO32(SocthermBase + SocthermSensorTemp2);
+        
+        info.tempCpu  = TranslateSocthermTemp(static_cast<u16>(temp1 >> 16));
+        info.tempGpu  = TranslateSocthermTemp(static_cast<u16>(temp1));
+        info.tempMem  = TranslateSocthermTemp(static_cast<u16>(temp2 >> 16));
+        info.tempPllx = TranslateSocthermTemp(static_cast<u16>(temp2));
+        // printf("tmr=%u\n", MMIO32(TmrBase + TimerUsCntr1Us));
+        msleep(500);
+        //printf("[hoc-bpmpfw]: Done logging\n");
+    }
+}
+
 extern "C" void main() {
     InitializeLibc();
 
@@ -42,15 +57,15 @@ extern "C" void main() {
     info.status = 0;
     info.magic = HOCCLK_BPMP_MAGIC; // written last
 
-    for (;;) {
-        const u32 temp1 = MMIO32(SocthermBase + SocthermSensorTemp1);
-        const u32 temp2 = MMIO32(SocthermBase + SocthermSensorTemp2);
+    /* If the main loop exits then it is a panic or invalid state */
+    MainLoop(info);
 
-        info.tempCpu  = TranslateSocthermTemp(static_cast<u16>(temp1 >> 16));
-        info.tempGpu  = TranslateSocthermTemp(static_cast<u16>(temp1));
-        info.tempMem  = TranslateSocthermTemp(static_cast<u16>(temp2 >> 16));
-        info.tempPllx = TranslateSocthermTemp(static_cast<u16>(temp2));
+    printf("[hoc-bpmpfw]: PANIC\n");
+    /* Clear the magic so sysmodule knows of a panic */
+    info.magic = 0x0; 
 
-        usleep(250000); // 250ms
-    }
+    /* Give a panic code */
+    info.status = ~0;
+    for(;;)
+        ;
 }
diff --git a/Source/hoc-clk/bpmpfw/source/regs.hpp b/Source/hoc-clk/bpmpfw/source/regs.hpp
index 24adffa2..b287c27b 100644
--- a/Source/hoc-clk/bpmpfw/source/regs.hpp
+++ b/Source/hoc-clk/bpmpfw/source/regs.hpp
@@ -29,21 +29,28 @@ constexpr u32 FlowCtlrBase        = 0x60007000;
 constexpr u32 FlowCtlrHaltCopEvents = 0x004;
 
 constexpr u32 HaltModeWaitEvent = (2u << 29);
-constexpr u32 HaltUsec          = (0u << 24);
+constexpr u32 HaltMsec          = (1u << 24);
+constexpr u32 HaltUsec          = (1u << 25);
+constexpr u32 HaltMaxCnt        = 0xFF;
 
-[[maybe_unused]] inline void FlowCtlrHaltUsec(u32 usec) {
-    MMIO32(FlowCtlrBase + FlowCtlrHaltCopEvents) = HaltModeWaitEvent | HaltUsec | (usec & 0xFFFFFFu);
+[[maybe_unused]] inline void usleep(u32 us) {
+    while (us) {
+        const u32 delay = (us > HaltMaxCnt) ? HaltMaxCnt : us;
+        us -= delay;
+        MMIO32(FlowCtlrBase + FlowCtlrHaltCopEvents) = HaltModeWaitEvent | HaltUsec | delay;
+    }
+}
+[[maybe_unused]] inline void msleep(u32 ms) {
+    while (ms) {
+        const u32 delay = (ms > HaltMaxCnt) ? HaltMaxCnt : ms;
+        ms -= delay;
+        MMIO32(FlowCtlrBase + FlowCtlrHaltCopEvents) = HaltModeWaitEvent | HaltMsec | delay;
+    }
 }
 
 constexpr u32 TmrBase        = 0x60005000;
 constexpr u32 TimerUsCntr1Us = 0x10;
 
-[[maybe_unused]] inline void usleep(u32 us) {
-    const u32 start = MMIO32(TmrBase + TimerUsCntr1Us);
-    while ((MMIO32(TmrBase + TimerUsCntr1Us) - start) <= us)
-        ;
-}
-
 constexpr u32 UartBBase = 0x70006040;
 constexpr u32 UartThr   = 0x00;
 constexpr u32 UartLsr   = 0x14;