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

Revert "Default to WT:B timing, update WT:B timing to use nCK as calculation"

Browse Source 
This reverts commit 6e87919f5a.
This commit is contained in:
souldbminersmwc
2025-08-28 07:33:40 -04:00
parent cd702892ad
commit 2831d6618a
2 changed files with 37 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp
View File

@@ -15,11 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
// ram timing defines
#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)
#include "customize.hpp" #include "customize.hpp"
namespace ams::ldr::oc { namespace ams::ldr::oc {
@@ -100,10 +96,6 @@ volatile CustomizeTable C = {
.commonGpuVoltOffset = 0, .commonGpuVoltOffset = 0,
.marikoEmcDvbShift = 0, .marikoEmcDvbShift = 0,
// TODO - Don't use defines for these!
#define nCK_erista 1000'000. / C.eristaEmcMaxClock;
#define nCK_mariko 1000'000. / C.marikoEmcMaxClock;
.BL = 16, .BL = 16,
.tRFCpb = 140, .tRFCpb = 140,
@@ -121,27 +113,27 @@ volatile CustomizeTable C = {
.tDQS2DQ_max = 0.8, .tDQS2DQ_max = 0.8,
.tDQSQ = 0.18, .tDQSQ = 0.18,
.tWTR = MAX(10, 8 * nCK_mariko), .tWTR = 10,
.tRTP = 7.5, // Cannot find concrete value for this timing .tRTP = 7.5,
.tWR = MAX(10, 4 * nCK_mariko), .tWR = 18,
.tR2REF = 25.5, .tR2REF = 25.5,
.tRCD = 20, // Cannot find concrete value for this timing .tRCD = 18,
.tRRD = 10, // Cannot find concrete value for this timing .tRRD = 10,
.tREFpb = 488, .tREFpb = 488,
.tXP = MAX(7.5, 5 * nCK_mariko), .tXP = 10,
.tCMDCKE = MAX(1.75, 3 * nCK_mariko), .tCMDCKE = 1.75,
.tMRWCKEL = MAX(14, 10 * nCK_mariko), .tMRWCKEL = 14,
.tCKELCS = MAX(5, 5 * nCK_mariko), .tCKELCS = 5,
.tCSCKEH = 1.75, .tCSCKEH = 1.75,
.tXSR = MAX(C.tRFcpb + 7.5, 5 * nCK_mariko), .tXSR = 287.5,
.tCKE = MAX(7.5, 4 * nCK_mariko), .tCKE = 7.5,
.tSR = MAX(15, 3 * nCK_mariko), .tSR = 15,
.tFAW = 30, .tFAW = 40,
.tCKCKEH = MAX(1.75, 3 * nCK_mariko), .tCKCKEH = 1.75,
.WL = 14, .WL = 14,
.RL = 32, .RL = 32,

44
preset/presetMicronWTB.txt
View File

@@ -1,41 +1,41 @@
OCS2-MICRON-WTB-PRESET OCS2-MICRON-WTB-PRESET
.BL = 16, .BL = 32,
.tRFCpb = 140, .tRFCpb = 140,
.tRFCab = 280, .tRFCab = 280,
.tRAS = 42, .tRAS = 27,
.tRPpb = 18, .tRPpb = 18,
.tRPab = 21, .tRPab = 21,
.tRC = 60, .tRC = 38,
.tDQSCK_min = 1.5, .tDQSCK_min = 1.5,
.tDQSCK_max = 3.5, .tDQSCK_max = 3.5,
.tWPRE = 1.8, .tWPRE = 2.0,
.tRPST = 0.4, .tRPST = 0.5,
.tDQSS_max = 1.25, .tDQSS_max = 1.25,
.tDQS2DQ_max = 0.8, .tDQS2DQ_max = 0.7,
.tDQSQ = 0.18, .tDQSQ = 0.18,
.tWTR = MAX(10, 8 * nCK_mariko), .tWTR = 10,
.tRTP = 7.5, // Cannot find concrete value for this timing .tRTP = 7.5,
.tWR = MAX(10, 4 * nCK_mariko), .tWR = 18,
.tR2REF = 25.5, .tR2REF = 25.5,
.tRCD = 20, // Cannot find concrete value for this timing .tRCD = 18,
.tRRD = 10, // Cannot find concrete value for this timing .tRRD = 18,
.tREFpb = 488, .tREFpb = 488,
.tXP = MAX(7.5, 5 * nCK_mariko), .tXP = 7.5,
.tCMDCKE = MAX(1.75, 3 * nCK_mariko), .tCMDCKE = 1.75,
.tMRWCKEL = MAX(14, 10 * nCK_mariko), .tMRWCKEL = 14,
.tCKELCS = MAX(5, 5 * nCK_mariko), .tCKELCS = 5,
.tCSCKEH = 1.75, .tCSCKEH = 1.75,
.tXSR = MAX(C.tRFcpb + 7.5, 5 * nCK_mariko), .tXSR = 287.5,
.tCKE = MAX(7.5, 4 * nCK_mariko), .tCKE = 5,
.tSR = MAX(15, 3 * nCK_mariko), .tSR = 15,
.tFAW = 30, .tFAW = 54,
.tCKCKEH = MAX(1.75, 3 * nCK_mariko), .tCKCKEH = 1.75,
.WL = 14, .WL = 15,
.RL = 32, .RL = 30,