kern: fix inverted conditional in UnmapProcessCodeMemory

subrepo:
  subdir:   "libraries"
  merged:   "78510a74"
upstream:
  origin:   "https://github.com/Atmosphere-NX/Atmosphere-libs"
  branch:   "master"
  commit:   "78510a74"
git-subrepo:
  version:  "0.4.1"
  origin:   "???"
  commit:   "???"

docs/changelog.md

@@ -1,4 +1,38 @@
 # Changelog
+## 0.16.0
++ Support was added for 11.0.0.
+  + `exosphère` was updated to reflect the latest official secure monitor behavior.
+  + `mesosphère` was updated to reflect the latest official kernel behavior.
+  + `loader`, `sm`, `boot`, `pgl` were updated to reflect the latest official behaviors.
+    + **Please Note**: 11.0.0 implements an opt-in version of the atmosphère `sm` extension that allows for closing session without unregistering services.
+      + Correspondingly, the extension will be deprecated in favor of the new official opt-in command. In 0.17.0, it will be removed entirely.
+      + If your custom system module relies on this extension (however unlikely that seems to me), please update it accordingly.
+  + `erpt` was partially updated to provide compatibility with 11.0.0.
+    + The latest firmware attaches additional fields and context information to logs.
+    + A future atmosphère update will implement this logic, so that users who are interested can also get the new information when examining their logs.
+  + **Please Note**: 11.0.0 introduced breaking changes to the `usb` system module's `usb:ds` API.
+    + Homebrew which uses the `usb:ds` service should rebuild with the latest libnx version to support running on 11.0.0.
++ The `boot` system module was rewritten to reflect the huge driver changes introduced in 8.0.0.
+  + This includes a number of improvements to both logo display and battery management logic.
++ Support was added for configuring the address space width for `hbl`.
+  + The `hbl_config!override_address_space_(#)` and `hbl_config!override_any_app_address_space` can now be set to `39_bit`, `36_bit`, or `32_bit` to control the address space for hbl on a per-override basis.
+  + If a configuration has not been set, hbl will now default to 39-bit address space.
+    + Previously, a legacy 36-bit address space was always used to maintain compatibility with 1.0.0.
+    + A new loader extension was added to support 39-bit whenever possible (including mesosphere-on-1.0.0), with fallback to 36-bit when unavailable.
++ Support was added to a number of components for running on Mariko hardware.
+  + The `boot` system module can now safely be run on mariko hardware, performing correct hardware initialization.
+  + Daybreak (and generally, system update logic) were updated to be usable on Mariko.
+  + Boot0 protection/management logic was updated to perform correct actions on Mariko.
+  + Reboot to payload does not and cannot work on Mariko. Correspondingly, A "fatal error" handler was written, to display and save fatal errors from within TrustZone.
+  + **Please Note:** Atmosphere is still not properly usable on Mariko hardware.
+    + In particular, wake-from-sleep will not properly function (the magic numbers aren't set correctly), among a few other minor issues.
++ `exosphère` received support for building under debug configuration.
+  + A small (otherwise unused) portion of IRAM is now reserved for debug-only exosphere code (this region is unused/untouched under release config).
+  + This enables logging (including printf) to uart from the secure monitor, for those interested.
++ A number of bugs were fixed, including:
+  + Minor issues in a number of filesystem related code were fixed.
+  + An issue was fixed that could cause NCM to abort on consoles which came with 3.0.x and were never updated.
++ Several issues were fixed, and usability and stability were improved.
 ## 0.15.0
 + fusee-primary's panic display was updated to automatically identify and give suggestions to resolve many of the most common errors users encounter.
 + Having been tested as well as I can alone, `mesosphere` (atmosphère's reimplementation of the Nintendo Switch kernel) is now available for users interested in trying it.

emummc/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/m4xw/emuMMC
 	branch = develop
-	commit = 25075973d31a5be6f2e769f1ea0fff44daf0cdfa
-	parent = 8ba513fefbcfd8278a433090e59017963ba9887f
+	commit = 6fd752dad13c02d482a5d89c24f4e8ce8b9d8f56
+	parent = 4f1a4e74992aa84b8ab84bccacc720e2d5823791
 	method = rebase
 	cmdver = 0.4.1

exosphere/program/source/boot/secmon_boot_setup.cpp

@@ -72,6 +72,9 @@ namespace ams::secmon::boot {
             /* care of it here. Perhaps we should read the number of anti-downgrade fuses burnt, and translate that */
             /* to the warmboot key? To be decided during the process of implementing ams-on-mariko support. */
             reg::Write(pmc + APBDEV_PMC_SECURE_SCRATCH32, 0x129);
+
+            /* TODO: Fix to ensure correct scratch contents on mariko, as otherwise wb is broken. */
+            AMS_ABORT_UNLESS(fuse::GetSocType() != fuse::SocType_Mariko);
         }
 
         /* This function derives the master kek and device keys using the tsec root key. */

exosphere/program/source/smc/secmon_smc_info.cpp

@@ -47,7 +47,7 @@ namespace ams::secmon::smc {
             [fuse::DramId_IcosaSamsung4GB]    = pkg1::MemorySize_4GB,
             [fuse::DramId_IcosaHynix4GB]      = pkg1::MemorySize_4GB,
             [fuse::DramId_IcosaMicron4GB]     = pkg1::MemorySize_4GB,
-            [fuse::DramId_CopperSamsung4GB]   = pkg1::MemorySize_4GB,
+            [fuse::DramId_FiveHynix1y4GB]     = pkg1::MemorySize_4GB,
             [fuse::DramId_IcosaSamsung6GB]    = pkg1::MemorySize_6GB,
             [fuse::DramId_CopperHynix4GB]     = pkg1::MemorySize_4GB,
             [fuse::DramId_CopperMicron4GB]    = pkg1::MemorySize_4GB,
@@ -66,9 +66,13 @@ namespace ams::secmon::smc {
             [fuse::DramId_HoagSamsung1y4GBX]  = pkg1::MemorySize_4GB,
             [fuse::DramId_IowaSamsung1y4GBY]  = pkg1::MemorySize_4GB,
             [fuse::DramId_IowaSamsung1y8GBY]  = pkg1::MemorySize_8GB,
-            [fuse::DramId_IowaSamsung1y4GBA]  = pkg1::MemorySize_4GB,
-            [fuse::DramId_FiveSamsung1y8GBX]  = pkg1::MemorySize_8GB,
+            [fuse::DramId_FiveSamsung1y4GB]   = pkg1::MemorySize_4GB,
+            [fuse::DramId_HoagSamsung1y8GBX]  = pkg1::MemorySize_8GB,
             [fuse::DramId_FiveSamsung1y4GBX]  = pkg1::MemorySize_4GB,
+            [fuse::DramId_IowaMicron1y4GB]    = pkg1::MemorySize_4GB,
+            [fuse::DramId_HoagMicron1y4GB]    = pkg1::MemorySize_4GB,
+            [fuse::DramId_FiveMicron1y4GB]    = pkg1::MemorySize_4GB,
+            [fuse::DramId_FiveSamsung1y8GBX]  = pkg1::MemorySize_8GB,
         };
 
         constexpr const pkg1::MemoryMode MemoryModes[] = {

libraries/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/Atmosphere-NX/Atmosphere-libs
 	branch = master
-	commit = 10e9e0e8f926b11c2c7de16ffe15bea7d7ec2cdf
-	parent = 2ee2a4f1ac04bc7f15de8be8d57ad04d7e73f735
+	commit = 78510a74f010eb532ba77f905171f41094df94cb
+	parent = f72475872a5a6519e5ca9322e7f1960432230f40
 	method = merge
 	cmdver = 0.4.1

libraries/libexosphere/include/exosphere/fuse.hpp

@@ -51,7 +51,7 @@ namespace ams::fuse {
         DramId_IcosaSamsung4GB    =  0,
         DramId_IcosaHynix4GB      =  1,
         DramId_IcosaMicron4GB     =  2,
-        DramId_CopperSamsung4GB   =  3,
+        DramId_FiveHynix1y4GB     =  3,
         DramId_IcosaSamsung6GB    =  4,
         DramId_CopperHynix4GB     =  5,
         DramId_CopperMicron4GB    =  6,
@@ -70,9 +70,13 @@ namespace ams::fuse {
         DramId_HoagSamsung1y4GBX  = 19,
         DramId_IowaSamsung1y4GBY  = 20,
         DramId_IowaSamsung1y8GBY  = 21,
-        DramId_IowaSamsung1y4GBA  = 22,
-        DramId_FiveSamsung1y8GBX  = 23,
+        DramId_FiveSamsung1y4GB   = 22,
+        DramId_HoagSamsung1y8GBX  = 23,
         DramId_FiveSamsung1y4GBX  = 24,
+        DramId_IowaMicron1y4GB    = 25,
+        DramId_HoagMicron1y4GB    = 26,
+        DramId_FiveMicron1y4GB    = 27,
+        DramId_FiveSamsung1y8GBX  = 28,
 
         DramId_Count,
     };

libraries/libmesosphere/source/board/nintendo/nx/kern_k_system_control.cpp

@@ -558,7 +558,7 @@ namespace ams::kern::board::nintendo::nx {
             /* NOTE: Atmosphere extension; if we received an exception context from Panic(), */
             /*       generate a fatal error report using it. */
             const KExceptionContext *e_ctx = static_cast<const KExceptionContext *>(arg);
-            auto *f_ctx = GetPointer<::ams::impl::FatalErrorContext>(iram_address + RebootPayloadSize);
+            auto *f_ctx = GetPointer<::ams::impl::FatalErrorContext>(iram_address + 0x2E000);
 
             /* Clear the fatal context. */
             std::memset(f_ctx, 0xCC, sizeof(*f_ctx));

libraries/libmesosphere/source/kern_k_page_table_base.cpp

@@ -908,7 +908,7 @@ namespace ams::kern {
                 }
 
                 /* Check if we're done. */
-                if (dst_address + size - 1 > info.GetLastAddress()) {
+                if (dst_address + size - 1 <= info.GetLastAddress()) {
                     break;
                 }
 

libraries/libstratosphere/include/stratosphere/erpt/erpt_ids.autogen.hpp

@@ -164,10 +164,10 @@
     HANDLER(UsbStateInfo,                        123) \
     HANDLER(NvHostErrInfo,                       124) \
     HANDLER(RunningUlaInfo,                      125) \
-    HANDLER(Category_Unknown126,                 126) \
-    HANDLER(Category_Unknown127,                 127) \
-    HANDLER(Category_Unknown128,                 128) \
-    HANDLER(Category_Unknown129,                 129) \
+    HANDLER(InternalPanelInfo,                   126) \
+    HANDLER(ResourceLimitLimitInfo,              127) \
+    HANDLER(ResourceLimitPeakInfo,               128) \
+    HANDLER(TouchScreenInfo,                     129) \
 
 #define AMS_ERPT_FOREACH_FIELD(HANDLER) \
     HANDLER(TestU64,                                                  0,   Test,                                FieldType_NumericU64, FieldFlag_None   ) \
@@ -782,22 +782,22 @@
     HANDLER(NANDTotalSizeOfSystem,                                    609, NANDFreeSpaceInfo,                   FieldType_NumericU64, FieldFlag_None   ) \
     HANDLER(NANDFreeSpaceOfSystem,                                    610, NANDFreeSpaceInfo,                   FieldType_NumericU64, FieldFlag_None   ) \
     HANDLER(AccessPointSSIDAsHex,                                     611, AccessPointInfo,                     FieldType_String,     FieldFlag_None   ) \
-    HANDLER(PanelVendorId,                                            612, Category_Unknown126,                 FieldType_NumericU8,  FieldFlag_None   ) \
-    HANDLER(PanelRevisionId,                                          613, Category_Unknown126,                 FieldType_NumericU8,  FieldFlag_None   ) \
-    HANDLER(PanelModelId,                                             614, Category_Unknown126,                 FieldType_NumericU8,  FieldFlag_None   ) \
+    HANDLER(PanelVendorId,                                            612, InternalPanelInfo,                   FieldType_NumericU8,  FieldFlag_None   ) \
+    HANDLER(PanelRevisionId,                                          613, InternalPanelInfo,                   FieldType_NumericU8,  FieldFlag_None   ) \
+    HANDLER(PanelModelId,                                             614, InternalPanelInfo,                   FieldType_NumericU8,  FieldFlag_None   ) \
     HANDLER(ErrorContext,                                             615, ErrorInfoAuto,                       FieldType_U8Array,    FieldFlag_None   ) \
     HANDLER(ErrorContextSize,                                         616, ErrorInfoAuto,                       FieldType_NumericU64, FieldFlag_None   ) \
     HANDLER(ErrorContextTotalSize,                                    617, ErrorInfoAuto,                       FieldType_NumericU64, FieldFlag_None   ) \
-    HANDLER(SystemPhysicalMemoryLimit,                                618, Category_Unknown127,                 FieldType_NumericI64, FieldFlag_None   ) \
-    HANDLER(SystemThreadCountLimit,                                   619, Category_Unknown127,                 FieldType_NumericI64, FieldFlag_None   ) \
-    HANDLER(SystemEventCountLimit,                                    620, Category_Unknown127,                 FieldType_NumericI64, FieldFlag_None   ) \
-    HANDLER(SystemTransferMemoryCountLimit,                           621, Category_Unknown127,                 FieldType_NumericI64, FieldFlag_None   ) \
-    HANDLER(SystemSessionCountLimit,                                  622, Category_Unknown127,                 FieldType_NumericI64, FieldFlag_None   ) \
-    HANDLER(SystemPhysicalMemoryPeak,                                 623, Category_Unknown128,                 FieldType_NumericI64, FieldFlag_None   ) \
-    HANDLER(SystemThreadCountPeak,                                    624, Category_Unknown128,                 FieldType_NumericI64, FieldFlag_None   ) \
-    HANDLER(SystemEventCountPeak,                                     625, Category_Unknown128,                 FieldType_NumericI64, FieldFlag_None   ) \
-    HANDLER(SystemTransferMemoryCountPeak,                            626, Category_Unknown128,                 FieldType_NumericI64, FieldFlag_None   ) \
-    HANDLER(SystemSessionCountPeak,                                   627, Category_Unknown128,                 FieldType_NumericI64, FieldFlag_None   ) \
+    HANDLER(SystemPhysicalMemoryLimit,                                618, ResourceLimitLimitInfo,              FieldType_NumericI64, FieldFlag_None   ) \
+    HANDLER(SystemThreadCountLimit,                                   619, ResourceLimitLimitInfo,              FieldType_NumericI64, FieldFlag_None   ) \
+    HANDLER(SystemEventCountLimit,                                    620, ResourceLimitLimitInfo,              FieldType_NumericI64, FieldFlag_None   ) \
+    HANDLER(SystemTransferMemoryCountLimit,                           621, ResourceLimitLimitInfo,              FieldType_NumericI64, FieldFlag_None   ) \
+    HANDLER(SystemSessionCountLimit,                                  622, ResourceLimitLimitInfo,              FieldType_NumericI64, FieldFlag_None   ) \
+    HANDLER(SystemPhysicalMemoryPeak,                                 623, ResourceLimitPeakInfo,               FieldType_NumericI64, FieldFlag_None   ) \
+    HANDLER(SystemThreadCountPeak,                                    624, ResourceLimitPeakInfo,               FieldType_NumericI64, FieldFlag_None   ) \
+    HANDLER(SystemEventCountPeak,                                     625, ResourceLimitPeakInfo,               FieldType_NumericI64, FieldFlag_None   ) \
+    HANDLER(SystemTransferMemoryCountPeak,                            626, ResourceLimitPeakInfo,               FieldType_NumericI64, FieldFlag_None   ) \
+    HANDLER(SystemSessionCountPeak,                                   627, ResourceLimitPeakInfo,               FieldType_NumericI64, FieldFlag_None   ) \
     HANDLER(GpuCrashHash,                                             628, GpuCrashInfo,                        FieldType_U8Array,    FieldFlag_None   ) \
-    HANDLER(TouchScreenPanelGpioValue,                                629, Category_Unknown129,                 FieldType_NumericU8,  FieldFlag_None   ) \
+    HANDLER(TouchScreenPanelGpioValue,                                629, TouchScreenInfo,                     FieldType_NumericU8,  FieldFlag_None   ) \
 

libraries/libstratosphere/source/fssystem/save/fssystem_buffered_storage.cpp

@@ -601,7 +601,7 @@ namespace ams::fssystem::save {
         this->base_storage   = base_storage;
         this->buffer_manager = buffer_manager;
         this->block_size     = block_size;
-        this->cache_count    = cache_count;
+        this->cache_count    = buffer_count;
 
         /* Allocate the caches. */
         this->caches.reset(new Cache[buffer_count]);

stratosphere/boot/source/boot_display_config.inc

@@ -180,6 +180,7 @@ constexpr const RegisterWrite DisplayConfigDsi01Init03[] = {
     {sizeof(u32) * DSI_PKT_SEQ_3_HI, 0},
     {sizeof(u32) * DSI_PKT_SEQ_4_HI, 0},
     {sizeof(u32) * DSI_PKT_SEQ_5_HI, 0},
+    {sizeof(u32) * DSI_CONTROL,      0},
 };
 
 constexpr const RegisterWrite DisplayConfigDsi01Init04Erista[] = {

utilities/erpt.py

@@ -217,6 +217,10 @@ CATEGORIES = {
     123 : 'UsbStateInfo',
     124 : 'NvHostErrInfo',
     125 : 'RunningUlaInfo',
+    126 : 'InternalPanelInfo',
+    127 : 'ResourceLimitLimitInfo',
+    128 : 'ResourceLimitPeakInfo',
+    129 : 'TouchScreenInfo',
 }
 
 FIELD_TYPES = {