* [PATCH 1/3] dt-bindings: soc: update MT7623A power dt-bindings
@ 2022-07-26 3:06 Chukun Pan
2022-07-26 3:06 ` [PATCH 2/3] soc: mediatek: update power domain data of MT7623A Chukun Pan
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Chukun Pan @ 2022-07-26 3:06 UTC (permalink / raw)
To: Matthias Brugger
Cc: Krzysztof Kozlowski, Rob Herring, linux-arm-kernel,
linux-mediatek, linux-kernel, devicetree, Chukun Pan
Add new power domains(VDEC/DISP/ISP/BDP)
for MT7623A from MT7623 side.
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
---
include/dt-bindings/power/mt7623a-power.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/dt-bindings/power/mt7623a-power.h b/include/dt-bindings/power/mt7623a-power.h
index 2544822aa76b..27d198e207b7 100644
--- a/include/dt-bindings/power/mt7623a-power.h
+++ b/include/dt-bindings/power/mt7623a-power.h
@@ -6,5 +6,9 @@
#define MT7623A_POWER_DOMAIN_ETH 1
#define MT7623A_POWER_DOMAIN_HIF 2
#define MT7623A_POWER_DOMAIN_IFR_MSC 3
+#define MT7623A_POWER_DOMAIN_VDEC 4
+#define MT7623A_POWER_DOMAIN_DISP 5
+#define MT7623A_POWER_DOMAIN_ISP 6
+#define MT7623A_POWER_DOMAIN_BDP 7
#endif /* _DT_BINDINGS_POWER_MT7623A_POWER_H */
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] soc: mediatek: update power domain data of MT7623A 2022-07-26 3:06 [PATCH 1/3] dt-bindings: soc: update MT7623A power dt-bindings Chukun Pan @ 2022-07-26 3:06 ` Chukun Pan 2022-07-26 8:54 ` AngeloGioacchino Del Regno 2022-07-26 3:06 ` [PATCH 3/3] arm: dts: mt7623: update scpsys device nodes Chukun Pan 2022-07-26 9:25 ` [PATCH 1/3] dt-bindings: soc: update MT7623A power dt-bindings Krzysztof Kozlowski 2 siblings, 1 reply; 5+ messages in thread From: Chukun Pan @ 2022-07-26 3:06 UTC (permalink / raw) To: Matthias Brugger Cc: Krzysztof Kozlowski, Rob Herring, linux-arm-kernel, linux-mediatek, linux-kernel, devicetree, Chukun Pan When running OpenWrt on MT7623A, I receive a kernel warning as follows (Device dts using mt7623.dtsi): mtk-scpsys 10006000.scpsys: Failed to power on domain mfg WARNING: CPU: 0 PID: 1 at drivers/soc/mediatek/mtk-scpsys.c:457 0xc04a4130 When I switch the device dts to using mt7623a.dtsi, the system fails to boot: rcu: INFO: rcu_preempt detected stalls on CPUs/tasks: rcu: 0-...0: (0 ticks this GP) idle=146/1/0x40000000 softirq=53/53 fqs=1051 (detected by 1, t=2102 jiffies, g=-1111, q=18) Sending NMI from CPU 1 to CPUs 0: Solved the problem by duplicating the power domain of the MT7623 (except MFG) to MT7623A, the system works fine without kernel warnings/errors. Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn> --- drivers/soc/mediatek/mtk-scpsys.c | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c index ca75b14931ec..8b5713db1ca3 100644 --- a/drivers/soc/mediatek/mtk-scpsys.c +++ b/drivers/soc/mediatek/mtk-scpsys.c @@ -910,6 +910,41 @@ static const struct scp_domain_data scp_domain_data_mt7623a[] = { .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, + [MT7623A_POWER_DOMAIN_VDEC] = { + .name = "vdec", + .sta_mask = PWR_STATUS_VDEC, + .ctl_offs = SPM_VDE_PWR_CON, + .sram_pdn_bits = GENMASK(11, 8), + .sram_pdn_ack_bits = GENMASK(12, 12), + .clk_id = {CLK_MM}, + .caps = MTK_SCPD_ACTIVE_WAKEUP, + }, + [MT7623A_POWER_DOMAIN_DISP] = { + .name = "disp", + .sta_mask = PWR_STATUS_DISP, + .ctl_offs = SPM_DIS_PWR_CON, + .sram_pdn_bits = GENMASK(11, 8), + .clk_id = {CLK_MM}, + .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0, + .caps = MTK_SCPD_ACTIVE_WAKEUP, + }, + [MT7623A_POWER_DOMAIN_ISP] = { + .name = "isp", + .sta_mask = PWR_STATUS_ISP, + .ctl_offs = SPM_ISP_PWR_CON, + .sram_pdn_bits = GENMASK(11, 8), + .sram_pdn_ack_bits = GENMASK(13, 12), + .clk_id = {CLK_MM}, + .caps = MTK_SCPD_ACTIVE_WAKEUP, + }, + [MT7623A_POWER_DOMAIN_BDP] = { + .name = "bdp", + .sta_mask = PWR_STATUS_BDP, + .ctl_offs = SPM_BDP_PWR_CON, + .sram_pdn_bits = GENMASK(11, 8), + .clk_id = {CLK_NONE}, + .caps = MTK_SCPD_ACTIVE_WAKEUP, + }, }; /* -- 2.25.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] soc: mediatek: update power domain data of MT7623A 2022-07-26 3:06 ` [PATCH 2/3] soc: mediatek: update power domain data of MT7623A Chukun Pan @ 2022-07-26 8:54 ` AngeloGioacchino Del Regno 0 siblings, 0 replies; 5+ messages in thread From: AngeloGioacchino Del Regno @ 2022-07-26 8:54 UTC (permalink / raw) To: Chukun Pan, Matthias Brugger Cc: Krzysztof Kozlowski, Rob Herring, linux-arm-kernel, linux-mediatek, linux-kernel, devicetree, Rex-BC Chen Il 26/07/22 05:06, Chukun Pan ha scritto: > When running OpenWrt on MT7623A, I receive a kernel > warning as follows (Device dts using mt7623.dtsi): > > mtk-scpsys 10006000.scpsys: Failed to power on domain mfg > WARNING: CPU: 0 PID: 1 at drivers/soc/mediatek/mtk-scpsys.c:457 0xc04a4130 > > When I switch the device dts to using mt7623a.dtsi, > the system fails to boot: > > rcu: INFO: rcu_preempt detected stalls on CPUs/tasks: > rcu: 0-...0: (0 ticks this GP) idle=146/1/0x40000000 softirq=53/53 fqs=1051 > (detected by 1, t=2102 jiffies, g=-1111, q=18) > Sending NMI from CPU 1 to CPUs 0: > > Solved the problem by duplicating the power domain of > the MT7623 (except MFG) to MT7623A, the system works > fine without kernel warnings/errors. > > Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn> Can anyone from MediaTek check if these power domains do exist on MT7623A? Thanks, Angelo > --- > drivers/soc/mediatek/mtk-scpsys.c | 35 +++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c > index ca75b14931ec..8b5713db1ca3 100644 > --- a/drivers/soc/mediatek/mtk-scpsys.c > +++ b/drivers/soc/mediatek/mtk-scpsys.c > @@ -910,6 +910,41 @@ static const struct scp_domain_data scp_domain_data_mt7623a[] = { > .clk_id = {CLK_NONE}, > .caps = MTK_SCPD_ACTIVE_WAKEUP, > }, > + [MT7623A_POWER_DOMAIN_VDEC] = { > + .name = "vdec", > + .sta_mask = PWR_STATUS_VDEC, > + .ctl_offs = SPM_VDE_PWR_CON, > + .sram_pdn_bits = GENMASK(11, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .clk_id = {CLK_MM}, > + .caps = MTK_SCPD_ACTIVE_WAKEUP, > + }, > + [MT7623A_POWER_DOMAIN_DISP] = { > + .name = "disp", > + .sta_mask = PWR_STATUS_DISP, > + .ctl_offs = SPM_DIS_PWR_CON, > + .sram_pdn_bits = GENMASK(11, 8), > + .clk_id = {CLK_MM}, > + .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0, > + .caps = MTK_SCPD_ACTIVE_WAKEUP, > + }, > + [MT7623A_POWER_DOMAIN_ISP] = { > + .name = "isp", > + .sta_mask = PWR_STATUS_ISP, > + .ctl_offs = SPM_ISP_PWR_CON, > + .sram_pdn_bits = GENMASK(11, 8), > + .sram_pdn_ack_bits = GENMASK(13, 12), > + .clk_id = {CLK_MM}, > + .caps = MTK_SCPD_ACTIVE_WAKEUP, > + }, > + [MT7623A_POWER_DOMAIN_BDP] = { > + .name = "bdp", > + .sta_mask = PWR_STATUS_BDP, > + .ctl_offs = SPM_BDP_PWR_CON, > + .sram_pdn_bits = GENMASK(11, 8), > + .clk_id = {CLK_NONE}, > + .caps = MTK_SCPD_ACTIVE_WAKEUP, > + }, > }; > > /* ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 3/3] arm: dts: mt7623: update scpsys device nodes 2022-07-26 3:06 [PATCH 1/3] dt-bindings: soc: update MT7623A power dt-bindings Chukun Pan 2022-07-26 3:06 ` [PATCH 2/3] soc: mediatek: update power domain data of MT7623A Chukun Pan @ 2022-07-26 3:06 ` Chukun Pan 2022-07-26 9:25 ` [PATCH 1/3] dt-bindings: soc: update MT7623A power dt-bindings Krzysztof Kozlowski 2 siblings, 0 replies; 5+ messages in thread From: Chukun Pan @ 2022-07-26 3:06 UTC (permalink / raw) To: Matthias Brugger Cc: Krzysztof Kozlowski, Rob Herring, linux-arm-kernel, linux-mediatek, linux-kernel, devicetree, Chukun Pan Since the power domain data of mt7623a changed, device tree should also be changed accordingly. Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn> --- arch/arm/boot/dts/mt7623a.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/mt7623a.dtsi b/arch/arm/boot/dts/mt7623a.dtsi index d304b62d24b5..fb2670875a66 100644 --- a/arch/arm/boot/dts/mt7623a.dtsi +++ b/arch/arm/boot/dts/mt7623a.dtsi @@ -31,8 +31,9 @@ &pcie { &scpsys { compatible = "mediatek,mt7623a-scpsys"; - clocks = <&topckgen CLK_TOP_ETHIF_SEL>; - clock-names = "ethif"; + clocks = <&topckgen CLK_TOP_MM_SEL>, + <&topckgen CLK_TOP_ETHIF_SEL>; + clock-names = "mm", "ethif"; }; &usb0 { -- 2.25.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] dt-bindings: soc: update MT7623A power dt-bindings 2022-07-26 3:06 [PATCH 1/3] dt-bindings: soc: update MT7623A power dt-bindings Chukun Pan 2022-07-26 3:06 ` [PATCH 2/3] soc: mediatek: update power domain data of MT7623A Chukun Pan 2022-07-26 3:06 ` [PATCH 3/3] arm: dts: mt7623: update scpsys device nodes Chukun Pan @ 2022-07-26 9:25 ` Krzysztof Kozlowski 2 siblings, 0 replies; 5+ messages in thread From: Krzysztof Kozlowski @ 2022-07-26 9:25 UTC (permalink / raw) To: Chukun Pan, Matthias Brugger Cc: Krzysztof Kozlowski, Rob Herring, linux-arm-kernel, linux-mediatek, linux-kernel, devicetree On 26/07/2022 05:06, Chukun Pan wrote: > Add new power domains(VDEC/DISP/ISP/BDP) > for MT7623A from MT7623 side. > > Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn> > --- > include/dt-bindings/power/mt7623a-power.h | 4 ++++ > 1 file changed, 4 insertions(+) Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-07-26 9:25 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-07-26 3:06 [PATCH 1/3] dt-bindings: soc: update MT7623A power dt-bindings Chukun Pan 2022-07-26 3:06 ` [PATCH 2/3] soc: mediatek: update power domain data of MT7623A Chukun Pan 2022-07-26 8:54 ` AngeloGioacchino Del Regno 2022-07-26 3:06 ` [PATCH 3/3] arm: dts: mt7623: update scpsys device nodes Chukun Pan 2022-07-26 9:25 ` [PATCH 1/3] dt-bindings: soc: update MT7623A power dt-bindings Krzysztof Kozlowski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).