Re: [edk2] [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function
Sorry, I am not familiar with EBC. I only keep the original logic of it.
Thanks,
Zhichao
> -Original Message-
> From: Ard Biesheuvel [mailto:ard.biesheu...@linaro.org]
> Sent: Monday, March 25, 2019 4:26 PM
> To: Gao, Zhichao
> Cc: edk2-devel@lists.01.org; Wang, Jian J ; Wu, Hao
> A ; Ni, Ray ; Zeng, Star
> ; Gao, Liming
> Subject: Re: [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add
> cache flush function
>
> On Fri, 22 Mar 2019 at 04:09, Zhichao Gao wrote:
> >
> > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1462
> >
> > The IA32 ARCH need cache flush function during capsule update.
> > Both arm ARCH and IA32 do not need flush cache function, so merge the
> > CapsuleCacheWriteBack() to one file. And add a null version for EBC.
> >
>
> What is the point of being able to build a DXE_RUNTIME_DRIVER module for
> EBC?
>
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Zhichao Gao
> > Cc: Jian J Wang
> > Cc: Hao Wu
> > Cc: Ray Ni
> > Cc: Star Zeng
> > Cc: Liming Gao
> > Cc: Ard Biesheuvel
> > ---
> > .../Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c | 35 +---
> > .../Universal/CapsuleRuntimeDxe/CapsuleCache.c | 63
> ++
> > .../Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c | 38
> +
> > .../Universal/CapsuleRuntimeDxe/CapsuleReset.c | 16 +-
> > .../CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf| 20 ---
> > 5 files changed, 115 insertions(+), 57 deletions(-)
> > create mode 100644
> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
> > create mode 100644
> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c
> >
> > diff --git
> a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
> b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
> > index d79d2fc693..ec630ab7a8 100644
> > --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
> > +++
> b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
> > @@ -3,6 +3,7 @@
> >PersistAcrossReset capsules
> >
> >Copyright (c) 2018, Linaro, Ltd. All rights reserved.
> > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> >
> >This program and the accompanying materials are licensed and made
> available
> >under the terms and conditions of the BSD License which accompanies
> this
> > @@ -16,8 +17,6 @@
> >
> > #include "CapsuleService.h"
> >
> > -#include
> > -
> > /**
> >Whether the platform supports capsules that persist across reset. Note
> that
> >some platforms only support such capsules at boot time.
> > @@ -41,35 +40,3 @@ IsPersistAcrossResetCapsuleSupported (
> >return FeaturePcdGet (PcdSupportUpdateCapsuleReset)
> && !EfiAtRuntime ();
> > }
> >
> > -/**
> > - Writes Back a range of data cache lines covering a set of capsules in
> memory.
> > -
> > - Writes Back the data cache lines specified by ScatterGatherList.
> > -
> > - @param ScatterGatherList Physical address of the data structure that
> > -describes a set of capsules in memory
> > -
> > -**/
> > -VOID
> > -CapsuleCacheWriteBack (
> > - IN EFI_PHYSICAL_ADDRESSScatterGatherList
> > - )
> > -{
> > - EFI_CAPSULE_BLOCK_DESCRIPTOR*Desc;
> > -
> > - Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)ScatterGatherList;
> > - do {
> > -WriteBackDataCacheRange (Desc, sizeof *Desc);
> > -
> > -if (Desc->Length > 0) {
> > - WriteBackDataCacheRange ((VOID *)(UINTN)Desc->Union.DataBlock,
> > - Desc->Length
> > - );
> > - Desc++;
> > -} else if (Desc->Union.ContinuationPointer > 0) {
> > - Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)Desc-
> >Union.ContinuationPointer;
> > -}
> > - } while (Desc->Length > 0 || Desc->Union.ContinuationPointer > 0);
> > -
> > - WriteBackDataCacheRange (Desc, sizeof *Desc);
> > -}
> > diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
> b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
> > new file mode 100644
> > index 00..ab81296a65
> > --- /dev/null
> > +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
> > @@ -0,0 +1,63 @@
> > +/** @file
> > + Flush the cache is required for most architectures while do capsule
> > + update. It is not support at Runtime.
> > +
> > + Copyright (c) 2018, Linaro, Ltd. All rights reserved.
> > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> > +
> > + This program and the accompanying materials are licensed and made
> available
> > + under the terms and conditions of the BSD License which accompanies
> this
> > + distribution. The full text of the license may be found at
> > + http://opensource.org/licenses/bsd-license.php
> > +
> > + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> > + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> > +
> > +**/
> > +
> > +#include "CapsuleServ
Re: [edk2] [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function
On Fri, 22 Mar 2019 at 04:09, Zhichao Gao wrote:
>
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1462
>
> The IA32 ARCH need cache flush function during capsule update.
> Both arm ARCH and IA32 do not need flush cache function, so
> merge the CapsuleCacheWriteBack() to one file. And add a null
> version for EBC.
>
What is the point of being able to build a DXE_RUNTIME_DRIVER module for EBC?
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Zhichao Gao
> Cc: Jian J Wang
> Cc: Hao Wu
> Cc: Ray Ni
> Cc: Star Zeng
> Cc: Liming Gao
> Cc: Ard Biesheuvel
> ---
> .../Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c | 35 +---
> .../Universal/CapsuleRuntimeDxe/CapsuleCache.c | 63
> ++
> .../Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c | 38 +
> .../Universal/CapsuleRuntimeDxe/CapsuleReset.c | 16 +-
> .../CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf| 20 ---
> 5 files changed, 115 insertions(+), 57 deletions(-)
> create mode 100644 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
> create mode 100644
> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c
>
> diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
> b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
> index d79d2fc693..ec630ab7a8 100644
> --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
> +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
> @@ -3,6 +3,7 @@
>PersistAcrossReset capsules
>
>Copyright (c) 2018, Linaro, Ltd. All rights reserved.
> + Copyright (c) 2019, Intel Corporation. All rights reserved.
>
>This program and the accompanying materials are licensed and made available
>under the terms and conditions of the BSD License which accompanies this
> @@ -16,8 +17,6 @@
>
> #include "CapsuleService.h"
>
> -#include
> -
> /**
>Whether the platform supports capsules that persist across reset. Note that
>some platforms only support such capsules at boot time.
> @@ -41,35 +40,3 @@ IsPersistAcrossResetCapsuleSupported (
>return FeaturePcdGet (PcdSupportUpdateCapsuleReset) && !EfiAtRuntime ();
> }
>
> -/**
> - Writes Back a range of data cache lines covering a set of capsules in
> memory.
> -
> - Writes Back the data cache lines specified by ScatterGatherList.
> -
> - @param ScatterGatherList Physical address of the data structure that
> -describes a set of capsules in memory
> -
> -**/
> -VOID
> -CapsuleCacheWriteBack (
> - IN EFI_PHYSICAL_ADDRESSScatterGatherList
> - )
> -{
> - EFI_CAPSULE_BLOCK_DESCRIPTOR*Desc;
> -
> - Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)ScatterGatherList;
> - do {
> -WriteBackDataCacheRange (Desc, sizeof *Desc);
> -
> -if (Desc->Length > 0) {
> - WriteBackDataCacheRange ((VOID *)(UINTN)Desc->Union.DataBlock,
> - Desc->Length
> - );
> - Desc++;
> -} else if (Desc->Union.ContinuationPointer > 0) {
> - Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR
> *)(UINTN)Desc->Union.ContinuationPointer;
> -}
> - } while (Desc->Length > 0 || Desc->Union.ContinuationPointer > 0);
> -
> - WriteBackDataCacheRange (Desc, sizeof *Desc);
> -}
> diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
> b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
> new file mode 100644
> index 00..ab81296a65
> --- /dev/null
> +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
> @@ -0,0 +1,63 @@
> +/** @file
> + Flush the cache is required for most architectures while do capsule
> + update. It is not support at Runtime.
> +
> + Copyright (c) 2018, Linaro, Ltd. All rights reserved.
> + Copyright (c) 2019, Intel Corporation. All rights reserved.
> +
> + This program and the accompanying materials are licensed and made available
> + under the terms and conditions of the BSD License which accompanies this
> + distribution. The full text of the license may be found at
> + http://opensource.org/licenses/bsd-license.php
> +
> + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +
> +**/
> +
> +#include "CapsuleService.h"
> +
> +#include
> +
> +/**
> + Writes Back a range of data cache lines covering a set of capsules in
> memory.
> +
> + Writes Back the data cache lines specified by ScatterGatherList.
> +
> + @param ScatterGatherList Physical address of the data structure that
> +describes a set of capsules in memory
> +
> +**/
> +VOID
> +CapsuleCacheWriteBack (
> + IN EFI_PHYSICAL_ADDRESSScatterGatherList
> + )
> +{
> + EFI_CAPSULE_BLOCK_DESCRIPTOR*Desc;
> +
> + if (!EfiAtRuntime ()) {
> +Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)ScatterGatherList;
> +do {
> + WriteBackDataCacheRange (
> +(VOID *)(
Re: [edk2] [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function
Liming,
Both IA32 and X64 ARCH need flush function. My fault to use IA32 to represent
the X86 and X64 ARCH.
I will clarify it in the commit message later.
Thanks,
Zhichao
> -Original Message-
> From: Gao, Liming
> Sent: Monday, March 25, 2019 2:59 PM
> To: Gao, Zhichao ; edk2-devel@lists.01.org
> Cc: Wang, Jian J ; Wu, Hao A ;
> Ni, Ray ; Zeng, Star ; Ard
> Biesheuvel
> Subject: RE: [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add
> cache flush function
>
> Zhichao:
> Could you help clarify the commit message? Does IA32 and X64 Arch
> implementation need flush function or not?
>
> >The IA32 ARCH need cache flush function during capsule update.
> >Both arm ARCH and IA32 do not need flush cache function,
>
> Thanks
> Liming
> >-Original Message-
> >From: Gao, Zhichao
> >Sent: Friday, March 22, 2019 11:07 AM
> >To: edk2-devel@lists.01.org
> >Cc: Wang, Jian J ; Wu, Hao A
> >; Ni, Ray ; Zeng, Star
> >; Gao, Liming ; Ard
> >Biesheuvel
> >Subject: [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add
> cache
> >flush function
> >
> >BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1462
> >
> >The IA32 ARCH need cache flush function during capsule update.
> >Both arm ARCH and IA32 do not need flush cache function, so merge the
> >CapsuleCacheWriteBack() to one file. And add a null version for EBC.
> >
> >Contributed-under: TianoCore Contribution Agreement 1.1
> >Signed-off-by: Zhichao Gao
> >Cc: Jian J Wang
> >Cc: Hao Wu
> >Cc: Ray Ni
> >Cc: Star Zeng
> >Cc: Liming Gao
> >Cc: Ard Biesheuvel
> >---
> > .../Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c | 35 +---
> > .../Universal/CapsuleRuntimeDxe/CapsuleCache.c | 63
> >++
> > .../Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c | 38
> +
> > .../Universal/CapsuleRuntimeDxe/CapsuleReset.c | 16 +-
> > .../CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf| 20 ---
> > 5 files changed, 115 insertions(+), 57 deletions(-) create mode
> >100644 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
> > create mode 100644
> >MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c
> >
> >diff --git
> >a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
> >b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
> >index d79d2fc693..ec630ab7a8 100644
> >--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
> >+++
> b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
> >@@ -3,6 +3,7 @@
> > PersistAcrossReset capsules
> >
> > Copyright (c) 2018, Linaro, Ltd. All rights reserved.
> >+ Copyright (c) 2019, Intel Corporation. All rights reserved.
> >
> > This program and the accompanying materials are licensed and made
> >available
> > under the terms and conditions of the BSD License which accompanies
> >this @@ -16,8 +17,6 @@
> >
> > #include "CapsuleService.h"
> >
> >-#include
> >-
> > /**
> > Whether the platform supports capsules that persist across reset. Note
> that
> > some platforms only support such capsules at boot time.
> >@@ -41,35 +40,3 @@ IsPersistAcrossResetCapsuleSupported (
> > return FeaturePcdGet (PcdSupportUpdateCapsuleReset)
> && !EfiAtRuntime
> >(); }
> >
> >-/**
> >- Writes Back a range of data cache lines covering a set of capsules in
> memory.
> >-
> >- Writes Back the data cache lines specified by ScatterGatherList.
> >-
> >- @param ScatterGatherList Physical address of the data structure that
> >-describes a set of capsules in memory
> >-
> >-**/
> >-VOID
> >-CapsuleCacheWriteBack (
> >- IN EFI_PHYSICAL_ADDRESSScatterGatherList
> >- )
> >-{
> >- EFI_CAPSULE_BLOCK_DESCRIPTOR*Desc;
> >-
> >- Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)ScatterGatherList;
> >- do {
> >-WriteBackDataCacheRange (Desc, sizeof *Desc);
> >-
> >-if (Desc->Length > 0) {
> >- WriteBackDataCacheRange ((VOID *)(UINTN)Desc->Union.DataBlock,
> >- Desc->Length
> >- );
> >- Desc++;
> >-} else if (Desc->Union.ContinuationPointer > 0) {
> >- Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)Desc-
> >>Union.ContinuationPointer;
> >-}
> >- } while (Desc->Length > 0 || Desc->Union.ContinuationPointer > 0);
> >-
> >- WriteBackDataCacheRange (Desc, sizeof *Desc); -} diff --git
> >a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
> >b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
> >new file mode 100644
> >index 00..ab81296a65
> >--- /dev/null
> >+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
> >@@ -0,0 +1,63 @@
> >+/** @file
> >+ Flush the cache is required for most architectures while do capsule
> >+ update. It is not support at Runtime.
> >+
> >+ Copyright (c) 2018, Linaro, Ltd. All rights reserved. Copyright
> >+ (c) 2019, Intel Corporation. All rights reserved.
> >+
> >+ This program and the accompanying materials are licensed and made
> >available
> >+ und
Re: [edk2] [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function
Zhichao:
Could you help clarify the commit message? Does IA32 and X64 Arch
implementation need flush function or not?
>The IA32 ARCH need cache flush function during capsule update.
>Both arm ARCH and IA32 do not need flush cache function,
Thanks
Liming
>-Original Message-
>From: Gao, Zhichao
>Sent: Friday, March 22, 2019 11:07 AM
>To: edk2-devel@lists.01.org
>Cc: Wang, Jian J ; Wu, Hao A ;
>Ni, Ray ; Zeng, Star ; Gao, Liming
>; Ard Biesheuvel
>Subject: [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache
>flush function
>
>BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1462
>
>The IA32 ARCH need cache flush function during capsule update.
>Both arm ARCH and IA32 do not need flush cache function, so
>merge the CapsuleCacheWriteBack() to one file. And add a null
>version for EBC.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Zhichao Gao
>Cc: Jian J Wang
>Cc: Hao Wu
>Cc: Ray Ni
>Cc: Star Zeng
>Cc: Liming Gao
>Cc: Ard Biesheuvel
>---
> .../Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c | 35 +---
> .../Universal/CapsuleRuntimeDxe/CapsuleCache.c | 63
>++
> .../Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c | 38 +
> .../Universal/CapsuleRuntimeDxe/CapsuleReset.c | 16 +-
> .../CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf| 20 ---
> 5 files changed, 115 insertions(+), 57 deletions(-)
> create mode 100644
>MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
> create mode 100644
>MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c
>
>diff --git
>a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
>b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
>index d79d2fc693..ec630ab7a8 100644
>--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
>+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
>@@ -3,6 +3,7 @@
> PersistAcrossReset capsules
>
> Copyright (c) 2018, Linaro, Ltd. All rights reserved.
>+ Copyright (c) 2019, Intel Corporation. All rights reserved.
>
> This program and the accompanying materials are licensed and made
>available
> under the terms and conditions of the BSD License which accompanies this
>@@ -16,8 +17,6 @@
>
> #include "CapsuleService.h"
>
>-#include
>-
> /**
> Whether the platform supports capsules that persist across reset. Note that
> some platforms only support such capsules at boot time.
>@@ -41,35 +40,3 @@ IsPersistAcrossResetCapsuleSupported (
> return FeaturePcdGet (PcdSupportUpdateCapsuleReset) && !EfiAtRuntime
>();
> }
>
>-/**
>- Writes Back a range of data cache lines covering a set of capsules in
>memory.
>-
>- Writes Back the data cache lines specified by ScatterGatherList.
>-
>- @param ScatterGatherList Physical address of the data structure that
>-describes a set of capsules in memory
>-
>-**/
>-VOID
>-CapsuleCacheWriteBack (
>- IN EFI_PHYSICAL_ADDRESSScatterGatherList
>- )
>-{
>- EFI_CAPSULE_BLOCK_DESCRIPTOR*Desc;
>-
>- Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)ScatterGatherList;
>- do {
>-WriteBackDataCacheRange (Desc, sizeof *Desc);
>-
>-if (Desc->Length > 0) {
>- WriteBackDataCacheRange ((VOID *)(UINTN)Desc->Union.DataBlock,
>- Desc->Length
>- );
>- Desc++;
>-} else if (Desc->Union.ContinuationPointer > 0) {
>- Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)Desc-
>>Union.ContinuationPointer;
>-}
>- } while (Desc->Length > 0 || Desc->Union.ContinuationPointer > 0);
>-
>- WriteBackDataCacheRange (Desc, sizeof *Desc);
>-}
>diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
>b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
>new file mode 100644
>index 00..ab81296a65
>--- /dev/null
>+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
>@@ -0,0 +1,63 @@
>+/** @file
>+ Flush the cache is required for most architectures while do capsule
>+ update. It is not support at Runtime.
>+
>+ Copyright (c) 2018, Linaro, Ltd. All rights reserved.
>+ Copyright (c) 2019, Intel Corporation. All rights reserved.
>+
>+ This program and the accompanying materials are licensed and made
>available
>+ under the terms and conditions of the BSD License which accompanies this
>+ distribution. The full text of the license may be found at
>+ http://opensource.org/licenses/bsd-license.php
>+
>+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
>BASIS,
>+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
>EXPRESS OR IMPLIED.
>+
>+**/
>+
>+#include "CapsuleService.h"
>+
>+#include
>+
>+/**
>+ Writes Back a range of data cache lines covering a set of capsules in
>memory.
>+
>+ Writes Back the data cache lines specified by ScatterGatherList.
>+
>+ @param ScatterGatherList Physical address of the data structure that
>+describes a set of capsules in memory
>+
>+**/
>+VOID
>+C
[edk2] [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1462
The IA32 ARCH need cache flush function during capsule update.
Both arm ARCH and IA32 do not need flush cache function, so
merge the CapsuleCacheWriteBack() to one file. And add a null
version for EBC.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao
Cc: Jian J Wang
Cc: Hao Wu
Cc: Ray Ni
Cc: Star Zeng
Cc: Liming Gao
Cc: Ard Biesheuvel
---
.../Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c | 35 +---
.../Universal/CapsuleRuntimeDxe/CapsuleCache.c | 63 ++
.../Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c | 38 +
.../Universal/CapsuleRuntimeDxe/CapsuleReset.c | 16 +-
.../CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf| 20 ---
5 files changed, 115 insertions(+), 57 deletions(-)
create mode 100644 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
create mode 100644 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
index d79d2fc693..ec630ab7a8 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c
@@ -3,6 +3,7 @@
PersistAcrossReset capsules
Copyright (c) 2018, Linaro, Ltd. All rights reserved.
+ Copyright (c) 2019, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
@@ -16,8 +17,6 @@
#include "CapsuleService.h"
-#include
-
/**
Whether the platform supports capsules that persist across reset. Note that
some platforms only support such capsules at boot time.
@@ -41,35 +40,3 @@ IsPersistAcrossResetCapsuleSupported (
return FeaturePcdGet (PcdSupportUpdateCapsuleReset) && !EfiAtRuntime ();
}
-/**
- Writes Back a range of data cache lines covering a set of capsules in memory.
-
- Writes Back the data cache lines specified by ScatterGatherList.
-
- @param ScatterGatherList Physical address of the data structure that
-describes a set of capsules in memory
-
-**/
-VOID
-CapsuleCacheWriteBack (
- IN EFI_PHYSICAL_ADDRESSScatterGatherList
- )
-{
- EFI_CAPSULE_BLOCK_DESCRIPTOR*Desc;
-
- Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)ScatterGatherList;
- do {
-WriteBackDataCacheRange (Desc, sizeof *Desc);
-
-if (Desc->Length > 0) {
- WriteBackDataCacheRange ((VOID *)(UINTN)Desc->Union.DataBlock,
- Desc->Length
- );
- Desc++;
-} else if (Desc->Union.ContinuationPointer > 0) {
- Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR
*)(UINTN)Desc->Union.ContinuationPointer;
-}
- } while (Desc->Length > 0 || Desc->Union.ContinuationPointer > 0);
-
- WriteBackDataCacheRange (Desc, sizeof *Desc);
-}
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
new file mode 100644
index 00..ab81296a65
--- /dev/null
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
@@ -0,0 +1,63 @@
+/** @file
+ Flush the cache is required for most architectures while do capsule
+ update. It is not support at Runtime.
+
+ Copyright (c) 2018, Linaro, Ltd. All rights reserved.
+ Copyright (c) 2019, Intel Corporation. All rights reserved.
+
+ This program and the accompanying materials are licensed and made available
+ under the terms and conditions of the BSD License which accompanies this
+ distribution. The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include "CapsuleService.h"
+
+#include
+
+/**
+ Writes Back a range of data cache lines covering a set of capsules in memory.
+
+ Writes Back the data cache lines specified by ScatterGatherList.
+
+ @param ScatterGatherList Physical address of the data structure that
+describes a set of capsules in memory
+
+**/
+VOID
+CapsuleCacheWriteBack (
+ IN EFI_PHYSICAL_ADDRESSScatterGatherList
+ )
+{
+ EFI_CAPSULE_BLOCK_DESCRIPTOR*Desc;
+
+ if (!EfiAtRuntime ()) {
+Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)ScatterGatherList;
+do {
+ WriteBackDataCacheRange (
+(VOID *)(UINTN)Desc,
+(UINTN)sizeof (*Desc)
+);
+
+ if (Desc->Length > 0) {
+WriteBackDataCacheRange (
+ (VOID *)(UINTN)Desc->Union.DataBlock,
+ (UINTN)Desc->Length
+ );
+Desc++;
+ } else if (Desc->Union.ContinuationPointer > 0) {
+Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR
*)(UINTN)Desc->Union.ContinuationPointer;
+ }
+} whil
