bpc.mitm/exo: support pmic reboot/shutdown on mariko (thanks @CTCaer)

exosphere/program/source/secmon_user_power_management.cpp

@@ -70,6 +70,15 @@ namespace ams::secmon {
 
     }
 
+    void PerformUserRebootByPmic() {
+        /* Ensure that i2c-5 is usable for communicating with the pmic. */
+        clkrst::EnableI2c5Clock();
+        i2c::Initialize(i2c::Port_5);
+
+        /* Reboot. */
+        pmic::ShutdownSystem(true);
+    }
+
     void PerformUserRebootToRcm() {
         /* Configure the bootrom to boot to rcm. */
         reg::Write(PMC + APBDEV_PMC_SCRATCH0, 0x2);
@@ -100,11 +109,20 @@ namespace ams::secmon {
     }
 
     void PerformUserShutDown() {
+        if (fuse::GetSocType() == fuse::SocType_Mariko) {
+            /* Ensure that i2c-5 is usable for communicating with the pmic. */
+            clkrst::EnableI2c5Clock();
+            i2c::Initialize(i2c::Port_5);
+
+            /* On Mariko shutdown via pmic. */
+            pmic::ShutdownSystem(false);
+        } else /* if (fuse::GetSocType() == fuse::SocType_Erista) */ {
             /* Load our reboot stub to iram. */
             LoadRebootStub(RebootStubAction_ShutDown);
 
             /* Reboot. */
             PerformPmcReboot();
         }
+    }
 
 }

exosphere/program/source/secmon_user_power_management.hpp

@@ -23,11 +23,13 @@ namespace ams::secmon {
         UserRebootType_ToRcm        = 1,
         UserRebootType_ToPayload    = 2,
         UserRebootType_ToFatalError = 3,
+        UserRebootType_ByPmic       = 4,
     };
 
     void PerformUserRebootToRcm();
     void PerformUserRebootToPayload();
     void PerformUserRebootToFatalError();
+    void PerformUserRebootByPmic();
     void PerformUserShutDown();
 
 }

exosphere/program/source/smc/secmon_smc_info.cpp

@@ -357,6 +357,9 @@ namespace ams::secmon::smc {
                             case UserRebootType_ToFatalError:
                                 PerformUserRebootToFatalError();
                                 break;
+                            case UserRebootType_ByPmic:
+                                PerformUserRebootByPmic();
+                                break;
                             default:
                                 return SmcResult::InvalidArgument;
                         }
@@ -365,19 +368,18 @@ namespace ams::secmon::smc {
                             case UserRebootType_ToFatalError:
                                 PerformUserRebootToFatalError();
                                 break;
+                            case UserRebootType_ByPmic:
+                                PerformUserRebootByPmic();
+                                break;
                             default:
                                 return SmcResult::InvalidArgument;
                         }
                     }
                     break;
                 case ConfigItem::ExosphereNeedsShutdown:
-                    if (soc_type == fuse::SocType_Erista) {
                     if (args.r[3] != 0) {
                         PerformUserShutDown();
                     }
-                    } else /* if (soc_type == fuse::SocType_Mariko) */ {
-                        return SmcResult::NotSupported;
-                    }
                     break;
                 case ConfigItem::ExospherePayloadAddress:
                     if (g_payload_address == 0) {

libraries/libstratosphere/include/stratosphere/ams/ams_exosphere_api.hpp

@@ -25,6 +25,7 @@ namespace ams::exosphere {
     void ForceRebootToRcm();
     void ForceRebootToIramPayload();
     void ForceRebootToFatalError();
+    void ForceRebootByPmic();
     void ForceShutdown();
 
     bool IsRcmBugPatched();

libraries/libstratosphere/source/ams/ams_exosphere_api.cpp

@@ -39,6 +39,10 @@ namespace ams::exosphere {
         R_ABORT_UNLESS(spl::impl::SetConfig(spl::ConfigItem::ExosphereNeedsReboot, 3));
     }
 
+    void ForceRebootByPmic() {
+        R_ABORT_UNLESS(spl::impl::SetConfig(spl::ConfigItem::ExosphereNeedsReboot, 4));
+    }
+
     void ForceShutdown() {
         R_ABORT_UNLESS(spl::impl::SetConfig(spl::ConfigItem::ExosphereNeedsShutdown, 1));
     }

stratosphere/ams_mitm/source/bpc_mitm/bpc_ams_power_utils.cpp

@@ -33,6 +33,7 @@ namespace ams::mitm::bpc {
             Standard,
             ToRcm,
             ToPayload,
+            ByPmic,
         };
 
         /* Globals. */
@@ -93,6 +94,9 @@ namespace ams::mitm::bpc {
 
     void RebootSystem() {
         switch (g_reboot_type) {
+            case RebootType::ByPmic:
+                exosphere::ForceRebootByPmic();
+                break;
             case RebootType::ToRcm:
                 exosphere::ForceRebootToRcm();
                 break;
@@ -113,6 +117,11 @@ namespace ams::mitm::bpc {
     }
 
     void SetRebootPayload(const void *payload, size_t payload_size) {
+        /* Mariko does not support reboot-to-payload. */
+        if (spl::GetSocType() == spl::SocType_Mariko) {
+            return;
+        }
+
         /* Clear payload buffer */
         std::memset(g_reboot_payload, 0xCC, sizeof(g_reboot_payload));
 
@@ -131,6 +140,9 @@ namespace ams::mitm::bpc {
     }
 
     Result LoadRebootPayload() {
+        /* Mariko does not support reboot-to-payload. */
+        R_SUCCEED_IF(spl::GetSocType() == spl::SocType_Mariko)
+
         /* Clear payload buffer */
         std::memset(g_reboot_payload, 0xCC, sizeof(g_reboot_payload));
 
@@ -163,6 +175,11 @@ namespace ams::mitm::bpc {
             g_reboot_type = RebootType::ToPayload;
         }
 
+        /* TODO: Should we actually allow control over this on mariko? */
+        if (spl::GetSocType() == spl::SocType_Mariko) {
+            g_reboot_type = RebootType::ByPmic;
+        }
+
         R_SUCCEED();
     }
 

stratosphere/ams_mitm/source/bpc_mitm/bpcmitm_module.cpp

@@ -67,11 +67,6 @@ namespace ams::mitm::bpc {
         /* Wait until initialization is complete. */
         mitm::WaitInitialized();
 
-        /* On Mariko, we can't reboot to payload/do exosphere-shutdown...so there is no point in bpc.mitm. */
-        if (spl::GetSocType() == spl::SocType_Mariko) {
-            return;
-        }
-
         /* Create bpc mitm. */
         const sm::ServiceName service_name = (hos::GetVersion() >= hos::Version_2_0_0) ? MitmServiceName : DeprecatedMitmServiceName;