[PATCH v1 0/2] Fix for variable store corrupt issue

[PATCH v1 0/2] Fix for variable store corrupt issue

[Sami Mujawar]

These patches fix the "Firmware Volume for Variable Store is
corrupted" issue which is seen when the Flash is erased or
not formatted.

Sami Mujawar (2):
  Platform/ARM: Fix NOR Flash dependency for Juno
  Platform/ARM: Fix NOR Flash dependency for FVP

 Platform/ARM/JunoPkg/ArmJuno.dsc                     | 1 +
 Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 1 +
 2 files changed, 2 insertions(+)

-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH 1/2] Platform/ARM: Fix NOR Flash dependency for Juno

[Sami Mujawar]

The correct load order for the NOR Flash driver and Runtime Variables
to work is as below:
    1. Arm CPU Architecture Protocol Dxe
    2. NOR Flash Dxe
    3. Runtime Variable Dxe

NvVarStoreFormattedLib was recently introduced to resolve the dependency
order and more details can be seen at
https://github.com/tianocore/edk2/compare/master...lersek:depex_fixes

This patch propagates the necessary changes for ARM Juno platform and
also fixes the "Firmware Volume for Variable Store is corrupted" error
seen when the Flash is erased (or not formatted).

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Alexei Fedorov <alexei.fedorov@arm.com>
---
The changes can be seen at:
https://github.com/samimujawar/edk2-platforms/tree/255_firmware_volume_issue_v1

Notes:
    v1:
    - Fixed firmware volume variable store corrupt issue.           [SAMI]

 Platform/ARM/JunoPkg/ArmJuno.dsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
index d5e87f1edfd5d60a543e51cb42dfbcc4489d3f7d..a10476fa135d0eccbed3d0eaf8cb02b26617c2eb 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dsc
+++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
@@ -255,6 +255,7 @@ [Components.common]
   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
     <LibraryClasses>
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
+      NULL|EmbeddedPkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf
       BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
   }
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH 2/2] Platform/ARM: Fix NOR Flash dependency for FVP

[Sami Mujawar]

The correct load order for the NOR Flash driver and Runtime Variables
to work is as below:
    1. Arm CPU Architecture Protocol Dxe
    2. NOR Flash Dxe
    3. Runtime Variable Dxe

NvVarStoreFormattedLib was recently introduced to resolve the dependency
order and more details can be seen at
https://github.com/tianocore/edk2/compare/master...lersek:depex_fixes

This patch propagates the necessary changes for ARM FVP platform and
also fixes the "Firmware Volume for Variable Store is corrupted" error
seen when the Flash is erased (or not formatted).

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Alexei Fedorov <alexei.fedorov@arm.com>
---
The changes can be seen at:
https://github.com/samimujawar/edk2-platforms/tree/255_firmware_volume_issue_v1

Notes:
    v1:
    - Fixed firmware volume variable store corrupt issue.           [SAMI]

 Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
index cdf9e2d49784d542701dc84eb511f592e77ec106..e0539d6a01363a3f2ae8e42d1a9e4125711b834f 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
@@ -229,6 +229,7 @@ [Components.common]
   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
     <LibraryClasses>
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
+      NULL|EmbeddedPkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf
       BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
   }
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

Re: [PATCH v1 0/2] Fix for variable store corrupt issue

[Ard Biesheuvel]

On 26 April 2018 at 11:32, Sami Mujawar <sami.mujawar@arm.com> wrote:
> These patches fix the "Firmware Volume for Variable Store is
> corrupted" issue which is seen when the Flash is erased or
> not formatted.
>
> Sami Mujawar (2):
>   Platform/ARM: Fix NOR Flash dependency for Juno
>   Platform/ARM: Fix NOR Flash dependency for FVP
>
>  Platform/ARM/JunoPkg/ArmJuno.dsc                     | 1 +
>  Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 1 +
>  2 files changed, 2 insertions(+)
>

Hello Sami,

Does ArmVExpress-CTA15-A7.dsc need this change as well?

-- 
Ard.

Re: [PATCH v1 0/2] Fix for variable store corrupt issue

[Sami Mujawar]

Hi Ard,

I do not have the setup currently to test ArmVExpress-CTA15-A7. However, I think it will need this change as well. 
Please ignore this patchset, I will send another one shortly. 

Regards,

Sami Mujawar
-----Original Message-----
From: Ard Biesheuvel <ard.biesheuvel@linaro.org> 
Sent: 26 April 2018 10:44 AM
To: Sami Mujawar <Sami.Mujawar@arm.com>
Cc: edk2-devel@lists.01.org; Arvind Chauhan <Arvind.Chauhan@arm.com>; Daniil Egranov <Daniil.Egranov@arm.com>; Thomas Abraham <thomas.abraham@arm.com>; Leif Lindholm <leif.lindholm@linaro.org>; Matteo Carlini <Matteo.Carlini@arm.com>; Stephanie Hughes-Fitt <Stephanie.Hughes-Fitt@arm.com>; nd <nd@arm.com>; Evan Lloyd <Evan.Lloyd@arm.com>; Alexei Fedorov <Alexei.Fedorov@arm.com>; Kinney, Michael D <michael.d.kinney@intel.com>
Subject: Re: [PATCH v1 0/2] Fix for variable store corrupt issue

On 26 April 2018 at 11:32, Sami Mujawar <sami.mujawar@arm.com> wrote:
> These patches fix the "Firmware Volume for Variable Store is 
> corrupted" issue which is seen when the Flash is erased or not 
> formatted.
>
> Sami Mujawar (2):
>   Platform/ARM: Fix NOR Flash dependency for Juno
>   Platform/ARM: Fix NOR Flash dependency for FVP
>
>  Platform/ARM/JunoPkg/ArmJuno.dsc                     | 1 +
>  Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 1 +
>  2 files changed, 2 insertions(+)
>

Hello Sami,

Does ArmVExpress-CTA15-A7.dsc need this change as well?

--
Ard.

Re: [PATCH v1 0/2] Fix for variable store corrupt issue

[Leif Lindholm]

On Thu, Apr 26, 2018 at 09:47:17AM +0000, Sami Mujawar wrote:
> Hi Ard,
> 
> I do not have the setup currently to test ArmVExpress-CTA15-A7. However, I think it will need this change as well. 
> Please ignore this patchset, I will send another one shortly. 

No need to resubmit the whole set - just send out a 3/3 to go on top
of this.

Regards,

Leif

> Regards,
> 
> Sami Mujawar
> -----Original Message-----
> From: Ard Biesheuvel <ard.biesheuvel@linaro.org> 
> Sent: 26 April 2018 10:44 AM
> To: Sami Mujawar <Sami.Mujawar@arm.com>
> Cc: edk2-devel@lists.01.org; Arvind Chauhan <Arvind.Chauhan@arm.com>; Daniil Egranov <Daniil.Egranov@arm.com>; Thomas Abraham <thomas.abraham@arm.com>; Leif Lindholm <leif.lindholm@linaro.org>; Matteo Carlini <Matteo.Carlini@arm.com>; Stephanie Hughes-Fitt <Stephanie.Hughes-Fitt@arm.com>; nd <nd@arm.com>; Evan Lloyd <Evan.Lloyd@arm.com>; Alexei Fedorov <Alexei.Fedorov@arm.com>; Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: Re: [PATCH v1 0/2] Fix for variable store corrupt issue
> 
> On 26 April 2018 at 11:32, Sami Mujawar <sami.mujawar@arm.com> wrote:
> > These patches fix the "Firmware Volume for Variable Store is 
> > corrupted" issue which is seen when the Flash is erased or not 
> > formatted.
> >
> > Sami Mujawar (2):
> >   Platform/ARM: Fix NOR Flash dependency for Juno
> >   Platform/ARM: Fix NOR Flash dependency for FVP
> >
> >  Platform/ARM/JunoPkg/ArmJuno.dsc                     | 1 +
> >  Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 1 +
> >  2 files changed, 2 insertions(+)
> >
> 
> Hello Sami,
> 
> Does ArmVExpress-CTA15-A7.dsc need this change as well?
> 
> --
> Ard.

Re: [PATCH v1 0/2] Fix for variable store corrupt issue

[Ard Biesheuvel]

On 26 April 2018 at 12:47, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> On Thu, Apr 26, 2018 at 09:47:17AM +0000, Sami Mujawar wrote:
>> Hi Ard,
>>
>> I do not have the setup currently to test ArmVExpress-CTA15-A7. However, I think it will need this change as well.
>> Please ignore this patchset, I will send another one shortly.
>
> No need to resubmit the whole set - just send out a 3/3 to go on top
> of this.
>

Thanks Sami

Patches #1 .. #3 pushed as b581a4934d8f..3f20ed76ce78