* [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Capsule on Disk file name capsule
@ 2021-10-18 20:11 Bob Morgan
2021-10-29 1:46 ` 回复: " gaoliming
0 siblings, 1 reply; 5+ messages in thread
From: Bob Morgan @ 2021-10-18 20:11 UTC (permalink / raw)
To: devel; +Cc: Bob Morgan, Jian J Wang, Liming Gao, Guomin Jiang
Enhance RelocateCapsuleToRam() to skip creation of the Capsule on Disk
file name capsule if PcdSupportUpdateCapsuleReset feature is not enabled.
This avoids an EFI_UNSUPPORTED return status from UpdateCapsule() when the
file name capsule is encountered and PcdSupportUpdateCapsuleReset is FALSE.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Signed-off-by: Bob Morgan <bobm@nvidia.com>
---
.../Library/DxeCapsuleLibFmp/CapsuleOnDisk.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
index 4c32c6cdcf..e65e335585 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
@@ -1739,6 +1739,7 @@ RelocateCapsuleToRam (
UINT8 *StringBuf;
UINTN StringSize;
UINTN TotalStringSize;
+ UINTN CapsulesToProcess;
CapsuleOnDiskBuf = NULL;
BlockDescriptors = NULL;
@@ -1778,6 +1779,13 @@ RelocateCapsuleToRam (
TotalStringSize += StrSize (CapsuleOnDiskBuf[Index].FileInfo->FileName);
}
+ // If Persist Across Reset isn't supported, skip the file name strings capsule
+ if (!FeaturePcdGet (PcdSupportUpdateCapsuleReset)) {
+ CapsulesToProcess = CapsuleOnDiskNum;
+ goto BuildSg;
+ }
+ CapsulesToProcess = CapsuleOnDiskNum + 1;
+
FileNameCapsule = AllocateZeroPool (sizeof (EFI_CAPSULE_HEADER) + TotalStringSize);
if (FileNameCapsule == NULL) {
DEBUG ((DEBUG_ERROR, "Fail to allocate memory for name capsule.\n"));
@@ -1804,18 +1812,23 @@ RelocateCapsuleToRam (
//
// 3. Build Gather list for the capsules
//
- Status = BuildGatherList (CapsuleBuffer, CapsuleSize, CapsuleOnDiskNum + 1, &BlockDescriptors);
+BuildSg:
+ Status = BuildGatherList (CapsuleBuffer, CapsuleSize, CapsulesToProcess, &BlockDescriptors);
if (EFI_ERROR (Status) || BlockDescriptors == NULL) {
FreePool (CapsuleBuffer);
FreePool (CapsuleSize);
- FreePool (FileNameCapsule);
+ if (FileNameCapsule != NULL) {
+ FreePool (FileNameCapsule);
+ }
return EFI_OUT_OF_RESOURCES;
}
//
// 4. Call UpdateCapsule() service
//
- Status = gRT->UpdateCapsule((EFI_CAPSULE_HEADER **) CapsuleBuffer, CapsuleOnDiskNum + 1, (UINTN) BlockDescriptors);
+ Status = gRT->UpdateCapsule ((EFI_CAPSULE_HEADER **) CapsuleBuffer,
+ CapsulesToProcess,
+ (UINTN) BlockDescriptors);
return Status;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* 回复: [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Capsule on Disk file name capsule
2021-10-18 20:11 [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Capsule on Disk file name capsule Bob Morgan
@ 2021-10-29 1:46 ` gaoliming
2021-10-29 16:01 ` [edk2-devel] " Bob Morgan
0 siblings, 1 reply; 5+ messages in thread
From: gaoliming @ 2021-10-29 1:46 UTC (permalink / raw)
To: 'Bob Morgan', devel; +Cc: 'Jian J Wang', 'Guomin Jiang'
Bob:
> -----邮件原件-----
> 发件人: Bob Morgan <bobm@nvidia.com>
> 发送时间: 2021年10月19日 4:12
> 收件人: devel@edk2.groups.io
> 抄送: Bob Morgan <bobm@nvidia.com>; Jian J Wang
> <jian.j.wang@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Guomin
> Jiang <guomin.jiang@intel.com>
> 主题: [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Capsule on Disk file name
> capsule
>
> Enhance RelocateCapsuleToRam() to skip creation of the Capsule on Disk
> file name capsule if PcdSupportUpdateCapsuleReset feature is not enabled.
> This avoids an EFI_UNSUPPORTED return status from UpdateCapsule() when
> the
> file name capsule is encountered and PcdSupportUpdateCapsuleReset is
> FALSE.
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> Signed-off-by: Bob Morgan <bobm@nvidia.com>
> ---
> .../Library/DxeCapsuleLibFmp/CapsuleOnDisk.c | 19
> ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> index 4c32c6cdcf..e65e335585 100644
> --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> @@ -1739,6 +1739,7 @@ RelocateCapsuleToRam (
> UINT8 *StringBuf;
> UINTN StringSize;
> UINTN TotalStringSize;
> + UINTN CapsulesToProcess;
>
> CapsuleOnDiskBuf = NULL;
> BlockDescriptors = NULL;
> @@ -1778,6 +1779,13 @@ RelocateCapsuleToRam (
> TotalStringSize += StrSize
> (CapsuleOnDiskBuf[Index].FileInfo->FileName);
> }
>
> + // If Persist Across Reset isn't supported, skip the file name strings
capsule
> + if (!FeaturePcdGet (PcdSupportUpdateCapsuleReset)) {
> + CapsulesToProcess = CapsuleOnDiskNum;
> + goto BuildSg;
> + }
> + CapsulesToProcess = CapsuleOnDiskNum + 1;
> +
> FileNameCapsule = AllocateZeroPool (sizeof (EFI_CAPSULE_HEADER) +
> TotalStringSize);
> if (FileNameCapsule == NULL) {
> DEBUG ((DEBUG_ERROR, "Fail to allocate memory for name
> capsule.\n"));
> @@ -1804,18 +1812,23 @@ RelocateCapsuleToRam (
> //
> // 3. Build Gather list for the capsules
> //
> - Status = BuildGatherList (CapsuleBuffer, CapsuleSize, CapsuleOnDiskNum
+
> 1, &BlockDescriptors);
> +BuildSg:
What does 'BuildSg' mean?
Thanks
Liming
> + Status = BuildGatherList (CapsuleBuffer, CapsuleSize,
CapsulesToProcess,
> &BlockDescriptors);
> if (EFI_ERROR (Status) || BlockDescriptors == NULL) {
> FreePool (CapsuleBuffer);
> FreePool (CapsuleSize);
> - FreePool (FileNameCapsule);
> + if (FileNameCapsule != NULL) {
> + FreePool (FileNameCapsule);
> + }
> return EFI_OUT_OF_RESOURCES;
> }
>
> //
> // 4. Call UpdateCapsule() service
> //
> - Status = gRT->UpdateCapsule((EFI_CAPSULE_HEADER **) CapsuleBuffer,
> CapsuleOnDiskNum + 1, (UINTN) BlockDescriptors);
> + Status = gRT->UpdateCapsule ((EFI_CAPSULE_HEADER **) CapsuleBuffer,
> + CapsulesToProcess,
> + (UINTN) BlockDescriptors);
>
> return Status;
> }
> --
> 2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [edk2-devel] 回复: [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Capsule on Disk file name capsule
2021-10-29 1:46 ` 回复: " gaoliming
@ 2021-10-29 16:01 ` Bob Morgan
2021-11-02 1:11 ` 回复: " gaoliming
0 siblings, 1 reply; 5+ messages in thread
From: Bob Morgan @ 2021-10-29 16:01 UTC (permalink / raw)
To: devel@edk2.groups.io, gaoliming@byosoft.com.cn
Cc: 'Jian J Wang', 'Guomin Jiang'
Hi Liming,
BuildSg is supposed to mean 'Build Scatter-Gather'. Maybe 'BuildGather' would be a better goto label since it matches the comment and the function?
Let me know.
Thanks,
-bob
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming via groups.io
Sent: Thursday, October 28, 2021 7:46 PM
To: Bob Morgan <bobm@nvidia.com>; devel@edk2.groups.io
Cc: 'Jian J Wang' <jian.j.wang@intel.com>; 'Guomin Jiang' <guomin.jiang@intel.com>
Subject: [edk2-devel] 回复: [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Capsule on Disk file name capsule
External email: Use caution opening links or attachments
Bob:
> -----邮件原件-----
> 发件人: Bob Morgan <bobm@nvidia.com>
> 发送时间: 2021年10月19日 4:12
> 收件人: devel@edk2.groups.io
> 抄送: Bob Morgan <bobm@nvidia.com>; Jian J Wang <jian.j.wang@intel.com>;
> Liming Gao <gaoliming@byosoft.com.cn>; Guomin Jiang
> <guomin.jiang@intel.com>
> 主题: [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Capsule on Disk file name
> capsule
>
> Enhance RelocateCapsuleToRam() to skip creation of the Capsule on Disk
> file name capsule if PcdSupportUpdateCapsuleReset feature is not enabled.
> This avoids an EFI_UNSUPPORTED return status from UpdateCapsule() when
> the file name capsule is encountered and PcdSupportUpdateCapsuleReset
> is FALSE.
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> Signed-off-by: Bob Morgan <bobm@nvidia.com>
> ---
> .../Library/DxeCapsuleLibFmp/CapsuleOnDisk.c | 19
> ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> index 4c32c6cdcf..e65e335585 100644
> --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> @@ -1739,6 +1739,7 @@ RelocateCapsuleToRam (
> UINT8 *StringBuf;
> UINTN StringSize;
> UINTN TotalStringSize;
> + UINTN CapsulesToProcess;
>
> CapsuleOnDiskBuf = NULL;
> BlockDescriptors = NULL;
> @@ -1778,6 +1779,13 @@ RelocateCapsuleToRam (
> TotalStringSize += StrSize
> (CapsuleOnDiskBuf[Index].FileInfo->FileName);
> }
>
> + // If Persist Across Reset isn't supported, skip the file name
> + strings
capsule
> + if (!FeaturePcdGet (PcdSupportUpdateCapsuleReset)) {
> + CapsulesToProcess = CapsuleOnDiskNum;
> + goto BuildSg;
> + }
> + CapsulesToProcess = CapsuleOnDiskNum + 1;
> +
> FileNameCapsule = AllocateZeroPool (sizeof (EFI_CAPSULE_HEADER) +
> TotalStringSize);
> if (FileNameCapsule == NULL) {
> DEBUG ((DEBUG_ERROR, "Fail to allocate memory for name
> capsule.\n")); @@ -1804,18 +1812,23 @@ RelocateCapsuleToRam (
> //
> // 3. Build Gather list for the capsules
> //
> - Status = BuildGatherList (CapsuleBuffer, CapsuleSize,
> CapsuleOnDiskNum
+
> 1, &BlockDescriptors);
> +BuildSg:
What does 'BuildSg' mean?
Thanks
Liming
> + Status = BuildGatherList (CapsuleBuffer, CapsuleSize,
CapsulesToProcess,
> &BlockDescriptors);
> if (EFI_ERROR (Status) || BlockDescriptors == NULL) {
> FreePool (CapsuleBuffer);
> FreePool (CapsuleSize);
> - FreePool (FileNameCapsule);
> + if (FileNameCapsule != NULL) {
> + FreePool (FileNameCapsule);
> + }
> return EFI_OUT_OF_RESOURCES;
> }
>
> //
> // 4. Call UpdateCapsule() service
> //
> - Status = gRT->UpdateCapsule((EFI_CAPSULE_HEADER **) CapsuleBuffer,
> CapsuleOnDiskNum + 1, (UINTN) BlockDescriptors);
> + Status = gRT->UpdateCapsule ((EFI_CAPSULE_HEADER **) CapsuleBuffer,
> + CapsulesToProcess,
> + (UINTN) BlockDescriptors);
>
> return Status;
> }
> --
> 2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread* 回复: [edk2-devel] 回复: [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Capsule on Disk file name capsule
2021-10-29 16:01 ` [edk2-devel] " Bob Morgan
@ 2021-11-02 1:11 ` gaoliming
2021-11-02 20:35 ` Bob Morgan
0 siblings, 1 reply; 5+ messages in thread
From: gaoliming @ 2021-11-02 1:11 UTC (permalink / raw)
To: devel, bobm; +Cc: 'Jian J Wang', 'Guomin Jiang'
Bob:
Yes. 'BuildGather' is better.
Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Bob Morgan
> via groups.io
> 发送时间: 2021年10月30日 0:02
> 收件人: devel@edk2.groups.io; gaoliming@byosoft.com.cn
> 抄送: 'Jian J Wang' <jian.j.wang@intel.com>; 'Guomin Jiang'
> <guomin.jiang@intel.com>
> 主题: Re: [edk2-devel] 回复: [PATCH] MdeModulePkg/DxeCapsuleLibFmp:
> Capsule on Disk file name capsule
>
> Hi Liming,
>
> BuildSg is supposed to mean 'Build Scatter-Gather'. Maybe 'BuildGather'
> would be a better goto label since it matches the comment and the function?
>
> Let me know.
>
> Thanks,
>
> -bob
>
>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming
> via groups.io
> Sent: Thursday, October 28, 2021 7:46 PM
> To: Bob Morgan <bobm@nvidia.com>; devel@edk2.groups.io
> Cc: 'Jian J Wang' <jian.j.wang@intel.com>; 'Guomin Jiang'
> <guomin.jiang@intel.com>
> Subject: [edk2-devel] 回复: [PATCH] MdeModulePkg/DxeCapsuleLibFmp:
> Capsule on Disk file name capsule
>
> External email: Use caution opening links or attachments
>
>
> Bob:
>
>
> > -----邮件原件-----
> > 发件人: Bob Morgan <bobm@nvidia.com>
> > 发送时间: 2021年10月19日 4:12
> > 收件人: devel@edk2.groups.io
> > 抄送: Bob Morgan <bobm@nvidia.com>; Jian J Wang
> <jian.j.wang@intel.com>;
> > Liming Gao <gaoliming@byosoft.com.cn>; Guomin Jiang
> > <guomin.jiang@intel.com>
> > 主题: [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Capsule on Disk file
> name
> > capsule
> >
> > Enhance RelocateCapsuleToRam() to skip creation of the Capsule on Disk
> > file name capsule if PcdSupportUpdateCapsuleReset feature is not enabled.
> > This avoids an EFI_UNSUPPORTED return status from UpdateCapsule()
> when
> > the file name capsule is encountered and PcdSupportUpdateCapsuleReset
> > is FALSE.
> >
> > Cc: Jian J Wang <jian.j.wang@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Guomin Jiang <guomin.jiang@intel.com>
> > Signed-off-by: Bob Morgan <bobm@nvidia.com>
> > ---
> > .../Library/DxeCapsuleLibFmp/CapsuleOnDisk.c | 19
> > ++++++++++++++++---
> > 1 file changed, 16 insertions(+), 3 deletions(-)
> >
> > diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> > b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> > index 4c32c6cdcf..e65e335585 100644
> > --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> > +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> > @@ -1739,6 +1739,7 @@ RelocateCapsuleToRam (
> > UINT8 *StringBuf;
> > UINTN StringSize;
> > UINTN TotalStringSize;
> > + UINTN CapsulesToProcess;
> >
> > CapsuleOnDiskBuf = NULL;
> > BlockDescriptors = NULL;
> > @@ -1778,6 +1779,13 @@ RelocateCapsuleToRam (
> > TotalStringSize += StrSize
> > (CapsuleOnDiskBuf[Index].FileInfo->FileName);
> > }
> >
> > + // If Persist Across Reset isn't supported, skip the file name
> > + strings
> capsule
> > + if (!FeaturePcdGet (PcdSupportUpdateCapsuleReset)) {
> > + CapsulesToProcess = CapsuleOnDiskNum;
> > + goto BuildSg;
> > + }
> > + CapsulesToProcess = CapsuleOnDiskNum + 1;
> > +
> > FileNameCapsule = AllocateZeroPool (sizeof (EFI_CAPSULE_HEADER) +
> > TotalStringSize);
> > if (FileNameCapsule == NULL) {
> > DEBUG ((DEBUG_ERROR, "Fail to allocate memory for name
> > capsule.\n")); @@ -1804,18 +1812,23 @@ RelocateCapsuleToRam (
> > //
> > // 3. Build Gather list for the capsules
> > //
> > - Status = BuildGatherList (CapsuleBuffer, CapsuleSize,
> > CapsuleOnDiskNum
> +
> > 1, &BlockDescriptors);
> > +BuildSg:
>
> What does 'BuildSg' mean?
>
> Thanks
> Liming
> > + Status = BuildGatherList (CapsuleBuffer, CapsuleSize,
> CapsulesToProcess,
> > &BlockDescriptors);
> > if (EFI_ERROR (Status) || BlockDescriptors == NULL) {
> > FreePool (CapsuleBuffer);
> > FreePool (CapsuleSize);
> > - FreePool (FileNameCapsule);
> > + if (FileNameCapsule != NULL) {
> > + FreePool (FileNameCapsule);
> > + }
> > return EFI_OUT_OF_RESOURCES;
> > }
> >
> > //
> > // 4. Call UpdateCapsule() service
> > //
> > - Status = gRT->UpdateCapsule((EFI_CAPSULE_HEADER **) CapsuleBuffer,
> > CapsuleOnDiskNum + 1, (UINTN) BlockDescriptors);
> > + Status = gRT->UpdateCapsule ((EFI_CAPSULE_HEADER **)
> CapsuleBuffer,
> > + CapsulesToProcess,
> > + (UINTN) BlockDescriptors);
> >
> > return Status;
> > }
> > --
> > 2.17.1
>
>
>
>
>
>
>
>
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [edk2-devel] 回复: [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Capsule on Disk file name capsule
2021-11-02 1:11 ` 回复: " gaoliming
@ 2021-11-02 20:35 ` Bob Morgan
0 siblings, 0 replies; 5+ messages in thread
From: Bob Morgan @ 2021-11-02 20:35 UTC (permalink / raw)
To: devel@edk2.groups.io, gaoliming@byosoft.com.cn
Cc: 'Jian J Wang', 'Guomin Jiang'
Thanks Liming. I will send a v2 patch with that change.
-bob
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming via groups.io
Sent: Monday, November 1, 2021 7:12 PM
To: devel@edk2.groups.io; Bob Morgan <bobm@nvidia.com>
Cc: 'Jian J Wang' <jian.j.wang@intel.com>; 'Guomin Jiang' <guomin.jiang@intel.com>
Subject: 回复: [edk2-devel] 回复: [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Capsule on Disk file name capsule
External email: Use caution opening links or attachments
Bob:
Yes. 'BuildGather' is better.
Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Bob Morgan via
> groups.io
> 发送时间: 2021年10月30日 0:02
> 收件人: devel@edk2.groups.io; gaoliming@byosoft.com.cn
> 抄送: 'Jian J Wang' <jian.j.wang@intel.com>; 'Guomin Jiang'
> <guomin.jiang@intel.com>
> 主题: Re: [edk2-devel] 回复: [PATCH] MdeModulePkg/DxeCapsuleLibFmp:
> Capsule on Disk file name capsule
>
> Hi Liming,
>
> BuildSg is supposed to mean 'Build Scatter-Gather'. Maybe 'BuildGather'
> would be a better goto label since it matches the comment and the function?
>
> Let me know.
>
> Thanks,
>
> -bob
>
>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
> gaoliming via groups.io
> Sent: Thursday, October 28, 2021 7:46 PM
> To: Bob Morgan <bobm@nvidia.com>; devel@edk2.groups.io
> Cc: 'Jian J Wang' <jian.j.wang@intel.com>; 'Guomin Jiang'
> <guomin.jiang@intel.com>
> Subject: [edk2-devel] 回复: [PATCH] MdeModulePkg/DxeCapsuleLibFmp:
> Capsule on Disk file name capsule
>
> External email: Use caution opening links or attachments
>
>
> Bob:
>
>
> > -----邮件原件-----
> > 发件人: Bob Morgan <bobm@nvidia.com>
> > 发送时间: 2021年10月19日 4:12
> > 收件人: devel@edk2.groups.io
> > 抄送: Bob Morgan <bobm@nvidia.com>; Jian J Wang
> <jian.j.wang@intel.com>;
> > Liming Gao <gaoliming@byosoft.com.cn>; Guomin Jiang
> > <guomin.jiang@intel.com>
> > 主题: [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Capsule on Disk file
> name
> > capsule
> >
> > Enhance RelocateCapsuleToRam() to skip creation of the Capsule on
> > Disk file name capsule if PcdSupportUpdateCapsuleReset feature is not enabled.
> > This avoids an EFI_UNSUPPORTED return status from UpdateCapsule()
> when
> > the file name capsule is encountered and
> > PcdSupportUpdateCapsuleReset is FALSE.
> >
> > Cc: Jian J Wang <jian.j.wang@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Guomin Jiang <guomin.jiang@intel.com>
> > Signed-off-by: Bob Morgan <bobm@nvidia.com>
> > ---
> > .../Library/DxeCapsuleLibFmp/CapsuleOnDisk.c | 19
> > ++++++++++++++++---
> > 1 file changed, 16 insertions(+), 3 deletions(-)
> >
> > diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> > b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> > index 4c32c6cdcf..e65e335585 100644
> > --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> > +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
> > @@ -1739,6 +1739,7 @@ RelocateCapsuleToRam (
> > UINT8 *StringBuf;
> > UINTN StringSize;
> > UINTN TotalStringSize;
> > + UINTN CapsulesToProcess;
> >
> > CapsuleOnDiskBuf = NULL;
> > BlockDescriptors = NULL;
> > @@ -1778,6 +1779,13 @@ RelocateCapsuleToRam (
> > TotalStringSize += StrSize
> > (CapsuleOnDiskBuf[Index].FileInfo->FileName);
> > }
> >
> > + // If Persist Across Reset isn't supported, skip the file name
> > + strings
> capsule
> > + if (!FeaturePcdGet (PcdSupportUpdateCapsuleReset)) {
> > + CapsulesToProcess = CapsuleOnDiskNum;
> > + goto BuildSg;
> > + }
> > + CapsulesToProcess = CapsuleOnDiskNum + 1;
> > +
> > FileNameCapsule = AllocateZeroPool (sizeof (EFI_CAPSULE_HEADER) +
> > TotalStringSize);
> > if (FileNameCapsule == NULL) {
> > DEBUG ((DEBUG_ERROR, "Fail to allocate memory for name
> > capsule.\n")); @@ -1804,18 +1812,23 @@ RelocateCapsuleToRam (
> > //
> > // 3. Build Gather list for the capsules
> > //
> > - Status = BuildGatherList (CapsuleBuffer, CapsuleSize,
> > CapsuleOnDiskNum
> +
> > 1, &BlockDescriptors);
> > +BuildSg:
>
> What does 'BuildSg' mean?
>
> Thanks
> Liming
> > + Status = BuildGatherList (CapsuleBuffer, CapsuleSize,
> CapsulesToProcess,
> > &BlockDescriptors);
> > if (EFI_ERROR (Status) || BlockDescriptors == NULL) {
> > FreePool (CapsuleBuffer);
> > FreePool (CapsuleSize);
> > - FreePool (FileNameCapsule);
> > + if (FileNameCapsule != NULL) {
> > + FreePool (FileNameCapsule);
> > + }
> > return EFI_OUT_OF_RESOURCES;
> > }
> >
> > //
> > // 4. Call UpdateCapsule() service
> > //
> > - Status = gRT->UpdateCapsule((EFI_CAPSULE_HEADER **)
> > CapsuleBuffer, CapsuleOnDiskNum + 1, (UINTN) BlockDescriptors);
> > + Status = gRT->UpdateCapsule ((EFI_CAPSULE_HEADER **)
> CapsuleBuffer,
> > + CapsulesToProcess,
> > + (UINTN) BlockDescriptors);
> >
> > return Status;
> > }
> > --
> > 2.17.1
>
>
>
>
>
>
>
>
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-11-02 20:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-18 20:11 [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Capsule on Disk file name capsule Bob Morgan
2021-10-29 1:46 ` 回复: " gaoliming
2021-10-29 16:01 ` [edk2-devel] " Bob Morgan
2021-11-02 1:11 ` 回复: " gaoliming
2021-11-02 20:35 ` Bob Morgan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox