From 58cf4e8fc80baa8b1b97c4e8bf180e6b0a5de761 Mon Sep 17 00:00:00 2001 From: brentr Date: Sun, 3 Mar 2024 22:39:07 -0800 Subject: [PATCH] Added 1.3ghz overlay for B variant RK3308 (#6348) Updated and improved RK3308 overlay README doc Moved rock-s0.wip to .conf --- config/boards/{rock-s0.wip => rock-s0.conf} | 0 .../archive/rockchip64-6.6/overlay/Makefile | 3 +- .../overlay/README.rockchip-overlays | 40 ++++++++++------ .../overlay/rk3308-b@1.3ghz.dts | 27 +++++++++++ .../archive/rockchip64-6.7/overlay/Makefile | 3 +- .../overlay/README.rockchip-overlays | 46 +++++++++++++++---- .../overlay/rk3308-b@1.3ghz.dts | 27 +++++++++++ 7 files changed, 122 insertions(+), 24 deletions(-) rename config/boards/{rock-s0.wip => rock-s0.conf} (100%) create mode 100644 patch/kernel/archive/rockchip64-6.6/overlay/rk3308-b@1.3ghz.dts create mode 100644 patch/kernel/archive/rockchip64-6.7/overlay/rk3308-b@1.3ghz.dts diff --git a/config/boards/rock-s0.wip b/config/boards/rock-s0.conf similarity index 100% rename from config/boards/rock-s0.wip rename to config/boards/rock-s0.conf diff --git a/patch/kernel/archive/rockchip64-6.6/overlay/Makefile b/patch/kernel/archive/rockchip64-6.6/overlay/Makefile index 860337d61c64..18a0b45ee43b 100644 --- a/patch/kernel/archive/rockchip64-6.6/overlay/Makefile +++ b/patch/kernel/archive/rockchip64-6.6/overlay/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ - rk3308-s0-ext-antenna.dtbo \ + rk3308-s0-ext-antenna.dtbo \ + rk3308-b@1.3ghz.dtbo \ rk3308-bs.dtbo rk3308-bs@1.3ghz.dtbo \ rk3308-emmc.dtbo \ rk3308-sdio@10mhz.dtbo rk3308-sdio@4mhz.dtbo \ diff --git a/patch/kernel/archive/rockchip64-6.6/overlay/README.rockchip-overlays b/patch/kernel/archive/rockchip64-6.6/overlay/README.rockchip-overlays index 4605b997d199..eee057e5ec41 100644 --- a/patch/kernel/archive/rockchip64-6.6/overlay/README.rockchip-overlays +++ b/patch/kernel/archive/rockchip64-6.6/overlay/README.rockchip-overlays @@ -193,20 +193,28 @@ wifi + bt chip and clones. Enable additional cpu "high-speed" bins up to 1.3ghz ********************************** -Details for Rock Pi-S overlays (7 Oct 2022): +Details for Rock Pi-S overlays (2 Mar 2024): -V1.3 of the RockPi-S uses a the B-S variant of the RK3308 that is optimized -for lower core voltages than the older chips on the V1.2 and V1.1 boards. -All V1.3 boards should apply the +Older V1.1, V1.2, and those V1.3 boards produced during 2022 and 2023 +use a the B-S variant of the RK3308 that is optimized for lower core voltages. +Per Radxa, these chips will be marked RK3308B-S instead of RK3308B +All boards utilizing the RK3308B-S part should apply the: ### rk3308-bs overlay to lower the core voltages to reduce power consumption. This also enables operation at 1.1Ghz. -Optionally, V1.3 boards may add the +Optionally, boards utilizing the RK3308B-S parts may add the ### rk3308-bs@1.3ghz to overclock the B-S CPU to 1.3Ghz. Add the rk3308bs-rock-pi-s-1.3Ghz overlay *after adding* rockchip-rk3308bs +According to Radxa, RockPI-S boards manufactured after after 2024 went back +to the RK3308B. I have found that many B suffix chips operate fine at the +lower voltage selected by the rk3308-bs* overlays. So, when in doubt, try +the rk3308-bs* overlays first. If operation is unstable, switch to the +rk3308-b* overlays. This will apply the minium CPU voltage necessary for +your SOC. + =========== Install the following overlays only on older (unpatched) mainline kernels: @@ -231,13 +239,19 @@ Note that older mainline kernels cannot drive the SDIO clock faster than 10Mhz. ********************************** -Details for Rock S 0 overlays (7 Feb 2024): - -Note thaat rk3308-bs* overlays crash the s0 for some strange reason -So, the max CPU clock is currently limited to 1ghz :-( -(under investigation...) +Details for Rock S0 overlays (2 Mar 2024): +By default, the internal WiFi selects its internal chip antenna. +This antenna is so noisy as to be nearly unusable. +The external antenna, fortunately, works quite well. +Install an external WiFi antenna and select it with: ### rk3308-s0-ext-antenna -Select Rock S0's external WiFi antenna input -(instead of its internal WiFi antenna) -The internal antenna is very weak. Use an external one if convenient. + +All Rock S0 boards use the RK3308B chip. +The: +### rk3308-bs@1.3ghz +overlay enables (overclocked) operation at 1.3ghz +1.3Ghz operation appears stable on the two boards I've tested. + +The legacy kernel is not supported on the Rock S0 + diff --git a/patch/kernel/archive/rockchip64-6.6/overlay/rk3308-b@1.3ghz.dts b/patch/kernel/archive/rockchip64-6.6/overlay/rk3308-b@1.3ghz.dts new file mode 100644 index 000000000000..4f022bd4a1a9 --- /dev/null +++ b/patch/kernel/archive/rockchip64-6.6/overlay/rk3308-b@1.3ghz.dts @@ -0,0 +1,27 @@ +//Overclock the Rockchip RK3308-B suffix SOC to 1.3 Ghz +// THIS SHOULD NOT BE APPLIED to RK3308-B-S suffix chips +// because is will overvolt them + +/dts-v1/; +/plugin/; + +/ { + fragment@0 { + target = <&cpu0_opp_table>; + __overlay__ { + //the following are unsupported, overclocked operating points + opp-1200000000 { + opp-hz = /bits/ 64 <1200000000>; + opp-microvolt = <1250000 1250000 1340000>; + clock-latency-ns = <40000>; + status = "okay"; + }; + opp-1296000000 { + opp-hz = /bits/ 64 <1296000000>; + opp-microvolt = <1300000 1300000 1340000>; + clock-latency-ns = <40000>; + status = "okay"; + }; + }; + }; +}; diff --git a/patch/kernel/archive/rockchip64-6.7/overlay/Makefile b/patch/kernel/archive/rockchip64-6.7/overlay/Makefile index a205e7f45563..c6bfcdb71501 100644 --- a/patch/kernel/archive/rockchip64-6.7/overlay/Makefile +++ b/patch/kernel/archive/rockchip64-6.7/overlay/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ - rk3308-s0-ext-antenna.dtbo \ + rk3308-s0-ext-antenna.dtbo \ + rk3308-b@1.3ghz.dtbo \ rk3308-bs.dtbo rk3308-bs@1.3ghz.dtbo \ rk3308-emmc.dtbo \ rk3308-sdio@10mhz.dtbo rk3308-sdio@4mhz.dtbo \ diff --git a/patch/kernel/archive/rockchip64-6.7/overlay/README.rockchip-overlays b/patch/kernel/archive/rockchip64-6.7/overlay/README.rockchip-overlays index 15a32759f78d..757027017b5e 100644 --- a/patch/kernel/archive/rockchip64-6.7/overlay/README.rockchip-overlays +++ b/patch/kernel/archive/rockchip64-6.7/overlay/README.rockchip-overlays @@ -193,21 +193,32 @@ wifi + bt chip and clones. Enable additional cpu "high-speed" bins up to 1.3ghz ********************************** -Details for Rock Pi-S overlays (7 Oct 2022): +Details for Rock Pi-S overlays (2 Mar 2024): -V1.3 of the RockPi-S uses a the B-S variant of the RK3308 that is optimized -for lower core voltages than the older chips on the V1.2 and V1.1 boards. -All V1.3 boards should apply the +Older V1.1 and V1.2 boards use the B variant of the RK3308. +Some V1.3 boards manufactured after October 2023 also use the B variant. +To overclock the RK3308B, apply: +### rk3308-b@1.3ghz + +V1.3 boards produced during 2022 and most of 2023 use the lower voltage +B-S variant of the RK3308. +Per Radxa, these chips will be marked RK3308BS instead of RK3308B +All boards utilizing the RK3308B-S part should apply the: ### rk3308-bs -overlay to lower the core voltages to reduce power consumption. -This also enables operation at 1.1Ghz. +overlay to operate at the appropriate (lower) the core voltage. +This overlay also enables operation at 1.1Ghz. -Optionally, V1.3 boards may add the +Optionally, boards utilizing the RK3308B-S parts may add the ### rk3308-bs@1.3ghz to overclock the B-S CPU to 1.3Ghz. -Add the rk3308bs-rock-pi-s-1.3Ghz overlay *after adding* rockchip-rk3308bs +Apply the rk3308-bs@1.3Ghz overlay *after applying* rk3308-bs + +Applying the *-bs overlays to the B variant of the SOC may result in +unstable operation due to undervolting. +Applying the rk3308-b@1.3ghz to a BS variant chip consumes more power and +has the potential to damage the SOC due to overvolting. -=========== +===== For Older Kernels ====== Install the following overlays only on older (unpatched) mainline kernels: Older mainline kernels disable the Rock Pi S built-in SDNAND (EMMC) @@ -228,3 +239,20 @@ increases the SDIO clock to only 4Mhz, providing about 1MB/s WiFi throughput. use this only if 10Mhz SDIO clock is unstable Note that older mainline kernels cannot drive the SDIO clock faster than 10Mhz. + + +********************************** +Details for Rock S0 overlays (2 Mar 2024): + +By default, the internal WiFi uses its internal chip antenna. +Almost any external antenna will improve WiFi performance over the internal one. +Install an external WiFi antenna and select it by applying the overlay: +### rk3308-s0-ext-antenna + +All Rock S0 boards use the RK3308B chip. +So, applying the overlay: +### rk3308-b@1.3ghz +enables (overclocked) operation at 1.3ghz + +The legacy kernel is not supported on the Rock S0 + diff --git a/patch/kernel/archive/rockchip64-6.7/overlay/rk3308-b@1.3ghz.dts b/patch/kernel/archive/rockchip64-6.7/overlay/rk3308-b@1.3ghz.dts new file mode 100644 index 000000000000..4f022bd4a1a9 --- /dev/null +++ b/patch/kernel/archive/rockchip64-6.7/overlay/rk3308-b@1.3ghz.dts @@ -0,0 +1,27 @@ +//Overclock the Rockchip RK3308-B suffix SOC to 1.3 Ghz +// THIS SHOULD NOT BE APPLIED to RK3308-B-S suffix chips +// because is will overvolt them + +/dts-v1/; +/plugin/; + +/ { + fragment@0 { + target = <&cpu0_opp_table>; + __overlay__ { + //the following are unsupported, overclocked operating points + opp-1200000000 { + opp-hz = /bits/ 64 <1200000000>; + opp-microvolt = <1250000 1250000 1340000>; + clock-latency-ns = <40000>; + status = "okay"; + }; + opp-1296000000 { + opp-hz = /bits/ 64 <1296000000>; + opp-microvolt = <1300000 1300000 1340000>; + clock-latency-ns = <40000>; + status = "okay"; + }; + }; + }; +};