Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

efi_loader: fix display of NVMe EUI-64

Browse source 
UEFI specification 2.9A requires to display the EUI-64 "in hexadecimal
format with byte 7 first (i.e., on the left) and byte 0 last".

This is in contrast to what the NVMe specification wants.
But it is what EDK II has been implementing.

Here is an example with the patch applied:

    qemu-system-aarch64 -machine virt -cpu cortex-a72 -nographic \
    -bios denx/u-boot.bin \
    -device nvme,id=nvme1,serial=9ff81223 \
    -device nvme-ns,bus=nvme1,drive=nvme1n0,eui64=0x123456789ABCDEF0 \
    -drive file=arm64.img,if=none,format=raw,id=nvme1n0

    => nvme scan
    => efidebug devices
    Device Path
    ====================
    /VenHw(…)/NVMe(0x1,f0-de-bc-9a-78-56-34-12)

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt 2022-02-23 09:06:24 +01:00
parent 648a8dcb39
commit fbc04c0dab
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/efi_loader/efi_device_path_to_text.c
View file

@ -190,13 +190,14 @@ static char *dp_msging(char *s, struct efi_device_path *dp)
struct efi_device_path_nvme *ndp = struct efi_device_path_nvme *ndp =
(struct efi_device_path_nvme *)dp; (struct efi_device_path_nvme *)dp;
u32 ns_id; u32 ns_id;
int i;
memcpy(&ns_id, &ndp->ns_id, sizeof(ns_id)); memcpy(&ns_id, &ndp->ns_id, sizeof(ns_id));
s += sprintf(s, "NVMe(0x%x,", ns_id); s += sprintf(s, "NVMe(0x%x,", ns_id);
for (i = 0; i < sizeof(ndp->eui64); ++i)
/* Display byte 7 first, byte 0 last */
for (int i = 0; i < 8; ++i)
s += sprintf(s, "%s%02x", i ? "-" : "", s += sprintf(s, "%s%02x", i ? "-" : "",
ndp->eui64[i]); ndp->eui64[i ^ 7]);
s += sprintf(s, ")"); s += sprintf(s, ")");
break; break;