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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8159FC433EF for ; Mon, 11 Oct 2021 06:52:46 +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 7201460EE2 for ; Mon, 11 Oct 2021 06:52:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7201460EE2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.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 5136A82021; Mon, 11 Oct 2021 08:52:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="hTk0+u4B"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 71E398369B; Mon, 11 Oct 2021 08:52:39 +0200 (CEST) Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) (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 C908A80FBE for ; Mon, 11 Oct 2021 08:52:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pf1-x42a.google.com with SMTP id y7so4486777pfg.8 for ; Sun, 10 Oct 2021 23:52:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=B2eZejtfzUyymOgOwkTnhiJCr6gb6h4uCc1u17pMhjQ=; b=hTk0+u4BJKXDHqrK1gkoWOkMTQsZmdycJa+dW2f61sJbUBYvJv0sNkxI65uBjvpKpk c9ZzpKj5remlUPFqsaG5cNuta7j34f4PLkrQN41KrwHqdQq1p7uiJLSm67UvlFTc25SB AYa74zUvTTOk1QMt5b0YWFlPE2ZUJEYv5dw8IWd2bHPHvWfWwWztuC9T/ptk6Wisgyv9 BoItjlBd9igFqKvGDFd/lkWseSyYMPyJ6BVjpxZJ+6nfe7jmQeX1LIpEfzp9/gOe9o/W yFmi8MJhfesXUPU/d2ML1thEXq0QG0xwXT6e2UWONHBYT+wJMGtq8ma3tAxKvAFXvgIT Vt0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=B2eZejtfzUyymOgOwkTnhiJCr6gb6h4uCc1u17pMhjQ=; b=1b0/fWS1fjd/ep80//iLe3Yco5mNUVdY2wahSAUkLzZIOPdnrWPUhuFQRnRICf4S8m TmVsWpbcLP6qSwTI3gKBPP9c4JA4VpWFdKVE0zxv/QRrmEoSt/0FmSf6cXc263iHoLLC 57C1hDNY3VLRYS1e9nwZbbWw8ALj5p48ZivS/jMDQu85KhcPgHpxdz1WykX9NSsGqZ5t gfu8VyrPBdnyGqwmlHw9zEcbH8VNyaqGmossPerlhlj6C+5DTQtnbKTbEJtZwg8NS3LL Axt8UBYCrg4o3eMue7B+A/faKdhxmEZD1ANVv9mJMWjW7uehwTlAV2fXrm15gWGAdtvt 87XA== X-Gm-Message-State: AOAM5307Ln26HNaMvofGOFW9KMqesOBuqQYHvZs0cXWDhofLYpoa243G 8IPpQmTkkKTdkiJ73aSRTxHaKQ== X-Google-Smtp-Source: ABdhPJxrAdfT7n1q5NrsLwKhTuXvEZrKFMIi6oLkRiyx20XaqT2ydaP+u3Y3D7n63wLm9s0Zyab78w== X-Received: by 2002:aa7:991e:0:b0:44c:a172:e670 with SMTP id z30-20020aa7991e000000b0044ca172e670mr24142650pff.10.1633935153065; Sun, 10 Oct 2021 23:52:33 -0700 (PDT) Received: from laputa (122-100-26-39m5.mineo.jp. [122.100.26.39]) by smtp.gmail.com with ESMTPSA id i124sm6628708pfc.153.2021.10.10.23.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Oct 2021 23:52:32 -0700 (PDT) Date: Mon, 11 Oct 2021 15:52:27 +0900 From: AKASHI Takahiro To: Simon Glass Cc: Heinrich Schuchardt , Alex Graf , Ilias Apalodimas , U-Boot Mailing List Subject: Re: [RFC 14/22] efi_loader: disk: a helper function to create efi_disk objects from udevice Message-ID: <20211011065227.GI44356@laputa> Mail-Followup-To: AKASHI Takahiro , Simon Glass , Heinrich Schuchardt , Alex Graf , Ilias Apalodimas , U-Boot Mailing List References: <20211001050228.55183-1-takahiro.akashi@linaro.org> <20211001050228.55183-29-takahiro.akashi@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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 On Sun, Oct 10, 2021 at 08:14:21AM -0600, Simon Glass wrote: > On Thu, 30 Sept 2021 at 23:04, AKASHI Takahiro > wrote: > > > > Add efi_disk_create() function. > > > > Any UEFI handle created by efi_disk_create() can be treated as a efi_disk > > object, the udevice is either a UCLASS_BLK (a whole raw disk) or > > UCLASS_PARTITION (a disk partition). > > > > So this function is expected to be called every time such an udevice > > is detected and activated through a device model's "probe" interface. > > > > Signed-off-by: AKASHI Takahiro > > --- > > include/efi_loader.h | 2 + > > lib/efi_loader/efi_disk.c | 92 +++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 94 insertions(+) > > > > Reviewed-by: Simon Glass > > But some nits below. > > Don't worry about !CONFIG_BLK - that code should be removed. Yes. I added a tentative patch to remove !CONFIG_BLK code in efi_disk in patch#13. > > diff --git a/include/efi_loader.h b/include/efi_loader.h > > index c440962fe522..751fde7fb153 100644 > > --- a/include/efi_loader.h > > +++ b/include/efi_loader.h > > @@ -517,6 +517,8 @@ efi_status_t EFIAPI efi_convert_pointer(efi_uintn_t debug_disposition, > > void efi_carve_out_dt_rsv(void *fdt); > > /* Called by bootefi to make console interface available */ > > efi_status_t efi_console_register(void); > > +/* Called when a block devices has been probed */ > > +int efi_disk_create(struct udevice *dev); > > Please buck the trend in this file and add a full function comment. In > this case it needs to cover @dev and the return value and also explain > what the function does. OK. > > /* Called by bootefi to make all disk storage accessible as EFI objects */ > > efi_status_t efi_disk_register(void); > > /* Called by efi_init_obj_list() to install EFI_RNG_PROTOCOL */ > > diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c > > index cd5528046251..3fae40e034fb 100644 > > --- a/lib/efi_loader/efi_disk.c > > +++ b/lib/efi_loader/efi_disk.c > > @@ -10,6 +10,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -484,6 +485,7 @@ error: > > return ret; > > } > > > > +#ifndef CONFIG_BLK > > /** > > * efi_disk_create_partitions() - create handles and protocols for partitions > > * > > @@ -531,6 +533,96 @@ int efi_disk_create_partitions(efi_handle_t parent, struct blk_desc *desc, > > > > return disks; > > } > > +#endif /* CONFIG_BLK */ > > + > > +/* > > + * Create a handle for a whole raw disk > > + * > > + * @dev uclass device > > ?? what type of device? (Will fix: UCLASS_BLK) > > + * @return 0 on success, -1 otherwise > > + */ > > +static int efi_disk_create_raw(struct udevice *dev) > > +{ > > + struct efi_disk_obj *disk; > > + struct blk_desc *desc; > > + const char *if_typename; > > + int diskid; > > + efi_status_t ret; > > + > > + desc = dev_get_uclass_plat(dev); > > + if_typename = blk_get_if_type_name(desc->if_type); > > + diskid = desc->devnum; > > + > > + ret = efi_disk_add_dev(NULL, NULL, if_typename, desc, > > + diskid, NULL, 0, &disk); > > + if (ret != EFI_SUCCESS) { > > if (ret) > > is much shorter and easier to read Yeah, but I don't want to assume EFI_SUCCESS is *zero*. > > + log_err("Adding disk %s%d failed\n", if_typename, diskid); > > + return -1; > > + } > > + disk->dev = dev; > > + dev->efi_obj = &disk->header; > > + > > + return 0; > > +} > > + > > +/* > > + * Create a handle for a disk partition > > + * > > + * @dev uclass device > > ?? (UCLASS_PARTITION) > > + * @return 0 on success, -1 otherwise > > + */ > > +static int efi_disk_create_part(struct udevice *dev) > > +{ > > + efi_handle_t parent; > > + struct blk_desc *desc; > > + const char *if_typename; > > + struct disk_part *part_data; > > + struct disk_partition *info; > > + unsigned int part; > > + int diskid; > > + struct efi_device_path *dp = NULL; > > + struct efi_disk_obj *disk; > > + efi_status_t ret; > > + > > + parent = dev->parent->efi_obj; > > dev_get_parent(dev) I will replace all of "dev->parent" with dev_get_parent() if I will not forget to do that in the next version :) Thanks, -Takahiro Akashi > > + desc = dev_get_uclass_plat(dev->parent); > > + if_typename = blk_get_if_type_name(desc->if_type); > > + diskid = desc->devnum; > > + > > + part_data = dev_get_uclass_plat(dev); > > + part = part_data->partnum; > > + info = &part_data->gpt_part_info; > > + > > + /* TODO: should not use desc? */ > > + dp = efi_dp_from_part(desc, 0); > > + > > + ret = efi_disk_add_dev(parent, dp, if_typename, desc, diskid, > > + info, part, &disk); > > + if (ret != EFI_SUCCESS) { > > + log_err("Adding partition %s%d:%x failed\n", > > + if_typename, diskid, part); > > + return -1; > > + } > > + disk->dev = dev; > > + dev->efi_obj = &disk->header; > > + > > + return 0; > > +} > > + > > +int efi_disk_create(struct udevice *dev) > > +{ > > + enum uclass_id id; > > + > > + id = device_get_uclass_id(dev); > > + > > + if (id == UCLASS_BLK) > > + return efi_disk_create_raw(dev); > > + > > + if (id == UCLASS_PARTITION) > > + return efi_disk_create_part(dev); > > + > > + return -1; > > +} > > > > /** > > * efi_disk_register() - register block devices > > -- > > 2.33.0 > > > > Regards, > Simon