Re: [PATCH v3 9/9] efi_loader: rename struct efi_initrd_dp to efi_lo_dp_prefix

On Mon, 10 Jun 2024 at 12:11, Heinrich Schuchardt heinrich.schuchardt@canonical.com wrote:

As we now also store device-tree device-paths in load options rename struct efi_initrd_dp to efi_lo_dp_prefix.

Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com

v3: new patch

---

cmd/eficonfig.c | 4 ++-- cmd/efidebug.c | 4 ++-- include/efi_load_initrd.h | 12 +++++++++++- lib/efi_loader/efi_load_initrd.c | 2 +- lib/efi_loader/initrddump.c | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index a12df1e7d59..530eb931564 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -1402,7 +1402,7 @@ static efi_status_t eficonfig_edit_boot_option(u16 *varname, struct eficonfig_bo struct efi_device_path *initrd_device_dp = NULL; struct efi_device_path *fdt_device_dp = NULL;

•   const struct efi_initrd_dp initrd_prefix = {
  

•   const struct efi_lo_dp_prefix initrd_prefix = {
            .vendor = {
                    {
                    DEVICE_PATH_TYPE_MEDIA_DEVICE,
  

@@ -1418,7 +1418,7 @@ static efi_status_t eficonfig_edit_boot_option(u16 *varname, struct eficonfig_bo } };

•   const struct efi_initrd_dp fdt_prefix = {
  

•   const struct efi_lo_dp_prefix fdt_prefix = {
            .vendor = {
                    {
                    DEVICE_PATH_TYPE_MEDIA_DEVICE,
  

diff --git a/cmd/efidebug.c b/cmd/efidebug.c index a25ebd2061d..846d6b67a48 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -685,7 +685,7 @@ struct efi_device_path *create_lo_dp_part(const char *dev, const char *part, struct efi_device_path *dp = NULL; const struct efi_device_path *dp_prefix; efi_status_t ret;

•   const struct efi_initrd_dp fdt_dp = {
  

•   const struct efi_lo_dp_prefix fdt_dp = {
            .vendor = {
                    {
                    DEVICE_PATH_TYPE_MEDIA_DEVICE,
  

@@ -700,7 +700,7 @@ struct efi_device_path *create_lo_dp_part(const char *dev, const char *part, sizeof(fdt_dp.end), } };

•   const struct efi_initrd_dp initrd_dp = {
  

•   const struct efi_lo_dp_prefix initrd_dp = {
            .vendor = {
                    {
                    DEVICE_PATH_TYPE_MEDIA_DEVICE,
  

diff --git a/include/efi_load_initrd.h b/include/efi_load_initrd.h index be5d5a7acbe..9feafb18c86 100644 --- a/include/efi_load_initrd.h +++ b/include/efi_load_initrd.h @@ -18,7 +18,17 @@ 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68) extern const efi_guid_t efi_lf2_initrd_guid;

-struct efi_initrd_dp { +/**

• • struct efi_lo_dp_prefix - separator device path used in load options
• • We use vendor media device nodes in UEFI load options to separate
• • the binary, initrd, and fdt device-paths. This structure contains
• • the vendor media device node and an end node.
• • @vendor: vendor media device node
• • @end: end node
• */

+struct efi_lo_dp_prefix { struct efi_device_path_vendor vendor; struct efi_device_path end; } __packed; diff --git a/lib/efi_loader/efi_load_initrd.c b/lib/efi_loader/efi_load_initrd.c index d91135436c4..2f0ee1ab4a1 100644 --- a/lib/efi_loader/efi_load_initrd.c +++ b/lib/efi_loader/efi_load_initrd.c @@ -24,7 +24,7 @@ static const struct efi_load_file_protocol efi_lf2_protocol = {

• Device path defined by Linux to identify the handle providing the
• EFI_LOAD_FILE2_PROTOCOL used for loading the initial ramdisk.

*/ -static const struct efi_initrd_dp dp_lf2_handle = { +static const struct efi_lo_dp_prefix dp_lf2_handle = { .vendor = { { DEVICE_PATH_TYPE_MEDIA_DEVICE, diff --git a/lib/efi_loader/initrddump.c b/lib/efi_loader/initrddump.c index 0004b6b042b..7f4ea6675a8 100644 --- a/lib/efi_loader/initrddump.c +++ b/lib/efi_loader/initrddump.c @@ -33,7 +33,7 @@ static bool nocolor;

• Device path defined by Linux to identify the handle providing the
• EFI_LOAD_FILE2_PROTOCOL used for loading the initial ramdisk.

*/ -static const struct efi_initrd_dp initrd_dp = { +static const struct efi_lo_dp_prefix initrd_dp = { .vendor = { { DEVICE_PATH_TYPE_MEDIA_DEVICE, -- 2.43.0

Reviewed-by: Ilias Apalodimas ilias.apalodimas@linaro.org