PRODINFO: Revamp blanking/write disallow policy. (#913)

* exo/fusee: hookup new prodinfo settings

* fusee: new scheme doesn't need FLAGS_DEFAULT

* fusee: fix c/p errors

* ams.mitm: completely revamp prodinfo backup mechanism

* ams.mitm: Implement revamped blanking/write policy

* strat: make early boot more debuggable

* exo: condense flag logic

stratosphere/ams_mitm/source/bpc_mitm/bpc_ams_module.cpp

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "../amsmitm_initialization.hpp"
+#include "bpc_ams_module.hpp"
+#include "bpc_ams_service.hpp"
+
+namespace ams::mitm::bpc_ams {
+
+    namespace {
+
+        constexpr sm::ServiceName AtmosphereServiceName = sm::ServiceName::Encode("bpc:ams");
+        constexpr size_t          AtmosphereMaxSessions = 4;
+
+        constexpr size_t MaxServers = 1;
+        constexpr size_t MaxSessions = AtmosphereMaxSessions;
+        using ServerOptions = sf::hipc::DefaultServerManagerOptions;
+        sf::hipc::ServerManager<MaxServers, ServerOptions, MaxSessions> g_server_manager;
+
+    }
+
+    void MitmModule::ThreadFunction(void *arg) {
+        /* Create bpc:ams. */
+        {
+            Handle bpcams_h;
+            R_ABORT_UNLESS(svcManageNamedPort(&bpcams_h, AtmosphereServiceName.name, AtmosphereMaxSessions));
+            g_server_manager.RegisterServer<bpc::AtmosphereService>(bpcams_h);
+        }
+
+        /* Loop forever, servicing our services. */
+        g_server_manager.LoopProcess();
+    }
+
+}

stratosphere/ams_mitm/source/bpc_mitm/bpc_ams_module.hpp

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include <stratosphere.hpp>
+#include "../amsmitm_module.hpp"
+
+namespace ams::mitm::bpc_ams {
+
+    DEFINE_MITM_MODULE_CLASS(0x8000, AMS_GET_SYSTEM_THREAD_PRIORITY(bpc, IpcServer));
+
+}

stratosphere/ams_mitm/source/bpc_mitm/bpc_ams_power_utils.cpp

@@ -97,6 +97,21 @@ namespace ams::mitm::bpc {
         DoRebootToPayload(ctx);
     }
 
+    void SetInitialRebootPayload(const void *payload, size_t payload_size) {
+        /* Clear payload buffer */
+        std::memset(g_reboot_payload, 0xCC, sizeof(g_reboot_payload));
+
+        /* Ensure valid. */
+        AMS_ABORT_UNLESS(payload != nullptr && payload_size <= sizeof(g_reboot_payload));
+
+        /* Copy in payload. */
+        std::memcpy(g_reboot_payload, payload, payload_size);
+
+        /* NOTE: Preferred reboot type will be parsed from settings later on. */
+        g_reboot_type = RebootType::ToPayload;
+
+    }
+
     Result LoadRebootPayload() {
         /* Clear payload buffer */
         std::memset(g_reboot_payload, 0xCC, sizeof(g_reboot_payload));

stratosphere/ams_mitm/source/bpc_mitm/bpc_ams_power_utils.hpp

@@ -24,6 +24,7 @@ namespace ams::mitm::bpc {
     void ShutdownSystem();
 
     /* Atmosphere power utilities. */
+    void SetInitialRebootPayload(const void *payload, size_t payload_size);
     Result LoadRebootPayload();
     Result DetectPreferredRebootFunctionality();
     void RebootForFatalError(const ams::FatalErrorContext *ctx);

stratosphere/ams_mitm/source/bpc_mitm/bpc_ams_service.cpp

@@ -13,13 +13,32 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include "../amsmitm_initialization.hpp"
 #include "bpc_ams_service.hpp"
 #include "bpc_ams_power_utils.hpp"
 
 namespace ams::mitm::bpc {
 
+    namespace {
+
+        bool g_set_initial_payload = false;
+
+    }
+
     void AtmosphereService::RebootToFatalError(const ams::FatalErrorContext &ctx) {
         bpc::RebootForFatalError(&ctx);
     }
 
+    void AtmosphereService::SetInitialRebootPayload(const ams::sf::InBuffer &payload) {
+        if (!g_set_initial_payload) {
+            g_set_initial_payload = true;
+
+            /* Set the initial reboot payload. */
+            bpc::SetInitialRebootPayload(payload.GetPointer(), payload.GetSize());
+
+            /* Start the initialization process. */
+            ::ams::mitm::StartInitialize();
+        }
+    }
+
 }

stratosphere/ams_mitm/source/bpc_mitm/bpc_ams_service.hpp

@@ -22,13 +22,16 @@ namespace ams::mitm::bpc {
     class AtmosphereService final : public sf::IServiceObject {
         private:
             enum class CommandId {
-                RebootToFatalError = 65000,
+                RebootToFatalError      = 65000,
+                SetInitialRebootPayload = 65001,
             };
         private:
             void RebootToFatalError(const ams::FatalErrorContext &ctx);
+            void SetInitialRebootPayload(const ams::sf::InBuffer &payload);
         public:
             DEFINE_SERVICE_DISPATCH_TABLE {
                 MAKE_SERVICE_COMMAND_META(RebootToFatalError),
+                MAKE_SERVICE_COMMAND_META(SetInitialRebootPayload),
             };
     };
 

stratosphere/ams_mitm/source/bpc_mitm/bpcmitm_module.cpp

@@ -16,8 +16,6 @@
 #include "../amsmitm_initialization.hpp"
 #include "bpcmitm_module.hpp"
 #include "bpc_mitm_service.hpp"
-#include "bpc_ams_service.hpp"
-#include "bpc_ams_power_utils.hpp"
 
 namespace ams::mitm::bpc {
 
@@ -27,11 +25,8 @@ namespace ams::mitm::bpc {
         constexpr sm::ServiceName DeprecatedMitmServiceName = sm::ServiceName::Encode("bpc:c");
         constexpr size_t          MitmServiceMaxSessions = 13;
 
-        constexpr sm::ServiceName AtmosphereServiceName = sm::ServiceName::Encode("bpc:ams");
-        constexpr size_t          AtmosphereMaxSessions = 3;
-
-        constexpr size_t MaxServers = 2;
-        constexpr size_t MaxSessions = MitmServiceMaxSessions + AtmosphereMaxSessions;
+        constexpr size_t MaxServers = 1;
+        constexpr size_t MaxSessions = MitmServiceMaxSessions;
         using ServerOptions = sf::hipc::DefaultServerManagerOptions;
         sf::hipc::ServerManager<MaxServers, ServerOptions, MaxSessions> g_server_manager;
 
@@ -41,13 +36,6 @@ namespace ams::mitm::bpc {
         /* Wait until initialization is complete. */
         mitm::WaitInitialized();
 
-        /* Create bpc:ams. */
-        {
-            Handle bpcams_h;
-            R_ABORT_UNLESS(svcManageNamedPort(&bpcams_h, AtmosphereServiceName.name, AtmosphereMaxSessions));
-            g_server_manager.RegisterServer<bpc::AtmosphereService>(bpcams_h);
-        }
-
         /* Create bpc mitm. */
         const sm::ServiceName service_name = (hos::GetVersion() >= hos::Version_2_0_0) ? MitmServiceName : DeprecatedMitmServiceName;
         R_ABORT_UNLESS(g_server_manager.RegisterMitmServer<BpcMitmService>(service_name));