commit fc09fbeafec0138da05512a44fb83330a5c0671e
author Stephen Chu <stephen.chu@synaptics.corp-partner.google.com> Thu Dec 14 00:33:39 2023 +0800
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Dec 14 02:00:59 2023 +0000
tree 688d096fe049f743d71b5a30a56a6ccb105da7a3
parent daa08452d9997e85995cc76fde64ae0cf71e17c4

DHD: Restore clock status after CTO init

Bug: 315252799
Test: No ramdump in T6pro reboot test
Change-Id: I23ab938aa48055428e6048a2cc04b484017c4977
Signed-off-by: Stephen Chu <stephen.chu@synaptics.corp-partner.google.com>

dhd_pcie.c

diff --git a/dhd_pcie.c b/dhd_pcie.c
index 7be2891..2300e6d 100644
--- a/dhd_pcie.c
+++ b/dhd_pcie.c
@@ -2212,6 +2212,13 @@
 		if (PCIECTO_ENAB(bus)) {
 			dhdpcie_cto_init(bus, TRUE);
 		}
+		cc = (chipcregs_t*)si_setcore(bus->sih, CC_CORE_ID, 0);
+		if (cc) {
+			AND_REG(osh, &cc->clk_ctl_st, ~CCS_FORCEHT);
+		} else {
+			DHD_ERROR(("CC is NULL\n"));
+		}
+		si_setcore(bus->sih, origidx, 0);
 	}
 
 	/* need to set the force_bt_quiesce flag here