[Linaro-uefi,Linaro-uefi,v2,13/17] Hisilicon/D03/D05: Change Monotonic Drive

Message ID 1491046162-53797-14-git-send-email-chenhui.sun@linaro.org
State New
Headers show
Series
  • D03/D05 platforms bug fix
Related show

Commit Message

Chenhui Sun April 1, 2017, 11:29 a.m.
SCT test report:
"BS.GetNextMonotonicCount - GetNextMonotonicCount() gets the
high 32-bit after reset at EFI_TPL_APPLICATION."

Reference 《UEFI Spec 2.6》chapter 7.5.2:
“The GetNextHighMonotonicCount() function returns the next
high 32 bits of the platform’s monotonic counter. The
platform’s monotonic counter is comprised of two 32-bit
quantities: the high 32 bits and the low 32 bits. During boot
service time the low 32-bit value is volatile: it is
reset to zero on every system reset and is increased by 1
on every call to GetNextMonotonicCount().
The high 32-bit value is nonvolatile and is increased by 1
whenever the system resets, whenever GetNextHighMonotonicCount()
is called, or whenever the low 32-bit count
(returned by GetNextMonoticCount()) overflows.”

In EmbeddedMonotonicCounter.inf driver,
The high 32-bit value is nonvolatile and is increased by 1 whenever
the system resets, but When GetNextHighMonotonicCount() is called,
or whenever the low 32-bit count (returned by GetNextMonoticCount())
overflows don’t increased by 1.

So Monotonic Driver is switched from EmbeddedPkg to MdeModulePkg.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chenhui Sun <chenhui.sun@linaro.com>
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
Signed-off-by: Yi Li <phoenix.liyi@huawei.com>
---
 Platforms/Hisilicon/D03/D03.dsc | 1 -
 Platforms/Hisilicon/D03/D03.fdf | 2 +-
 Platforms/Hisilicon/D05/D05.dsc | 1 -
 Platforms/Hisilicon/D05/D05.fdf | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

Comments

Leif Lindholm April 6, 2017, 5:50 p.m. | #1
On Sat, Apr 01, 2017 at 07:29:18PM +0800, Chenhui Sun wrote:
> SCT test report:
> "BS.GetNextMonotonicCount - GetNextMonotonicCount() gets the
> high 32-bit after reset at EFI_TPL_APPLICATION."
> 
> Reference 《UEFI Spec 2.6》chapter 7.5.2:
> “The GetNextHighMonotonicCount() function returns the next
> high 32 bits of the platform’s monotonic counter. The
> platform’s monotonic counter is comprised of two 32-bit
> quantities: the high 32 bits and the low 32 bits. During boot
> service time the low 32-bit value is volatile: it is
> reset to zero on every system reset and is increased by 1
> on every call to GetNextMonotonicCount().
> The high 32-bit value is nonvolatile and is increased by 1
> whenever the system resets, whenever GetNextHighMonotonicCount()
> is called, or whenever the low 32-bit count
> (returned by GetNextMonoticCount()) overflows.”
> 
> In EmbeddedMonotonicCounter.inf driver,
> The high 32-bit value is nonvolatile and is increased by 1 whenever
> the system resets, but When GetNextHighMonotonicCount() is called,
> or whenever the low 32-bit count (returned by GetNextMonoticCount())
> overflows don’t increased by 1.
> 
> So Monotonic Driver is switched from EmbeddedPkg to MdeModulePkg.

Much better, thanks!

> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chenhui Sun <chenhui.sun@linaro.com>
> Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
> Signed-off-by: Yi Li <phoenix.liyi@huawei.com>

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

Pushed as 04f95ed263.

> ---
>  Platforms/Hisilicon/D03/D03.dsc | 1 -
>  Platforms/Hisilicon/D03/D03.fdf | 2 +-
>  Platforms/Hisilicon/D05/D05.dsc | 1 -
>  Platforms/Hisilicon/D05/D05.fdf | 2 +-
>  4 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/Platforms/Hisilicon/D03/D03.dsc b/Platforms/Hisilicon/D03/D03.dsc
> index 9c73494..ca6295e 100644
> --- a/Platforms/Hisilicon/D03/D03.dsc
> +++ b/Platforms/Hisilicon/D03/D03.dsc
> @@ -372,7 +372,6 @@
>    }
>    MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
>    MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
> -  EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
>  
>    MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
>    EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
> diff --git a/Platforms/Hisilicon/D03/D03.fdf b/Platforms/Hisilicon/D03/D03.fdf
> index 3302ec9..3102f94 100644
> --- a/Platforms/Hisilicon/D03/D03.fdf
> +++ b/Platforms/Hisilicon/D03/D03.fdf
> @@ -167,7 +167,7 @@ READ_LOCK_STATUS   = TRUE
>    INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
>  
>    INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
> -  INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
> +  INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
>  
>    INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
>    INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
> diff --git a/Platforms/Hisilicon/D05/D05.dsc b/Platforms/Hisilicon/D05/D05.dsc
> index 2877da0..c1f4dfd 100644
> --- a/Platforms/Hisilicon/D05/D05.dsc
> +++ b/Platforms/Hisilicon/D05/D05.dsc
> @@ -492,7 +492,6 @@
>    }
>    MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
>    MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
> -  EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
>  
>    MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
>    EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
> diff --git a/Platforms/Hisilicon/D05/D05.fdf b/Platforms/Hisilicon/D05/D05.fdf
> index bdfb211..5a646f3 100644
> --- a/Platforms/Hisilicon/D05/D05.fdf
> +++ b/Platforms/Hisilicon/D05/D05.fdf
> @@ -171,7 +171,7 @@ READ_LOCK_STATUS   = TRUE
>    INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
>  
>    INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
> -  INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
> +  INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
>  
>    INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
>    INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
> -- 
> 1.9.1
>

Patch hide | download patch | download mbox

diff --git a/Platforms/Hisilicon/D03/D03.dsc b/Platforms/Hisilicon/D03/D03.dsc
index 9c73494..ca6295e 100644
--- a/Platforms/Hisilicon/D03/D03.dsc
+++ b/Platforms/Hisilicon/D03/D03.dsc
@@ -372,7 +372,6 @@ 
   }
   MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-  EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
 
   MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
   EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
diff --git a/Platforms/Hisilicon/D03/D03.fdf b/Platforms/Hisilicon/D03/D03.fdf
index 3302ec9..3102f94 100644
--- a/Platforms/Hisilicon/D03/D03.fdf
+++ b/Platforms/Hisilicon/D03/D03.fdf
@@ -167,7 +167,7 @@  READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-  INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
+  INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
 
   INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
   INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
diff --git a/Platforms/Hisilicon/D05/D05.dsc b/Platforms/Hisilicon/D05/D05.dsc
index 2877da0..c1f4dfd 100644
--- a/Platforms/Hisilicon/D05/D05.dsc
+++ b/Platforms/Hisilicon/D05/D05.dsc
@@ -492,7 +492,6 @@ 
   }
   MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-  EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
 
   MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
   EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
diff --git a/Platforms/Hisilicon/D05/D05.fdf b/Platforms/Hisilicon/D05/D05.fdf
index bdfb211..5a646f3 100644
--- a/Platforms/Hisilicon/D05/D05.fdf
+++ b/Platforms/Hisilicon/D05/D05.fdf
@@ -171,7 +171,7 @@  READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-  INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
+  INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
 
   INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
   INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf