From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CABB8C433EF for ; Thu, 9 Sep 2021 20:09:48 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4943261179 for ; Thu, 9 Sep 2021 20:09:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4943261179 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 233668353E; Thu, 9 Sep 2021 22:09:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="megMh/6U"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 804808353F; Thu, 9 Sep 2021 22:09:43 +0200 (CEST) Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0CE488353E for ; Thu, 9 Sep 2021 22:09:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@google.com Received: by mail-wr1-x42c.google.com with SMTP id g16so4253817wrb.3 for ; Thu, 09 Sep 2021 13:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wl6NCn7QFCmAojB2o/fplzqFm04r++R3ppYkFgtd7Pw=; b=megMh/6UEaPKZUItlP4XfY622i7tMH/Sjc83R6u1tJCV3DWmyPSoyLz9DXUuS9e8Cg RMHt+Ch35G6ApWs5H4xpni+I1G7D8T9D/VyL+HJBqXtJ1IquIL0b2t+9znODgEdtwa0j 9TaOqHw3f50WoMbKj8zr4huPEG5jx3tnoso6s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wl6NCn7QFCmAojB2o/fplzqFm04r++R3ppYkFgtd7Pw=; b=pHrCtgbYAJ84936gcT/C9E1y7Wj9OsO65oVxQdQhiqzCYyVh9oUm8cwNLYeoeW5RKe jgUzRb7kF/a/27b5bEHQkAMYS9HdNnbcAhB5rokhJxbFtnoRmOF0rfRXjYRUXsziAf5P fCxDUcI3fEvtbsaye4737QrygsJLH1JYMvLA4HaAKkhU4r1wdhWoBePkp85qn2VUhaKa wAXXtDLZJoKWQnAaPeRJDw77u2bxybJfVnGbwJhDeHxmnOpBXuhxNQEGSwDTJfO+OaGx 0dymTcLqlATQ+o2Q8lgY8yLz5HuLpdQsqPCJwu7mQxEWP6bGzpxg/0jiQG4kYpf+ahIh CStg== X-Gm-Message-State: AOAM531gSNDEoouRGO9iVq0QJKzlasrAMQRPt7WiSd0vZeQS+wiNDSLe S0KAg41qnlrGfsEJmYWwqe8tTdfcGkJYtk2+LOsV6w== X-Google-Smtp-Source: ABdhPJwjf5WLsHMXJmj/c66iaX7BYUXK1vRoibE5DhObc6BHM8ApLAaMihCxjASv5gzKjzu2HxbP0Ab0/UY4dFlZjjE= X-Received: by 2002:a05:6000:1150:: with SMTP id d16mr5750025wrx.357.1631218177122; Thu, 09 Sep 2021 13:09:37 -0700 (PDT) MIME-Version: 1.0 References: <20210908133405.696481-1-sjg@chromium.org> <20210908073355.14.I0774d3540ebe726f31838b851815e829fb6a4056@changeid> <2924c018-6a5b-4261-cff3-0ad1a416ef98@gmx.de> In-Reply-To: <2924c018-6a5b-4261-cff3-0ad1a416ef98@gmx.de> From: Simon Glass Date: Thu, 9 Sep 2021 14:09:25 -0600 Message-ID: Subject: Re: [PATCH 14/35] efi: Locate all block devices in the app To: Heinrich Schuchardt Cc: U-Boot Mailing List , Ilias Apalodimas , Bin Meng , Tom Rini , Christian Melki , Alexander Graf Content-Type: text/plain; charset="UTF-8" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Hi Heinrich, On Wed, 8 Sept 2021 at 12:19, Heinrich Schuchardt wrote: > > On 9/8/21 3:33 PM, Simon Glass wrote: > > When starting the app, locate all block devices and make them available > > to U-Boot. This allows listing partitions and accessing files in > > filesystems. > > > > EFI also has the concept of 'disks', meaning boot media. For now, this > > is not obviously useful in U-Boot, but add code to at least locate these. > > This can be expanded later as needed. > > UEFI firmware handles with the EFI_BLOCK_IO_PROTOCOL for raw access to > disks and partitions. It further provides the > EFI_SIMPLE_FILE_SYSTEM_PROTOCOL on these handles to access files on > formatted media. OK ta. > > > > > Signed-off-by: Simon Glass > > --- > > > > include/efi.h | 15 ++++++ > > include/efi_api.h | 15 ++++++ > > lib/efi/efi_app.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 149 insertions(+) > > > > diff --git a/include/efi.h b/include/efi.h > > index 0ec5913ddd1..c0fddf7f6cd 100644 > > --- a/include/efi.h > > +++ b/include/efi.h > > @@ -529,4 +529,19 @@ void efi_putc(struct efi_priv *priv, const char ch); > > */ > > int efi_info_get(enum efi_entry_t type, void **datap, int *sizep); > > > > +/** > > + * efi_bind_block() - bind a new block device to an EFI device > > + * > > + * Binds a new top-level EFI_MEDIA device as well as a child block device so > > + * that the block device can be accessed in U-Boot. > > + * > > + * The device can then be accessed using 'part list efi 0', 'fat ls efi 0:1', > > + * for example, just like any other interface type. > > + * > > + * @handle: handle of the controller on which this driver is installed > > + * @blkio: block io protocol proxied by this driver > > + * @return 0 if OK, -ve on error > > + */ > > +int efi_bind_block(efi_handle_t handle, struct efi_block_io *blkio); > > + > > #endif /* _LINUX_EFI_H */ > > diff --git a/include/efi_api.h b/include/efi_api.h > > index c8f959bb720..0e88b3e5dbe 100644 > > --- a/include/efi_api.h > > +++ b/include/efi_api.h > > @@ -1994,4 +1994,19 @@ struct efi_firmware_management_protocol { > > const u16 *package_version_name); > > }; > > > > +#define EFI_DISK_IO_PROTOCOL_GUID \ > > + EFI_GUID(0xce345171, 0xba0b, 0x11d2, 0x8e, 0x4f, \ > > + 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b) > > + > > +struct efi_disk { > > + u64 revision; > > + efi_status_t (EFIAPI *read_disk)(struct efi_disk *this, u32 media_id, > > + u64 offset, efi_uintn_t buffer_size, > > + void *buffer); > > + > > + efi_status_t (EFIAPI *write_disk)(struct efi_disk *this, u32 media_id, > > + u64 offset, efi_uintn_t buffer_size, > > + void *buffer); > > +}; > > + > > #endif > > diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c > > index f61665686c5..9ba48517422 100644 > > --- a/lib/efi/efi_app.c > > +++ b/lib/efi/efi_app.c > > @@ -21,6 +21,9 @@ > > #include > > #include > > #include > > +#include > > +#include > > +#include > > > > DECLARE_GLOBAL_DATA_PTR; > > > > @@ -46,6 +49,33 @@ int efi_info_get(enum efi_entry_t type, void **datap, int *sizep) > > return -ENOSYS; > > } > > > > +/** > > + * Create a block device so U-Boot can access an EFI device > > + * > > + * @handle: EFI handle to bind > > + * @blkio: block io protocol > > + * Return: 0 = success > > + */ > > +int efi_bind_block(efi_handle_t handle, struct efi_block_io *blkio) > > +{ > > + struct efi_media_plat plat; > > + struct udevice *dev; > > + char name[18]; > > + int ret; > > + > > + plat.handle = handle; > > + plat.blkio = blkio; > > + ret = device_bind(dm_root(), DM_DRIVER_GET(efi_media), "efi_media", > > + &plat, ofnode_null(), &dev); > > + if (ret) > > + return log_msg_ret("bind", ret); > > + > > + snprintf(name, sizeof(name), "efi_media_%x", dev_seq(dev)); > > + device_set_name(dev, name); > > + > > + return 0; > > +} > > + > > static efi_status_t setup_memory(struct efi_priv *priv) > > { > > struct efi_boot_services *boot = priv->boot; > > @@ -105,6 +135,95 @@ static void free_memory(struct efi_priv *priv) > > global_data_ptr = NULL; > > } > > > > +static int setup_disks(void) > > +{ > > + /* This is not fully implemented yet */ > > + return 0; > > + > > + efi_guid_t efi_disk_guid = EFI_DISK_IO_PROTOCOL_GUID; > > + struct efi_boot_services *boot = efi_get_boot(); > > + struct efi_disk *disk; > > + int ret; > > + > > + if (!boot) > > + return log_msg_ret("sys", -ENOSYS); > > + ret = boot->locate_protocol(&efi_disk_guid, NULL, (void **)&disk); > > + if (ret) > > + return log_msg_ret("prot", -ENOTSUPP); > > + > > + return 0; > > +} > > + > > +static int setup_block(void) > > +{ > > + efi_guid_t efi_blkio_guid = EFI_BLOCK_IO_PROTOCOL_GUID; > > + efi_guid_t efi_devpath_guid = EFI_DEVICE_PATH_PROTOCOL_GUID; > > + struct efi_boot_services *boot = efi_get_boot(); > > + struct efi_block_io *blkio; > > + struct efi_device_path device_path; > > + efi_handle_t handle[100]; > > + efi_uintn_t buf_size; > > + int num_handles; > > + int ret, i; > > + > > + if (!boot) > > + return log_msg_ret("sys", -ENOSYS); > > + > > + buf_size = sizeof(handle); > > + ret = boot->locate_handle(BY_PROTOCOL, &efi_blkio_guid, NULL, > > + &buf_size, handle); > > You could use LocateHandleBuffer() here which will allocate enough > memory for all matching handles. OK ta. > > > + if (ret) > > + return log_msg_ret("loc", -ENOTSUPP); > > + > > + num_handles = buf_size / sizeof(efi_handle_t); > > + log_info("Found %d EFI handles\n", num_handles); > > + > > + for (i = 0; i < num_handles; i++) { > > + ret = boot->handle_protocol(handle[i], &efi_devpath_guid, > > + (void **)&device_path); > > > Why do you read the devicepath if you don't use it? Well there is quite a bit of code here I am unsure about...e.g. will we need it later or is there something missing now? If not I can drop it. > > > + if (ret) { > > + log_warning("- devpath %d failed (ret=%d)\n", i, ret); > > + continue; > > + } > > Here some analysis of devicepaths and installed protocols is missing to > find out which of the handles represents a block device and which > represents a partition: > > If the last devicepath node is type 4 , Media Device Path with SubType 1 > Hard Drive and the partition number is non-zero it is a partition. > > If the devicepath without the last node relates to a handle with the > EFI_BLOCK_IO_PROTOCOL, this also indicates that the current handle is > for a partition. OK thanks, I will take a look. Regards, Simon [..]