public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-devel] [PATCH 1/1] AmpereAltraPkg/FlashLib: Fix kernel crash if not call SetVirtualAddressMap()
@ 2024-08-14  3:22 Nhi Pham via groups.io
  2024-08-29  8:25 ` Chuong Tran
  0 siblings, 1 reply; 5+ messages in thread
From: Nhi Pham via groups.io @ 2024-08-14  3:22 UTC (permalink / raw)
  To: devel; +Cc: quic_llindhol, chuong, rebecca, nhi

From: Chuong Tran <chuong@os.amperecomputing.com>

OS kernel with greater than or equal to 48-bit VA space avoids EFI's
SetVirtualAddressMap() runtime service on Arm64 and simply uses the 1:1
address mapping that UEFI used at booting. However, AmpereAltraPkg's
RuntimeFlashLib replies on function call SetVirtualAddressMap() to
determine whether it is in boot time or run-time. If
SetVirtualAddressMap() has not been called prior, it causes the kernel
crash. This patch fixes that issue by removing the separation between
UEFI boot time and run-time in RuntimeFlashLib.

Signed-off-by: Nhi Pham <nhi@os.amperecomputing.com>
---
 Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c  | 11 +++--------
 Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c |  2 --
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
index 83695c857a11..0b000c2aad46 100644
--- a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
+++ b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
@@ -15,7 +15,6 @@
 
 #include "FlashLibCommon.h"
 
-BOOLEAN                       gFlashLibRuntime = FALSE;
 UINT8                         *gFlashLibPhysicalBuffer;
 UINT8                         *gFlashLibVirtualBuffer;
 
@@ -34,13 +33,9 @@ ConvertToPhysicalBuffer (
   IN UINT32 Size
   )
 {
-  if (gFlashLibRuntime) {
-    ASSERT (VirtualPtr != NULL);
-    CopyMem (gFlashLibVirtualBuffer, VirtualPtr, Size);
-    return gFlashLibPhysicalBuffer;
-  }
-
-  return VirtualPtr;
+  ASSERT (VirtualPtr != NULL);
+  CopyMem (gFlashLibVirtualBuffer, VirtualPtr, Size);
+  return gFlashLibPhysicalBuffer;
 }
 
 /**
diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
index 2dcd13e08146..14cef8e17ece 100644
--- a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
+++ b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
@@ -35,8 +35,6 @@ FlashLibAddressChangeEvent (
 {
   gRT->ConvertPointer (0x0, (VOID **)&gFlashLibVirtualBuffer);
   gRT->ConvertPointer (0x0, (VOID **)&mMmCommunicationProtocol);
-
-  gFlashLibRuntime = TRUE;
 }
 
 /**
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120334): https://edk2.groups.io/g/devel/message/120334
Mute This Topic: https://groups.io/mt/107889187/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [edk2-devel] [PATCH 1/1] AmpereAltraPkg/FlashLib: Fix kernel crash if not call SetVirtualAddressMap()
  2024-08-14  3:22 [edk2-devel] [PATCH 1/1] AmpereAltraPkg/FlashLib: Fix kernel crash if not call SetVirtualAddressMap() Nhi Pham via groups.io
@ 2024-08-29  8:25 ` Chuong Tran
  2024-08-29  8:47   ` Nhi Pham via groups.io
  0 siblings, 1 reply; 5+ messages in thread
From: Chuong Tran @ 2024-08-29  8:25 UTC (permalink / raw)
  To: Nhi Pham, devel; +Cc: quic_llindhol, chuong, rebecca

Acked-by: Chuong Tran <chuong@os.amperecomputing.com>

Thanks,
Chuong

On 8/14/2024 10:22 AM, Nhi Pham wrote:
> From: Chuong Tran <chuong@os.amperecomputing.com>
>
> OS kernel with greater than or equal to 48-bit VA space avoids EFI's
> SetVirtualAddressMap() runtime service on Arm64 and simply uses the 1:1
> address mapping that UEFI used at booting. However, AmpereAltraPkg's
> RuntimeFlashLib replies on function call SetVirtualAddressMap() to
> determine whether it is in boot time or run-time. If
> SetVirtualAddressMap() has not been called prior, it causes the kernel
> crash. This patch fixes that issue by removing the separation between
> UEFI boot time and run-time in RuntimeFlashLib.
>
> Signed-off-by: Nhi Pham <nhi@os.amperecomputing.com>
> ---
>   Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c  | 11 +++--------
>   Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c |  2 --
>   2 files changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
> index 83695c857a11..0b000c2aad46 100644
> --- a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
> +++ b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
> @@ -15,7 +15,6 @@
>   
>   #include "FlashLibCommon.h"
>   
> -BOOLEAN                       gFlashLibRuntime = FALSE;
>   UINT8                         *gFlashLibPhysicalBuffer;
>   UINT8                         *gFlashLibVirtualBuffer;
>   
> @@ -34,13 +33,9 @@ ConvertToPhysicalBuffer (
>     IN UINT32 Size
>     )
>   {
> -  if (gFlashLibRuntime) {
> -    ASSERT (VirtualPtr != NULL);
> -    CopyMem (gFlashLibVirtualBuffer, VirtualPtr, Size);
> -    return gFlashLibPhysicalBuffer;
> -  }
> -
> -  return VirtualPtr;
> +  ASSERT (VirtualPtr != NULL);
> +  CopyMem (gFlashLibVirtualBuffer, VirtualPtr, Size);
> +  return gFlashLibPhysicalBuffer;
>   }
>   
>   /**
> diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
> index 2dcd13e08146..14cef8e17ece 100644
> --- a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
> +++ b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
> @@ -35,8 +35,6 @@ FlashLibAddressChangeEvent (
>   {
>     gRT->ConvertPointer (0x0, (VOID **)&gFlashLibVirtualBuffer);
>     gRT->ConvertPointer (0x0, (VOID **)&mMmCommunicationProtocol);
> -
> -  gFlashLibRuntime = TRUE;
>   }
>   
>   /**



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120480): https://edk2.groups.io/g/devel/message/120480
Mute This Topic: https://groups.io/mt/107889187/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [edk2-devel] [PATCH 1/1] AmpereAltraPkg/FlashLib: Fix kernel crash if not call SetVirtualAddressMap()
  2024-08-29  8:25 ` Chuong Tran
@ 2024-08-29  8:47   ` Nhi Pham via groups.io
  2024-08-29 13:38     ` Ard Biesheuvel via groups.io
  0 siblings, 1 reply; 5+ messages in thread
From: Nhi Pham via groups.io @ 2024-08-29  8:47 UTC (permalink / raw)
  To: Chuong Tran OS, devel@edk2.groups.io
  Cc: quic_llindhol@quicinc.com, Chuong Tran OS, Rebecca  Cran OS

[-- Attachment #1: Type: text/plain, Size: 3507 bytes --]

Pushed as 03d3395552c5

Thanks,
Nhi
________________________________
From: Chuong Tran OS <chuong@amperemail.onmicrosoft.com>
Sent: Thursday, August 29, 2024 3:25 PM
To: Nhi Pham OS <nhi@os.amperecomputing.com>; devel@edk2.groups.io <devel@edk2.groups.io>
Cc: quic_llindhol@quicinc.com <quic_llindhol@quicinc.com>; Chuong Tran OS <chuong@os.amperecomputing.com>; Rebecca Cran OS <rebecca@os.amperecomputing.com>
Subject: Re: [PATCH 1/1] AmpereAltraPkg/FlashLib: Fix kernel crash if not call SetVirtualAddressMap()

Acked-by: Chuong Tran <chuong@os.amperecomputing.com>

Thanks,
Chuong

On 8/14/2024 10:22 AM, Nhi Pham wrote:
> From: Chuong Tran <chuong@os.amperecomputing.com>
>
> OS kernel with greater than or equal to 48-bit VA space avoids EFI's
> SetVirtualAddressMap() runtime service on Arm64 and simply uses the 1:1
> address mapping that UEFI used at booting. However, AmpereAltraPkg's
> RuntimeFlashLib replies on function call SetVirtualAddressMap() to
> determine whether it is in boot time or run-time. If
> SetVirtualAddressMap() has not been called prior, it causes the kernel
> crash. This patch fixes that issue by removing the separation between
> UEFI boot time and run-time in RuntimeFlashLib.
>
> Signed-off-by: Nhi Pham <nhi@os.amperecomputing.com>
> ---
>   Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c  | 11 +++--------
>   Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c |  2 --
>   2 files changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
> index 83695c857a11..0b000c2aad46 100644
> --- a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
> +++ b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
> @@ -15,7 +15,6 @@
>
>   #include "FlashLibCommon.h"
>
> -BOOLEAN                       gFlashLibRuntime = FALSE;
>   UINT8                         *gFlashLibPhysicalBuffer;
>   UINT8                         *gFlashLibVirtualBuffer;
>
> @@ -34,13 +33,9 @@ ConvertToPhysicalBuffer (
>     IN UINT32 Size
>     )
>   {
> -  if (gFlashLibRuntime) {
> -    ASSERT (VirtualPtr != NULL);
> -    CopyMem (gFlashLibVirtualBuffer, VirtualPtr, Size);
> -    return gFlashLibPhysicalBuffer;
> -  }
> -
> -  return VirtualPtr;
> +  ASSERT (VirtualPtr != NULL);
> +  CopyMem (gFlashLibVirtualBuffer, VirtualPtr, Size);
> +  return gFlashLibPhysicalBuffer;
>   }
>
>   /**
> diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
> index 2dcd13e08146..14cef8e17ece 100644
> --- a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
> +++ b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
> @@ -35,8 +35,6 @@ FlashLibAddressChangeEvent (
>   {
>     gRT->ConvertPointer (0x0, (VOID **)&gFlashLibVirtualBuffer);
>     gRT->ConvertPointer (0x0, (VOID **)&mMmCommunicationProtocol);
> -
> -  gFlashLibRuntime = TRUE;
>   }
>
>   /**



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120429): https://edk2.groups.io/g/devel/message/120429
Mute This Topic: https://groups.io/mt/107889187/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



[-- Attachment #2: Type: text/html, Size: 6251 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [edk2-devel] [PATCH 1/1] AmpereAltraPkg/FlashLib: Fix kernel crash if not call SetVirtualAddressMap()
  2024-08-29  8:47   ` Nhi Pham via groups.io
@ 2024-08-29 13:38     ` Ard Biesheuvel via groups.io
  2024-08-30  4:24       ` Nhi Pham via groups.io
  0 siblings, 1 reply; 5+ messages in thread
From: Ard Biesheuvel via groups.io @ 2024-08-29 13:38 UTC (permalink / raw)
  To: devel, nhi
  Cc: Chuong Tran OS, quic_llindhol@quicinc.com, Chuong Tran OS,
	Rebecca Cran OS

On Thu, 29 Aug 2024 at 10:48, Nhi Pham via groups.io
<nhi=os.amperecomputing.com@groups.io> wrote:
>
> Pushed as 03d3395552c5
>

Thanks for finally providing a fix for this!

Is there any way to detect whether a firmware build has this fix?


> ________________________________
> From: Chuong Tran OS <chuong@amperemail.onmicrosoft.com>
> Sent: Thursday, August 29, 2024 3:25 PM
> To: Nhi Pham OS <nhi@os.amperecomputing.com>; devel@edk2.groups.io <devel@edk2.groups.io>
> Cc: quic_llindhol@quicinc.com <quic_llindhol@quicinc.com>; Chuong Tran OS <chuong@os.amperecomputing.com>; Rebecca Cran OS <rebecca@os.amperecomputing.com>
> Subject: Re: [PATCH 1/1] AmpereAltraPkg/FlashLib: Fix kernel crash if not call SetVirtualAddressMap()
>
> Acked-by: Chuong Tran <chuong@os.amperecomputing.com>
>
> Thanks,
> Chuong
>
> On 8/14/2024 10:22 AM, Nhi Pham wrote:
> > From: Chuong Tran <chuong@os.amperecomputing.com>
> >
> > OS kernel with greater than or equal to 48-bit VA space avoids EFI's
> > SetVirtualAddressMap() runtime service on Arm64 and simply uses the 1:1
> > address mapping that UEFI used at booting. However, AmpereAltraPkg's
> > RuntimeFlashLib replies on function call SetVirtualAddressMap() to
> > determine whether it is in boot time or run-time. If
> > SetVirtualAddressMap() has not been called prior, it causes the kernel
> > crash. This patch fixes that issue by removing the separation between
> > UEFI boot time and run-time in RuntimeFlashLib.
> >
> > Signed-off-by: Nhi Pham <nhi@os.amperecomputing.com>
> > ---
> >   Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c  | 11 +++--------
> >   Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c |  2 --
> >   2 files changed, 3 insertions(+), 10 deletions(-)
> >
> > diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
> > index 83695c857a11..0b000c2aad46 100644
> > --- a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
> > +++ b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
> > @@ -15,7 +15,6 @@
> >
> >   #include "FlashLibCommon.h"
> >
> > -BOOLEAN                       gFlashLibRuntime = FALSE;
> >   UINT8                         *gFlashLibPhysicalBuffer;
> >   UINT8                         *gFlashLibVirtualBuffer;
> >
> > @@ -34,13 +33,9 @@ ConvertToPhysicalBuffer (
> >     IN UINT32 Size
> >     )
> >   {
> > -  if (gFlashLibRuntime) {
> > -    ASSERT (VirtualPtr != NULL);
> > -    CopyMem (gFlashLibVirtualBuffer, VirtualPtr, Size);
> > -    return gFlashLibPhysicalBuffer;
> > -  }
> > -
> > -  return VirtualPtr;
> > +  ASSERT (VirtualPtr != NULL);
> > +  CopyMem (gFlashLibVirtualBuffer, VirtualPtr, Size);
> > +  return gFlashLibPhysicalBuffer;
> >   }
> >
> >   /**
> > diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
> > index 2dcd13e08146..14cef8e17ece 100644
> > --- a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
> > +++ b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
> > @@ -35,8 +35,6 @@ FlashLibAddressChangeEvent (
> >   {
> >     gRT->ConvertPointer (0x0, (VOID **)&gFlashLibVirtualBuffer);
> >     gRT->ConvertPointer (0x0, (VOID **)&mMmCommunicationProtocol);
> > -
> > -  gFlashLibRuntime = TRUE;
> >   }
> >
> >   /**
>
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120430): https://edk2.groups.io/g/devel/message/120430
Mute This Topic: https://groups.io/mt/107889187/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [edk2-devel] [PATCH 1/1] AmpereAltraPkg/FlashLib: Fix kernel crash if not call SetVirtualAddressMap()
  2024-08-29 13:38     ` Ard Biesheuvel via groups.io
@ 2024-08-30  4:24       ` Nhi Pham via groups.io
  0 siblings, 0 replies; 5+ messages in thread
From: Nhi Pham via groups.io @ 2024-08-30  4:24 UTC (permalink / raw)
  To: Ard Biesheuvel, devel@edk2.groups.io
  Cc: Chuong Tran OS, quic_llindhol@quicinc.com, Rebecca  Cran OS

[-- Attachment #1: Type: text/plain, Size: 4536 bytes --]

Hi Ard,

AFAIK, the latest Ampere Software Release Package (SRP) release has been already fixed this runtime issue.

Regards,
Nhi
________________________________
From: Ard Biesheuvel <ardb@kernel.org>
Sent: Thursday, August 29, 2024 8:38 PM
To: devel@edk2.groups.io <devel@edk2.groups.io>; Nhi Pham OS <nhi@os.amperecomputing.com>
Cc: Chuong Tran OS <chuong@amperemail.onmicrosoft.com>; quic_llindhol@quicinc.com <quic_llindhol@quicinc.com>; Chuong Tran OS <chuong@os.amperecomputing.com>; Rebecca Cran OS <rebecca@os.amperecomputing.com>
Subject: Re: [edk2-devel] [PATCH 1/1] AmpereAltraPkg/FlashLib: Fix kernel crash if not call SetVirtualAddressMap()

On Thu, 29 Aug 2024 at 10:48, Nhi Pham via groups.io
<nhi=os.amperecomputing.com@groups.io> wrote:
>
> Pushed as 03d3395552c5
>

Thanks for finally providing a fix for this!

Is there any way to detect whether a firmware build has this fix?


> ________________________________
> From: Chuong Tran OS <chuong@amperemail.onmicrosoft.com>
> Sent: Thursday, August 29, 2024 3:25 PM
> To: Nhi Pham OS <nhi@os.amperecomputing.com>; devel@edk2.groups.io <devel@edk2.groups.io>
> Cc: quic_llindhol@quicinc.com <quic_llindhol@quicinc.com>; Chuong Tran OS <chuong@os.amperecomputing.com>; Rebecca Cran OS <rebecca@os.amperecomputing.com>
> Subject: Re: [PATCH 1/1] AmpereAltraPkg/FlashLib: Fix kernel crash if not call SetVirtualAddressMap()
>
> Acked-by: Chuong Tran <chuong@os.amperecomputing.com>
>
> Thanks,
> Chuong
>
> On 8/14/2024 10:22 AM, Nhi Pham wrote:
> > From: Chuong Tran <chuong@os.amperecomputing.com>
> >
> > OS kernel with greater than or equal to 48-bit VA space avoids EFI's
> > SetVirtualAddressMap() runtime service on Arm64 and simply uses the 1:1
> > address mapping that UEFI used at booting. However, AmpereAltraPkg's
> > RuntimeFlashLib replies on function call SetVirtualAddressMap() to
> > determine whether it is in boot time or run-time. If
> > SetVirtualAddressMap() has not been called prior, it causes the kernel
> > crash. This patch fixes that issue by removing the separation between
> > UEFI boot time and run-time in RuntimeFlashLib.
> >
> > Signed-off-by: Nhi Pham <nhi@os.amperecomputing.com>
> > ---
> >   Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c  | 11 +++--------
> >   Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c |  2 --
> >   2 files changed, 3 insertions(+), 10 deletions(-)
> >
> > diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
> > index 83695c857a11..0b000c2aad46 100644
> > --- a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
> > +++ b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/FlashLibCommon.c
> > @@ -15,7 +15,6 @@
> >
> >   #include "FlashLibCommon.h"
> >
> > -BOOLEAN                       gFlashLibRuntime = FALSE;
> >   UINT8                         *gFlashLibPhysicalBuffer;
> >   UINT8                         *gFlashLibVirtualBuffer;
> >
> > @@ -34,13 +33,9 @@ ConvertToPhysicalBuffer (
> >     IN UINT32 Size
> >     )
> >   {
> > -  if (gFlashLibRuntime) {
> > -    ASSERT (VirtualPtr != NULL);
> > -    CopyMem (gFlashLibVirtualBuffer, VirtualPtr, Size);
> > -    return gFlashLibPhysicalBuffer;
> > -  }
> > -
> > -  return VirtualPtr;
> > +  ASSERT (VirtualPtr != NULL);
> > +  CopyMem (gFlashLibVirtualBuffer, VirtualPtr, Size);
> > +  return gFlashLibPhysicalBuffer;
> >   }
> >
> >   /**
> > diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
> > index 2dcd13e08146..14cef8e17ece 100644
> > --- a/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
> > +++ b/Silicon/Ampere/AmpereAltraPkg/Library/FlashLib/RuntimeFlashLib.c
> > @@ -35,8 +35,6 @@ FlashLibAddressChangeEvent (
> >   {
> >     gRT->ConvertPointer (0x0, (VOID **)&gFlashLibVirtualBuffer);
> >     gRT->ConvertPointer (0x0, (VOID **)&mMmCommunicationProtocol);
> > -
> > -  gFlashLibRuntime = TRUE;
> >   }
> >
> >   /**
>
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120441): https://edk2.groups.io/g/devel/message/120441
Mute This Topic: https://groups.io/mt/107889187/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



[-- Attachment #2: Type: text/html, Size: 7815 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-09-03 18:04 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-14  3:22 [edk2-devel] [PATCH 1/1] AmpereAltraPkg/FlashLib: Fix kernel crash if not call SetVirtualAddressMap() Nhi Pham via groups.io
2024-08-29  8:25 ` Chuong Tran
2024-08-29  8:47   ` Nhi Pham via groups.io
2024-08-29 13:38     ` Ard Biesheuvel via groups.io
2024-08-30  4:24       ` Nhi Pham via groups.io

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox