Change in coreboot[master]: soc/mediatek/mt8192: Keep CONN MCU in reset state

[Yidi Lin (Code Review)]

Hello Weiyi Lu,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/46447

to review the following change.

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

soc/mediatek/mt8192: Keep CONN MCU in reset state

Keep the CONN MCU in reset state to prevent CONN from
asserting the clk26m request to SPM.

TEST=clk26m request from conn has been released.

Signed-off-by: Weiyi Lu 
Change-Id: Ia1b706da497ba2827341051459c3628e2ae9240f
---
M src/soc/mediatek/mt8192/include/soc/pll.h
M src/soc/mediatek/mt8192/pll.c
2 files changed, 9 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/46447/1

diff --git a/src/soc/mediatek/mt8192/include/soc/pll.h b/src/soc/mediatek/mt8192/include/soc/pll.h
index 35e8ff2..cafa1dd 100644
--- a/src/soc/mediatek/mt8192/include/soc/pll.h
+++ b/src/soc/mediatek/mt8192/include/soc/pll.h
@@ -306,6 +306,9 @@
 DEFINE_BITFIELD(CLK26CALI_0_TRIGGER, 4, 4)
 DEFINE_BITFIELD(CLK26CALI_1_LOAD_CNT, 25, 16)

+DEFINE_BITFIELD(WDT_SWSYSRST_KEY, 31, 24)
+DEFINE_BITFIELD(WDT_SWSYSRST_CONN_MCU, 12, 12)
+
 enum {
    INFRACFG_AO_AXIMEM_BUS_DCM_REG0_MASK = ((0x1f << 12) | \
    		(0x1 << 17) | \
diff --git a/src/soc/mediatek/mt8192/pll.c b/src/soc/mediatek/mt8192/pll.c
index 0366cd6..fdd0b1e 100644
--- a/src/soc/mediatek/mt8192/pll.c
+++ b/src/soc/mediatek/mt8192/pll.c
@@ -10,6 +10,7 @@
 #include <soc/infracfg.h>
 #include <soc/mcucfg.h>
 #include <soc/pll.h>
+#include <soc/wdt.h>

enum mux_id {
    TOP_AXI_SEL,
@@ -460,6 +461,11 @@

/* enable [14] dramc_pll104m_ck */
    setbits32(&mtk_topckgen->clk_misc_cfg_0, 1 << 14);
+
+	/* reset CONNSYS MCU */
+	SET32_BITFIELDS(&mtk_wdt->wdt_swsysrst,
+			WDT_SWSYSRST_KEY, 0x88,
+			WDT_SWSYSRST_CONN_MCU, 1);
 }

void mt_pll_raise_little_cpu_freq(u32 freq)

[pan gao (Code Review)]

pan gao has uploaded a new patch set (#9) to the change originally created by Yidi Lin. ( https://review.coreboot.org/c/coreboot/+/46447 )

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

soc/mediatek/mt8192: Keep CONN MCU in reset state

Keep the CONN MCU in reset state to prevent CONN from
asserting the clk26m request to SPM.

TEST=clk26m request from conn has been released.

Signed-off-by: Weiyi Lu 
Change-Id: Ia1b706da497ba2827341051459c3628e2ae9240f
---
M src/soc/mediatek/mt8192/include/soc/pll.h
M src/soc/mediatek/mt8192/pll.c
2 files changed, 9 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/46447/9

[Yidi Lin (Code Review)]

Hello build bot (Jenkins), Weiyi Lu, pan gao,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/46447

to look at the new patch set (#28).

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

soc/mediatek/mt8192: Keep CONN MCU in reset state

Keep the CONN MCU in reset state to prevent CONN from
asserting the clk26m request to SPM.

TEST=clk26m request from conn has been released.

Signed-off-by: Weiyi Lu 
Change-Id: Ia1b706da497ba2827341051459c3628e2ae9240f
---
M src/soc/mediatek/mt8192/include/soc/pll.h
M src/soc/mediatek/mt8192/pll.c
2 files changed, 9 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/46447/28

[Yidi Lin (Code Review)]

Hello Hung-Te Lin, Xi Chen, build bot (Jenkins), Weiyi Lu, pan gao,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/46447

to look at the new patch set (#39).

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

soc/mediatek/mt8192: Keep CONN MCU in reset state

Keep the CONN MCU in reset state to prevent CONN from
asserting the clk26m request to SPM.

TEST=clk26m request from conn has been released.

Signed-off-by: Weiyi Lu 
Change-Id: Ia1b706da497ba2827341051459c3628e2ae9240f
---
M src/soc/mediatek/mt8192/include/soc/pll.h
M src/soc/mediatek/mt8192/pll.c
2 files changed, 9 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/46447/39

[Yidi Lin (Code Review)]

Hello Hung-Te Lin, Xi Chen, build bot (Jenkins), Weiyi Lu, pan gao,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/46447

to look at the new patch set (#41).

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

soc/mediatek/mt8192: Keep CONN MCU in reset state

Keep the CONN MCU in reset state to prevent CONN from
asserting the clk26m request to SPM.

TEST=clk26m request from conn has been released.

Signed-off-by: Weiyi Lu 
Change-Id: Ia1b706da497ba2827341051459c3628e2ae9240f
---
M src/soc/mediatek/mt8192/include/soc/pll.h
M src/soc/mediatek/mt8192/pll.c
2 files changed, 9 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/46447/41

[Yu-Ping Wu (Code Review)]

Yu-Ping Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46447 )

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

Patch Set 44:

(2 comments)

https://review.coreboot.org/c/coreboot/+/46447/44//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/46447/44//COMMIT_MSG@10 
PS44, Line 10: asserting
This can fit in the previous line.

https://review.coreboot.org/c/coreboot/+/46447/44/src/soc/mediatek/mt8192/pl... 
File src/soc/mediatek/mt8192/pll.c:

https://review.coreboot.org/c/coreboot/+/46447/44/src/soc/mediatek/mt8192/pl... 
PS44, Line 468: 1
0x1

[Yidi Lin (Code Review)]

Hello Hung-Te Lin, Xi Chen, build bot (Jenkins), Weiyi Lu, pan gao,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/46447

to look at the new patch set (#45).

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

soc/mediatek/mt8192: Keep CONN MCU in reset state

Keep the CONN MCU in reset state to prevent CONN from asserting
the clk26m request to SPM.

TEST=clk26m request from conn has been released.

Signed-off-by: Weiyi Lu 
Change-Id: Ia1b706da497ba2827341051459c3628e2ae9240f
---
M src/soc/mediatek/mt8192/include/soc/pll.h
M src/soc/mediatek/mt8192/pll.c
2 files changed, 9 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/46447/45

[Yidi Lin (Code Review)]

Yidi Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46447 )

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

Patch Set 45:

(2 comments)

https://review.coreboot.org/c/coreboot/+/46447/44//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/46447/44//COMMIT_MSG@10 
PS44, Line 10: asserting
> This can fit in the previous line.

Done

https://review.coreboot.org/c/coreboot/+/46447/44/src/soc/mediatek/mt8192/pl... 
File src/soc/mediatek/mt8192/pll.c:

https://review.coreboot.org/c/coreboot/+/46447/44/src/soc/mediatek/mt8192/pl... 
PS44, Line 468: 1
> 0x1

Done

[Yu-Ping Wu (Code Review)]

Yu-Ping Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46447 )

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

Patch Set 45:

(1 comment)

https://review.coreboot.org/c/coreboot/+/46447/44//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/46447/44//COMMIT_MSG@10 
PS44, Line 10: asserting
> Done

Same for "the"

[Yidi Lin (Code Review)]

Hello Hung-Te Lin, Xi Chen, build bot (Jenkins), Weiyi Lu, pan gao,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/46447

to look at the new patch set (#46).

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

soc/mediatek/mt8192: Keep CONN MCU in reset state

Keep the CONN MCU in reset state to prevent CONN from asserting the
clk26m request to SPM.

TEST=clk26m request from conn has been released.

Signed-off-by: Weiyi Lu 
Change-Id: Ia1b706da497ba2827341051459c3628e2ae9240f
---
M src/soc/mediatek/mt8192/include/soc/pll.h
M src/soc/mediatek/mt8192/pll.c
2 files changed, 9 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/46447/46

[Yidi Lin (Code Review)]

Yidi Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46447 )

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

Patch Set 46:

(1 comment)

https://review.coreboot.org/c/coreboot/+/46447/44//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/46447/44//COMMIT_MSG@10 
PS44, Line 10: asserting
> Same for "the"

Done

[Hung-Te Lin (Code Review)]

Hung-Te Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46447 )

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

Patch Set 46: Code-Review+2

[Yu-Ping Wu (Code Review)]

Yu-Ping Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46447 )

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

Patch Set 46: Code-Review+2

[Hung-Te Lin (Code Review)]

Hung-Te Lin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46447 )

Change subject: soc/mediatek/mt8192: Keep CONN MCU in reset state
......................................................................

soc/mediatek/mt8192: Keep CONN MCU in reset state

Keep the CONN MCU in reset state to prevent CONN from asserting the
clk26m request to SPM.

TEST=clk26m request from conn has been released.

Signed-off-by: Weiyi Lu 
Change-Id: Ia1b706da497ba2827341051459c3628e2ae9240f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46447
Tested-by: build bot (Jenkins) 
Reviewed-by: Hung-Te Lin 
Reviewed-by: Yu-Ping Wu 
---
M src/soc/mediatek/mt8192/include/soc/pll.h
M src/soc/mediatek/mt8192/pll.c
2 files changed, 9 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Hung-Te Lin: Looks good to me, approved
  Yu-Ping Wu: Looks good to me, approved

diff --git a/src/soc/mediatek/mt8192/include/soc/pll.h b/src/soc/mediatek/mt8192/include/soc/pll.h
index 170196b..52bf3c2 100644
--- a/src/soc/mediatek/mt8192/include/soc/pll.h
+++ b/src/soc/mediatek/mt8192/include/soc/pll.h
@@ -306,6 +306,9 @@
 DEFINE_BITFIELD(CLK26CALI_0_TRIGGER, 4, 4)
 DEFINE_BITFIELD(CLK26CALI_1_LOAD_CNT, 25, 16)

+DEFINE_BITFIELD(WDT_SWSYSRST_KEY, 31, 24)
+DEFINE_BITFIELD(WDT_SWSYSRST_CONN_MCU, 12, 12)
+
 enum {
    INFRACFG_AO_AXIMEM_BUS_DCM_REG0_MASK = (0x1f << 12) | (0x1 << 17) | (0x1 << 18),
    INFRACFG_AO_AXIMEM_BUS_DCM_REG0_ON = (0x10 << 12) | (0x1 << 17) | (0x0 << 18),
diff --git a/src/soc/mediatek/mt8192/pll.c b/src/soc/mediatek/mt8192/pll.c
index afa7c85..6d61fb4 100644
--- a/src/soc/mediatek/mt8192/pll.c
+++ b/src/soc/mediatek/mt8192/pll.c
@@ -10,6 +10,7 @@
 #include <soc/infracfg.h>
 #include <soc/mcucfg.h>
 #include <soc/pll.h>
+#include <soc/wdt.h>

enum mux_id {
    TOP_AXI_SEL,
@@ -467,6 +468,11 @@

/* enable [14] dramc_pll104m_ck */
    setbits32(&mtk_topckgen->clk_misc_cfg_0, 1 << 14);
+
+	/* reset CONNSYS MCU */
+	SET32_BITFIELDS(&mtk_wdt->wdt_swsysrst,
+			WDT_SWSYSRST_KEY, 0x88,
+			WDT_SWSYSRST_CONN_MCU, 0x1);
 }

void mt_pll_raise_little_cpu_freq(u32 freq)