From: Ming Huang <ming.huang@linaro.org>
To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org,
edk2-devel@lists.01.org, graeme.gregory@linaro.org
Cc: ard.biesheuvel@linaro.org, michael.d.kinney@intel.com,
lersek@redhat.com, guoheyi@huawei.com, wanghuiqiang@huawei.com,
huangming23@huawei.com, zhangjinsong2@huawei.com,
huangdaode@hisilicon.com, john.garry@huawei.com,
xinliang.liu@linaro.org, Ming Huang <ming.huang@linaro.org>
Subject: [PATCH edk2-platforms v3 01/36] Hisilicon/D0x: Unify FlashFvbDxe driver
Date: Thu, 16 Aug 2018 20:12:04 +0800 [thread overview]
Message-ID: <20180816121239.44129-2-ming.huang@linaro.org> (raw)
In-Reply-To: <20180816121239.44129-1-ming.huang@linaro.org>
Add PcdSFCMEM0BaseAddress and switch three 32-bit macro
PcdFlashNvStorage of D05/D03 to 64-bit for unifying FlashFvbDxe
driver.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ming Huang <ming.huang@linaro.org>
---
Platform/Hisilicon/D03/D03.fdf | 6 +++---
Platform/Hisilicon/D05/D05.fdf | 6 +++---
Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf | 7 ++++---
Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c | 22 ++++++++++----------
4 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
index 4591f7b5b1..b23765020d 100644
--- a/Platform/Hisilicon/D03/D03.fdf
+++ b/Platform/Hisilicon/D03/D03.fdf
@@ -69,7 +69,7 @@ FILE = Platform/Hisilicon/D03/bl1.bin
FILE = Platform/Hisilicon/D03/fip.bin
0x002D0000|0x0000E000
-gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
+gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
DATA = {
## This is the EFI_FIRMWARE_VOLUME_HEADER
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -97,7 +97,7 @@ DATA = {
}
0x002DE000|0x00002000
-gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
+gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
#NV_FTW_WORKING
DATA = {
# EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid =
@@ -110,7 +110,7 @@ DATA = {
}
0x002E0000|0x00010000
-gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
+gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
0x002F0000|0x00010000
FILE = Platform/Hisilicon/D0x-CustomData.Fv
diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
index 6227607ffe..6fa5b5e6c8 100644
--- a/Platform/Hisilicon/D05/D05.fdf
+++ b/Platform/Hisilicon/D05/D05.fdf
@@ -69,7 +69,7 @@ FILE = Platform/Hisilicon/D05/bl1.bin
FILE = Platform/Hisilicon/D05/fip.bin
0x002D0000|0x0000E000
-gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
+gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
DATA = {
## This is the EFI_FIRMWARE_VOLUME_HEADER
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -97,7 +97,7 @@ DATA = {
}
0x002DE000|0x00002000
-gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
+gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
#NV_FTW_WORKING
DATA = {
# EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid =
@@ -110,7 +110,7 @@ DATA = {
}
0x002E0000|0x00010000
-gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
+gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
0x002F0000|0x00010000
FILE = Platform/Hisilicon/D0x-CustomData.Fv
diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
index 09ec7ce08b..f8be4741ef 100644
--- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
+++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
@@ -54,14 +54,15 @@
gHisiSpiFlashProtocolGuid
[Pcd.common]
- gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
- gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
- gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
gArmPlatformTokenSpaceGuid.PcdNorFlashCheckBlockLocked
+ gHisiTokenSpaceGuid.PcdSFCMEM0BaseAddress
[Depex]
gHisiSpiFlashProtocolGuid
diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c
index 7c6b64c33e..e18cc9e06e 100644
--- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c
+++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c
@@ -28,8 +28,8 @@ FLASH_DESCRIPTION mFlashDevices[FLASH_DEVICE_COUNT] =
{
{
// UEFI Variable Services non-volatile storage
- 0xa4000000,
- FixedPcdGet32(PcdFlashNvStorageVariableBase),
+ FixedPcdGet64 (PcdSFCMEM0BaseAddress),
+ FixedPcdGet64 (PcdFlashNvStorageVariableBase64),
0x20000,
SIZE_64KB,
{0xCC2CBF29, 0x1498, 0x4CDD, {0x81, 0x71, 0xF8, 0xB6, 0xB4, 0x1D, 0x09, 0x09}}
@@ -145,8 +145,8 @@ InitializeFvAndVariableStoreHeaders (
Headers = AllocateZeroPool(HeadersLength);
// FirmwareVolumeHeader->FvLength is declared to have the Variable area AND the FTW working area AND the FTW Spare contiguous.
- ASSERT(PcdGet32(PcdFlashNvStorageVariableBase) + PcdGet32(PcdFlashNvStorageVariableSize) == PcdGet32(PcdFlashNvStorageFtwWorkingBase));
- ASSERT(PcdGet32(PcdFlashNvStorageFtwWorkingBase) + PcdGet32(PcdFlashNvStorageFtwWorkingSize) == PcdGet32(PcdFlashNvStorageFtwSpareBase));
+ ASSERT(PcdGet64(PcdFlashNvStorageVariableBase64) + PcdGet32(PcdFlashNvStorageVariableSize) == PcdGet64(PcdFlashNvStorageFtwWorkingBase64));
+ ASSERT(PcdGet64(PcdFlashNvStorageFtwWorkingBase64) + PcdGet32(PcdFlashNvStorageFtwWorkingSize) == PcdGet64(PcdFlashNvStorageFtwSpareBase64));
// Check if the size of the area is at least one block size
ASSERT((PcdGet32(PcdFlashNvStorageVariableSize) > 0) && ((UINT32)PcdGet32(PcdFlashNvStorageVariableSize) / Instance->Media.BlockSize > 0));
@@ -154,9 +154,9 @@ InitializeFvAndVariableStoreHeaders (
ASSERT((PcdGet32(PcdFlashNvStorageFtwSpareSize) > 0) && ((UINT32)PcdGet32(PcdFlashNvStorageFtwSpareSize) / Instance->Media.BlockSize > 0));
// Ensure the Variable area Base Addresses are aligned on a block size boundaries
- ASSERT((UINT32)PcdGet32(PcdFlashNvStorageVariableBase) % Instance->Media.BlockSize == 0);
- ASSERT((UINT32)PcdGet32(PcdFlashNvStorageFtwWorkingBase) % Instance->Media.BlockSize == 0);
- ASSERT((UINT32)PcdGet32(PcdFlashNvStorageFtwSpareBase) % Instance->Media.BlockSize == 0);
+ ASSERT((UINT32)PcdGet64(PcdFlashNvStorageVariableBase64) % Instance->Media.BlockSize == 0);
+ ASSERT((UINT32)PcdGet64(PcdFlashNvStorageFtwWorkingBase64) % Instance->Media.BlockSize == 0);
+ ASSERT((UINT32)PcdGet64(PcdFlashNvStorageFtwSpareBase64) % Instance->Media.BlockSize == 0);
//
// EFI_FIRMWARE_VOLUME_HEADER
@@ -855,10 +855,10 @@ FvbInitialize (
UINT32 FvbNumLba;
Instance->Initialized = TRUE;
- mFlashNvStorageVariableBase = FixedPcdGet32 (PcdFlashNvStorageVariableBase);
+ mFlashNvStorageVariableBase = FixedPcdGet64 (PcdFlashNvStorageVariableBase64);
// Set the index of the first LBA for the FVB
- Instance->StartLba = (PcdGet32 (PcdFlashNvStorageVariableBase) - Instance->RegionBaseAddress) / Instance->Media.BlockSize;
+ Instance->StartLba = (PcdGet64 (PcdFlashNvStorageVariableBase64) - Instance->RegionBaseAddress) / Instance->Media.BlockSize;
// Determine if there is a valid header at the beginning of the Flash
Status = ValidateFvHeader (Instance);
@@ -1208,8 +1208,8 @@ FlashFvbInitialize (
{
// Check if this Flash device contain the variable storage region
ContainVariableStorage =
- (FlashDevices[Index].RegionBaseAddress <= (UINT32)PcdGet32 (PcdFlashNvStorageVariableBase)) &&
- ((UINT32)(PcdGet32 (PcdFlashNvStorageVariableBase) + PcdGet32 (PcdFlashNvStorageVariableSize)) <= FlashDevices[Index].RegionBaseAddress + FlashDevices[Index].Size);
+ (FlashDevices[Index].RegionBaseAddress <= PcdGet64 (PcdFlashNvStorageVariableBase64)) &&
+ ((PcdGet64 (PcdFlashNvStorageVariableBase64) + PcdGet32 (PcdFlashNvStorageVariableSize)) <= FlashDevices[Index].RegionBaseAddress + FlashDevices[Index].Size);
Status = FlashCreateInstance (
FlashDevices[Index].DeviceBaseAddress,
--
2.17.0
next prev parent reply other threads:[~2018-08-16 12:13 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-16 12:12 [PATCH edk2-platforms v3 00/36] Upload for D06 platform Ming Huang
2018-08-16 12:12 ` Ming Huang [this message]
2018-08-16 12:12 ` [PATCH edk2-platforms v3 02/36] Hisilicon/D0X: Rename the global variable gDS3231RtcDevice Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 03/36] Hisilicon/D06: Add several base file for D06 Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 04/36] Platform/Hisilicon/D06: Add M41T83RealTimeClockLib Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 05/36] Platform/Hisilicon/D06: Add edk2-non-osi components for D06 Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 06/36] Hisilicon/D06: Add OemMiscLibD06 Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 07/36] Silicon/Hisilicon/D06: Wait for all disk ready Ming Huang
2018-08-22 10:25 ` Leif Lindholm
2018-08-22 15:00 ` Ming
2018-08-16 12:12 ` [PATCH edk2-platforms v3 08/36] Silicon/Hisilicon/Acpi: Unify HisiAcipPlatformDxe Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 09/36] Hisilicon/D06: Add Debug Serial Port Init Driver Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 10/36] Hisilicon/D06: Add ACPI Tables for D06 Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 11/36] Hisilicon/D06: Add Hi1620OemConfigUiLib Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 12/36] Silicon/Hisilicon/D06: Stop watchdog Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 13/36] Hisilicon/I2C: Modify I2CLib.c for coding style Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 14/36] Silicon/Hisilicon/I2C: Refactor I2C library Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 15/36] Silicon/Hisilicon/D06: Fix I2C enable fail issue for D06 Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 16/36] Silicon/Hisilicon/D06: Add I2C delay for HNS auto config Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 17/36] Hisilicon/I2C: Fix a typo issue Ming Huang
2018-08-21 21:45 ` Leif Lindholm
2018-08-21 21:48 ` Leif Lindholm
2018-08-16 12:12 ` [PATCH edk2-platforms v3 18/36] Silicon/Hisilicon/D06: Optimize HNS config CDR post time Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 19/36] Silicon/Hisilicon/Setup: Add Setup Item "EnableGOP" Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 20/36] Hisilicon/Hi1620: Add ACPI PPTT table Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 21/36] Platform/Hisilicon/D06: Enable ACPI PPTT Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 22/36] Platform/Hisilicon/D06: Add OemNicLib Ming Huang
2018-08-22 14:55 ` Leif Lindholm
2018-08-16 12:12 ` [PATCH edk2-platforms v3 23/36] Platform/Hisilicon/D06: Add OemNicConfig2P Driver Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 24/36] Hisilicon/D0x: Update SMBIOS type9 info Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 25/36] Platform/Hisilicon/D06: Add EarlyConfigPeim peim Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 26/36] Platform/Hisilicon/D06: Add PciHostBridgeLib Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 27/36] Hisilicon/D06: add apei driver Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 28/36] Silicon/Hisilicon/D06: Add some Lpc macro to LpcLib.h Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 29/36] Platform/Hisilicon/D06: Add capsule upgrade support Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 30/36] Silicon/Hisilicon/D06: Modify for close slave core clock Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 31/36] Silicon/Hisilicon/D06: Add I2C Bus Exception handle function Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 32/36] Silicon/Hisilicon/Setup: Support SPCR table switch Ming Huang
2018-08-21 21:11 ` Leif Lindholm
[not found] ` <6cf5a20d-b648-1ae8-043d-75f241fc4123@linaro.org>
2018-08-23 10:50 ` Ming
2018-08-23 11:12 ` Leif Lindholm
2018-08-23 11:58 ` Ming
2018-08-16 12:12 ` [PATCH edk2-platforms v3 33/36] Silicon/Hisilicon/setup: Support SMMU switch Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 34/36] Hisilicon/D06: Add PciPlatformLib Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 35/36] Hisilicon/D06: Add edk2-non-osi Shell components Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 36/36] Platform/Hisilicon/D0x: Update version string to 18.08 Ming Huang
2018-08-17 12:23 ` [PATCH edk2-platforms v3 00/36] Upload for D06 platform Leif Lindholm
2018-08-18 6:20 ` Ming
2018-08-22 16:40 ` Leif Lindholm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180816121239.44129-2-ming.huang@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox