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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CAB3DC433EF for ; Wed, 20 Jul 2022 05:23:40 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D30578403F; Wed, 20 Jul 2022 07:23:37 +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="qANYG565"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3B6D284055; Wed, 20 Jul 2022 07:23:36 +0200 (CEST) Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) (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 2B1D28402F for ; Wed, 20 Jul 2022 07:23:33 +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-pj1-x1033.google.com with SMTP id q13-20020a17090a304d00b001f1af9a18a2so964702pjl.5 for ; Tue, 19 Jul 2022 22:23:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :from:date:from:to:cc; bh=6mPtRK6Up4SsV4bVLlBNIhb4dpRM9V1axHhgcVfkRTY=; b=qANYG565hTSdfWBCSeYgBWPRqjCUpYdrFfWN7iynSSpm2b677kaWv6yjgsNrWI3nEB f0/1u0FeVadm2C9ppM6Wyo53voMmYoWX131+zU8UhoUKplu2xqDVKFR714v6NpJWPPsv eETl39tv8Uy96d7J311guv2wZ8GmBRGQYPzRUCWPadEKUs9hkj9vogv5F1mwJkX6Ho6K bUwdi1zGpeZumUioEgJ2/3BH/Cf76LWyMuWTBQyMiQmJ87D3tgRIN1yTtsJZExGvSW/1 i7QKNQ9DjYhsxc+hzdHAf3+vROX6Ojg+DOD7YWY6bmOoGkfJY+Q27Dd5YXlHFuNpkR+I aepQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :from:date:x-gm-message-state:from:to:cc; bh=6mPtRK6Up4SsV4bVLlBNIhb4dpRM9V1axHhgcVfkRTY=; b=nNlyNDTxZZ/G0Z08XnL83njhtCTwLPxt4StjpniOwcAg27KV8yAjionxWH95hKcWCY N3saO+eK6iy2CJCv5tiWNdY3D7w33Oabc2uJp5wpkoc8RVI/5QggbbcOX9hstcuGJXAb uOUuBH5LLapGZoHsCOeGUNNUes5uZzHZeq6BWzzcR/W2e3BD/I9io258x8FNTSEFwZNp EMEE4fd+RE6/iaYvXmzHkeILmnkEi5s9ynXh8M3lHn46MIP+xOHpV8yAz7gguurvpw8+ xXOpE19g072GVlah6vv94s7KPOIXggIBHsTTl+xNrG2xhy47lr7EvrTPiedU0oYqRBhw ZiWQ== X-Gm-Message-State: AJIora+VpLcX/bMEpBFyCI/MiePf8p4ep+vOzwQet4wCB3CFAanPJ+HW BsyrsBaJDpM2xds8X3pwwmJC1w== X-Google-Smtp-Source: AGRyM1uaO7UOG4DDSc/Nr8LNIoq2eWi99sbj3D6Cs4MH9lnTgLRHaJBpfvwiwG10a/FjOMn0MXCz1g== X-Received: by 2002:a17:90b:4a0d:b0:1f0:3400:52df with SMTP id kk13-20020a17090b4a0d00b001f0340052dfmr3440064pjb.154.1658294611276; Tue, 19 Jul 2022 22:23:31 -0700 (PDT) Received: from laputa ([2400:4050:c3e1:100:f416:6ef9:e0c6:d3cb]) by smtp.gmail.com with ESMTPSA id y5-20020aa793c5000000b0052ab7144de8sm12906227pff.10.2022.07.19.22.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 22:23:30 -0700 (PDT) Date: Wed, 20 Jul 2022 14:23:26 +0900 From: Takahiro Akashi To: Heinrich Schuchardt Cc: Masahisa Kojima , Ilias Apalodimas , Simon Glass , Mark Kettenis , u-boot@lists.denx.de Subject: Re: [RESEND v9 1/9] efi_loader: move udevice pointer into struct efi_object Message-ID: <20220720052326.GD36287@laputa> Mail-Followup-To: Takahiro Akashi , Heinrich Schuchardt , Masahisa Kojima , Ilias Apalodimas , Simon Glass , Mark Kettenis , u-boot@lists.denx.de References: <20220715144749.30564-1-masahisa.kojima@linaro.org> <20220715144749.30564-2-masahisa.kojima@linaro.org> <0a2d9892-7bc7-a4e4-6052-325edcc7ace6@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.6 at phobos.denx.de X-Virus-Status: Clean On Sun, Jul 17, 2022 at 01:23:41PM +0200, Heinrich Schuchardt wrote: > On 7/17/22 10:09, Heinrich Schuchardt wrote: > > On 7/15/22 16:47, Masahisa Kojima wrote: > > > This is a preparation patch to provide the unified method > > > to access udevice pointer associated with the block io device. > > > The EFI handles of both EFI block io driver implemented in > > > lib/efi_loader/efi_disk.c and EFI block io driver implemented > > > as EFI payload can posess the udevice pointer in the struct efi_object. > > > > > > We can use this udevice pointer to get the U-Boot friendly > > > block device name(e.g. mmc 0:1, nvme 0:1) through efi_handle_t. > > > > > > Signed-off-by: Masahisa Kojima > > > --- > > > Newly created in v9 > > > > > >   include/efi_loader.h      |  8 ++++++++ > > >   lib/efi_loader/efi_disk.c | 20 +++++++++++++------- > > >   2 files changed, 21 insertions(+), 7 deletions(-) > > > > > > diff --git a/include/efi_loader.h b/include/efi_loader.h > > > index 3a63a1f75f..bba5ffd482 100644 > > > --- a/include/efi_loader.h > > > +++ b/include/efi_loader.h > > > @@ -226,6 +226,12 @@ const char *__efi_nesting_dec(void); > > >   #define EFI_CACHELINE_SIZE 128 > > >   #endif > > > > > > +/** > > > + * efi_handle_to_udev - accessor to the DM device associated to the > > > EFI handle > > > + * @handle:    pointer to the EFI handle > > > + */ > > > +#define efi_handle_to_udev(handle) (((struct efi_object *)handle)->dev) > > > > This conversion will hide errors if handle is not of type efi_handle_t. > > We should avoid the conversion and see build time errors instead. > > Please, remove the macro. > > > > For every handle of type efi_handle_t you can access the field > > handle->dev directly. > > > > For struct efi_disk_obj we can use disk->header.dev. > > > > > + > > >   /* Key identifying current memory map */ > > >   extern efi_uintn_t efi_memory_map_key; > > > > > > @@ -375,6 +381,7 @@ enum efi_object_type { > > >    * @protocols:    linked list with the protocol interfaces installed > > > on this > > >    *        handle > > >    * @type:    image type if the handle relates to an image > > > + * @dev:    pointer to the DM device which is associated with this > > > EFI handle > > >    * > > >    * UEFI offers a flexible and expandable object model. The objects > > > in the UEFI > > >    * API are devices, drivers, and loaded images. struct efi_object is > > > our storage > > > @@ -392,6 +399,7 @@ struct efi_object { > > >       /* The list of protocols */ > > >       struct list_head protocols; > > >       enum efi_object_type type; > > > +    struct udevice *dev; > > >   }; > > > > > >   enum efi_image_auth_status { > > > diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c > > > index 1d700b2a6b..a8e8521e3e 100644 > > > --- a/lib/efi_loader/efi_disk.c > > > +++ b/lib/efi_loader/efi_disk.c > > > @@ -46,7 +46,6 @@ struct efi_disk_obj { > > >       struct efi_device_path *dp; > > >       unsigned int part; > > >       struct efi_simple_file_system_protocol *volume; > > > -    struct udevice *dev; /* TODO: move it to efi_object */ > > > > ok > > > > >   }; > > > > > >   /** > > > @@ -124,16 +123,16 @@ static efi_status_t efi_disk_rw_blocks(struct > > > efi_block_io *this, > > >           return EFI_BAD_BUFFER_SIZE; > > > > > >       if (CONFIG_IS_ENABLED(PARTITIONS) && > > > -        device_get_uclass_id(diskobj->dev) == UCLASS_PARTITION) { > > > +        device_get_uclass_id(efi_handle_to_udev(diskobj)) == > > > UCLASS_PARTITION) { > > > > device_get_uclass_id(diskobj->header.hdev)) == UCLASS_PARTITION) { > > > > >           if (direction == EFI_DISK_READ) > > > -            n = dev_read(diskobj->dev, lba, blocks, buffer); > > > +            n = dev_read(efi_handle_to_udev(diskobj), lba, blocks, > > > buffer); > > > > dev_read(diskobj->header.hdev) > > > > >           else > > > -            n = dev_write(diskobj->dev, lba, blocks, buffer); > > > +            n = dev_write(efi_handle_to_udev(diskobj), lba, blocks, > > > buffer); > > > > dev_write(diskobj->header.hdev) > > > > >       } else { > > >           /* dev is a block device (UCLASS_BLK) */ > > >           struct blk_desc *desc; > > > > > > -        desc = dev_get_uclass_plat(diskobj->dev); > > > +        desc = dev_get_uclass_plat(efi_handle_to_udev(diskobj)); > > > > dev_get_uclass(diskobj->header.hdev) > > > > > > >           if (direction == EFI_DISK_READ) > > >               n = blk_dread(desc, lba, blocks, buffer); > > >           else > > > @@ -552,7 +551,7 @@ static int efi_disk_create_raw(struct udevice *dev) > > > > > >           return -1; > > >       } > > > -    disk->dev = dev; > > > +    efi_handle_to_udev(disk) = dev; > > >       if (dev_tag_set_ptr(dev, DM_TAG_EFI, &disk->header)) { > > >           efi_free_pool(disk->dp); > > >           efi_delete_handle(&disk->header); > > > @@ -609,7 +608,7 @@ static int efi_disk_create_part(struct udevice *dev) > > >           log_err("Adding partition for %s failed\n", dev->name); > > >           return -1; > > >       } > > > -    disk->dev = dev; > > > +    efi_handle_to_udev(disk) = dev; > > > > disk->header.dev = dev; > > > > >       if (dev_tag_set_ptr(dev, DM_TAG_EFI, &disk->header)) { > > >           efi_free_pool(disk->dp); > > >           efi_delete_handle(&disk->header); > > > @@ -656,6 +655,13 @@ static int efi_disk_probe(void *ctx, struct event > > > *event) > > >           ret = efi_disk_create_raw(dev); > > >           if (ret) > > >               return -1; > > > +    } else { > > > +        efi_handle_t handle; > > > + > > > +        if (dev_tag_get_ptr(dev, DM_TAG_EFI, (void **)&handle)) > > Setting handle->dev can be done more easily in efi_bl_bind(): I don't think so. "dev" field should be maintained in *one* place, i.e. efi_disk_probe(), which is uniquely called from probe event (even for efi_block_dev case). To make this clear, we'd better put the code in efi_disk_create_raw(): efi_disk_create_raw() if (desc->if_type == IF_TYPE_EFI_LOADER) { /* handle should exist now */        dev_tag_get_ptr(dev, DM_TAG_EFI, (void **)&handle)); efi_set_udev(handle, dev); return 0; } /* normal block devices */ ... efi_set_udev(&disk->header, dev); ... -Takahiro Akashi > handle->dev = bdev; > > We can further remove the field handle from struct blk_create_device as > it is now available in handle->dev. > > Best regards > > Heinrich > > > > +            return -1; > > > + > > > +        efi_handle_to_udev(handle) = dev; > > > > handle->dev = dev; > > > > Best regards > > > > Heinrich > > > > >       } > > > > > >       device_foreach_child(child, dev) { > > >