hoc-sys: revert to an ancient version that works on mariko units
This commit is contained in:
@@ -74,11 +74,10 @@ typedef enum
|
||||
|
||||
typedef enum
|
||||
{
|
||||
SysClkPartLoad_EMC = 0,
|
||||
SysClkPartLoad_EMCCpu,
|
||||
HocClkPartLoad_GPU,
|
||||
SysClkPartLoad_EnumMax
|
||||
} SysClkPartLoad;
|
||||
SysClkRamLoad_All = 0,
|
||||
SysClkRamLoad_Cpu,
|
||||
SysClkRamLoad_EnumMax
|
||||
} SysClkRamLoad;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
|
||||
@@ -49,7 +49,6 @@ Result sysclkIpcGetConfigValues(SysClkConfigValueList* out_configValues);
|
||||
Result sysclkIpcSetConfigValues(SysClkConfigValueList* configValues);
|
||||
Result sysclkIpcGetFreqList(SysClkModule module, u32* list, u32 maxCount, u32* outCount);
|
||||
Result sysclkIpcSetReverseNXRTMode(ReverseNXMode mode);
|
||||
Result hocClkIpcUpdateEmcRegs();
|
||||
|
||||
static inline Result sysclkIpcRemoveOverride(SysClkModule module)
|
||||
{
|
||||
|
||||
@@ -40,8 +40,8 @@ typedef struct
|
||||
uint32_t overrideFreqs[SysClkModule_EnumMax];
|
||||
uint32_t temps[SysClkThermalSensor_EnumMax];
|
||||
int32_t power[SysClkPowerSensor_EnumMax];
|
||||
uint32_t partLoad[SysClkPartLoad_EnumMax];
|
||||
// uint32_t perfConfId;
|
||||
uint32_t ramLoad[SysClkRamLoad_EnumMax];
|
||||
uint32_t perfConfId;
|
||||
} SysClkContext;
|
||||
|
||||
typedef struct
|
||||
@@ -52,4 +52,6 @@ typedef struct
|
||||
};
|
||||
} SysClkTitleProfileList;
|
||||
|
||||
#define SYSCLK_FREQ_LIST_MAX 32
|
||||
#define SYSCLK_FREQ_LIST_MAX 32
|
||||
#define SYSCLK_GPU_BOOST_HZ 76800000
|
||||
#define SYSCLK_CPU_BOOST_HZ 1785000000
|
||||
@@ -47,9 +47,6 @@ typedef enum {
|
||||
HocClkConfigValue_MarikoMaxGpuClock,
|
||||
HocClkConfigValue_MarikoMaxMemClock,
|
||||
|
||||
HocClkConfigValue_MarikoCpuBoostClock,
|
||||
HocClkConfigValue_EristaCpuBoostClock,
|
||||
|
||||
HocClkConfigValue_ThermalThrottle,
|
||||
HocClkConfigValue_ThermalThrottleThreshold,
|
||||
|
||||
@@ -59,13 +56,10 @@ typedef enum {
|
||||
HocClkConfigValue_HandheldTDP,
|
||||
HocClkConfigValue_HandheldTDPLimit,
|
||||
HocClkConfigValue_LiteTDPLimit,
|
||||
HocClkConfigValue_TDPCycleLimit,
|
||||
|
||||
HocClkConfigValue_EnforceBoardLimit,
|
||||
|
||||
HocClkConfigValue_EMCDVFS,
|
||||
HocClkConfigValue_EMCVdd2VoltageUV,
|
||||
HocClkConfigValue_EMCVdd2VoltageUVStockErista,
|
||||
HocClkConfigValue_EMCVdd2VoltageUVStockMariko,
|
||||
SysClkConfigValue_EnumMax,
|
||||
} SysClkConfigValue;
|
||||
|
||||
@@ -106,12 +100,6 @@ static inline const char* sysclkFormatConfigValue(SysClkConfigValue val, bool pr
|
||||
case HocClkConfigValue_MarikoMaxMemClock:
|
||||
return pretty ? "Max MEM Clock" : "mem_max_m";
|
||||
|
||||
case HocClkConfigValue_MarikoCpuBoostClock:
|
||||
return pretty ? "CPU Boost Clock" : "cpu_boost_m";
|
||||
|
||||
case HocClkConfigValue_EristaCpuBoostClock:
|
||||
return pretty ? "CPU Boost Clock" : "cpu_boost_e";
|
||||
|
||||
case HocClkConfigValue_ThermalThrottle:
|
||||
return pretty ? "Thermal Throttle" : "thermal_throttle";
|
||||
|
||||
@@ -132,16 +120,9 @@ static inline const char* sysclkFormatConfigValue(SysClkConfigValue val, bool pr
|
||||
case HocClkConfigValue_LiteTDPLimit:
|
||||
return pretty ? "Lite TDP Limit" : "tdp_limit_l";
|
||||
|
||||
case HocClkConfigValue_EnforceBoardLimit:
|
||||
return pretty ? "Enforce Board Limit" : "enforce_board_limit";
|
||||
case HocClkConfigValue_EMCDVFS:
|
||||
return pretty ? "EMC DVFS" : "emc_dvfs";
|
||||
case HocClkConfigValue_EMCVdd2VoltageUV:
|
||||
return pretty ? "Overclocked EMC Vdd2 Voltage" : "emc_vdd2_voltage_uv";
|
||||
case HocClkConfigValue_EMCVdd2VoltageUVStockErista:
|
||||
return pretty ? "Stock EMC Vdd2 Voltage" : "emc_vdd2_voltage_uv_s_e";
|
||||
case HocClkConfigValue_EMCVdd2VoltageUVStockMariko:
|
||||
return pretty ? "Stock EMC Vdd2 Voltage" : "emc_vdd2_voltage_uv_s_m";
|
||||
case HocClkConfigValue_TDPCycleLimit:
|
||||
return pretty ? "TDP Cycle Limit" : "tdp_limit_c";
|
||||
|
||||
default:
|
||||
return pretty ? "Null" : "null";
|
||||
}
|
||||
@@ -161,7 +142,6 @@ static inline uint64_t sysclkDefaultConfigValue(SysClkConfigValue val)
|
||||
case HocClkConfigValue_OverwriteBoostMode:
|
||||
return 0ULL;
|
||||
case HocClkConfigValue_EristaMaxCpuClock:
|
||||
case HocClkConfigValue_EristaCpuBoostClock:
|
||||
return 1785ULL;
|
||||
case HocClkConfigValue_EristaMaxGpuClock:
|
||||
return 921ULL;
|
||||
@@ -169,10 +149,9 @@ static inline uint64_t sysclkDefaultConfigValue(SysClkConfigValue val)
|
||||
return 1600ULL;
|
||||
|
||||
case HocClkConfigValue_MarikoMaxCpuClock:
|
||||
case HocClkConfigValue_MarikoCpuBoostClock:
|
||||
return 1963ULL;
|
||||
case HocClkConfigValue_MarikoMaxGpuClock:
|
||||
return 1152ULL;
|
||||
return 1075ULL;
|
||||
case HocClkConfigValue_MarikoMaxMemClock:
|
||||
return 1862ULL;
|
||||
|
||||
@@ -180,8 +159,6 @@ static inline uint64_t sysclkDefaultConfigValue(SysClkConfigValue val)
|
||||
case HocClkConfigValue_DockedGovernor:
|
||||
case HocClkConfigValue_HandheldGovernor:
|
||||
case HocClkConfigValue_HandheldTDP:
|
||||
case HocClkConfigValue_EnforceBoardLimit:
|
||||
case HocClkConfigValue_EMCDVFS:
|
||||
return 1ULL;
|
||||
case HocClkConfigValue_ThermalThrottleThreshold:
|
||||
return 70ULL;
|
||||
@@ -189,12 +166,8 @@ static inline uint64_t sysclkDefaultConfigValue(SysClkConfigValue val)
|
||||
return 8600ULL;
|
||||
case HocClkConfigValue_LiteTDPLimit:
|
||||
return 6400ULL;
|
||||
case HocClkConfigValue_EMCVdd2VoltageUV:
|
||||
return 1175000ULL;
|
||||
case HocClkConfigValue_EMCVdd2VoltageUVStockErista:
|
||||
return 1125000ULL;
|
||||
case HocClkConfigValue_EMCVdd2VoltageUVStockMariko:
|
||||
return 1100000ULL;
|
||||
case HocClkConfigValue_TDPCycleLimit:
|
||||
return 10ULL;
|
||||
default:
|
||||
return 0ULL;
|
||||
}
|
||||
@@ -210,8 +183,6 @@ static inline uint64_t sysclkValidConfigValue(SysClkConfigValue val, uint64_t in
|
||||
case HocClkConfigValue_MarikoMaxCpuClock:
|
||||
case HocClkConfigValue_MarikoMaxGpuClock:
|
||||
case HocClkConfigValue_MarikoMaxMemClock:
|
||||
case HocClkConfigValue_EristaCpuBoostClock:
|
||||
case HocClkConfigValue_MarikoCpuBoostClock:
|
||||
case HocClkConfigValue_ThermalThrottleThreshold:
|
||||
case HocClkConfigValue_HandheldTDPLimit:
|
||||
case HocClkConfigValue_LiteTDPLimit:
|
||||
@@ -221,9 +192,7 @@ static inline uint64_t sysclkValidConfigValue(SysClkConfigValue val, uint64_t in
|
||||
case SysClkConfigValue_FreqLogIntervalMs:
|
||||
case SysClkConfigValue_PowerLogIntervalMs:
|
||||
case SysClkConfigValue_CsvWriteIntervalMs:
|
||||
case HocClkConfigValue_EMCVdd2VoltageUV:
|
||||
case HocClkConfigValue_EMCVdd2VoltageUVStockErista:
|
||||
case HocClkConfigValue_EMCVdd2VoltageUVStockMariko:
|
||||
case HocClkConfigValue_TDPCycleLimit:
|
||||
return input >= 0;
|
||||
case HocClkConfigValue_UncappedClocks:
|
||||
case HocClkConfigValue_OverwriteBoostMode:
|
||||
@@ -231,8 +200,6 @@ static inline uint64_t sysclkValidConfigValue(SysClkConfigValue val, uint64_t in
|
||||
case HocClkConfigValue_DockedGovernor:
|
||||
case HocClkConfigValue_HandheldGovernor:
|
||||
case HocClkConfigValue_HandheldTDP:
|
||||
case HocClkConfigValue_EnforceBoardLimit:
|
||||
case HocClkConfigValue_EMCDVFS:
|
||||
return (input & 0x1) == input;
|
||||
default:
|
||||
return false;
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "clock_manager.h"
|
||||
|
||||
#define SYSCLK_IPC_API_VERSION 4
|
||||
#define SYSCLK_IPC_SERVICE_NAME "hoc:sys"
|
||||
#define SYSCLK_IPC_SERVICE_NAME "sys:clk"
|
||||
|
||||
enum SysClkIpcCmd
|
||||
{
|
||||
@@ -49,7 +49,6 @@ enum SysClkIpcCmd
|
||||
SysClkIpcCmd_SetConfigValues = 10,
|
||||
SysClkIpcCmd_GetFreqList = 11,
|
||||
SysClkIpcCmd_SetReverseNXRTMode = 12,
|
||||
HocClkIpcCmd_UpdateEMCRegs = 13,
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user