Updated: Sys-clk-OC, Loader, System_settings

- Sys-clk-OC

  - Major cleanup in clock_manager, preparing to add basic Erista support.

  - Added an experimental CPU & GPU frequency governor.

    - Known issue:

      - Occasional stuttering is expected: GPU load% metric PMU_GET_GPU_LOAD does not reflect real utilization precisely. Use another metric, some interpolation algo or add min frequency option for improvement.

- Loader

  - Addressed an issue for Erista variants: Boot with unmodified Fusee or Hekate, nn::pcv::EmcDvfsPeriodicCompHandler will fail with rc 0x8C5. Fixed by removing 40.8 MHz while retaining 1600.0 MHz MEM table -- however, this means user has to use modified sys-clk.

Source/sys-clk-OC/common/include/sysclk.h

@@ -19,6 +19,7 @@ extern "C" {
 #include "sysclk/apm.h"
 #include "sysclk/config.h"
 #include "sysclk/errors.h"
+#include "sysclk/psm_ext.h"
 
 #ifdef __cplusplus
 }

Source/sys-clk-OC/common/include/sysclk/clocks.h

@@ -63,10 +63,8 @@ typedef struct
 {
     bool systemCoreBoostCPU;
     bool allowUnsafeFreq;
-    bool syncReverseNXMode;
+    bool governor;
     SysClkProfile realProfile;
-    ReverseNXMode reverseNXToolMode;
-    ReverseNXMode reverseNXRTMode;
     uint32_t maxMEMFreq;
     uint32_t boostCPUFreq;
 } SysClkOcExtra;

Source/sys-clk-OC/common/include/sysclk/config.h

@@ -22,6 +22,7 @@ typedef enum {
     SysClkConfigValue_AllowUnsafeFrequencies,
     SysClkConfigValue_DisableFastCharging,
     SysClkConfigValue_ChargingLimitPercentage,
+    SysClkConfigValue_GovernorExperimental,
     SysClkConfigValue_EnumMax,
 } SysClkConfigValue;
 
@@ -49,6 +50,8 @@ static inline const char* sysclkFormatConfigValue(SysClkConfigValue val, bool pr
             return pretty ? "Disable Fast Charging" : "disable_fast_charging";
         case SysClkConfigValue_ChargingLimitPercentage:
             return pretty ? "Charging Limit (%%)" : "charging_limit_perc";
+        case SysClkConfigValue_GovernorExperimental:
+            return pretty ? "Governor (Experimental)" : "governor_experimental";
         default:
             return NULL;
     }
@@ -64,6 +67,7 @@ static inline uint64_t sysclkDefaultConfigValue(SysClkConfigValue val)
         case SysClkConfigValue_CsvWriteIntervalMs:
         case SysClkConfigValue_AllowUnsafeFrequencies:
         case SysClkConfigValue_DisableFastCharging:
+        case SysClkConfigValue_GovernorExperimental:
             return 0ULL;
         case SysClkConfigValue_AutoCPUBoost:
         case SysClkConfigValue_SyncReverseNXMode:
@@ -88,6 +92,7 @@ static inline uint64_t sysclkValidConfigValue(SysClkConfigValue val, uint64_t in
         case SysClkConfigValue_SyncReverseNXMode:
         case SysClkConfigValue_AllowUnsafeFrequencies:
         case SysClkConfigValue_DisableFastCharging:
+        case SysClkConfigValue_GovernorExperimental:
             return (input & 0x1) == input;
         case SysClkConfigValue_ChargingLimitPercentage:
             return (input <= 100 && input >= 20);

Source/sys-clk-OC/common/include/sysclk/psm_ext.h

@@ -0,0 +1,79 @@
+#pragma once
+
+#include <switch.h>
+
+typedef enum {
+    PsmPDC_NewPDO       = 1, //Received new Power Data Object
+    PsmPDC_NoPD         = 2, //No Power Delivery source is detected
+    PsmPDC_AcceptedRDO  = 3  //Received and accepted Request Data Object
+} PsmChargeInfoPDC; //BM92T series
+
+typedef enum {
+    PsmPowerRole_Sink      = 1,
+    PsmPowerRole_Source    = 2
+} PsmPowerRole;
+
+const char* PsmPowerRoleToStr(PsmPowerRole role);
+
+typedef enum {
+    PsmInfoChargerType_None         = 0,
+    PsmInfoChargerType_PD           = 1,
+    PsmInfoChargerType_TypeC_1500mA = 2,
+    PsmInfoChargerType_TypeC_3000mA = 3,
+    PsmInfoChargerType_DCP          = 4,
+    PsmInfoChargerType_CDP          = 5,
+    PsmInfoChargerType_SDP          = 6,
+    PsmInfoChargerType_Apple_500mA  = 7,
+    PsmInfoChargerType_Apple_1000mA = 8,
+    PsmInfoChargerType_Apple_2000mA = 9
+} PsmInfoChargerType;
+
+const char* PsmInfoChargerTypeToStr(PsmInfoChargerType type);
+
+typedef enum {
+    PsmFlags_NoHub  = BIT(0),  //If hub is disconnected
+    PsmFlags_Rail   = BIT(8),  //At least one Joy-con is charging from rail
+    PsmFlags_SPDSRC = BIT(12), //OTG
+    PsmFlags_ACC    = BIT(16)  //Accessory
+} PsmChargeInfoFlags;
+
+typedef struct {
+    int32_t InputCurrentLimit;          //Input (Sink) current limit in mA
+    int32_t VBUSCurrentLimit;           //Output (Source/VBUS/OTG) current limit in mA
+    int32_t ChargeCurrentLimit;         //Battery charging current limit in mA (512mA when Docked, 768mA when BatteryTemperature < 17.0 C)
+    int32_t ChargeVoltageLimit;         //Battery charging voltage limit in mV (3952mV when BatteryTemperature >= 51.0 C)
+    int32_t unk_x10;                    //Possibly an emum, getting the same value as PowerRole in all tested cases
+    int32_t unk_x14;                    //Possibly flags
+    PsmChargeInfoPDC PDCState;          //Power Delivery Controller State
+    int32_t BatteryTemperature;         //Battery temperature in milli C
+    int32_t RawBatteryCharge;           //Raw battery charged capacity per cent-mille (i.e. 100% = 100000 pcm)
+    int32_t VoltageAvg;                 //Voltage avg in mV (more in Notes)
+    int32_t BatteryAge;                 //Battery age (capacity full / capacity design) per cent-mille (i.e. 100% = 100000 pcm)
+    PsmPowerRole PowerRole;
+    PsmInfoChargerType ChargerType;
+    int32_t ChargerVoltageLimit;        //Charger and external device voltage limit in mV
+    int32_t ChargerCurrentLimit;        //Charger and external device current limit in mA
+    PsmChargeInfoFlags Flags;           //Unknown flags
+} PsmChargeInfo;
+
+typedef enum {
+  Psm_EnableBatteryCharging      = 2,
+  Psm_DisableBatteryCharging     = 3,
+  Psm_EnableFastBatteryCharging  = 10,
+  Psm_DisableFastBatteryCharging = 11,
+  Psm_GetBatteryChargeInfoFields = 17,
+} IPsmServerCmd;
+
+bool PsmIsChargerConnected(const PsmChargeInfo* info);
+bool PsmIsCharging(const PsmChargeInfo* info);
+bool PsmIsFastChargingEnabled(const PsmChargeInfo* info);
+
+typedef enum {
+    PsmBatteryState_Discharging,
+    PsmBatteryState_ChargingPaused,
+    PsmBatteryState_SlowCharging,
+    PsmBatteryState_FastCharging
+} PsmBatteryState;
+
+PsmBatteryState PsmGetBatteryState(const PsmChargeInfo* info);
+const char* PsmGetBatteryStateIcon(const PsmChargeInfo* info);