[nrf noup] Moved putting QSPI to sleep after OTA requestor init

Fixed bug observed on nRF53 SED that ends with assert due to not initialized QSPI during OTA Requestor init.
markaj-nordic · Jun 6, 2022 · a79fe42 · a79fe42
1 parent 4f5cc99
commit a79fe42
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 51 deletions.
diff --git a/src/platform/nrfconnect/OTAImageProcessorImpl.cpp b/src/platform/nrfconnect/OTAImageProcessorImpl.cpp
@@ -36,6 +36,8 @@ CHIP_ERROR OTAImageProcessorImpl::PrepareDownload()
 {
     VerifyOrReturnError(mDownloader != nullptr, CHIP_ERROR_INCORRECT_STATE);
 
+    TriggerFlashAction(FlashHandler::Action::WAKE_UP);
+
     return DeviceLayer::SystemLayer().ScheduleLambda([this] { mDownloader->OnPreparedForDownload(PrepareDownloadImpl()); });
 }
 
@@ -55,7 +57,10 @@ CHIP_ERROR OTAImageProcessorImpl::Finalize()
 
 CHIP_ERROR OTAImageProcessorImpl::Abort()
 {
-    return System::MapErrorZephyr(dfu_target_reset());
+    CHIP_ERROR error = System::MapErrorZephyr(dfu_target_reset());
+
+    TriggerFlashAction(FlashHandler::Action::SLEEP);
+    return error;
 }
 
 CHIP_ERROR OTAImageProcessorImpl::Apply()
@@ -67,6 +72,8 @@ CHIP_ERROR OTAImageProcessorImpl::Apply()
         err = dfu_target_schedule_update(-1);
     }
 
+    TriggerFlashAction(FlashHandler::Action::SLEEP);
+
 #ifdef CONFIG_CHIP_OTA_REQUESTOR_REBOOT_ON_APPLY
     if (!err)
     {
@@ -206,8 +213,16 @@ CHIP_ERROR OTAImageProcessorImpl::ProcessHeader(ByteSpan & aBlock)
     return CHIP_NO_ERROR;
 }
 
+void OTAImageProcessorImpl::TriggerFlashAction(FlashHandler::Action action)
+{
+    if (mFlashHandler)
+    {
+        mFlashHandler->DoAction(action);
+    }
+}
+
 // external flash power consumption optimization
-void ExtFlashHandler::DoAction(Action aAction)
+void FlashHandler::DoAction(Action aAction)
 {
 #if CONFIG_PM_DEVICE && CONFIG_NORDIC_QSPI_NOR && !CONFIG_SOC_NRF52840 // nRF52 is optimized per default
     // utilize the QSPI driver sleep power mode
@@ -220,30 +235,5 @@ void ExtFlashHandler::DoAction(Action aAction)
 #endif
 }
 
-OTAImageProcessorImplPMDevice::OTAImageProcessorImplPMDevice(ExtFlashHandler & aHandler) : mHandler(aHandler)
-{
-    mHandler.DoAction(ExtFlashHandler::Action::SLEEP);
-}
-
-CHIP_ERROR OTAImageProcessorImplPMDevice::PrepareDownload()
-{
-    mHandler.DoAction(ExtFlashHandler::Action::WAKE_UP);
-    return OTAImageProcessorImpl::PrepareDownload();
-}
-
-CHIP_ERROR OTAImageProcessorImplPMDevice::Abort()
-{
-    auto status = OTAImageProcessorImpl::Abort();
-    mHandler.DoAction(ExtFlashHandler::Action::SLEEP);
-    return status;
-}
-
-CHIP_ERROR OTAImageProcessorImplPMDevice::Apply()
-{
-    auto status = OTAImageProcessorImpl::Apply();
-    mHandler.DoAction(ExtFlashHandler::Action::SLEEP);
-    return status;
-}
-
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/nrfconnect/OTAImageProcessorImpl.h b/src/platform/nrfconnect/OTAImageProcessorImpl.h
@@ -27,11 +27,25 @@ class OTADownloader;
 
 namespace DeviceLayer {
 
+class FlashHandler
+{
+public:
+    enum class Action : uint8_t
+    {
+        WAKE_UP,
+        SLEEP
+    };
+    virtual ~FlashHandler() {}
+    virtual void DoAction(Action aAction);
+};
+
 class OTAImageProcessorImpl : public OTAImageProcessorInterface
 {
 public:
     static constexpr size_t kBufferSize = CONFIG_CHIP_OTA_REQUESTOR_BUFFER_SIZE;
 
+    OTAImageProcessorImpl(FlashHandler * flashHandler = nullptr) : mFlashHandler(flashHandler){};
+
     enum class ImageType : uint8_t
     {
         kAppImage = 0,
@@ -54,6 +68,7 @@ class OTAImageProcessorImpl : public OTAImageProcessorInterface
     CHIP_ERROR ProcessBlock(ByteSpan & aBlock) override;
     bool IsFirstImageRun() override;
     CHIP_ERROR ConfirmCurrentImage() override;
+    void TriggerFlashAction(FlashHandler::Action action);
 
 private:
     CHIP_ERROR PrepareDownloadImpl();
@@ -66,30 +81,7 @@ class OTAImageProcessorImpl : public OTAImageProcessorInterface
     uint8_t mBuffer[kBufferSize];
     OTAImageContentHeader mContentHeader;
     OTAImage mCurrentImage;
-};
-
-class ExtFlashHandler
-{
-public:
-    enum class Action : uint8_t
-    {
-        WAKE_UP,
-        SLEEP
-    };
-    virtual ~ExtFlashHandler() {}
-    virtual void DoAction(Action aAction);
-};
-
-class OTAImageProcessorImplPMDevice : public OTAImageProcessorImpl
-{
-public:
-    explicit OTAImageProcessorImplPMDevice(ExtFlashHandler & aHandler);
-    CHIP_ERROR PrepareDownload() override;
-    CHIP_ERROR Abort() override;
-    CHIP_ERROR Apply() override;
-
-private:
-    ExtFlashHandler & mHandler;
+    FlashHandler * mFlashHandler;
 };
 
 } // namespace DeviceLayer