* [Patch V1 1/1] \Silicon\Intel\Tools\FitGen: Add extra parameter to the Fit Gen Tool to input the Higher Flash Address
@ 2020-09-30 5:48 cbduggap
2020-09-30 5:48 ` [Patch V4 1/1] Tools\FitGen: Add extra parameter " cbduggap
0 siblings, 1 reply; 4+ messages in thread
From: cbduggap @ 2020-09-30 5:48 UTC (permalink / raw)
To: devel; +Cc: cbduggap
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2981
Add extra parameter to the Fit Gen Tool to input the Higher Address.
Default Address should be 4GB and if some one inputs new address,
tool must consume that address instead of Default address (4GB).
Signed-off-by: cbduggap <chinni.b.duggapu@intel.com>
---
Silicon/Intel/Tools/FitGen/FitGen.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitGen/FitGen.c
index c4006e69c8..c17a0fabc0 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -209,10 +209,12 @@ typedef struct {
#define DEFAULT_FIT_TABLE_POINTER_OFFSET 0x40
#define DEFAULT_FIT_ENTRY_VERSION 0x0100
+#define HIGHER_FLASH_ADDRESS (gFitTableContext.HigherAddressRemapValue)
+
#define MEMORY_TO_FLASH(FileBuffer, FvBuffer, FvSize) \
- (UINTN)(0x100000000 - ((UINTN)(FvBuffer) + (UINTN)(FvSize) - (UINTN)(FileBuffer)))
+ (UINTN)(HIGHER_FLASH_ADDRESS - ((UINTN)(FvBuffer) + (UINTN)(FvSize) - (UINTN)(FileBuffer)))
#define FLASH_TO_MEMORY(Address, FvBuffer, FvSize) \
- (VOID *)(UINTN)((UINTN)(FvBuffer) + (UINTN)(FvSize) - (0x100000000 - (UINTN)(Address)))
+ (VOID *)(UINTN)((UINTN)(FvBuffer) + (UINTN)(FvSize) - (HIGHER_FLASH_ADDRESS - (UINTN)(Address)))
#define FIT_TABLE_TYPE_HEADER 0
#define FIT_TABLE_TYPE_MICROCODE 1
@@ -268,6 +270,7 @@ typedef struct {
UINT32 MicrocodeVersion;
FIT_TABLE_CONTEXT_ENTRY OptionalModule[MAX_OPTIONAL_ENTRY];
FIT_TABLE_CONTEXT_ENTRY PortModule[MAX_PORT_ENTRY];
+ UINT64 HigherAddressRemapValue;
} FIT_TABLE_CONTEXT;
FIT_TABLE_CONTEXT gFitTableContext = {0};
@@ -330,6 +333,7 @@ Returns:
"\t[-F <FitTablePointerOffset>] [-F <FitTablePointerOffset>] [-V <FitHeaderVersion>]\n"
"\t[-NA]\n"
"\t[-A <MicrocodeAlignment>]\n"
+ "\t[-REMAP <FlashHigherAddress>\n"
"\t[-CLEAR]\n"
"\t[-L <MicrocodeSlotSize> <MicrocodeFfsGuid>]\n"
"\t[-I <BiosInfoGuid>]\n"
@@ -986,6 +990,21 @@ Returns:
Index += 2;
}
+ if ((Index >= argc) ||
+ ((strcmp (argv[Index], "-REMAP") == 0) ||
+ (strcmp (argv[Index], "-remap") == 0)) ) {
+ //
+ // by pass
+ //
+ gFitTableContext.HigherAddressRemapValue = xtoi (argv[Index + 1]);
+ Index += 2;
+ } else {
+ //
+ // no remapping
+ //
+ gFitTableContext.HigherAddressRemapValue = 0x100000000;
+ }
+ printf ("Higher Address Value : 0x%llx\n", gFitTableContext.HigherAddressRemapValue);
//
// 0.4 Clear FIT table related memory
//
--
2.26.2.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Patch V4 1/1] Tools\FitGen: Add extra parameter to input the Higher Flash Address
2020-09-30 5:48 [Patch V1 1/1] \Silicon\Intel\Tools\FitGen: Add extra parameter to the Fit Gen Tool to input the Higher Flash Address cbduggap
@ 2020-09-30 5:48 ` cbduggap
2020-09-30 5:53 ` 回复: [edk2-devel] " gaoliming
0 siblings, 1 reply; 4+ messages in thread
From: cbduggap @ 2020-09-30 5:48 UTC (permalink / raw)
To: devel; +Cc: cbduggap, Bob Feng, Liming Gao
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2981
Add extra parameter to the Fit Gen Tool to input the Higher Address.
Default Address should be 4GB and if some one inputs new address,
tool must consume that address instead of Default address (4GB).
Signed-off-by: cbduggap <chinni.b.duggapu@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: cbduggap <chinni.b.duggapu@intel.com>
---
Silicon/Intel/Tools/FitGen/FitGen.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitGen/FitGen.c
index c4006e69c8..cb60a3c324 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -209,10 +209,12 @@ typedef struct {
#define DEFAULT_FIT_TABLE_POINTER_OFFSET 0x40
#define DEFAULT_FIT_ENTRY_VERSION 0x0100
+#define TOP_FLASH_ADDRESS (gFitTableContext.TopFlashAddressRemapValue)
+
#define MEMORY_TO_FLASH(FileBuffer, FvBuffer, FvSize) \
- (UINTN)(0x100000000 - ((UINTN)(FvBuffer) + (UINTN)(FvSize) - (UINTN)(FileBuffer)))
+ (UINTN)(TOP_FLASH_ADDRESS - ((UINTN)(FvBuffer) + (UINTN)(FvSize) - (UINTN)(FileBuffer)))
#define FLASH_TO_MEMORY(Address, FvBuffer, FvSize) \
- (VOID *)(UINTN)((UINTN)(FvBuffer) + (UINTN)(FvSize) - (0x100000000 - (UINTN)(Address)))
+ (VOID *)(UINTN)((UINTN)(FvBuffer) + (UINTN)(FvSize) - (TOP_FLASH_ADDRESS - (UINTN)(Address)))
#define FIT_TABLE_TYPE_HEADER 0
#define FIT_TABLE_TYPE_MICROCODE 1
@@ -268,6 +270,7 @@ typedef struct {
UINT32 MicrocodeVersion;
FIT_TABLE_CONTEXT_ENTRY OptionalModule[MAX_OPTIONAL_ENTRY];
FIT_TABLE_CONTEXT_ENTRY PortModule[MAX_PORT_ENTRY];
+ UINT64 TopFlashAddressRemapValue;
} FIT_TABLE_CONTEXT;
FIT_TABLE_CONTEXT gFitTableContext = {0};
@@ -330,6 +333,7 @@ Returns:
"\t[-F <FitTablePointerOffset>] [-F <FitTablePointerOffset>] [-V <FitHeaderVersion>]\n"
"\t[-NA]\n"
"\t[-A <MicrocodeAlignment>]\n"
+ "\t[-REMAP <TopFlashAddress>\n"
"\t[-CLEAR]\n"
"\t[-L <MicrocodeSlotSize> <MicrocodeFfsGuid>]\n"
"\t[-I <BiosInfoGuid>]\n"
@@ -986,6 +990,21 @@ Returns:
Index += 2;
}
+ if ((Index >= argc) ||
+ ((strcmp (argv[Index], "-REMAP") == 0) ||
+ (strcmp (argv[Index], "-remap") == 0)) ) {
+ //
+ // by pass
+ //
+ gFitTableContext.TopFlashAddressRemapValue = xtoi (argv[Index + 1]);
+ Index += 2;
+ } else {
+ //
+ // no remapping
+ //
+ gFitTableContext.TopFlashAddressRemapValue = 0x100000000;
+ }
+ printf ("Top Flash Address Value : 0x%llx\n", gFitTableContext.TopFlashAddressRemapValue);
//
// 0.4 Clear FIT table related memory
//
--
2.26.2.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* 回复: [edk2-devel] [Patch V4 1/1] Tools\FitGen: Add extra parameter to input the Higher Flash Address
2020-09-30 5:48 ` [Patch V4 1/1] Tools\FitGen: Add extra parameter " cbduggap
@ 2020-09-30 5:53 ` gaoliming
0 siblings, 0 replies; 4+ messages in thread
From: gaoliming @ 2020-09-30 5:53 UTC (permalink / raw)
To: devel, chinni.b.duggapu; +Cc: 'Bob Feng'
Chinni:
Can you change subject and commit message with the top flash address
instead of higher flash address?
Thanks
Liming
> -----邮件原件-----
> 发件人: bounce+27952+65758+4905953+8761045@groups.io
> <bounce+27952+65758+4905953+8761045@groups.io> 代表 cbduggap
> 发送时间: 2020年9月30日 13:49
> 收件人: devel@edk2.groups.io
> 抄送: cbduggap <chinni.b.duggapu@intel.com>; Bob Feng
> <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>
> 主题: [edk2-devel] [Patch V4 1/1] Tools\FitGen: Add extra parameter to
input
> the Higher Flash Address
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2981
>
> Add extra parameter to the Fit Gen Tool to input the Higher Address.
> Default Address should be 4GB and if some one inputs new address,
> tool must consume that address instead of Default address (4GB).
>
> Signed-off-by: cbduggap <chinni.b.duggapu@intel.com>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
>
> Signed-off-by: cbduggap <chinni.b.duggapu@intel.com>
> ---
> Silicon/Intel/Tools/FitGen/FitGen.c | 23 +++++++++++++++++++++--
> 1 file changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c
> b/Silicon/Intel/Tools/FitGen/FitGen.c
> index c4006e69c8..cb60a3c324 100644
> --- a/Silicon/Intel/Tools/FitGen/FitGen.c
> +++ b/Silicon/Intel/Tools/FitGen/FitGen.c
> @@ -209,10 +209,12 @@ typedef struct {
> #define DEFAULT_FIT_TABLE_POINTER_OFFSET 0x40
>
> #define DEFAULT_FIT_ENTRY_VERSION 0x0100
>
>
>
> +#define TOP_FLASH_ADDRESS
> (gFitTableContext.TopFlashAddressRemapValue)
>
> +
>
> #define MEMORY_TO_FLASH(FileBuffer, FvBuffer, FvSize) \
>
> - (UINTN)(0x100000000 - ((UINTN)(FvBuffer) +
> (UINTN)(FvSize) - (UINTN)(FileBuffer)))
>
> + (UINTN)(TOP_FLASH_ADDRESS - ((UINTN)(FvBuffer) +
> (UINTN)(FvSize) - (UINTN)(FileBuffer)))
>
> #define FLASH_TO_MEMORY(Address, FvBuffer, FvSize) \
>
> - (VOID *)(UINTN)((UINTN)(FvBuffer) + (UINTN)(FvSize) -
> (0x100000000 - (UINTN)(Address)))
>
> + (VOID *)(UINTN)((UINTN)(FvBuffer) + (UINTN)(FvSize) -
> (TOP_FLASH_ADDRESS - (UINTN)(Address)))
>
>
>
> #define FIT_TABLE_TYPE_HEADER 0
>
> #define FIT_TABLE_TYPE_MICROCODE 1
>
> @@ -268,6 +270,7 @@ typedef struct {
> UINT32 MicrocodeVersion;
>
> FIT_TABLE_CONTEXT_ENTRY
> OptionalModule[MAX_OPTIONAL_ENTRY];
>
> FIT_TABLE_CONTEXT_ENTRY PortModule[MAX_PORT_ENTRY];
>
> + UINT64 TopFlashAddressRemapValue;
>
> } FIT_TABLE_CONTEXT;
>
>
>
> FIT_TABLE_CONTEXT gFitTableContext = {0};
>
> @@ -330,6 +333,7 @@ Returns:
> "\t[-F <FitTablePointerOffset>] [-F <FitTablePointerOffset>]
[-V
> <FitHeaderVersion>]\n"
>
> "\t[-NA]\n"
>
> "\t[-A <MicrocodeAlignment>]\n"
>
> + "\t[-REMAP <TopFlashAddress>\n"
>
> "\t[-CLEAR]\n"
>
> "\t[-L <MicrocodeSlotSize> <MicrocodeFfsGuid>]\n"
>
> "\t[-I <BiosInfoGuid>]\n"
>
> @@ -986,6 +990,21 @@ Returns:
> Index += 2;
>
> }
>
>
>
> + if ((Index >= argc) ||
>
> + ((strcmp (argv[Index], "-REMAP") == 0) ||
>
> + (strcmp (argv[Index], "-remap") == 0)) ) {
>
> + //
>
> + // by pass
>
> + //
>
> + gFitTableContext.TopFlashAddressRemapValue = xtoi (argv[Index + 1]);
>
> + Index += 2;
>
> + } else {
>
> + //
>
> + // no remapping
>
> + //
>
> + gFitTableContext.TopFlashAddressRemapValue = 0x100000000;
>
> + }
>
> + printf ("Top Flash Address Value : 0x%llx\n",
> gFitTableContext.TopFlashAddressRemapValue);
>
> //
>
> // 0.4 Clear FIT table related memory
>
> //
>
> --
> 2.26.2.windows.1
>
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#65758): https://edk2.groups.io/g/devel/message/65758
> Mute This Topic: https://groups.io/mt/77212511/4905953
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> [gaoliming@byosoft.com.cn]
> -=-=-=-=-=-=
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Patch V4 1/1] Tools\FitGen: Add extra parameter to input the Higher Flash Address
2020-10-05 14:13 [Patch V1 1/1] \Silicon\Intel\Tools\FitGen: Add extra parameter to the Fit Gen Tool " cbduggap
@ 2020-10-05 14:13 ` cbduggap
0 siblings, 0 replies; 4+ messages in thread
From: cbduggap @ 2020-10-05 14:13 UTC (permalink / raw)
To: devel; +Cc: cbduggap, Bob Feng, Liming Gao
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2981
Add extra parameter to the Fit Gen Tool to input the Higher Address.
Default Address should be 4GB and if some one inputs new address,
tool must consume that address instead of Default address (4GB).
Signed-off-by: cbduggap <chinni.b.duggapu@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: cbduggap <chinni.b.duggapu@intel.com>
---
Silicon/Intel/Tools/FitGen/FitGen.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitGen/FitGen.c
index c4006e69c8..cb60a3c324 100644
--- a/Silicon/Intel/Tools/FitGen/FitGen.c
+++ b/Silicon/Intel/Tools/FitGen/FitGen.c
@@ -209,10 +209,12 @@ typedef struct {
#define DEFAULT_FIT_TABLE_POINTER_OFFSET 0x40
#define DEFAULT_FIT_ENTRY_VERSION 0x0100
+#define TOP_FLASH_ADDRESS (gFitTableContext.TopFlashAddressRemapValue)
+
#define MEMORY_TO_FLASH(FileBuffer, FvBuffer, FvSize) \
- (UINTN)(0x100000000 - ((UINTN)(FvBuffer) + (UINTN)(FvSize) - (UINTN)(FileBuffer)))
+ (UINTN)(TOP_FLASH_ADDRESS - ((UINTN)(FvBuffer) + (UINTN)(FvSize) - (UINTN)(FileBuffer)))
#define FLASH_TO_MEMORY(Address, FvBuffer, FvSize) \
- (VOID *)(UINTN)((UINTN)(FvBuffer) + (UINTN)(FvSize) - (0x100000000 - (UINTN)(Address)))
+ (VOID *)(UINTN)((UINTN)(FvBuffer) + (UINTN)(FvSize) - (TOP_FLASH_ADDRESS - (UINTN)(Address)))
#define FIT_TABLE_TYPE_HEADER 0
#define FIT_TABLE_TYPE_MICROCODE 1
@@ -268,6 +270,7 @@ typedef struct {
UINT32 MicrocodeVersion;
FIT_TABLE_CONTEXT_ENTRY OptionalModule[MAX_OPTIONAL_ENTRY];
FIT_TABLE_CONTEXT_ENTRY PortModule[MAX_PORT_ENTRY];
+ UINT64 TopFlashAddressRemapValue;
} FIT_TABLE_CONTEXT;
FIT_TABLE_CONTEXT gFitTableContext = {0};
@@ -330,6 +333,7 @@ Returns:
"\t[-F <FitTablePointerOffset>] [-F <FitTablePointerOffset>] [-V <FitHeaderVersion>]\n"
"\t[-NA]\n"
"\t[-A <MicrocodeAlignment>]\n"
+ "\t[-REMAP <TopFlashAddress>\n"
"\t[-CLEAR]\n"
"\t[-L <MicrocodeSlotSize> <MicrocodeFfsGuid>]\n"
"\t[-I <BiosInfoGuid>]\n"
@@ -986,6 +990,21 @@ Returns:
Index += 2;
}
+ if ((Index >= argc) ||
+ ((strcmp (argv[Index], "-REMAP") == 0) ||
+ (strcmp (argv[Index], "-remap") == 0)) ) {
+ //
+ // by pass
+ //
+ gFitTableContext.TopFlashAddressRemapValue = xtoi (argv[Index + 1]);
+ Index += 2;
+ } else {
+ //
+ // no remapping
+ //
+ gFitTableContext.TopFlashAddressRemapValue = 0x100000000;
+ }
+ printf ("Top Flash Address Value : 0x%llx\n", gFitTableContext.TopFlashAddressRemapValue);
//
// 0.4 Clear FIT table related memory
//
--
2.26.2.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-05 14:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-30 5:48 [Patch V1 1/1] \Silicon\Intel\Tools\FitGen: Add extra parameter to the Fit Gen Tool to input the Higher Flash Address cbduggap
2020-09-30 5:48 ` [Patch V4 1/1] Tools\FitGen: Add extra parameter " cbduggap
2020-09-30 5:53 ` 回复: [edk2-devel] " gaoliming
-- strict thread matches above, loose matches on Subject: below --
2020-10-05 14:13 [Patch V1 1/1] \Silicon\Intel\Tools\FitGen: Add extra parameter to the Fit Gen Tool " cbduggap
2020-10-05 14:13 ` [Patch V4 1/1] Tools\FitGen: Add extra parameter " cbduggap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox