[edk2-platforms][PATCH 1/1] Platform/RaspberryPi: Fix Linux kernel panic on reset/poweroff

[edk2-platforms][PATCH 1/1] Platform/RaspberryPi: Fix Linux kernel panic on reset/poweroff

[Pete Batard]

Commit 94e9fba43d7e132be3c582c676968a7f408072c1 introduced an unconditional
call to PcdGet32 after we exit boot services, that produces a kernel panic
on Linux reset.

This addendum to the previous commit ensures that we only read the PCD and
apply the delay while we are still in UEFI, which is what we want anyway as
the goal was to fix the storage of NV variables set by the user from within
the UEFI firmware interface.

Signed-off-by: Pete Batard <pete@akeo.ie>
---
 Platform/RaspberryPi/Library/ResetLib/ResetLib.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Platform/RaspberryPi/Library/ResetLib/ResetLib.c b/Platform/RaspberryPi/Library/ResetLib/ResetLib.c
index 4a50166dd63b..a70eee485ddf 100644
--- a/Platform/RaspberryPi/Library/ResetLib/ResetLib.c
+++ b/Platform/RaspberryPi/Library/ResetLib/ResetLib.c
@@ -52,13 +52,13 @@ LibResetSystem (
      * Only if still in UEFI.
      */
     EfiEventGroupSignal (&gRaspberryPiEventResetGuid);
-  }
 
-  Delay = PcdGet32 (PcdPlatformResetDelay);
-  if (Delay != 0) {
-    DEBUG ((DEBUG_INFO, "Platform will be reset in %d.%d seconds...\n",
-            Delay / 1000000, (Delay % 1000000) / 100000));
-    MicroSecondDelay (Delay);
+    Delay = PcdGet32 (PcdPlatformResetDelay);
+    if (Delay != 0) {
+      DEBUG ((DEBUG_INFO, "Platform will be reset in %d.%d seconds...\n",
+              Delay / 1000000, (Delay % 1000000) / 100000));
+      MicroSecondDelay (Delay);
+    }
   }
   DEBUG ((DEBUG_INFO, "Platform %a.\n",
           (ResetType == EfiResetShutdown) ? "shutdown" : "reset"));
-- 
2.29.2.windows.2

Re: [edk2-platforms][PATCH 1/1] Platform/RaspberryPi: Fix Linux kernel panic on reset/poweroff

[Ard Biesheuvel]

On 1/5/21 3:09 PM, Pete Batard wrote:
> Commit 94e9fba43d7e132be3c582c676968a7f408072c1 introduced an unconditional
> call to PcdGet32 after we exit boot services, that produces a kernel panic
> on Linux reset.
> 
> This addendum to the previous commit ensures that we only read the PCD and
> apply the delay while we are still in UEFI, which is what we want anyway as
> the goal was to fix the storage of NV variables set by the user from within
> the UEFI firmware interface.
> 
> Signed-off-by: Pete Batard <pete@akeo.ie>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

Pushed as 162f4a41a860..ae6c236e7610

Thanks Pete.

> ---
>  Platform/RaspberryPi/Library/ResetLib/ResetLib.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/Platform/RaspberryPi/Library/ResetLib/ResetLib.c b/Platform/RaspberryPi/Library/ResetLib/ResetLib.c
> index 4a50166dd63b..a70eee485ddf 100644
> --- a/Platform/RaspberryPi/Library/ResetLib/ResetLib.c
> +++ b/Platform/RaspberryPi/Library/ResetLib/ResetLib.c
> @@ -52,13 +52,13 @@ LibResetSystem (
>       * Only if still in UEFI.
>       */
>      EfiEventGroupSignal (&gRaspberryPiEventResetGuid);
> -  }
>  
> -  Delay = PcdGet32 (PcdPlatformResetDelay);
> -  if (Delay != 0) {
> -    DEBUG ((DEBUG_INFO, "Platform will be reset in %d.%d seconds...\n",
> -            Delay / 1000000, (Delay % 1000000) / 100000));
> -    MicroSecondDelay (Delay);
> +    Delay = PcdGet32 (PcdPlatformResetDelay);
> +    if (Delay != 0) {
> +      DEBUG ((DEBUG_INFO, "Platform will be reset in %d.%d seconds...\n",
> +              Delay / 1000000, (Delay % 1000000) / 100000));
> +      MicroSecondDelay (Delay);
> +    }
>    }
>    DEBUG ((DEBUG_INFO, "Platform %a.\n",
>            (ResetType == EfiResetShutdown) ? "shutdown" : "reset"));
>