From: Laszlo Ersek <lersek@redhat.com>
To: edk2-devel-01 <edk2-devel@lists.01.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Jordan Justen <jordan.l.justen@intel.com>,
Leif Lindholm <leif.lindholm@linaro.org>
Subject: [PATCH 1/8] ArmPlatformPkg/NorFlashDxe: correct NumOfLba vararg type in EraseBlocks()
Date: Thu, 18 May 2017 17:04:20 +0200 [thread overview]
Message-ID: <20170518150427.16435-2-lersek@redhat.com> (raw)
In-Reply-To: <20170518150427.16435-1-lersek@redhat.com>
According to the PI spec, Volume 3,
EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL.EraseBlocks():
> The variable argument list is a list of tuples. Each tuple describes a
> range of LBAs to erase and consists of the following:
> * An EFI_LBA that indicates the starting LBA
> * A UINTN that indicates the number of blocks to erase
(NB, in edk2, EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL is a typedef to
EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL.)
In this driver, the NumOfLba local variable is defined with type UINTN,
but the TYPE argument passed to VA_ARG() is UINT32. Fix the mismatch.
In addition, update the DEBUG macro invocation where NumOfLba is formatted
with the %d conversion specifier: UINTN values should be converted to
UINT64 and printed with %Lu or %Lx for portability between 32-bit and
64-bit.
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Reported-by: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
index 12a861267a86..3ea858f46ffb 100644
--- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
+++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
@@ -628,10 +628,16 @@ FvbEraseBlocks (
}
// How many Lba blocks are we requested to erase?
- NumOfLba = VA_ARG (Args, UINT32);
+ NumOfLba = VA_ARG (Args, UINTN);
// All blocks must be within range
- DEBUG ((DEBUG_BLKIO, "FvbEraseBlocks: Check if: ( StartingLba=%ld + NumOfLba=%d - 1 ) > LastBlock=%ld.\n", Instance->StartLba + StartingLba, NumOfLba, Instance->Media.LastBlock));
+ DEBUG ((
+ DEBUG_BLKIO,
+ "FvbEraseBlocks: Check if: ( StartingLba=%ld + NumOfLba=%Lu - 1 ) > LastBlock=%ld.\n",
+ Instance->StartLba + StartingLba,
+ (UINT64)NumOfLba,
+ Instance->Media.LastBlock
+ ));
if ((NumOfLba == 0) || ((Instance->StartLba + StartingLba + NumOfLba - 1) > Instance->Media.LastBlock)) {
VA_END (Args);
DEBUG ((EFI_D_ERROR, "FvbEraseBlocks: ERROR - Lba range goes past the last Lba.\n"));
@@ -656,7 +662,7 @@ FvbEraseBlocks (
}
// How many Lba blocks are we requested to erase?
- NumOfLba = VA_ARG (Args, UINT32);
+ NumOfLba = VA_ARG (Args, UINTN);
// Go through each one and erase it
while (NumOfLba > 0) {
--
2.9.3
next prev parent reply other threads:[~2017-05-18 15:04 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-18 15:04 [PATCH 0/8] several Pkgs: FVB driver: correct NumOfLba vararg type in EraseBlocks() Laszlo Ersek
2017-05-18 15:04 ` Laszlo Ersek [this message]
2017-05-18 15:12 ` [PATCH 1/8] ArmPlatformPkg/NorFlashDxe: " Ard Biesheuvel
2017-05-18 17:21 ` Jordan Justen
2017-05-18 19:29 ` Laszlo Ersek
2017-05-18 20:44 ` Jordan Justen
2017-05-19 10:07 ` Leif Lindholm
2017-05-19 16:59 ` Jordan Justen
2017-05-22 17:50 ` Leif Lindholm
2017-05-18 22:11 ` Laszlo Ersek
2017-05-18 15:04 ` [PATCH 2/8] DuetPkg/FvbRuntimeService: " Laszlo Ersek
2017-05-24 15:51 ` Laszlo Ersek
2017-05-27 0:54 ` Wu, Hao A
2017-05-29 12:45 ` Laszlo Ersek
2017-05-18 15:04 ` [PATCH 3/8] EmulatorPkg/FvbServicesRuntimeDxe: " Laszlo Ersek
2017-05-18 22:11 ` Laszlo Ersek
2017-05-18 15:04 ` [PATCH 4/8] Nt32Pkg/FvbServicesRuntimeDxe: " Laszlo Ersek
2017-05-24 15:52 ` Laszlo Ersek
2017-05-27 0:54 ` Wu, Hao A
2017-05-29 12:45 ` Laszlo Ersek
2017-05-18 15:04 ` [PATCH 5/8] OvmfPkg/EmuVariableFvbRuntimeDxe: " Laszlo Ersek
2017-05-18 22:11 ` Laszlo Ersek
2017-05-18 15:04 ` [PATCH 6/8] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: " Laszlo Ersek
2017-05-18 22:12 ` Laszlo Ersek
2017-05-18 15:04 ` [PATCH 7/8] QuarkPlatformPkg/SpiFvbServices: " Laszlo Ersek
2017-05-24 15:53 ` Laszlo Ersek
2017-05-24 16:52 ` Kinney, Michael D
2017-05-29 12:45 ` Laszlo Ersek
2017-05-18 15:04 ` [PATCH 8/8] Vlv2TbltDevicePkg/FvbRuntimeDxe: " Laszlo Ersek
2017-05-19 1:49 ` Wei, David
2017-05-26 16:55 ` Laszlo Ersek
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=20170518150427.16435-2-lersek@redhat.com \
--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