diff --git a/Source/sys-clk/common/include/sysclk/board.h b/Source/sys-clk/common/include/sysclk/board.h index 02503c1f..2455827b 100644 --- a/Source/sys-clk/common/include/sysclk/board.h +++ b/Source/sys-clk/common/include/sysclk/board.h @@ -119,6 +119,14 @@ typedef enum } ReverseNXMode; +typedef enum { + HorizonOCSpeedo_CPU = 0, + HorizonOCSpeedo_GPU, + HorizonOCSpeedo_SOC, + HorizonOCSpeedo_EnumMax, +} HorizonOCSpeedo; + + #define SYSCLK_ENUM_VALID(n, v) ((v) < n##_EnumMax) static inline const char* sysclkFormatModule(SysClkModule module, bool pretty) diff --git a/Source/sys-clk/common/include/sysclk/clock_manager.h b/Source/sys-clk/common/include/sysclk/clock_manager.h index b16dae1d..bbbf4c2d 100644 --- a/Source/sys-clk/common/include/sysclk/clock_manager.h +++ b/Source/sys-clk/common/include/sysclk/clock_manager.h @@ -45,6 +45,7 @@ typedef struct uint32_t perfConfId; u8 maxDisplayFreq; u8 fps; + u16 speedos[HorizonOCSpeedo_EnumMax]; } SysClkContext; typedef struct diff --git a/Source/sys-clk/overlay/src/ui/gui/base_menu_gui.cpp b/Source/sys-clk/overlay/src/ui/gui/base_menu_gui.cpp index 85da2d11..16df6dd7 100644 --- a/Source/sys-clk/overlay/src/ui/gui/base_menu_gui.cpp +++ b/Source/sys-clk/overlay/src/ui/gui/base_menu_gui.cpp @@ -279,6 +279,7 @@ void BaseMenuGui::refresh() sprintf(displayStrings[25], "%u Hz", context->realFreqs[HorizonOCModule_Display]); sprintf(displayStrings[26], "%u.%u mV", context->voltages[HocClkVoltage_Display] / 1000U, context->voltages[HocClkVoltage_Display] % 1000U); + //sprintf(displayStrings[26], "%u", context->speedos[HorizonOCSpeedo_CPU]); } diff --git a/Source/sys-clk/sysmodule/perms.json b/Source/sys-clk/sysmodule/perms.json index 89347668..f4aafb6f 100644 --- a/Source/sys-clk/sysmodule/perms.json +++ b/Source/sys-clk/sysmodule/perms.json @@ -10,7 +10,7 @@ "is_retail": true, "pool_partition": 2, "is_64_bit": true, - "address_space_type": 3, + "address_space_type": 1, "filesystem_access": { "permissions": "0xFFFFFFFFFFFFFFFF" }, @@ -60,66 +60,135 @@ { "type": "syscalls", "value": { - "svcSetHeapSize": "0x01", - "svcSetMemoryPermission": "0x02", - "svcSetMemoryAttribute": "0x03", - "svcMapMemory": "0x04", - "svcUnmapMemory": "0x05", - "svcQueryMemory": "0x06", - "svcExitProcess": "0x07", - "svcCreateThread": "0x08", - "svcStartThread": "0x09", - "svcExitThread": "0x0a", - "svcSleepThread": "0x0b", - "svcGetThreadPriority": "0x0c", - "svcSetThreadPriority": "0x0d", - "svcGetThreadCoreMask": "0x0e", - "svcSetThreadCoreMask": "0x0f", - "svcGetCurrentProcessorNumber": "0x10", - "svcSignalEvent": "0x11", - "svcClearEvent": "0x12", - "svcMapSharedMemory": "0x13", - "svcUnmapSharedMemory": "0x14", - "svcCreateTransferMemory": "0x15", - "svcCloseHandle": "0x16", - "svcResetSignal": "0x17", - "svcWaitSynchronization": "0x18", - "svcCancelSynchronization": "0x19", - "svcArbitrateLock": "0x1a", - "svcArbitrateUnlock": "0x1b", - "svcWaitProcessWideKeyAtomic": "0x1c", - "svcSignalProcessWideKey": "0x1d", - "svcGetSystemTick": "0x1e", - "svcConnectToNamedPort": "0x1f", - "svcSendSyncRequestLight": "0x20", - "svcSendSyncRequest": "0x21", - "svcSendSyncRequestWithUserBuffer": "0x22", - "svcSendAsyncRequestWithUserBuffer": "0x23", - "svcGetProcessId": "0x24", - "svcGetThreadId": "0x25", - "svcBreak": "0x26", - "svcOutputDebugString": "0x27", - "svcReturnFromException": "0x28", - "svcGetInfo": "0x29", - "svcWaitForAddress": "0x34", - "svcSignalToAddress": "0x35", - "svcCreateSession": "0x40", - "svcAcceptSession": "0x41", - "svcReplyAndReceiveLight": "0x42", - "svcReplyAndReceive": "0x43", - "svcReplyAndReceiveWithUserBuffer": "0x44", - "svcCreateEvent": "0x45", - "svcCreateInterruptEvent": "0x53", - "svcReadWriteRegister": "0x4E", - "svcQueryMemoryMapping": "0x55", - "svcCreateDeviceAddressSpace": "0x56", - "svcAttachDeviceAddressSpace": "0x57", - "svcDetachDeviceAddressSpace": "0x58", - "svcMapDeviceAddressSpaceAligned": "0x5a", - "svcUnmapDeviceAddressSpace": "0x5c", - "svcGetSystemInfo": "0x6f", - "svcCallSecureMonitor": "0x7f" - } + "svcUnknown": "0x00", + "svcSetHeapSize": "0x01", + "svcSetMemoryPermission": "0x02", + "svcSetMemoryAttribute": "0x03", + "svcMapMemory": "0x04", + "svcUnmapMemory": "0x05", + "svcQueryMemory": "0x06", + "svcExitProcess": "0x07", + "svcCreateThread": "0x08", + "svcStartThread": "0x09", + "svcExitThread": "0x0a", + "svcSleepThread": "0x0b", + "svcGetThreadPriority": "0x0c", + "svcSetThreadPriority": "0x0d", + "svcGetThreadCoreMask": "0x0e", + "svcSetThreadCoreMask": "0x0f", + "svcGetCurrentProcessorNumber": "0x10", + "svcSignalEvent": "0x11", + "svcClearEvent": "0x12", + "svcMapSharedMemory": "0x13", + "svcUnmapSharedMemory": "0x14", + "svcCreateTransferMemory": "0x15", + "svcCloseHandle": "0x16", + "svcResetSignal": "0x17", + "svcWaitSynchronization": "0x18", + "svcCancelSynchronization": "0x19", + "svcArbitrateLock": "0x1a", + "svcArbitrateUnlock": "0x1b", + "svcWaitProcessWideKeyAtomic": "0x1c", + "svcSignalProcessWideKey": "0x1d", + "svcGetSystemTick": "0x1e", + "svcConnectToNamedPort": "0x1f", + "svcSendSyncRequestLight": "0x20", + "svcSendSyncRequest": "0x21", + "svcSendSyncRequestWithUserBuffer": "0x22", + "svcSendAsyncRequestWithUserBuffer": "0x23", + "svcGetProcessId": "0x24", + "svcGetThreadId": "0x25", + "svcBreak": "0x26", + "svcOutputDebugString": "0x27", + "svcReturnFromException": "0x28", + "svcGetInfo": "0x29", + "svcFlushEntireDataCache": "0x2a", + "svcFlushDataCache": "0x2b", + "svcMapPhysicalMemory": "0x2c", + "svcUnmapPhysicalMemory": "0x2d", + "svcGetFutureThreadInfo": "0x2e", + "svcGetLastThreadInfo": "0x2f", + "svcGetResourceLimitLimitValue": "0x30", + "svcGetResourceLimitCurrentValue": "0x31", + "svcSetThreadActivity": "0x32", + "svcGetThreadContext3": "0x33", + "svcWaitForAddress": "0x34", + "svcSignalToAddress": "0x35", + "svcUnknown": "0x36", + "svcUnknown": "0x37", + "svcUnknown": "0x38", + "svcUnknown": "0x39", + "svcUnknown": "0x3a", + "svcUnknown": "0x3b", + "svcDumpInfo": "0x3c", + "svcDumpInfoNew": "0x3d", + "svcUnknown": "0x3e", + "svcUnknown": "0x3f", + "svcCreateSession": "0x40", + "svcAcceptSession": "0x41", + "svcReplyAndReceiveLight": "0x42", + "svcReplyAndReceive": "0x43", + "svcReplyAndReceiveWithUserBuffer": "0x44", + "svcCreateEvent": "0x45", + "svcUnknown": "0x46", + "svcUnknown": "0x47", + "svcMapPhysicalMemoryUnsafe": "0x48", + "svcUnmapPhysicalMemoryUnsafe": "0x49", + "svcSetUnsafeLimit": "0x4a", + "svcCreateCodeMemory": "0x4b", + "svcControlCodeMemory": "0x4c", + "svcSleepSystem": "0x4d", + "svcReadWriteRegister": "0x4e", + "svcSetProcessActivity": "0x4f", + "svcCreateSharedMemory": "0x50", + "svcMapTransferMemory": "0x51", + "svcUnmapTransferMemory": "0x52", + "svcCreateInterruptEvent": "0x53", + "svcQueryPhysicalAddress": "0x54", + "svcQueryIoMapping": "0x55", + "svcCreateDeviceAddressSpace": "0x56", + "svcAttachDeviceAddressSpace": "0x57", + "svcDetachDeviceAddressSpace": "0x58", + "svcMapDeviceAddressSpaceByForce": "0x59", + "svcMapDeviceAddressSpaceAligned": "0x5a", + "svcMapDeviceAddressSpace": "0x5b", + "svcUnmapDeviceAddressSpace": "0x5c", + "svcInvalidateProcessDataCache": "0x5d", + "svcStoreProcessDataCache": "0x5e", + "svcFlushProcessDataCache": "0x5f", + "svcDebugActiveProcess": "0x60", + "svcBreakDebugProcess": "0x61", + "svcTerminateDebugProcess": "0x62", + "svcGetDebugEvent": "0x63", + "svcContinueDebugEvent": "0x64", + "svcGetProcessList": "0x65", + "svcGetThreadList": "0x66", + "svcGetDebugThreadContext": "0x67", + "svcSetDebugThreadContext": "0x68", + "svcQueryDebugProcessMemory": "0x69", + "svcReadDebugProcessMemory": "0x6a", + "svcWriteDebugProcessMemory": "0x6b", + "svcSetHardwareBreakPoint": "0x6c", + "svcGetDebugThreadParam": "0x6d", + "svcUnknown": "0x6e", + "svcGetSystemInfo": "0x6f", + "svcCreatePort": "0x70", + "svcManageNamedPort": "0x71", + "svcConnectToPort": "0x72", + "svcSetProcessMemoryPermission": "0x73", + "svcMapProcessMemory": "0x74", + "svcUnmapProcessMemory": "0x75", + "svcQueryProcessMemory": "0x76", + "svcMapProcessCodeMemory": "0x77", + "svcUnmapProcessCodeMemory": "0x78", + "svcCreateProcess": "0x79", + "svcStartProcess": "0x7a", + "svcTerminateProcess": "0x7b", + "svcGetProcessInfo": "0x7c", + "svcCreateResourceLimit": "0x7d", + "svcSetResourceLimitLimitValue": "0x7e", + "svcCallSecureMonitor": "0x7f" + } }, { "type": "min_kernel_version", "value": "0x0060" @@ -129,9 +198,9 @@ }, { "type": "debug_flags", "value": { - "allow_debug": true, + "allow_debug": false, "force_debug_prod": false, - "force_debug": false + "force_debug": true } }, { "type": "map", diff --git a/Source/sys-clk/sysmodule/src/board.cpp b/Source/sys-clk/sysmodule/src/board.cpp index 5d9dcf75..484de357 100644 --- a/Source/sys-clk/sysmodule/src/board.cpp +++ b/Source/sys-clk/sysmodule/src/board.cpp @@ -36,6 +36,20 @@ #include #include #include +#include +#include + +#define FUSE_CPU_SPEEDO_0_CALIB 0x114 +//#define FUSE_CPU_SPEEDO_1_CALIB 0x12C +#define FUSE_CPU_SPEEDO_2_CALIB 0x130 + +#define FUSE_SOC_SPEEDO_0_CALIB 0x134 +//#define FUSE_SOC_SPEEDO_1_CALIB 0x138 +//#define FUSE_SOC_SPEEDO_2_CALIB 0x13C + +#define FUSE_CPU_IDDQ_CALIB 0x118 +#define FUSE_SOC_IDDQ_CALIB 0x140 +#define FUSE_GPU_IDDQ_CALIB 0x228 #define HOSSVC_HAS_CLKRST (hosversionAtLeast(8,0,0)) #define HOSSVC_HAS_TC (hosversionAtLeast(5,0,0)) @@ -71,6 +85,9 @@ std::atomic idletick1{systemtickfrequency}; std::atomic idletick2{systemtickfrequency}; std::atomic idletick3{systemtickfrequency}; u32 cpu0, cpu1, cpu2, cpu3, cpuAvg; +u16 cpuSpeedo0, cpuSpeedo2, socSpeedo0; // CPU, GPU, SOC +u16 cpuIDDQ, gpuIDDQ, socIDDQ; + const char* Board::GetModuleName(SysClkModule module, bool pretty) { @@ -167,7 +184,6 @@ void miscThreadFunc(void*) { void Board::Initialize() { Result rc = 0; - if(HOSSVC_HAS_CLKRST) { rc = clkrstInitialize(); @@ -207,6 +223,8 @@ void Board::Initialize() // else fanCheck = fanOpenController(&fanController, 1); // } + rc = pmdmntInitialize(); + ASSERT_RESULT_OK(rc, "pmdmntInitialize"); threadCreate(&gpuLThread, gpuLoadThread, NULL, NULL, 0x1000, 0x3F, -2); threadStart(&gpuLThread); @@ -240,6 +258,71 @@ void Board::Initialize() FetchHardwareInfos(); } +void Board::fuseReadSpeedos() { + + u64 pid = 0; + if (R_FAILED(pmdmntGetProcessId(&pid, 0x0100000000000006))) { + return; + } + + Handle debug; + if (R_FAILED(svcDebugActiveProcess(&debug, pid))) { + return; + } + + MemoryInfo mem_info = {0}; + u32 pageinfo = 0; + u64 addr = 0; + + char stack[0x10] = {0}; + const char compare[0x10] = {0}; + char dump[0x400] = {0}; + + while (true) { + if (R_FAILED(svcQueryDebugProcessMemory(&mem_info, &pageinfo, debug, addr)) || mem_info.addr < addr) { + break; + } + + if (mem_info.type == MemType_Io && mem_info.size == 0x1000) { + if (R_FAILED(svcReadDebugProcessMemory(stack, debug, mem_info.addr, sizeof(stack)))) { + break; + } + + if (memcmp(stack, compare, sizeof(stack)) == 0) { + if (R_FAILED(svcReadDebugProcessMemory(dump, debug, mem_info.addr + 0x800, sizeof(dump)))) { + break; + } + + cpuSpeedo0 = *reinterpret_cast(dump + FUSE_CPU_SPEEDO_0_CALIB); + cpuSpeedo2 = *reinterpret_cast(dump + FUSE_CPU_SPEEDO_2_CALIB); + socSpeedo0 = *reinterpret_cast(dump + FUSE_SOC_SPEEDO_0_CALIB); + cpuIDDQ = *reinterpret_cast(dump + FUSE_CPU_IDDQ_CALIB); + gpuIDDQ = *reinterpret_cast(dump + FUSE_SOC_IDDQ_CALIB); + socIDDQ = *reinterpret_cast(dump + FUSE_GPU_IDDQ_CALIB); + + svcCloseHandle(debug); + return; + } + } + + addr = mem_info.addr + mem_info.size; + } + + svcCloseHandle(debug); +} + +u16 Board::getCPUSpeedo() { + return cpuSpeedo0; +} + +u16 Board::getGPUSpeedo() { + return cpuSpeedo2; +} + +u16 Board::getSOCSpeedo() { + return socSpeedo0; +} + void Board::Exit() { if(HOSSVC_HAS_CLKRST) @@ -273,6 +356,7 @@ void Board::Exit() pwmExit(); rgltrExit(); batteryInfoExit(); + pmdmntExit(); } SysClkProfile Board::GetProfile() @@ -662,6 +746,7 @@ HorizonOCConsoleType Board::GetConsoleType() { void Board::FetchHardwareInfos() { + fuseReadSpeedos(); u64 sku = 0; Result rc = splInitialize(); ASSERT_RESULT_OK(rc, "splInitialize"); diff --git a/Source/sys-clk/sysmodule/src/board.h b/Source/sys-clk/sysmodule/src/board.h index 29b59d1f..087388b3 100644 --- a/Source/sys-clk/sysmodule/src/board.h +++ b/Source/sys-clk/sysmodule/src/board.h @@ -33,6 +33,10 @@ class Board { public: + static void fuseReadSpeedos(); + static u16 getCPUSpeedo(); + static u16 getGPUSpeedo(); + static u16 getSOCSpeedo(); static const char* GetProfileName(SysClkProfile profile, bool pretty); static const char* GetModuleName(SysClkModule module, bool pretty); static const char* GetThermalSensorName(SysClkThermalSensor sensor, bool pretty); diff --git a/Source/sys-clk/sysmodule/src/clock_manager.cpp b/Source/sys-clk/sysmodule/src/clock_manager.cpp index c6fcf8f5..094d7f98 100644 --- a/Source/sys-clk/sysmodule/src/clock_manager.cpp +++ b/Source/sys-clk/sysmodule/src/clock_manager.cpp @@ -101,7 +101,11 @@ ClockManager::ClockManager() threadStart(&governorTHREAD); - + + this->context->speedos[HorizonOCSpeedo_CPU] = Board::getCPUSpeedo(); + this->context->speedos[HorizonOCSpeedo_GPU] = Board::getGPUSpeedo(); + this->context->speedos[HorizonOCSpeedo_SOC] = Board::getSOCSpeedo(); + } ClockManager::~ClockManager() @@ -439,7 +443,7 @@ void ClockManager::Tick() } isGovernorEnabled = newGovernorState; } - + if(module == HorizonOCModule_Display && this->config->GetConfigValue(HorizonOCConfigValue_OverwriteRefreshRate)) { if(targetHz) Board::SetHz(HorizonOCModule_Display, targetHz);