* [PATCH V2 0/2] Change reset logic related on capsule
@ 2019-03-22 3:07 Zhichao Gao
2019-03-22 3:07 ` [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function Zhichao Gao
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Zhichao Gao @ 2019-03-22 3:07 UTC (permalink / raw)
To: edk2-devel
Cc: Jian J Wang, Hao Wu, Ray Ni, Star Zeng, Liming Gao,
Ard Biesheuvel
Add CapsuleCacheWriteBack for IA ARCH before runtime.
Remove DoS3 in ResetSystemRuntimeDxe.
V2:
Adjust the code that would not change the logic of arm ARCH.
Fix some build errors because of type convertion.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Zhichao Gao (2):
MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function
MdeModulePkg/ResetSystemRuntimeDxe: Remove DoS3 in warm reset
.../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 ++++---
.../Universal/ResetSystemRuntimeDxe/ResetSystem.c | 38 -------------
6 files changed, 115 insertions(+), 95 deletions(-)
create mode 100644 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c
create mode 100644 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c
--
2.16.2.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function 2019-03-22 3:07 [PATCH V2 0/2] Change reset logic related on capsule Zhichao Gao @ 2019-03-22 3:07 ` Zhichao Gao 2019-03-25 6:59 ` Gao, Liming 2019-03-25 8:25 ` Ard Biesheuvel 2019-03-22 3:07 ` [PATCH V2 2/2] MdeModulePkg/ResetSystemRuntimeDxe: Remove DoS3 in warm reset Zhichao Gao 2019-03-29 12:01 ` [PATCH V2 0/2] Change reset logic related on capsule Gao, Liming 2 siblings, 2 replies; 8+ messages in thread From: Zhichao Gao @ 2019-03-22 3:07 UTC (permalink / raw) To: edk2-devel Cc: Jian J Wang, Hao Wu, Ray Ni, Star Zeng, Liming Gao, Ard Biesheuvel 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 <zhichao.gao@intel.com> Cc: Jian J Wang <jian.j.wang@intel.com> Cc: Hao Wu <hao.a.wu@intel.com> Cc: Ray Ni <ray.ni@intel.com> Cc: Star Zeng <star.zeng@intel.com> Cc: Liming Gao <liming.gao@intel.com> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- .../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.<BR> + Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> 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 <Library/CacheMaintenanceLib.h> - /** 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_ADDRESS ScatterGatherList - ) -{ - 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 0000000000..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.<BR> + Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> + + 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 <Library/CacheMaintenanceLib.h> + +/** + 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_ADDRESS ScatterGatherList + ) +{ + 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; + } + } while (Desc->Length > 0 || Desc->Union.ContinuationPointer > 0); + + WriteBackDataCacheRange ( + (VOID *)(UINTN)Desc, + (UINTN)sizeof (*Desc) + ); + } +} + diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c new file mode 100644 index 0000000000..cfb9bb1bf1 --- /dev/null +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c @@ -0,0 +1,38 @@ +/** @file + Null function version of cache function. + + Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR> + Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> + + 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 <Library/CacheMaintenanceLib.h> + +/** + Writes Back a range of data cache lines covering a set of capsules in memory. + + Writes Back the data cache lines specified by ScatterGatherList. + + Null version, do nothing. + + @param ScatterGatherList Physical address of the data structure that + describes a set of capsules in memory + +**/ +VOID +CapsuleCacheWriteBack ( + IN EFI_PHYSICAL_ADDRESS ScatterGatherList + ) +{ +} + diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c index 353f6f2090..8990cf2a35 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c @@ -3,6 +3,7 @@ PersistAcrossReset capsules Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR> + Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this @@ -32,18 +33,3 @@ IsPersistAcrossResetCapsuleSupported ( return FeaturePcdGet (PcdSupportUpdateCapsuleReset); } -/** - 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_ADDRESS ScatterGatherList - ) -{ -} diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf index ad7af5fe62..a0cb32a06f 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf @@ -4,7 +4,7 @@ # It installs the Capsule Architectural Protocol defined in PI1.0a to signify # the capsule runtime services are ready. # -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR> # 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 @@ -36,16 +36,22 @@ [Sources.Ia32, Sources.EBC, Sources.ARM, Sources.AARCH64] SaveLongModeContext.c - CapsuleReset.c -[Sources.X64] - X64/SaveLongModeContext.c +[Sources.Ia32, Sources.X64, Sources.ARM, Sources.AARCH64] + CapsuleCache.c + +[Sources.Ia32, Sources.X64, Sources.EBC] CapsuleReset.c [Sources.ARM, Sources.AARCH64] - SaveLongModeContext.c Arm/CapsuleReset.c +[Sources.EBC] + CapsuleCacheNull.c + +[Sources.X64] + X64/SaveLongModeContext.c + [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec @@ -61,14 +67,12 @@ BaseLib PrintLib BaseMemoryLib + CacheMaintenanceLib [LibraryClasses.X64] UefiLib BaseMemoryLib -[LibraryClasses.ARM, LibraryClasses.AARCH64] - CacheMaintenanceLib - [Guids] ## SOMETIMES_PRODUCES ## Variable:L"CapsuleUpdateData" # (Process across reset capsule image) for capsule updated data ## SOMETIMES_PRODUCES ## Variable:L"CapsuleLongModeBuffer" # The long mode buffer used by IA32 Capsule PEIM to call X64 CapsuleCoalesce code to handle >4GB capsule blocks -- 2.16.2.windows.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function 2019-03-22 3:07 ` [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function Zhichao Gao @ 2019-03-25 6:59 ` Gao, Liming 2019-03-25 7:09 ` Gao, Zhichao 2019-03-25 8:25 ` Ard Biesheuvel 1 sibling, 1 reply; 8+ messages in thread From: Gao, Liming @ 2019-03-25 6:59 UTC (permalink / raw) To: Gao, Zhichao, edk2-devel@lists.01.org Cc: Wang, Jian J, Wu, Hao A, Ni, Ray, Zeng, Star, Ard Biesheuvel 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 <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; >Ni, Ray <ray.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; Gao, Liming ><liming.gao@intel.com>; Ard Biesheuvel <ard.biesheuvel@linaro.org> >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 <zhichao.gao@intel.com> >Cc: Jian J Wang <jian.j.wang@intel.com> >Cc: Hao Wu <hao.a.wu@intel.com> >Cc: Ray Ni <ray.ni@intel.com> >Cc: Star Zeng <star.zeng@intel.com> >Cc: Liming Gao <liming.gao@intel.com> >Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> >--- > .../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.<BR> >+ Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> > > 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 <Library/CacheMaintenanceLib.h> >- > /** > 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_ADDRESS ScatterGatherList >- ) >-{ >- 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 0000000000..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.<BR> >+ Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> >+ >+ 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 <Library/CacheMaintenanceLib.h> >+ >+/** >+ 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_ADDRESS ScatterGatherList >+ ) >+{ >+ 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; >+ } >+ } while (Desc->Length > 0 || Desc->Union.ContinuationPointer > 0); >+ >+ WriteBackDataCacheRange ( >+ (VOID *)(UINTN)Desc, >+ (UINTN)sizeof (*Desc) >+ ); >+ } >+} >+ >diff --git >a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c >b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c >new file mode 100644 >index 0000000000..cfb9bb1bf1 >--- /dev/null >+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c >@@ -0,0 +1,38 @@ >+/** @file >+ Null function version of cache function. >+ >+ Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR> >+ Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> >+ >+ 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 <Library/CacheMaintenanceLib.h> >+ >+/** >+ Writes Back a range of data cache lines covering a set of capsules in memory. >+ >+ Writes Back the data cache lines specified by ScatterGatherList. >+ >+ Null version, do nothing. >+ >+ @param ScatterGatherList Physical address of the data structure that >+ describes a set of capsules in memory >+ >+**/ >+VOID >+CapsuleCacheWriteBack ( >+ IN EFI_PHYSICAL_ADDRESS ScatterGatherList >+ ) >+{ >+} >+ >diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c >b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c >index 353f6f2090..8990cf2a35 100644 >--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c >+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c >@@ -3,6 +3,7 @@ > PersistAcrossReset capsules > > Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR> >+ Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> > > This program and the accompanying materials are licensed and made >available > under the terms and conditions of the BSD License which accompanies this >@@ -32,18 +33,3 @@ IsPersistAcrossResetCapsuleSupported ( > return FeaturePcdGet (PcdSupportUpdateCapsuleReset); > } > >-/** >- 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_ADDRESS ScatterGatherList >- ) >-{ >-} >diff --git >a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >index ad7af5fe62..a0cb32a06f 100644 >--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >+++ >b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >@@ -4,7 +4,7 @@ > # It installs the Capsule Architectural Protocol defined in PI1.0a to signify > # the capsule runtime services are ready. > # >-# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR> >+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR> > # 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 >@@ -36,16 +36,22 @@ > > [Sources.Ia32, Sources.EBC, Sources.ARM, Sources.AARCH64] > SaveLongModeContext.c >- CapsuleReset.c > >-[Sources.X64] >- X64/SaveLongModeContext.c >+[Sources.Ia32, Sources.X64, Sources.ARM, Sources.AARCH64] >+ CapsuleCache.c >+ >+[Sources.Ia32, Sources.X64, Sources.EBC] > CapsuleReset.c > > [Sources.ARM, Sources.AARCH64] >- SaveLongModeContext.c > Arm/CapsuleReset.c > >+[Sources.EBC] >+ CapsuleCacheNull.c >+ >+[Sources.X64] >+ X64/SaveLongModeContext.c >+ > [Packages] > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec >@@ -61,14 +67,12 @@ > BaseLib > PrintLib > BaseMemoryLib >+ CacheMaintenanceLib > > [LibraryClasses.X64] > UefiLib > BaseMemoryLib > >-[LibraryClasses.ARM, LibraryClasses.AARCH64] >- CacheMaintenanceLib >- > [Guids] > ## SOMETIMES_PRODUCES ## Variable:L"CapsuleUpdateData" # (Process >across reset capsule image) for capsule updated data > ## SOMETIMES_PRODUCES ## Variable:L"CapsuleLongModeBuffer" # The >long mode buffer used by IA32 Capsule PEIM to call X64 CapsuleCoalesce code >to handle >4GB capsule blocks >-- >2.16.2.windows.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function 2019-03-25 6:59 ` Gao, Liming @ 2019-03-25 7:09 ` Gao, Zhichao 0 siblings, 0 replies; 8+ messages in thread From: Gao, Zhichao @ 2019-03-25 7:09 UTC (permalink / raw) To: Gao, Liming, edk2-devel@lists.01.org Cc: Wang, Jian J, Wu, Hao A, Ni, Ray, Zeng, Star, Ard Biesheuvel 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 <zhichao.gao@intel.com>; edk2-devel@lists.01.org > Cc: Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; > Ni, Ray <ray.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; Ard > Biesheuvel <ard.biesheuvel@linaro.org> > 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 <jian.j.wang@intel.com>; Wu, Hao A > ><hao.a.wu@intel.com>; Ni, Ray <ray.ni@intel.com>; Zeng, Star > ><star.zeng@intel.com>; Gao, Liming <liming.gao@intel.com>; Ard > >Biesheuvel <ard.biesheuvel@linaro.org> > >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 <zhichao.gao@intel.com> > >Cc: Jian J Wang <jian.j.wang@intel.com> > >Cc: Hao Wu <hao.a.wu@intel.com> > >Cc: Ray Ni <ray.ni@intel.com> > >Cc: Star Zeng <star.zeng@intel.com> > >Cc: Liming Gao <liming.gao@intel.com> > >Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > >--- > > .../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.<BR> > >+ Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> > > > > 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 <Library/CacheMaintenanceLib.h> > >- > > /** > > 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_ADDRESS ScatterGatherList > >- ) > >-{ > >- 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 0000000000..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.<BR> Copyright > >+ (c) 2019, Intel Corporation. All rights reserved.<BR> > >+ > >+ 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 <Library/CacheMaintenanceLib.h> > >+ > >+/** > >+ 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_ADDRESS ScatterGatherList > >+ ) > >+{ > >+ 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; > >+ } > >+ } while (Desc->Length > 0 || Desc->Union.ContinuationPointer > 0); > >+ > >+ WriteBackDataCacheRange ( > >+ (VOID *)(UINTN)Desc, > >+ (UINTN)sizeof (*Desc) > >+ ); > >+ } > >+} > >+ > >diff --git > >a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c > >b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c > >new file mode 100644 > >index 0000000000..cfb9bb1bf1 > >--- /dev/null > >+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c > >@@ -0,0 +1,38 @@ > >+/** @file > >+ Null function version of cache function. > >+ > >+ Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR> Copyright > >+ (c) 2019, Intel Corporation. All rights reserved.<BR> > >+ > >+ 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 <Library/CacheMaintenanceLib.h> > >+ > >+/** > >+ Writes Back a range of data cache lines covering a set of capsules in > memory. > >+ > >+ Writes Back the data cache lines specified by ScatterGatherList. > >+ > >+ Null version, do nothing. > >+ > >+ @param ScatterGatherList Physical address of the data structure that > >+ describes a set of capsules in memory > >+ > >+**/ > >+VOID > >+CapsuleCacheWriteBack ( > >+ IN EFI_PHYSICAL_ADDRESS ScatterGatherList > >+ ) > >+{ > >+} > >+ > >diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c > >b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c > >index 353f6f2090..8990cf2a35 100644 > >--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c > >+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c > >@@ -3,6 +3,7 @@ > > PersistAcrossReset capsules > > > > Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR> > >+ Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> > > > > This program and the accompanying materials are licensed and made > >available > > under the terms and conditions of the BSD License which accompanies > >this @@ -32,18 +33,3 @@ IsPersistAcrossResetCapsuleSupported ( > > return FeaturePcdGet (PcdSupportUpdateCapsuleReset); } > > > >-/** > >- 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_ADDRESS ScatterGatherList > >- ) > >-{ > >-} > >diff --git > >a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > >b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > >index ad7af5fe62..a0cb32a06f 100644 > >--- > a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > >+++ > >b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > >@@ -4,7 +4,7 @@ > > # It installs the Capsule Architectural Protocol defined in PI1.0a to > >signify # the capsule runtime services are ready. > > # > >-# Copyright (c) 2006 - 2018, Intel Corporation. All rights > >reserved.<BR> > >+# Copyright (c) 2006 - 2019, Intel Corporation. All rights > >+reserved.<BR> > > # 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 @@ -36,16 +36,22 @@ > > > > [Sources.Ia32, Sources.EBC, Sources.ARM, Sources.AARCH64] > > SaveLongModeContext.c > >- CapsuleReset.c > > > >-[Sources.X64] > >- X64/SaveLongModeContext.c > >+[Sources.Ia32, Sources.X64, Sources.ARM, Sources.AARCH64] > >+ CapsuleCache.c > >+ > >+[Sources.Ia32, Sources.X64, Sources.EBC] > > CapsuleReset.c > > > > [Sources.ARM, Sources.AARCH64] > >- SaveLongModeContext.c > > Arm/CapsuleReset.c > > > >+[Sources.EBC] > >+ CapsuleCacheNull.c > >+ > >+[Sources.X64] > >+ X64/SaveLongModeContext.c > >+ > > [Packages] > > MdePkg/MdePkg.dec > > MdeModulePkg/MdeModulePkg.dec > >@@ -61,14 +67,12 @@ > > BaseLib > > PrintLib > > BaseMemoryLib > >+ CacheMaintenanceLib > > > > [LibraryClasses.X64] > > UefiLib > > BaseMemoryLib > > > >-[LibraryClasses.ARM, LibraryClasses.AARCH64] > >- CacheMaintenanceLib > >- > > [Guids] > > ## SOMETIMES_PRODUCES ## Variable:L"CapsuleUpdateData" # > (Process > >across reset capsule image) for capsule updated data > > ## SOMETIMES_PRODUCES ## Variable:L"CapsuleLongModeBuffer" # > The > >long mode buffer used by IA32 Capsule PEIM to call X64 CapsuleCoalesce > >code to handle >4GB capsule blocks > >-- > >2.16.2.windows.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function 2019-03-22 3:07 ` [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function Zhichao Gao 2019-03-25 6:59 ` Gao, Liming @ 2019-03-25 8:25 ` Ard Biesheuvel 2019-03-25 11:06 ` Gao, Zhichao 1 sibling, 1 reply; 8+ messages in thread From: Ard Biesheuvel @ 2019-03-25 8:25 UTC (permalink / raw) To: Zhichao Gao Cc: edk2-devel@lists.01.org, Jian J Wang, Hao Wu, Ray Ni, Star Zeng, Liming Gao On Fri, 22 Mar 2019 at 04:09, Zhichao Gao <zhichao.gao@intel.com> 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 <zhichao.gao@intel.com> > Cc: Jian J Wang <jian.j.wang@intel.com> > Cc: Hao Wu <hao.a.wu@intel.com> > Cc: Ray Ni <ray.ni@intel.com> > Cc: Star Zeng <star.zeng@intel.com> > Cc: Liming Gao <liming.gao@intel.com> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > .../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.<BR> > + Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> > > 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 <Library/CacheMaintenanceLib.h> > - > /** > 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_ADDRESS ScatterGatherList > - ) > -{ > - 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 0000000000..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.<BR> > + Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> > + > + 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 <Library/CacheMaintenanceLib.h> > + > +/** > + 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_ADDRESS ScatterGatherList > + ) > +{ > + 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; > + } > + } while (Desc->Length > 0 || Desc->Union.ContinuationPointer > 0); > + > + WriteBackDataCacheRange ( > + (VOID *)(UINTN)Desc, > + (UINTN)sizeof (*Desc) > + ); > + } > +} > + > diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c > new file mode 100644 > index 0000000000..cfb9bb1bf1 > --- /dev/null > +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c > @@ -0,0 +1,38 @@ > +/** @file > + Null function version of cache function. > + > + Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR> > + Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> > + > + 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 <Library/CacheMaintenanceLib.h> > + > +/** > + Writes Back a range of data cache lines covering a set of capsules in memory. > + > + Writes Back the data cache lines specified by ScatterGatherList. > + > + Null version, do nothing. > + > + @param ScatterGatherList Physical address of the data structure that > + describes a set of capsules in memory > + > +**/ > +VOID > +CapsuleCacheWriteBack ( > + IN EFI_PHYSICAL_ADDRESS ScatterGatherList > + ) > +{ > +} > + > diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c > index 353f6f2090..8990cf2a35 100644 > --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c > +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c > @@ -3,6 +3,7 @@ > PersistAcrossReset capsules > > Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR> > + Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> > > This program and the accompanying materials are licensed and made available > under the terms and conditions of the BSD License which accompanies this > @@ -32,18 +33,3 @@ IsPersistAcrossResetCapsuleSupported ( > return FeaturePcdGet (PcdSupportUpdateCapsuleReset); > } > > -/** > - 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_ADDRESS ScatterGatherList > - ) > -{ > -} > diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > index ad7af5fe62..a0cb32a06f 100644 > --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > @@ -4,7 +4,7 @@ > # It installs the Capsule Architectural Protocol defined in PI1.0a to signify > # the capsule runtime services are ready. > # > -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR> > # 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 > @@ -36,16 +36,22 @@ > > [Sources.Ia32, Sources.EBC, Sources.ARM, Sources.AARCH64] > SaveLongModeContext.c > - CapsuleReset.c > > -[Sources.X64] > - X64/SaveLongModeContext.c > +[Sources.Ia32, Sources.X64, Sources.ARM, Sources.AARCH64] > + CapsuleCache.c > + > +[Sources.Ia32, Sources.X64, Sources.EBC] > CapsuleReset.c > > [Sources.ARM, Sources.AARCH64] > - SaveLongModeContext.c > Arm/CapsuleReset.c > > +[Sources.EBC] > + CapsuleCacheNull.c > + > +[Sources.X64] > + X64/SaveLongModeContext.c > + > [Packages] > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > @@ -61,14 +67,12 @@ > BaseLib > PrintLib > BaseMemoryLib > + CacheMaintenanceLib > > [LibraryClasses.X64] > UefiLib > BaseMemoryLib > > -[LibraryClasses.ARM, LibraryClasses.AARCH64] > - CacheMaintenanceLib > - > [Guids] > ## SOMETIMES_PRODUCES ## Variable:L"CapsuleUpdateData" # (Process across reset capsule image) for capsule updated data > ## SOMETIMES_PRODUCES ## Variable:L"CapsuleLongModeBuffer" # The long mode buffer used by IA32 Capsule PEIM to call X64 CapsuleCoalesce code to handle >4GB capsule blocks > -- > 2.16.2.windows.1 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function 2019-03-25 8:25 ` Ard Biesheuvel @ 2019-03-25 11:06 ` Gao, Zhichao 0 siblings, 0 replies; 8+ messages in thread From: Gao, Zhichao @ 2019-03-25 11:06 UTC (permalink / raw) To: Ard Biesheuvel Cc: edk2-devel@lists.01.org, Wang, Jian J, Wu, Hao A, Ni, Ray, Zeng, Star, Gao, Liming Sorry, I am not familiar with EBC. I only keep the original logic of it. Thanks, Zhichao > -----Original Message----- > From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org] > Sent: Monday, March 25, 2019 4:26 PM > To: Gao, Zhichao <zhichao.gao@intel.com> > Cc: edk2-devel@lists.01.org; Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao > A <hao.a.wu@intel.com>; Ni, Ray <ray.ni@intel.com>; Zeng, Star > <star.zeng@intel.com>; Gao, Liming <liming.gao@intel.com> > Subject: Re: [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add > cache flush function > > On Fri, 22 Mar 2019 at 04:09, Zhichao Gao <zhichao.gao@intel.com> 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 <zhichao.gao@intel.com> > > Cc: Jian J Wang <jian.j.wang@intel.com> > > Cc: Hao Wu <hao.a.wu@intel.com> > > Cc: Ray Ni <ray.ni@intel.com> > > Cc: Star Zeng <star.zeng@intel.com> > > Cc: Liming Gao <liming.gao@intel.com> > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > --- > > .../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.<BR> > > + Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> > > > > 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 <Library/CacheMaintenanceLib.h> > > - > > /** > > 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_ADDRESS ScatterGatherList > > - ) > > -{ > > - 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 0000000000..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.<BR> > > + Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> > > + > > + 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 <Library/CacheMaintenanceLib.h> > > + > > +/** > > + 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_ADDRESS ScatterGatherList > > + ) > > +{ > > + 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; > > + } > > + } while (Desc->Length > 0 || Desc->Union.ContinuationPointer > 0); > > + > > + WriteBackDataCacheRange ( > > + (VOID *)(UINTN)Desc, > > + (UINTN)sizeof (*Desc) > > + ); > > + } > > +} > > + > > diff --git > a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c > b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c > > new file mode 100644 > > index 0000000000..cfb9bb1bf1 > > --- /dev/null > > +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c > > @@ -0,0 +1,38 @@ > > +/** @file > > + Null function version of cache function. > > + > > + Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR> > > + Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> > > + > > + 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 <Library/CacheMaintenanceLib.h> > > + > > +/** > > + Writes Back a range of data cache lines covering a set of capsules in > memory. > > + > > + Writes Back the data cache lines specified by ScatterGatherList. > > + > > + Null version, do nothing. > > + > > + @param ScatterGatherList Physical address of the data structure that > > + describes a set of capsules in memory > > + > > +**/ > > +VOID > > +CapsuleCacheWriteBack ( > > + IN EFI_PHYSICAL_ADDRESS ScatterGatherList > > + ) > > +{ > > +} > > + > > diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c > b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c > > index 353f6f2090..8990cf2a35 100644 > > --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c > > +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c > > @@ -3,6 +3,7 @@ > > PersistAcrossReset capsules > > > > Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR> > > + Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> > > > > This program and the accompanying materials are licensed and made > available > > under the terms and conditions of the BSD License which accompanies > this > > @@ -32,18 +33,3 @@ IsPersistAcrossResetCapsuleSupported ( > > return FeaturePcdGet (PcdSupportUpdateCapsuleReset); > > } > > > > -/** > > - 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_ADDRESS ScatterGatherList > > - ) > > -{ > > -} > > diff --git > a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > > index ad7af5fe62..a0cb32a06f 100644 > > --- > a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > > +++ > b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > > @@ -4,7 +4,7 @@ > > # It installs the Capsule Architectural Protocol defined in PI1.0a to signify > > # the capsule runtime services are ready. > > # > > -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR> > > +# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR> > > # 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 > > @@ -36,16 +36,22 @@ > > > > [Sources.Ia32, Sources.EBC, Sources.ARM, Sources.AARCH64] > > SaveLongModeContext.c > > - CapsuleReset.c > > > > -[Sources.X64] > > - X64/SaveLongModeContext.c > > +[Sources.Ia32, Sources.X64, Sources.ARM, Sources.AARCH64] > > + CapsuleCache.c > > + > > +[Sources.Ia32, Sources.X64, Sources.EBC] > > CapsuleReset.c > > > > [Sources.ARM, Sources.AARCH64] > > - SaveLongModeContext.c > > Arm/CapsuleReset.c > > > > +[Sources.EBC] > > + CapsuleCacheNull.c > > + > > +[Sources.X64] > > + X64/SaveLongModeContext.c > > + > > [Packages] > > MdePkg/MdePkg.dec > > MdeModulePkg/MdeModulePkg.dec > > @@ -61,14 +67,12 @@ > > BaseLib > > PrintLib > > BaseMemoryLib > > + CacheMaintenanceLib > > > > [LibraryClasses.X64] > > UefiLib > > BaseMemoryLib > > > > -[LibraryClasses.ARM, LibraryClasses.AARCH64] > > - CacheMaintenanceLib > > - > > [Guids] > > ## SOMETIMES_PRODUCES ## Variable:L"CapsuleUpdateData" # > (Process across reset capsule image) for capsule updated data > > ## SOMETIMES_PRODUCES ## Variable:L"CapsuleLongModeBuffer" # > The long mode buffer used by IA32 Capsule PEIM to call X64 CapsuleCoalesce > code to handle >4GB capsule blocks > > -- > > 2.16.2.windows.1 > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH V2 2/2] MdeModulePkg/ResetSystemRuntimeDxe: Remove DoS3 in warm reset 2019-03-22 3:07 [PATCH V2 0/2] Change reset logic related on capsule Zhichao Gao 2019-03-22 3:07 ` [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function Zhichao Gao @ 2019-03-22 3:07 ` Zhichao Gao 2019-03-29 12:01 ` [PATCH V2 0/2] Change reset logic related on capsule Gao, Liming 2 siblings, 0 replies; 8+ messages in thread From: Zhichao Gao @ 2019-03-22 3:07 UTC (permalink / raw) To: edk2-devel; +Cc: Jian J Wang, Hao Wu, Ray Ni, Star Zeng, Liming Gao BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1462 Original logic is that checking the CapsuleUpdate variable and do the EnterS3WithImmediateWake if the system require a capsule update. The EnterS3WithImmediateWake is usually implemented in Platform ResetSystemLib instance and it may do some operation for capsule update. For now, thess preparations of capsule are platform reset notify functions' duty. Most platforms need flush cache to memory before warm reset during capsule update and this operation is added to capsule flow. So it is safe to remove it and do not affect the capsule update function. Change-Id: I7af8221528c7baee6d16daee79837c7e9584b232 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Zhichao Gao <zhichao.gao@intel.com> Cc: Jian J Wang <jian.j.wang@intel.com> Cc: Hao Wu <hao.a.wu@intel.com> Cc: Ray Ni <ray.ni@intel.com> Cc: Star Zeng <star.zeng@intel.com> Cc: Liming Gao <liming.gao@intel.com> --- .../Universal/ResetSystemRuntimeDxe/ResetSystem.c | 38 ---------------------- 1 file changed, 38 deletions(-) diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c index 4c7107faea..36234f4d5b 100644 --- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c +++ b/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c @@ -206,22 +206,6 @@ InitializeResetSystem ( return Status; } -/** - Put the system into S3 power state. -**/ -VOID -DoS3 ( - VOID - ) -{ - EnterS3WithImmediateWake (); - - // - // Should not return - // - CpuDeadLoop (); -} - /** Resets the entire platform. @@ -249,9 +233,6 @@ RuntimeServiceResetSystem ( IN VOID *ResetData OPTIONAL ) { - EFI_STATUS Status; - UINTN Size; - UINTN CapsuleDataPtr; LIST_ENTRY *Link; RESET_NOTIFY_ENTRY *Entry; @@ -315,25 +296,6 @@ RuntimeServiceResetSystem ( switch (ResetType) { case EfiResetWarm: - // - //Check if there are pending capsules to process - // - Size = sizeof (CapsuleDataPtr); - Status = EfiGetVariable ( - EFI_CAPSULE_VARIABLE_NAME, - &gEfiCapsuleVendorGuid, - NULL, - &Size, - (VOID *) &CapsuleDataPtr - ); - - if (Status == EFI_SUCCESS) { - // - //Process capsules across a system reset. - // - DoS3(); - } - ResetWarm (); break; -- 2.16.2.windows.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH V2 0/2] Change reset logic related on capsule 2019-03-22 3:07 [PATCH V2 0/2] Change reset logic related on capsule Zhichao Gao 2019-03-22 3:07 ` [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function Zhichao Gao 2019-03-22 3:07 ` [PATCH V2 2/2] MdeModulePkg/ResetSystemRuntimeDxe: Remove DoS3 in warm reset Zhichao Gao @ 2019-03-29 12:01 ` Gao, Liming 2 siblings, 0 replies; 8+ messages in thread From: Gao, Liming @ 2019-03-29 12:01 UTC (permalink / raw) To: Gao, Zhichao, edk2-devel@lists.01.org Cc: Wang, Jian J, Wu, Hao A, Ni, Ray, Zeng, Star, Ard Biesheuvel Reviewed-by: Liming Gao <liming.gao@intel.com> > -----Original Message----- > From: Gao, Zhichao > Sent: Friday, March 22, 2019 11:07 AM > To: edk2-devel@lists.01.org > Cc: Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray <ray.ni@intel.com>; Zeng, Star > <star.zeng@intel.com>; Gao, Liming <liming.gao@intel.com>; Ard Biesheuvel <ard.biesheuvel@linaro.org> > Subject: [PATCH V2 0/2] Change reset logic related on capsule > > Add CapsuleCacheWriteBack for IA ARCH before runtime. > Remove DoS3 in ResetSystemRuntimeDxe. > > V2: > Adjust the code that would not change the logic of arm ARCH. > Fix some build errors because of type convertion. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Zhichao Gao <zhichao.gao@intel.com> > Cc: Jian J Wang <jian.j.wang@intel.com> > Cc: Hao Wu <hao.a.wu@intel.com> > Cc: Ray Ni <ray.ni@intel.com> > Cc: Star Zeng <star.zeng@intel.com> > Cc: Liming Gao <liming.gao@intel.com> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > Zhichao Gao (2): > MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function > MdeModulePkg/ResetSystemRuntimeDxe: Remove DoS3 in warm reset > > .../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 ++++--- > .../Universal/ResetSystemRuntimeDxe/ResetSystem.c | 38 ------------- > 6 files changed, 115 insertions(+), 95 deletions(-) > create mode 100644 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCache.c > create mode 100644 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleCacheNull.c > > -- > 2.16.2.windows.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-03-29 12:01 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-03-22 3:07 [PATCH V2 0/2] Change reset logic related on capsule Zhichao Gao 2019-03-22 3:07 ` [PATCH V2 1/2] MdeModulePkg/CapsuleRuntimeDxe: IA32 add cache flush function Zhichao Gao 2019-03-25 6:59 ` Gao, Liming 2019-03-25 7:09 ` Gao, Zhichao 2019-03-25 8:25 ` Ard Biesheuvel 2019-03-25 11:06 ` Gao, Zhichao 2019-03-22 3:07 ` [PATCH V2 2/2] MdeModulePkg/ResetSystemRuntimeDxe: Remove DoS3 in warm reset Zhichao Gao 2019-03-29 12:01 ` [PATCH V2 0/2] Change reset logic related on capsule Gao, Liming
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox