All of lore.kernel.org
 help / color / mirror / Atom feed
From: AKASHI Takahiro <takahiro.akashi@linaro.org>
To: xypron.glpk@gmx.de, agraf@csgraf.de, sjg@chromium.org,
	ilias.apalodimas@linaro.org
Cc: u-boot@lists.denx.de, AKASHI Takahiro <takahiro.akashi@linaro.org>
Subject: [resent RFC 22/22] efi_selftest: block device: adjust dp for a test disk
Date: Mon,  4 Oct 2021 12:44:30 +0900	[thread overview]
Message-ID: <20211004034430.41355-23-takahiro.akashi@linaro.org> (raw)
In-Reply-To: <20211004034430.41355-1-takahiro.akashi@linaro.org>

Due to efi_disk-dm integration, the resultant device path for a test disk
got slightly changed, with efi_root contained as the first component.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
---
 lib/efi_selftest/efi_selftest_block_device.c | 26 ++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/lib/efi_selftest/efi_selftest_block_device.c b/lib/efi_selftest/efi_selftest_block_device.c
index 15f03751ac87..cac76249e6b4 100644
--- a/lib/efi_selftest/efi_selftest_block_device.c
+++ b/lib/efi_selftest/efi_selftest_block_device.c
@@ -30,6 +30,9 @@ static const efi_guid_t guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID;
 static const efi_guid_t guid_simple_file_system_protocol =
 					EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID;
 static const efi_guid_t guid_file_system_info = EFI_FILE_SYSTEM_INFO_GUID;
+static efi_guid_t guid_uboot =
+	EFI_GUID(0xe61d73b9, 0xa384, 0x4acc, \
+		 0xae, 0xab, 0x82, 0xe8, 0x28, 0xf3, 0x62, 0x8b);
 static efi_guid_t guid_vendor =
 	EFI_GUID(0xdbca4c98, 0x6cb0, 0x694d,
 		 0x08, 0x72, 0x81, 0x9c, 0x65, 0x0c, 0xb7, 0xb8);
@@ -206,25 +209,44 @@ static int setup(const efi_handle_t handle,
 
 	ret = boottime->allocate_pool(EFI_LOADER_DATA,
 				      sizeof(struct efi_device_path_vendor) +
+				      sizeof(struct efi_device_path_vendor) +
+				      sizeof(u8) +
 				      sizeof(struct efi_device_path),
 				      (void **)&dp);
 	if (ret != EFI_SUCCESS) {
 		efi_st_error("Out of memory\n");
 		return EFI_ST_FAILURE;
 	}
+	/* first part */
 	vendor_node.dp.type = DEVICE_PATH_TYPE_HARDWARE_DEVICE;
 	vendor_node.dp.sub_type = DEVICE_PATH_SUB_TYPE_VENDOR;
 	vendor_node.dp.length = sizeof(struct efi_device_path_vendor);
 
-	boottime->copy_mem(&vendor_node.guid, &guid_vendor,
+	boottime->copy_mem(&vendor_node.guid, &guid_uboot,
 			   sizeof(efi_guid_t));
 	boottime->copy_mem(dp, &vendor_node,
 			   sizeof(struct efi_device_path_vendor));
+
+	/* second part */
+	vendor_node.dp.type = DEVICE_PATH_TYPE_HARDWARE_DEVICE;
+	vendor_node.dp.sub_type = DEVICE_PATH_SUB_TYPE_VENDOR;
+	vendor_node.dp.length = sizeof(struct efi_device_path_vendor) + 1;
+
+	boottime->copy_mem(&vendor_node.guid, &guid_vendor,
+			   sizeof(efi_guid_t));
+	boottime->copy_mem((char *)dp + sizeof(struct efi_device_path_vendor),
+			   &vendor_node,
+			   sizeof(struct efi_device_path_vendor));
+	/* vendor_data[0] */
+	*((char *)dp + sizeof(struct efi_device_path_vendor) * 2) = 0;
+
 	end_node.type = DEVICE_PATH_TYPE_END;
 	end_node.sub_type = DEVICE_PATH_SUB_TYPE_END;
 	end_node.length = sizeof(struct efi_device_path);
 
-	boottime->copy_mem((char *)dp + sizeof(struct efi_device_path_vendor),
+	boottime->copy_mem((char *)dp + sizeof(struct efi_device_path_vendor)
+			   + sizeof(struct efi_device_path_vendor)
+			   + sizeof(u8),
 			   &end_node, sizeof(struct efi_device_path));
 	ret = boottime->install_protocol_interface(&disk_handle,
 						   &guid_device_path,
-- 
2.33.0


  parent reply	other threads:[~2021-10-04  3:49 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-04  3:44 [resent RFC 00/22] efi_loader: more tightly integrate UEFI disks to device model AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 01/22] part: call part_init() in blk_get_device_by_str() only for MMC AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 02/22] scsi: call device_probe() after scanning AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 03/22] usb: storage: " AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 04/22] mmc: " AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 05/22] nvme: " AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 06/22] sata: " AKASHI Takahiro
2021-10-04 18:45   ` Ilias Apalodimas
2021-10-05  1:06     ` AKASHI Takahiro
2021-10-08  5:44       ` Ilias Apalodimas
2021-10-04  3:44 ` [resent RFC 07/22] block: ide: " AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 08/22] dm: blk: add UCLASS_PARTITION AKASHI Takahiro
2021-10-04 18:40   ` Ilias Apalodimas
2021-10-05  1:30     ` AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 09/22] dm: blk: add a device-probe hook for scanning disk partitions AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 10/22] dm: blk: add read/write interfaces with udevice AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 11/22] efi_loader: disk: use udevice instead of blk_desc AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 12/22] dm: add a hidden link to efi object AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 13/22] efi_loader: remove !CONFIG_BLK code from efi_disk AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 14/22] efi_loader: disk: a helper function to create efi_disk objects from udevice AKASHI Takahiro
2021-10-04 18:50   ` Ilias Apalodimas
2021-10-05  1:37     ` AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 15/22] dm: blk: call efi's device-probe hook AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 16/22] efi_loader: cleanup after efi_disk-dm integration AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 17/22] efi_loader: add efi_remove_handle() AKASHI Takahiro
2021-10-12  8:16   ` Ilias Apalodimas
2021-10-13  0:55     ` AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 18/22] efi_loader: efi_disk: a helper function to delete efi_disk objects AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 19/22] dm: blk: call efi's device-removal hook AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 20/22] efi_driver: align with efi_disk-dm integration AKASHI Takahiro
2021-10-04  3:44 ` [resent RFC 21/22] efi_driver: cleanup after " AKASHI Takahiro
2021-10-04  3:44 ` AKASHI Takahiro [this message]
2021-10-04 14:47 ` [resent RFC 00/22] efi_loader: more tightly integrate UEFI disks to device model Heinrich Schuchardt
2021-10-04 18:07   ` Ilias Apalodimas
2021-10-05  2:27     ` AKASHI Takahiro
2021-10-05  2:14   ` AKASHI Takahiro
2021-10-04 23:45 ` Simon Glass

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-all 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=20211004034430.41355-23-takahiro.akashi@linaro.org \
    --to=takahiro.akashi@linaro.org \
    --cc=agraf@csgraf.de \
    --cc=ilias.apalodimas@linaro.org \
    --cc=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    --cc=xypron.glpk@gmx.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.