From 1690cfd7660604ff6e87daf37ad1515f82889dd9 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 21 Feb 2023 08:16:39 -0700 Subject: [PATCH] kern: adjust pool allocations --- .../source/board/nintendo/nx/kern_k_system_control.cpp | 2 +- libraries/libmesosphere/source/init/kern_init_slab_setup.cpp | 2 +- .../include/vapours/svc/board/nintendo/nx/svc_device_name.hpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/libmesosphere/source/board/nintendo/nx/kern_k_system_control.cpp b/libraries/libmesosphere/source/board/nintendo/nx/kern_k_system_control.cpp index 3e71fbb17..c2f73e31d 100644 --- a/libraries/libmesosphere/source/board/nintendo/nx/kern_k_system_control.cpp +++ b/libraries/libmesosphere/source/board/nintendo/nx/kern_k_system_control.cpp @@ -368,7 +368,7 @@ namespace ams::kern::board::nintendo::nx { size_t KSystemControl::Init::GetMinimumNonSecureSystemPoolSize() { /* Verify that our minimum is at least as large as Nintendo's. */ constexpr size_t MinimumSize = ::ams::svc::RequiredNonSecureSystemMemorySize; - static_assert(MinimumSize >= 0x29C8000); + static_assert(MinimumSize >= 0x2C04000); return MinimumSize; } diff --git a/libraries/libmesosphere/source/init/kern_init_slab_setup.cpp b/libraries/libmesosphere/source/init/kern_init_slab_setup.cpp index fea9eb38b..84be8a839 100644 --- a/libraries/libmesosphere/source/init/kern_init_slab_setup.cpp +++ b/libraries/libmesosphere/source/init/kern_init_slab_setup.cpp @@ -140,7 +140,7 @@ namespace ams::kern::init { } size_t CalculateSlabHeapGapSize() { - constexpr size_t KernelSlabHeapGapSize = 2_MB - 320_KB; + constexpr size_t KernelSlabHeapGapSize = 2_MB - 356_KB; static_assert(KernelSlabHeapGapSize <= KernelSlabHeapGapsSizeMax); return KernelSlabHeapGapSize; } diff --git a/libraries/libvapours/include/vapours/svc/board/nintendo/nx/svc_device_name.hpp b/libraries/libvapours/include/vapours/svc/board/nintendo/nx/svc_device_name.hpp index ab9c8c547..0148eea3f 100644 --- a/libraries/libvapours/include/vapours/svc/board/nintendo/nx/svc_device_name.hpp +++ b/libraries/libvapours/include/vapours/svc/board/nintendo/nx/svc_device_name.hpp @@ -64,8 +64,8 @@ namespace ams::svc::board::nintendo::nx { namespace impl { - constexpr inline const size_t RequiredNonSecureSystemMemorySizeVi = 0x2238 * 4_KB; - constexpr inline const size_t RequiredNonSecureSystemMemorySizeNvservices = 0x710 * 4_KB; + constexpr inline const size_t RequiredNonSecureSystemMemorySizeVi = 0x2400 * 4_KB; + constexpr inline const size_t RequiredNonSecureSystemMemorySizeNvservices = 0x784 * 4_KB; constexpr inline const size_t RequiredNonSecureSystemMemorySizeMisc = 0x80 * 4_KB; }