OmniNX/Horizon-OC
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed compile

Browse Source
This commit is contained in:
souldbminersmwc
2025-08-22 20:11:19 -04:00
parent 4738eea080
commit a63f790b7e
2 changed files with 216 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

326
Source/Atmosphere/stratosphere/loader/source/oc/mtc_timing_value.hpp
View File

@@ -16,220 +16,220 @@
* from GCC preprocessor output * from GCC preprocessor output
*/ */
#pragma once #pragma once
#include "oc_common.hpp" #include "oc_common.hpp"
namespace ams::ldr::oc {
#define MAX(A, B) std::max(A, B)
#define MIN(A, B) std::min(A, B)
#define CEIL(A) std::ceil(A)
#define FLOOR(A) std::floor(A)
const u8 ramtmarker[4] = {'R', 'A', 'M', 'T'};
//Preset One
const std::array<u32, 6> tRCD_values = {18, 17, 16, 15, 14, 13};
const std::array<u32, 6> tRP_values = {18, 17, 16, 15, 14, 13};
const std::array<u32, 6> tRAS_values = {42, 39, 36, 34, 32, 30};
namespace ams::ldr::oc { // Preset Two
#define MAX(A, B) std::max(A, B) const std::array<double, 5> tRRD_values = {10, 7.5, 6, 4, 3};
#define MIN(A, B) std::min(A, B) const std::array<double, 5> tFAW_values = {40, 30, 24, 16, 12};
#define CEIL(A) std::ceil(A)
#define FLOOR(A) std::floor(A)
//Preset One // Preset Three
const std::array<u32, 6> tRCD_values = {18, 17, 16, 15, 14, 13}; const std::array<u32, 6> tWR_values = {18, 15, 15, 12, 12, 8};
const std::array<u32, 6> tRP_values = {18, 17, 16, 15, 14, 13}; const std::array<double, 6> tRTP_values = {7.5, 7.5, 6, 6, 4, 4};
const std::array<u32, 6> tRAS_values = {42, 39, 36, 34, 32, 30};
// Preset Two // Preset Four
const std::array<double, 5> tRRD_values = {10, 7.5, 6, 4, 3}; const std::array<u32, 6> tRFC_values = {140, 120, 100, 80, 70, 60};
const std::array<double, 5> tFAW_values = {40, 30, 24, 16, 12};
// Preset Three // Preset Five
const std::array<u32, 6> tWR_values = {18, 15, 15, 12, 12, 8}; const std::array<u32, 6> tWTR_values = {10, 8, 6, 4, 2, 1};
const std::array<double, 6> tRTP_values = {7.5, 7.5, 6, 6, 4, 4};
// Preset Four // Preset Six
const std::array<u32, 6> tRFC_values = {140, 120, 100, 80, 70, 60}; const std::array<u32, 5> tREFpb_values = {488, 976, 1952, 3256, 9999};
// Preset Five const u32 TIMING_PRESET_ONE = C.ramTimingPresetOne;
const std::array<u32, 6> tWTR_values = {10, 8, 6, 4, 2, 1}; const u32 TIMING_PRESET_TWO = C.ramTimingPresetTwo;
const u32 TIMING_PRESET_THREE = C.ramTimingPresetThree;
const u32 TIMING_PRESET_FOUR = C.ramTimingPresetFour;
const u32 TIMING_PRESET_FIVE = C.ramTimingPresetFive;
const u32 TIMING_PRESET_SIX = C.ramTimingPresetSix;
const u32 TIMING_PRESET_SEVEN = C.ramTimingPresetSeven;
// Preset Six // Burst Length
const std::array<u32, 5> tREFpb_values = {488, 976, 1952, 3256, 9999}; const u32 BL = 16;
const u32 TIMING_PRESET_ONE = C.ramTimingPresetOne; // tRFCpb (refresh cycle time per bank) in ns for 8Gb density
const u32 TIMING_PRESET_TWO = C.ramTimingPresetTwo; const u32 tRFCpb = !TIMING_PRESET_FOUR ? 140 : tRFC_values[TIMING_PRESET_FOUR-1];
const u32 TIMING_PRESET_THREE = C.ramTimingPresetThree;
const u32 TIMING_PRESET_FOUR = C.ramTimingPresetFour;
const u32 TIMING_PRESET_FIVE = C.ramTimingPresetFive;
const u32 TIMING_PRESET_SIX = C.ramTimingPresetSix;
const u32 TIMING_PRESET_SEVEN = C.ramTimingPresetSeven;
// Burst Length // tRFCab (refresh cycle time all banks) in ns for 8Gb density
const u32 BL = 16; const u32 tRFCab = !TIMING_PRESET_FOUR ? 280 : 2*tRFCpb;
// tRFCpb (refresh cycle time per bank) in ns for 8Gb density // tRAS (row active time) in ns
const u32 tRFCpb = !TIMING_PRESET_FOUR ? 140 : tRFC_values[TIMING_PRESET_FOUR-1]; const u32 tRAS = !TIMING_PRESET_ONE ? 42 : tRAS_values[TIMING_PRESET_ONE-1];
// tRFCab (refresh cycle time all banks) in ns for 8Gb density // tRPpb (row precharge time per bank) in ns
const u32 tRFCab = !TIMING_PRESET_FOUR ? 280 : 2*tRFCpb; const u32 tRPpb = !TIMING_PRESET_ONE ? 18 : tRP_values[TIMING_PRESET_ONE-1];
// tRAS (row active time) in ns // tRPab (row precharge time all banks) in ns
const u32 tRAS = !TIMING_PRESET_ONE ? 42 : tRAS_values[TIMING_PRESET_ONE-1]; const u32 tRPab = !TIMING_PRESET_ONE ? 21 : tRPpb + 3;
// tRPpb (row precharge time per bank) in ns // tRC (ACTIVATE-ACTIVATE command period same bank) in ns
const u32 tRPpb = !TIMING_PRESET_ONE ? 18 : tRP_values[TIMING_PRESET_ONE-1]; const u32 tRC = tRPpb + tRAS;
// tRPab (row precharge time all banks) in ns // DQS output access time from CK_t/CK_c
const u32 tRPab = !TIMING_PRESET_ONE ? 21 : tRPpb + 3; const double tDQSCK_min = 1.5;
// DQS output access time from CK_t/CK_c
const double tDQSCK_max = 3.5;
// Write preamble (tCK)
const double tWPRE = 1.8;
// Read postamble (tCK)
const double tRPST = 0.4;
// WRITE command to first DQS transition(max) (tCK)
const double tDQSS_max = 1.25;
// DQ-to-DQS offset(max) (ns)
const double tDQS2DQ_max = 0.8;
// DQS_t, DQS_c to DQ skew total, per group, per access (DBI Disabled)
const double tDQSQ = 0.18;
// tRC (ACTIVATE-ACTIVATE command period same bank) in ns // Write-to-Read delay
const u32 tRC = tRPpb + tRAS; const u32 tWTR = !TIMING_PRESET_FIVE ? 10 : tWTR_values[TIMING_PRESET_FIVE-1];
// DQS output access time from CK_t/CK_c // Internal READ-to-PRE-CHARGE command delay in ns
const double tDQSCK_min = 1.5; const double tRTP = !TIMING_PRESET_THREE ? 7.5 : tRTP_values[TIMING_PRESET_THREE-1];
// DQS output access time from CK_t/CK_c
const double tDQSCK_max = 3.5;
// Write preamble (tCK)
const double tWPRE = 1.8;
// Read postamble (tCK)
const double tRPST = 0.4;
// WRITE command to first DQS transition(max) (tCK)
const double tDQSS_max = 1.25;
// DQ-to-DQS offset(max) (ns)
const double tDQS2DQ_max = 0.8;
// DQS_t, DQS_c to DQ skew total, per group, per access (DBI Disabled)
const double tDQSQ = 0.18;
// Write-to-Read delay // write recovery time
const u32 tWTR = !TIMING_PRESET_FIVE ? 10 : tWTR_values[TIMING_PRESET_FIVE-1]; const u32 tWR = !TIMING_PRESET_THREE ? 18 : tWR_values[TIMING_PRESET_THREE-1];
// Internal READ-to-PRE-CHARGE command delay in ns // Read to refresh delay
const double tRTP = !TIMING_PRESET_THREE ? 7.5 : tRTP_values[TIMING_PRESET_THREE-1]; const u32 tR2REF = tRTP + tRPpb;
// write recovery time // tRCD (RAS-CAS delay) in ns
const u32 tWR = !TIMING_PRESET_THREE ? 18 : tWR_values[TIMING_PRESET_THREE-1]; const u32 tRCD = !TIMING_PRESET_ONE ? 18 : tRCD_values[TIMING_PRESET_ONE-1];
// Read to refresh delay // tRRD (Active bank-A to Active bank-B) in ns
const u32 tR2REF = tRTP + tRPpb; const double tRRD = !TIMING_PRESET_TWO ? 10. : tRRD_values[TIMING_PRESET_TWO-1];
// tRCD (RAS-CAS delay) in ns // tREFpb (average refresh interval per bank) in ns for 8Gb density
const u32 tRCD = !TIMING_PRESET_ONE ? 18 : tRCD_values[TIMING_PRESET_ONE-1]; const u32 tREFpb = !TIMING_PRESET_SIX ? 488 : tREFpb_values[TIMING_PRESET_SIX-1];
// tREFab (average refresh interval all 8 banks) in ns for 8Gb density
// const u32 tREFab = tREFpb * 8;
// tRRD (Active bank-A to Active bank-B) in ns // tPDEX2WR, tPDEX2RD (timing delay from exiting powerdown mode to a write/read command) in ns
const double tRRD = !TIMING_PRESET_TWO ? 10. : tRRD_values[TIMING_PRESET_TWO-1]; // const u32 tPDEX2 = 10;
// Exit power-down to next valid command delay
const double tXP = 10;
// tREFpb (average refresh interval per bank) in ns for 8Gb density // Delay from valid command to CKE input LOW in ns
const u32 tREFpb = !TIMING_PRESET_SIX ? 488 : tREFpb_values[TIMING_PRESET_SIX-1]; const double tCMDCKE = 1.75;
// tREFab (average refresh interval all 8 banks) in ns for 8Gb density
// const u32 tREFab = tREFpb * 8;
// tPDEX2WR, tPDEX2RD (timing delay from exiting powerdown mode to a write/read command) in ns // tACT2PDEN (timing delay from an activate, MRS or EMRS command to power-down entry) in ns
// const u32 tPDEX2 = 10; // Valid clock and CS requirement after CKE input LOW after MRW command
// Exit power-down to next valid command delay const u32 tMRWCKEL = 14;
const double tXP = 10;
// Delay from valid command to CKE input LOW in ns // Valid CS requirement after CKE input LOW
const double tCMDCKE = 1.75; const double tCKELCS = 5;
// tACT2PDEN (timing delay from an activate, MRS or EMRS command to power-down entry) in ns // Valid CS requirement before CKE input HIGH
// Valid clock and CS requirement after CKE input LOW after MRW command const double tCSCKEH = 1.75;
const u32 tMRWCKEL = 14;
// Valid CS requirement after CKE input LOW // tXSR (SELF REFRESH exit to next valid command delay) in ns
const double tCKELCS = 5; const double tXSR = tRFCab + 7.5;
// Valid CS requirement before CKE input HIGH // tCKE (minimum pulse width(HIGH and LOW pulse width)) in ns
const double tCSCKEH = 1.75; const double tCKE = 7.5;
// tXSR (SELF REFRESH exit to next valid command delay) in ns // Minimum self refresh time (entry to exit)
const double tXSR = tRFCab + 7.5; const u32 tSR = 15;
// tCKE (minimum pulse width(HIGH and LOW pulse width)) in ns // tFAW (Four-bank Activate Window) in ns
const double tCKE = 7.5; const u32 tFAW = !TIMING_PRESET_TWO ? 40 : tFAW_values[TIMING_PRESET_TWO-1];
// Minimum self refresh time (entry to exit) // Valid Clock requirement before CKE Input HIGH in ns
const u32 tSR = 15; const double tCKCKEH = 1.75;
// tFAW (Four-bank Activate Window) in ns // p78 The first valid data is available RL × t CK + t DQSCK + t DQSQ
const u32 tFAW = !TIMING_PRESET_TWO ? 40 : tFAW_values[TIMING_PRESET_TWO-1]; //const u32 QUSE = RL + CEIL(tDQSCK_min/tCK_avg + tDQSQ);
// Valid Clock requirement before CKE Input HIGH in ns namespace pcv::erista {
const double tCKCKEH = 1.75; // tCK_avg (average clock period) in ns
const double tCK_avg = 1000'000. / C.eristaEmcMaxClock;
// p78 The first valid data is available RL × t CK + t DQSCK + t DQSQ // Write Latency
//const u32 QUSE = RL + CEIL(tDQSCK_min/tCK_avg + tDQSQ); const u32 WL = 14 - 2*TIMING_PRESET_SEVEN;
// Read Latency
const u32 RL = 32 - 4*TIMING_PRESET_SEVEN;
namespace pcv::erista { // minimum number of cycles from any read command to any write command, irrespective of bank
// tCK_avg (average clock period) in ns const u32 R2W = CEIL (RL + CEIL(tDQSCK_max/tCK_avg) + BL/2 - WL + tWPRE + FLOOR(tRPST)) + 6;
const double tCK_avg = 1000'000. / C.eristaEmcMaxClock;
// Write Latency // Delay Time From WRITE-to-READ
const u32 WL = 14 - 2*TIMING_PRESET_SEVEN; const u32 W2R = WL + BL/2 + 1 + CEIL(tWTR/tCK_avg) - 6;
// Read Latency
const u32 RL = 32 - 4*TIMING_PRESET_SEVEN;
// minimum number of cycles from any read command to any write command, irrespective of bank // write-to-precharge time for commands to the same bank in cycles
const u32 R2W = CEIL (RL + CEIL(tDQSCK_max/tCK_avg) + BL/2 - WL + tWPRE + FLOOR(tRPST)) + 6; const u32 WTP = WL + BL/2 + 1 + CEIL(tWR/tCK_avg) - 8;
// Delay Time From WRITE-to-READ // #_of_rows per die for 8Gb density
const u32 W2R = WL + BL/2 + 1 + CEIL(tWTR/tCK_avg) - 6; const u32 numOfRows = 65536;
// {REFRESH, REFRESH_LO} = max[(tREF/#_of_rows) / (emc_clk_period) - 64, (tREF/#_of_rows) / (emc_clk_period) * 97%]
// emc_clk_period = dram_clk / 2;
// 1600 MHz: 5894, but N' set to 6176 (~4.8% margin)
const u32 REFRESH = MIN((u32)65472, u32(std::ceil((double(tREFpb) * C.eristaEmcMaxClock / numOfRows * 1.048 / 2 - 64))) / 4 * 4);
const u32 REFBW = MIN((u32)65536, REFRESH+64);
// write-to-precharge time for commands to the same bank in cycles // Write With Auto Precharge to to Power-Down Entry
const u32 WTP = WL + BL/2 + 1 + CEIL(tWR/tCK_avg) - 8; const u32 WTPDEN = WTP + 1 + CEIL(tDQSS_max/tCK_avg) + CEIL(tDQS2DQ_max/tCK_avg) + 6;
// #_of_rows per die for 8Gb density // Additional time after t XP hasexpired until the MRR commandmay be issued
const u32 numOfRows = 65536; const double tMRRI = tRCD + 3 * tCK_avg;
// {REFRESH, REFRESH_LO} = max[(tREF/#_of_rows) / (emc_clk_period) - 64, (tREF/#_of_rows) / (emc_clk_period) * 97%]
// emc_clk_period = dram_clk / 2;
// 1600 MHz: 5894, but N' set to 6176 (~4.8% margin)
const u32 REFRESH = MIN((u32)65472, u32(std::ceil((double(tREFpb) * C.eristaEmcMaxClock / numOfRows * 1.048 / 2 - 64))) / 4 * 4);
const u32 REFBW = MIN((u32)65536, REFRESH+64);
// Write With Auto Precharge to to Power-Down Entry // tPDEX2MRR (timing delay from exiting powerdown mode to MRR command) in ns
const u32 WTPDEN = WTP + 1 + CEIL(tDQSS_max/tCK_avg) + CEIL(tDQS2DQ_max/tCK_avg) + 6; const double tPDEX2MRR = tXP + tMRRI;
}
namespace pcv::mariko {
// tCK_avg (average clock period) in ns
const double tCK_avg = 1000'000. / C.marikoEmcMaxClock;
// Write Latency
const u32 WL = 14 - 2*TIMING_PRESET_SEVEN;
// Read Latency
const u32 RL = 32 - 4*TIMING_PRESET_SEVEN;
// Additional time after t XP hasexpired until the MRR commandmay be issued // minimum number of cycles from any read command to any write command, irrespective of bank
const double tMRRI = tRCD + 3 * tCK_avg; const u32 R2W = CEIL (RL + CEIL(tDQSCK_max/tCK_avg) + BL/2 - WL + tWPRE + FLOOR(tRPST));
// tPDEX2MRR (timing delay from exiting powerdown mode to MRR command) in ns // Delay Time From WRITE-to-READ
const double tPDEX2MRR = tXP + tMRRI; const u32 W2R = WL + BL/2 + 1 + CEIL(tWTR/tCK_avg);
}
namespace pcv::mariko {
// tCK_avg (average clock period) in ns
const double tCK_avg = 1000'000. / C.marikoEmcMaxClock;
// Write Latency
const u32 WL = 14 - 2*TIMING_PRESET_SEVEN;
// Read Latency
const u32 RL = 32 - 4*TIMING_PRESET_SEVEN;
// minimum number of cycles from any read command to any write command, irrespective of bank // write-to-precharge time for commands to the same bank in cycles
const u32 R2W = CEIL (RL + CEIL(tDQSCK_max/tCK_avg) + BL/2 - WL + tWPRE + FLOOR(tRPST)); const u32 WTP = WL + BL/2 + 1 + CEIL(tWR/tCK_avg);
// Delay Time From WRITE-to-READ // Read-To-MRW delay
const u32 W2R = WL + BL/2 + 1 + CEIL(tWTR/tCK_avg); const u32 RTM = RL + BL/2 + CEIL(tDQSCK_max/tCK_avg) + FLOOR(tRPST) + CEIL(7.5/tCK_avg);
// write-to-precharge time for commands to the same bank in cycles // Write-To-MRW/MRR delay
const u32 WTP = WL + BL/2 + 1 + CEIL(tWR/tCK_avg); const u32 WTM = WL + 1 + BL/2 + CEIL(7.5/tCK_avg);
// Read-To-MRW delay // Read With AP-To-MRW/MRR delay
const u32 RTM = RL + BL/2 + CEIL(tDQSCK_max/tCK_avg) + FLOOR(tRPST) + CEIL(7.5/tCK_avg); const u32 RATM = RTM + CEIL(tRTP/tCK_avg) - 8;
// Write-To-MRW/MRR delay // Write With AP-To-MRW/MRR delay
const u32 WTM = WL + 1 + BL/2 + CEIL(7.5/tCK_avg); const u32 WATM = WTM + CEIL(tWR/tCK_avg);
// Read With AP-To-MRW/MRR delay // #_of_rows per die for 8Gb density
const u32 RATM = RTM + CEIL(tRTP/tCK_avg) - 8; const u32 numOfRows = 65536;
// {REFRESH, REFRESH_LO} = max[(tREF/#_of_rows) / (emc_clk_period) - 64, (tREF/#_of_rows) / (emc_clk_period) * 97%]
// emc_clk_period = dram_clk / 2;
// 1600 MHz: 5894, but N' set to 6176 (~4.8% margin)
const u32 REFRESH = MIN((u32)65472, u32(std::ceil((double(tREFpb) * C.marikoEmcMaxClock / numOfRows * 1.048 / 2 - 64))) / 4 * 4);
const u32 REFBW = MIN((u32)65536, REFRESH+64);
// Write With AP-To-MRW/MRR delay // Write With Auto Precharge to to Power-Down Entry
const u32 WATM = WTM + CEIL(tWR/tCK_avg); const u32 WTPDEN = WTP + 1 + CEIL(tDQSS_max/tCK_avg) + CEIL(tDQS2DQ_max/tCK_avg) + 6;
// #_of_rows per die for 8Gb density // Additional time after t XP hasexpired until the MRR commandmay be issued
const u32 numOfRows = 65536; const double tMRRI = tRCD + 3 * tCK_avg;
// {REFRESH, REFRESH_LO} = max[(tREF/#_of_rows) / (emc_clk_period) - 64, (tREF/#_of_rows) / (emc_clk_period) * 97%]
// emc_clk_period = dram_clk / 2;
// 1600 MHz: 5894, but N' set to 6176 (~4.8% margin)
const u32 REFRESH = MIN((u32)65472, u32(std::ceil((double(tREFpb) * C.marikoEmcMaxClock / numOfRows * 1.048 / 2 - 64))) / 4 * 4);
const u32 REFBW = MIN((u32)65536, REFRESH+64);
// Write With Auto Precharge to to Power-Down Entry // tPDEX2MRR (timing delay from exiting powerdown mode to MRR command) in ns
const u32 WTPDEN = WTP + 1 + CEIL(tDQSS_max/tCK_avg) + CEIL(tDQS2DQ_max/tCK_avg) + 6; const double tPDEX2MRR = tXP + tMRRI;
}
}
// Additional time after t XP hasexpired until the MRR commandmay be issued
const double tMRRI = tRCD + 3 * tCK_avg;
// tPDEX2MRR (timing delay from exiting powerdown mode to MRR command) in ns
const double tPDEX2MRR = tXP + tMRRI;
}
}

74
Source/Atmosphere/stratosphere/loader/source/patch.py
View File

@@ -1,74 +0,0 @@
#!python3
import sys
import os
def file_replace_str(file_path, search_replace_list):
assert file_path
assert search_replace_list
with open(file_path, "r") as f:
content = f.read()
for entry in search_replace_list:
(search, replace) = entry
if search in content:
content = content.replace(search, replace)
else:
assert replace in content, f"Pattern \"{search}\" not found"
with open(file_path, "w") as f:
f.write(content)
dir_path = os.path.dirname(__file__)
os.chdir(dir_path)
os.system("git reset --hard")
ldr_process_creation = os.path.join(dir_path, "ldr_process_creation.cpp")
file_replace_str(ldr_process_creation,
[("""#include "ldr_ro_manager.hpp"
namespace ams::ldr {""",
"""#include "ldr_ro_manager.hpp"
#include "oc/oc_loader.hpp"
namespace ams::ldr {"""),
(""" NsoHeader g_nso_headers[Nso_Count];
Result ValidateProgramVersion(ncm::ProgramId program_id, u32 version) {""",
""" NsoHeader g_nso_headers[Nso_Count];
/* Pcv/Ptm check cache. */
bool g_is_pcv;
bool g_is_ptm;
Result ValidateProgramVersion(ncm::ProgramId program_id, u32 version) {"""),
(""" R_UNLESS(meta->aci->program_id <= meta->acid->program_id_max, ldr::ResultInvalidProgramId());
/* Validate the kernel capabilities. */""",
""" R_UNLESS(meta->aci->program_id <= meta->acid->program_id_max, ldr::ResultInvalidProgramId());
/* Check if nca is pcv or ptm */
g_is_pcv = meta->aci->program_id == ncm::SystemProgramId::Pcv;
g_is_ptm = meta->aci->program_id == ncm::SystemProgramId::Ptm;
/* Validate the kernel capabilities. */"""),
(""" LocateAndApplyIpsPatchesToModule(nso_header->module_id, map_address, nso_size);
}""",
""" LocateAndApplyIpsPatchesToModule(nso_header->module_id, map_address, nso_size);
/* Apply pcv and ptm patches. */
if (g_is_pcv)
oc::pcv::Patch(map_address, nso_size);
if (g_is_ptm)
oc::ptm::Patch(map_address, nso_size);
}""")])
ldr_meta = os.path.join(dir_path, "ldr_meta.cpp")
file_replace_str(ldr_meta,
[(""" Result ValidateAcidSignature(Meta *meta) {
/* Loader did not check signatures prior to 10.0.0. */""",
""" Result ValidateAcidSignature(Meta *meta) {
R_SUCCEED();
/* Loader did not check signatures prior to 10.0.0. */""")])