From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sun, 31 Aug 2025 05:56:38 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1usZBH-006Q4V-0U for lore@lore.pengutronix.de; Sun, 31 Aug 2025 05:56:38 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1usZBF-0007VO-JO for lore@pengutronix.de; Sun, 31 Aug 2025 05:56:38 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/NjqhHCIB0W9fw4GLhvjZc3qBjprzFOZvsBdBdAki/w=; b=UoMvWzoZTOmapKAhYiNdEE15ac IpXOAbcLQsWF6okTgstWmpM5DDpz+FBJC8fIzjACs1EngMnop+sKAmV82VH9YatFq3lqw56sUud4c hSY4TvJfc29u+1Ato+lV2JZli0RITTOuGY8OWSHKQOyb3Bl3vLWLihrrQ5XcHg9BwdC+GL/3HmRHV UIRLiNuz4KAD4manE9HT6oa/CwBVb+NLeIvUkRPRCD6Lvx6RVf2gn817Fh5RfdxQh9PWn8Mazx8xX V2qwxvZjMNBl+2fdHMDtNZ1Wqtay/BmQrDUK2Lp0P29d2q96xIawuGdMDmQR50VugifqYQ8vwbPwn D1X5UvBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1usZAa-000000092H3-0H4A; Sun, 31 Aug 2025 03:55:56 +0000 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1usZAV-000000092D3-0L7w for barebox@lists.infradead.org; Sun, 31 Aug 2025 03:55:52 +0000 Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-7f7742e718fso312009085a.1 for ; Sat, 30 Aug 2025 20:55:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756612550; x=1757217350; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/NjqhHCIB0W9fw4GLhvjZc3qBjprzFOZvsBdBdAki/w=; b=Rjk1Sn7Y4Iy9+UwTeMuG4PsqBbL8R3N/RZmz/WLqWRDr9M2DCLJwU7q3eQvdUVcFU3 cUMkxX504AbIoVZDqlBk1I8T8dHPo8hXYLTJagVJJh8Nuya1BGu+m/29q/JAX7xPIq6b lDKZ5IIEMBeDFGKKv+mDPK7WdZO2t9veAG0O+E93uy985rCKRuZ/0kvNUKoTuPVvlB8q arFkgpVWjtI2ZeaVj+aBRbgDPKlxGoTxpTs47yNHWtvJRHwY5El5yvM5+5j+XwEcV6Ut BDuNkgJfs5owGgEKdOzcbk9Wbb4anehPfzL/pbKujooPkMS/6I5eDukLgr4oRMiABqmc L1nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756612550; x=1757217350; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/NjqhHCIB0W9fw4GLhvjZc3qBjprzFOZvsBdBdAki/w=; b=C6sonw3RUuNvn5YKhXJ+BxhoeQVitb0gp9LYetG/OCnfNKFsuKi08TJK4QZ7dPyaSf Oa72scc+vKQpX2jHybiPD1LTRs+xlX/Gws9t+CAEmOsE/iCW3nLl2T16bh3dGyjrrKVS jR35Yx92AtG6hqMjpm74oCbSagexCO4cnHk26+AtVWWixPbpNDlsWDkgH1sK/giIoKxx aUi9wKt9xiQH+8ld67Q17KyLmoAzaAXWzd1Bz0bbr2w0q1Lxknotsscq+MvvR/D6R8OM 4U5W3kPUjL9SvSvJ/TQKGRzhf78XhgteKWNF6DlYbSoE7LSL8VQQhinVJtZOR8G9j6V5 6QSA== X-Gm-Message-State: AOJu0YxkGByN4DhJGGFytYNMoSx/+LLKt95ivuqTLZYMiqquyu939eN2 PytTmynsHl4LHpPFUixHQw46hOzt+F2Vg56trBQdvClKhaK9EAtdybca X-Gm-Gg: ASbGnctnuPJErDQ8RAwZtT9kEevT2H1/eUngO9MgOJ1r8Jay7fDGTjPtMNeYP4d2XI6 dkhN2TDfxL8XY5idQvejc7pxmivlVLYm7CNxXJQ66tPIkzTDgmPJMBT0rUqdGsvSgktAhWrgVkP coka1XtjE3q4kC6FPPIerPkP41UZQV4CgdsibXBGEOm30dxGiWRVUj3dhKQoAZGGhsotV9oTSFE k8FQCdzy2AuykWcZI87fjvv+0K10zkPHrWTwkwT6pueJCeLRCcd9iwthat3O1+YGJq8MIpwNgD9 fM5ERqcqJnvBM1lfUbsZewb1DvfYuOIYmG/GqyTtM+zEXO7cYiJrC2NkpeKB30dUpB8sCjW2Mbi dtS2rgD15DF8Fo/riBjvmBvwGW+F/FKFlP8uSrKKd6Ovvd6hJBAozbO3T0ZGBDk4y6NpdqM4hlm Sz72NwRyUipxd9Ebv+wVhVLs9DBA== X-Google-Smtp-Source: AGHT+IFo+8baEOtqBdwYM4e3TGeufi+eUz4eC0nIa5VueD3EeqCE8W/y7zzkEYlNs6kuDEQOdz52Ww== X-Received: by 2002:a05:620a:3189:b0:7e8:44ac:8136 with SMTP id af79cd13be357-7ff26eaad42mr399502985a.2.1756612549885; Sat, 30 Aug 2025 20:55:49 -0700 (PDT) Received: from Latitude-7490.ht.home ([2607:fa49:8c41:2600:10aa:d623:fe15:9cbf]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7fc0f097401sm433366985a.30.2025.08.30.20.55.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Aug 2025 20:55:49 -0700 (PDT) From: chalianis1@gmail.com To: s.hauer@pengutronix.de, a.fatoum@pengutronix.de Cc: barebox@lists.infradead.org, Chali Anis Date: Sat, 30 Aug 2025 23:55:38 -0400 Message-Id: <20250831035542.1623695-3-chalianis1@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250831035542.1623695-1-chalianis1@gmail.com> References: <20250831035542.1623695-1-chalianis1@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250830_205551_127884_658D9362 X-CRM114-Status: GOOD ( 19.37 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 3/7] efi: payload: initrd: implement efi initrd media protocol. X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) From: Chali Anis Add the ability to install an initrd media protocol from an initrd file or a fitImage, support both the initrd media protocol or installing the initramfs directly to efi like what linux do. Signed-off-by: Chali Anis --- efi/guid.c | 7 +++ efi/payload/Makefile | 1 + efi/payload/efi-initrd.c | 123 ++++++++++++++++++++++++++++++++++++++ include/efi.h | 4 ++ include/efi/efi-payload.h | 3 + 5 files changed, 138 insertions(+) create mode 100644 efi/payload/efi-initrd.c diff --git a/efi/guid.c b/efi/guid.c index ef230a2b2403..7b572acb768b 100644 --- a/efi/guid.c +++ b/efi/guid.c @@ -44,6 +44,7 @@ const efi_guid_t efi_load_file_protocol_guid = EFI_LOAD_FILE_PROTOCOL_GUID; const efi_guid_t efi_load_file2_protocol_guid = EFI_LOAD_FILE2_PROTOCOL_GUID; const efi_guid_t efi_device_path_utilities_protocol_guid = EFI_DEVICE_PATH_UTILITIES_PROTOCOL_GUID; +const efi_guid_t efi_linux_initrd_media_guid = EFI_LINUX_INITRD_MEDIA_GUID; #define EFI_GUID_STRING(guid, short, long) do { \ if (!efi_guidcmp(guid, *g)) \ @@ -128,5 +129,11 @@ const char *efi_guid_string(efi_guid_t *g) EFI_GUID_STRING(EFI_ISCSIDXE_INF_GUID, "IScsiDxe.inf", "EFI IScsiDxe.inf File GUID"); EFI_GUID_STRING(EFI_VLANCONFIGDXE_INF_GUID, "VlanConfigDxe.inf", "EFI VlanConfigDxe.inf File GUID"); + /* FDT */ + EFI_GUID_STRING(EFI_DEVICE_TREE_GUID, "DeviceTree", "EFI Device Tree GUID"); + + /* Ramdisk */ + EFI_GUID_STRING(EFI_LINUX_INITRD_MEDIA_GUID, "Initrd Media", "EFI Linux Initrd Media GUID"); + return "unknown"; } diff --git a/efi/payload/Makefile b/efi/payload/Makefile index a4a0332a8288..1250535302d3 100644 --- a/efi/payload/Makefile +++ b/efi/payload/Makefile @@ -2,6 +2,7 @@ obj-y += init.o obj-y += image.o +obj-y += efi-initrd.o obj-$(CONFIG_OFTREE) += fdt.o bbenv-y += env-efi obj-$(CONFIG_CMD_IOMEM) += iomem.o diff --git a/efi/payload/efi-initrd.c b/efi/payload/efi-initrd.c new file mode 100644 index 000000000000..633fbc29c137 --- /dev/null +++ b/efi/payload/efi-initrd.c @@ -0,0 +1,123 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * efi-initrd.c - barebox EFI payload support + * + * Copyright (c) 2025 Anis Chali + */ +#include +#include +#include +#include +#include +#include +#include +#include + +static efi_status_t EFIAPI efi_initrd_load_file2( + struct efi_load_file_protocol *this, struct efi_device_path *file_path, + bool boot_policy, unsigned long *buffer_size, void *buffer); + +static const struct { + struct efi_device_path_vendor vendor; + struct efi_device_path end; +} __packed initrd_dev_path = { { { + DEVICE_PATH_TYPE_MEDIA_DEVICE, + DEVICE_PATH_SUB_TYPE_VENDOR_PATH, + sizeof(initrd_dev_path.vendor), + }, + EFI_LINUX_INITRD_MEDIA_GUID }, + { DEVICE_PATH_TYPE_END, DEVICE_PATH_SUB_TYPE_END, + DEVICE_PATH_END_LENGTH } }; + +static struct efi_device_path_memory *initrd_dev; +static efi_handle_t lf2_handle; +static struct efi_load_file_protocol efi_lf2_p = { + .load_file = efi_initrd_load_file2 +}; + +static efi_status_t EFIAPI efi_initrd_load_file2( + struct efi_load_file_protocol *this, struct efi_device_path *file_path, + bool boot_policy, unsigned long *buffer_size, void *buffer) +{ + size_t initrd_size; + + if (!this || this != &efi_lf2_p || !buffer_size) + return EFI_INVALID_PARAMETER; + + if (file_path->type != initrd_dev_path.end.type || + file_path->sub_type != initrd_dev_path.end.sub_type) + return EFI_INVALID_PARAMETER; + + if (boot_policy) + return EFI_UNSUPPORTED; + + initrd_size = initrd_dev->ending_address - initrd_dev->starting_address; + if (!buffer || *buffer_size < initrd_size) { + *buffer_size = initrd_size; + return EFI_BUFFER_TOO_SMALL; + } + + else { + memcpy(buffer, (void *)(uintptr_t)initrd_dev->starting_address, + initrd_size); + *buffer_size = initrd_size; + } + + return EFI_SUCCESS; +} + +int efi_initrd_register(void *initrd, size_t initrd_sz) +{ + efi_physical_addr_t mem; + efi_status_t efiret; + size_t sz; + int ret; + + sz = sizeof(struct efi_device_path_memory) + + sizeof(struct efi_device_path); + efiret = BS->allocate_pool(EFI_BOOT_SERVICES_DATA, sz, (void **)&mem); + if (EFI_ERROR(efiret)) { + pr_err("Failed to allocate memory for INITRD %s\n", + efi_strerror(efiret)); + ret = -efi_errno(efiret); + return ret; + } + + initrd_dev = efi_phys_to_virt(mem); + initrd_dev->header.type = DEVICE_PATH_TYPE_HARDWARE_DEVICE; + initrd_dev->header.sub_type = DEVICE_PATH_SUB_TYPE_MEMORY; + initrd_dev->header.length = sizeof(struct efi_device_path_memory); + initrd_dev->memory_type = EFI_LOADER_DATA; + initrd_dev->starting_address = efi_virt_to_phys(initrd); + initrd_dev->ending_address = efi_virt_to_phys(initrd) + initrd_sz; + + memcpy(&initrd_dev[1], &initrd_dev_path.end, DEVICE_PATH_END_LENGTH); + + efiret = BS->install_multiple_protocol_interfaces( + &lf2_handle, &efi_load_file2_protocol_guid, &efi_lf2_p, + &efi_device_path_protocol_guid, &initrd_dev_path, NULL); + if (EFI_ERROR(efiret)) { + pr_err("Failed to install protocols for INITRD %s\n", + efi_strerror(efiret)); + ret = -efi_errno(efiret); + goto out; + } + + return 0; +out: + BS->free_pool(efi_phys_to_virt(mem)); + return ret; +} + +void efi_initrd_unregister(void) +{ + if (!initrd_dev) + return; + + BS->uninstall_multiple_protocol_interfaces( + lf2_handle, &efi_device_path_protocol_guid, &initrd_dev_path, + &efi_load_file2_protocol_guid, &efi_lf2_p, NULL); + + BS->free_pool(initrd_dev); + initrd_dev = NULL; +} diff --git a/include/efi.h b/include/efi.h index 40b69fdb0188..bd339ea097c3 100644 --- a/include/efi.h +++ b/include/efi.h @@ -558,6 +558,9 @@ extern struct efi_runtime_services *RT; #define EFI_DRIVER_BINDING_PROTOCOL_GUID \ EFI_GUID(0x18a031ab, 0xb443, 0x4d1a, 0xa5, 0xc0, 0x0c, 0x09, 0x26, 0x1e, 0x9f, 0x71) +#define EFI_LINUX_INITRD_MEDIA_GUID \ + EFI_GUID(0x5568e427, 0x68fc, 0x4f3d, 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68) + struct efi_driver_binding_protocol { efi_status_t (EFIAPI * supported)( struct efi_driver_binding_protocol *this, @@ -603,6 +606,7 @@ extern const efi_guid_t efi_guid_event_group_reset_system; extern const efi_guid_t efi_load_file_protocol_guid; extern const efi_guid_t efi_load_file2_protocol_guid; extern const efi_guid_t efi_device_path_utilities_protocol_guid; +extern const efi_guid_t efi_linux_initrd_media_guid; struct efi_config_table { efi_guid_t guid; diff --git a/include/efi/efi-payload.h b/include/efi/efi-payload.h index fe45864dd8a7..d8e66a187a87 100644 --- a/include/efi/efi-payload.h +++ b/include/efi/efi-payload.h @@ -34,4 +34,7 @@ int efi_set_variable_usec(char *name, efi_guid_t *vendor, uint64_t usec); void *efi_earlymem_alloc(const struct efi_system_table *sys_table, size_t *memsize, enum efi_memory_type mem_type); +int efi_initrd_register(void *initrd, size_t initrd_size); +void efi_initrd_unregister(void); + #endif -- 2.34.1