---- Changes in v3: - Fixed dt_binding_check for qcom,cpr.yaml, cpufreq-qcom-hw.yaml - Fixed qcom-cpufreq-hw.c kernel test robot ARM build failure - Removed unused variables and redundant if branch in cpr3.c Changes in v2: - Rebased qcom-cpufreq-hw dt-binding on top of Manivannan's patches - Fixed CPR and CPR3 YAML doc issues - Fixed bugs in qcom-cpufreq-hw: -- The APM corner number is now handled correctly when a corner with higher voltage than the maximum APM threshold is detected -- The APM corner number now gets written to the SEQ1 register, useful for older firmwares - Changes in CPR3: -- Memory footprint has been reduced, as unsigned int variables were changed to u8/u16 where applicable (a lot of them, actually) -- Some masks were wrong and have been fixed -- Min/max step quotients moved in thread descriptor, as they are not global on MSM8998 -- Fixed a bug about enabling thread aggregation on CPR hardware using one thread but multiple hw instances (these cannot be aggregated) -- Added calculations on post voltage adjustments for open and closed loop voltages, needed by MSM8998 -- Added some more safety checks around the corner voltage calculation -- Added fine-tuning open/closed loop based on fixed value offsets, needed by MSM8998 -- Fixed wrong scaling factor logic: it worked because I had lucky values on SDM630, but MSM8998 was an entirely different story!! I thought that these values were per-ring-oscillator, but it turns out that they are per-fuse-corner instead. Silly me! -- Added parameters and compatible for MSM8998 Silver/Gold clusters - Added MSM8998 to cpufreq-dt-platdev blacklist - Implemented dynamic Memory Accelerator corners support in both CPR3 and qcom-cpufreq-hw, needed by MSM8998 - Implemented ACD programming in qcom-cpufreq-hw, needed by MSM8998 - Added MSM8998 Silver/Gold parameters to the CPR3 (CPR-Hardened) driver - Fixed MSM8998 SAW parameters on SPM driver - Tested again on three different SDM630 smartphones (Xperia XA2/XA2Ultra/10) - Now also tested on two different MSM8998 smartphones (Xperia XZ Premium and F(x)Tec Pro1) ---- This patch series is definitely big. Yup. But it all goes together... here's why: This series implements full support for CPU scaling on *many* Qualcomm SoCs and partial support for the others on which the Operating State Manager is not present. Since this is a bit tangled, let's go step by step. First of all, there's the SPM: this is a component that we can find on very old chips, like MSM8974; there, it has been used to actually do the power scaling basically "on its own" - sending the cores in a specific sleep mode to save power. On the newer ones, including MSM8998, SDM630, 660 and others, it is still present! Though, this time, it's being used for the cluster caches and it has a different firmware (and maybe it's also slightly different HW), implementing the SAWv4.1 set and getting controlled *not by the OS* but by other controllers in the SoC (like the OSM). Contrary from MSM8974 and the like, this new version of the SPM just requires us to set the initial parameters for AVS and *nothing else*, as its states will be totally managed internally. Then, hardening here we come! In all the new SoCs - as new as SM8150 and most probably even newer ones - there are also new versions of "the same old story".. and here I'm referring to the Core Power Reduction (CPR) block: since MSM8996 (or around that time frame), this block has got a sort of major change... which actually varies the register set and implements "threads". I won't go far with explaining that in this cover letter (as it's all explained in the commits) but, in short, here's the catch: CPR v3, v4 and CPR-Hardened are all based over the same register set and are extensions of their previous. A sort of special treatment must be given to CPR-Hardened (CPRh): this is the one that's present on the newest SoCs, as this is a hardened version of CPR4 and - in this version - it has got the ability to also get managed internally, along with the SAWv4.1, by the Operating State Manager (OSM). And finally, we get to the OSM. This final piece appeared on MSM8998 for the first time (as far as I know), and it is (a sort of microcontroller?) doing the "real deal": CPU DVFS through a lookup table providing "corners" - or "performance states" - to the OS; pretty straightforward way of offloading a whole lot of tasks that the kernel would otherwise have to do. And there we go with the full picture: - From SDM845 onwards, SAW, CPRh and OSM are getting setup by the bootloader/TZ *before* booting the OS, so then all the OS has to do is to request a specific performance state to the OSM hardware and forget about all the rest, which is anyway protected by the hypervisor (so there's no access anyway); BUT: - In MSM/APQ 8998, SDM/SDA 630/636/660 (and other variants), there is no setup of any of these puzzle pieces, and they're also (basically) fully accessible, which means that the OS must do it in order to get in the same state as the newer ones and to get the entire scaling hardware to start rolling. "Simply", that's it. Now that I've written a kilometer-long "short explaination" of what's going on, there's a shorter version of it: - On new SoCs, the bootloader sets up the entire thing - On old ones, the OS must do what the bootloader didn't do. - That's what this patch series does. :)) There's also slightly more: since - as already explained - the CPR-Hardened is an incremental upgrade of CPR v3->v4, it was necessary for me to also implement support for these two versions, present in "another whole bunch" of Qualcomm SoCs, including MSM8953, MSM8996 and others, which is used to do either power reduction or complete voltage scaling for the CPU clusters on these old ones... and, well, also in 8998/630/660 along with the Hardened one... and the reason is... that this piece of HW is also capable of doing the same with the GPU, even though this is not yet implemented in this set. I didn't feel like implementing the Multimedia Subsystem (MMSS) part of the CPR3/4 in this patch series because, eh, it's already long enough, I'd say. Perhaps, if/after this gets merged, I will take another challenge... :)) AngeloGioacchino Del Regno (13): cpuidle: qcom_spm: Detach state machine from main SPM handling soc: qcom: spm: Implement support for SAWv4.1, SDM630/660 L2 AVS soc: qcom: spm: Add compatible for MSM8998 SAWv4.1 L2 cpufreq: blacklist SDM630/636/660 in cpufreq-dt-platdev cpufreq: blacklist MSM8998 in cpufreq-dt-platdev soc: qcom: cpr: Move common functions to new file dt-bindings: avs: cpr: Convert binding to YAML schema arm64: qcom: qcs404: Change CPR nvmem-names soc: qcom: Add support for Core Power Reduction v3, v4 and Hardened MAINTAINERS: Add entry for Qualcomm CPRv3/v4/Hardened driver dt-bindings: soc: qcom: cpr3: Add bindings for CPR3 driver cpufreq: qcom-hw: Implement CPRh aware OSM programming dt-bindings: cpufreq: qcom-hw: Add bindings for 8998 Manivannan Sadhasivam (2): dt-bindings: arm: cpus: Document 'qcom,freq-domain' property dt-bindings: cpufreq: cpufreq-qcom-hw: Convert to YAML bindings .../devicetree/bindings/arm/cpus.yaml | 6 + .../bindings/cpufreq/cpufreq-qcom-hw.txt | 172 - .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 242 ++ .../bindings/power/avs/qcom,cpr.txt | 131 +- .../bindings/soc/qcom/qcom,cpr.yaml | 167 + .../bindings/soc/qcom/qcom,cpr3.yaml | 241 ++ MAINTAINERS | 8 +- arch/arm64/boot/dts/qcom/qcs404.dtsi | 26 +- drivers/cpufreq/cpufreq-dt-platdev.c | 4 + drivers/cpufreq/qcom-cpufreq-hw.c | 1248 ++++++- drivers/cpuidle/Kconfig.arm | 1 + drivers/cpuidle/cpuidle-qcom-spm.c | 294 +- drivers/soc/qcom/Kconfig | 26 + drivers/soc/qcom/Makefile | 4 +- drivers/soc/qcom/cpr-common.c | 405 +++ drivers/soc/qcom/cpr-common.h | 117 + drivers/soc/qcom/cpr.c | 441 +-- drivers/soc/qcom/cpr3.c | 2894 +++++++++++++++++ drivers/soc/qcom/spm.c | 240 ++ include/soc/qcom/spm.h | 45 + 20 files changed, 5713 insertions(+), 999 deletions(-) delete mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.txt create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,cpr.yaml create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,cpr3.yaml create mode 100644 drivers/soc/qcom/cpr-common.c create mode 100644 drivers/soc/qcom/cpr-common.h create mode 100644 drivers/soc/qcom/cpr3.c create mode 100644 drivers/soc/qcom/spm.c create mode 100644 include/soc/qcom/spm.h -- 2.29.2
