Skip to contentSkip to conversation

ARM: dts: omap4-droid4: Fix sgx clock rate

PATCH In review Tony Lindgren 2 participants 4 messages Mar 10, 2020 – Mar 15, 2020 Device tree bindings

lore
Share & tools
lore

Tony Lindgren

author
#0 lore raw

PATCH 1/1 ARM: dts: omap4-droid4: Fix sgx clock rate

We currently have a different clock rate for droid4 compared to the stock v3.0.8 based Android Linux kernel:

# cat /sys/kernel/debug/clk/dpll_*_m7x2_ck/clk_rate
266666667
307200000
# cat /sys/kernel/debug/clk/l3_gfx_cm:clk:0000:0/clk_rate
307200000

Let's fix this by configuring sgx to use 153.6 MHz instead of 307.2 MHz.

This helps a bit with thermal issues that seem to be related to memory corruption when using sgx. It seems that other driver related issues still remain though.

Cc Arthur Demchenkov <[email protected]>
Cc Merlijn Wajer <[email protected]>
Cc Sebastian Reichel <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
---
 arch/arm/boot/dts/motorola-mapphone-common.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/arm/boot/dts/motorola-mapphone-common.dtsi +10 -0
@@ -689,6 +689,16 @@ &rng_target {
 	status = "disabled";
 };
 
+/*
+ * Use dpll_per for sgx at 153.6MHz like the stock v3.0.8 Android kernel
+ */
+&sgx_module {
+	assigned-clocks = <&l3_gfx_clkctrl OMAP4_GPU_CLKCTRL 24>,
+			  <&dpll_per_m7x2_ck>;
+	assigned-clock-rates = <0>, <153600000>;
+	assigned-clock-parents = <&dpll_per_m7x2_ck>;
+};
+
 /* Configure pwm clock source for timers 8 & 9 */
 &timer8 {
 	assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;
Signature · 1 line
2.25.1
author
#1 lore raw
Quoted 1 line · Tony Lindgren

+&sgx_module {

Sorry the sgx_module label came from the linux_openpvrsgx branch I had merged in as Arthur noticed.

Below is an updated patch against v5.6-rc series.

Regards,

Tony

8< ------------------------
From tony Mon Sep 17 00:00:00 2001
From: Tony Lindgren <[email protected]>
Date: Tue, 10 Mar 2020 14:02:48 -0700
Subject: [PATCH] ARM: dts: omap4-droid4: Fix sgx clock rate

We currently have a different clock rate for droid4 compared to the stock v3.0.8 based Android Linux kernel:

# cat /sys/kernel/debug/clk/dpll_*_m7x2_ck/clk_rate
266666667
307200000
# cat /sys/kernel/debug/clk/l3_gfx_cm:clk:0000:0/clk_rate
307200000

Let's fix this by configuring sgx to use 153.6 MHz instead of 307.2 MHz.

This helps a bit with thermal issues that seem to be related to memory corruption when using sgx. It seems that other driver related issues still remain though.

Cc Arthur Demchenkov <[email protected]>
Cc Merlijn Wajer <[email protected]>
Cc Sebastian Reichel <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
---
 arch/arm/boot/dts/motorola-mapphone-common.dtsi | 10 ++++++++++
 arch/arm/boot/dts/omap4.dtsi                    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
arch/arm/boot/dts/motorola-mapphone-common.dtsi +10 -0
@@ -678,6 +678,16 @@ &rng_target {
 	status = "disabled";
 };
 
+/*
+ * Use dpll_per for sgx at 153.6MHz like the stock v3.0.8 Android kernel
+ */
+&sgx_module {
+	assigned-clocks = <&l3_gfx_clkctrl OMAP4_GPU_CLKCTRL 24>,
+			  <&dpll_per_m7x2_ck>;
+	assigned-clock-rates = <0>, <153600000>;
+	assigned-clock-parents = <&dpll_per_m7x2_ck>;
+};
+
 /* Configure pwm clock source for timers 8 & 9 */
 &timer8 {
 	assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;
arch/arm/boot/dts/omap4.dtsi +1 -1
@@ -390,7 +390,7 @@ abb_iva: regulator-abb-iva {
 			status = "disabled";
 		};
 
-		target-module@56000000 {
+		sgx_module: target-module@56000000 {
 			compatible = "ti,sysc-omap4", "ti,sysc";
 			reg = <0x5600fe00 0x4>,
 			      <0x5600fe10 0x4>;
Signature · 1 line
2.25.1
author
#2 lore raw
Quoted 7 lines · Tony Lindgren
Quoted 1 line · Tony Lindgren

+&sgx_module {

Sorry the sgx_module label came from the linux_openpvrsgx branch I had merged in as Arthur noticed.

Below is an updated patch against v5.6-rc series.

And looks like this is also needed for at least duovero, so let's change the clock for all 4430.

Regards,

Tony

8< ----------------------
From tony Mon Sep 17 00:00:00 2001
From: Tony Lindgren <[email protected]>
Date: Tue, 10 Mar 2020 14:02:48 -0700
Subject: [PATCH] ARM: dts: omap4: Fix sgx clock rate for 4430

We currently have a different clock rate for droid4 compared to the stock v3.0.8 based Android Linux kernel:

# cat /sys/kernel/debug/clk/dpll_*_m7x2_ck/clk_rate
266666667
307200000
# cat /sys/kernel/debug/clk/l3_gfx_cm:clk:0000:0/clk_rate
307200000

Let's fix this by configuring sgx to use 153.6 MHz instead of 307.2 MHz. Looks like also at least duover needs this change to avoid hangs, so let's apply it for all 4430.

This helps a bit with thermal issues that seem to be related to memory corruption when using sgx. It seems that other driver related issues still remain though.

Cc Arthur Demchenkov <[email protected]>
Cc Merlijn Wajer <[email protected]>
Cc Sebastian Reichel <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
---
 arch/arm/boot/dts/omap4.dtsi    |  2 +-
 arch/arm/boot/dts/omap443x.dtsi | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
arch/arm/boot/dts/omap4.dtsi +1 -1
@@ -390,7 +390,7 @@ abb_iva: regulator-abb-iva {
 			status = "disabled";
 		};
 
-		target-module@56000000 {
+		sgx_module: target-module@56000000 {
 			compatible = "ti,sysc-omap4", "ti,sysc";
 			reg = <0x5600fe00 0x4>,
 			      <0x5600fe10 0x4>;
arch/arm/boot/dts/omap443x.dtsi +10 -0
@@ -74,3 +74,13 @@ &cpu_thermal {
 };
 
 /include/ "omap443x-clocks.dtsi"
+
+/*
+ * Use dpll_per for sgx at 153.6MHz like droid4 stock v3.0.8 Android kernel
+ */
+&sgx_module {
+	assigned-clocks = <&l3_gfx_clkctrl OMAP4_GPU_CLKCTRL 24>,
+			  <&dpll_per_m7x2_ck>;
+	assigned-clock-rates = <0>, <153600000>;
+	assigned-clock-parents = <&dpll_per_m7x2_ck>;
+};
Signature · 1 line
2.25.1
build bot
#3 lore raw
In reply to Tony Lindgren
I love your patch! Yet something to improve:

Hi Tony,

I love your patch! Yet something to improve:

[auto build test ERROR on robh/for-next]
[also build test ERROR on omap/for-next balbi-usb/next v5.6-rc5 next-20200310] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Tony-Lindgren/ARM-dts-omap4-droid4-Fix-sgx-clock-rate/20200311-060127
base:   https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
config: arm-multi_v7_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 9.2.0

reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=9.2.0 make.cross ARCH=arm

If you fix the issue, kindly add following tag

Reported-by kbuild test robot <[email protected]>

All errors (new ones prefixed by >>):

>> Error: arch/arm/boot/dts/motorola-mapphone-common.dtsi:675.1-12 Label or path sgx_module not found
>> FATAL ERROR: Syntax error parsing input tree

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org