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 A39F0C433F5 for ; Mon, 4 Oct 2021 18:50:14 +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 F014460FD8 for ; Mon, 4 Oct 2021 18:50:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org F014460FD8 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 3125B80D2E; Mon, 4 Oct 2021 20:50:11 +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="lNv+NQd9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B1C0E8311B; Mon, 4 Oct 2021 20:50:09 +0200 (CEST) Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) (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 CA79080691 for ; Mon, 4 Oct 2021 20:50:05 +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=ilias.apalodimas@linaro.org Received: by mail-wm1-x329.google.com with SMTP id z184-20020a1c7ec1000000b003065f0bc631so264013wmc.0 for ; Mon, 04 Oct 2021 11:50:05 -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:references:mime-version :content-disposition:in-reply-to; bh=gpfP/RQ7FfQ8xeIgGLEHlMBDfblas1flCbzrYof/zQo=; b=lNv+NQd9pN5g9QbXSjlXyvi9Q7Bfe1WXOt1UGkYOspmvJgf+o8uQ5xM3uZj9PjZBJ0 vwOgVElJ5y67Cu4AnpXWy3pL0eZ54hSdECj2zgv1b5EwwFEKloy8j089TF+JOiOsmQF7 VdUQsWXdnMcicywq9dYnuaJx7y9cOK8K2fqPsGFTu+hPBge1Q7XFKgMyTOziCbY6gV6k nANprFQdLSfWbbmsvcK6iaQGCwr1lVCfe7xsSwKcnIaOKWcPZ0Orb3KU59gKZdThTRh6 MHHTNDM5zOxkJpvM/fYVfHndDmAlzw9J1r/OsjyFhpxYf9/QB9uEFl8y50x5qP0UBxSl 7yzg== 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:references :mime-version:content-disposition:in-reply-to; bh=gpfP/RQ7FfQ8xeIgGLEHlMBDfblas1flCbzrYof/zQo=; b=tPXnSxJItY9gy7l09jyI6u5MrA3e7DXqp3USe2ePTztCSNZFPgQLNxOAfZPPfh+gmX VSWCB3YJKyxWGxCbYxjGDEdR2+3XBEgXQeOsFj7+FZVkoygGOhY1wvNKYN/nWHaxxJRz 4Lw1AiqN9nx0doFOdpJgkxqL2pg+A+ByH4uemCbw1Tu7CBJxx27nns3XVTAhK/9nkBeA qoX+20NaBBXN8vYzvdeJj0SWgBwfAHvouaul3PNeIE5L4s+XvvsNivIRwpvxjVbaAPBD STlJ1USkysYW14T81P6bbrGFm4zXXZEx90AOdQLtYG3g4Sa6MjcYSTptAGvF0T5yjD1r DSAA== X-Gm-Message-State: AOAM533jUXj1bMCGAvCGpGM6FcPEEX19HnwH5TwiAwjrsJnaXFcAuVJI E6Ta8h9hvo4wcNBTj0wy6U6NSg== X-Google-Smtp-Source: ABdhPJxkdZN/1+X+Y+22idtql3l9NBWzv5Y06Pz6iBzvkr/k7An1I6H+wFf6XDHLtDQcJBq0VBqR/w== X-Received: by 2002:a7b:c0c2:: with SMTP id s2mr12243031wmh.179.1633373405197; Mon, 04 Oct 2021 11:50:05 -0700 (PDT) Received: from enceladus (ppp-94-66-220-209.home.otenet.gr. [94.66.220.209]) by smtp.gmail.com with ESMTPSA id p6sm10739259wrj.95.2021.10.04.11.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 11:50:04 -0700 (PDT) Date: Mon, 4 Oct 2021 21:50:02 +0300 From: Ilias Apalodimas To: AKASHI Takahiro Cc: xypron.glpk@gmx.de, agraf@csgraf.de, sjg@chromium.org, u-boot@lists.denx.de Subject: Re: [resent RFC 14/22] efi_loader: disk: a helper function to create efi_disk objects from udevice Message-ID: References: <20211004034430.41355-1-takahiro.akashi@linaro.org> <20211004034430.41355-15-takahiro.akashi@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211004034430.41355-15-takahiro.akashi@linaro.org> 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 Mon, Oct 04, 2021 at 12:44:22PM +0900, 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(+) > > 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); > /* 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 > + * @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) { > + 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 > + * @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; > + 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; > +} Can't we add a 'bool part' on this one and have a single function? > + > +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 /Ilias