From patchwork Tue Apr 19 01:05:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 563305 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp2861204map; Mon, 18 Apr 2022 18:08:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCLRLdy3Q98rKaAwawwaLHJXLFgxReM923McbYrKsC1wlZtgqxEesJ4qkF4l7SA5IROeSd X-Received: by 2002:a17:906:c113:b0:6d7:7b53:9cb with SMTP id do19-20020a170906c11300b006d77b5309cbmr11771235ejc.197.1650330481185; Mon, 18 Apr 2022 18:08:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650330481; cv=none; d=google.com; s=arc-20160816; b=yzILKTqP+S+kJmINzRZ4vMiZJVoGQSVsOo/aZlNPrsufvCv/CLROXHD53SLi3Ywvql GzoBXq2KEUW0VvTMfGJWOrhyK9E/18ofdozmFC/eLL2/wlmWM5/CcxDBGiKBGYwwJiUI Cd3six+yKgm8jAd3545V5xu+A5TT/chPY4M9wXcw67RMJh6/wT4TPCfqBKLtrkTQ6FqX dAyZFylWkFhWMgWOrv2GlhvFajbWNU+urGkAmqKKe8++7uTmNrD6aPvuR8fs3pyeVIVP SrSvjhiSNWxnzHLgIBMhoqd4vPEBumqW6S/UFFpTv92JDgwFtzmUeuq6RwWrSMJnnKcS bKSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ttzRaXmF+uRsWc3HJfIzPa3gWWQ85JO83DmWjnDfnrM=; b=RFoZNub3CdKCOe4p/ZgPV/HD1nivNbWi/h2msVRpq+fZbrvC7795riKFiPqEAM4qL1 e4hM9o5qrnaXcblxGQNfCKAKgTbCVmW3kmwqem8srSKDaA86OXE66XrEKDvJkGT4WbSR +PPFNzEazdrYz1jUCwwJffKj0YqYkShxUklGTy/TafP9mBmXW/J6rM0Buw3Zn8FVblds KiSHF/opK60Jzmx0AHPHe4Tkqh4ZOeoMAN+cdbwD8nT0cOtLCzteh3VQCYoESrOxWgP3 3Bec3uPJGG+yuJOgn0xH5OioHeiEdU89eYrL36+JHw+mk5zpRFp5Dg48SRKgCR6VabrA a6jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xGyUKgFF; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id v10-20020a056402348a00b0041d79cd16d5si8044073edc.304.2022.04.18.18.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Apr 2022 18:08:01 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xGyUKgFF; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7DDFC83DF3; Tue, 19 Apr 2022 03:07:26 +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="xGyUKgFF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6A94783DA7; Tue, 19 Apr 2022 03:06:18 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) (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 7953E83DA3 for ; Tue, 19 Apr 2022 03:06:08 +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-pg1-x52d.google.com with SMTP id t13so21988326pgn.8 for ; Mon, 18 Apr 2022 18:06:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ttzRaXmF+uRsWc3HJfIzPa3gWWQ85JO83DmWjnDfnrM=; b=xGyUKgFFKY2ooMkM38FcPTuaCvEV0i0k/Pqdfp/D/vKc3t9k1VY7JBt0uBSftBMo8n 6/oKmH51TZHyLLBCZWA/+lOMRhn99bo0K+fnED2btORTLxCM4Dcvf/aYtrWp8BcjHJXW DObENk71g/soBA3sLQOP+HowtJZziM+YYu17S3a8mMnlX/ZVHe/zpcG9o0cNVMcCUMem cK5SU8+6lgQJd/6AMYRLVTqKwZ63fGZGFA1r+7wK+OiJGL5H2p/YQIUKS/lcjlKs0mfy MdSNyJ9wGQQOQnxKIpfyBJMji2hLCie/LHS6lYcUpzdYNeUenh5M8rRivr74e5mkFvdK w/yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ttzRaXmF+uRsWc3HJfIzPa3gWWQ85JO83DmWjnDfnrM=; b=A6HsppUoBt7UvhIBzVfUdOseEfco7wH9Axkd3TfKOcXIwSfs9Rp79U5Y9gZVgW5pzO r1AOZKqcjXdJns47gRkWLsBTRUwwkfEIf9wUHtyJM9BYx4VdymWNPPHkFf1jaGHtLwbH F4+tHGNmaZADwLOen9VzAzutYDjgTaEJWnpNdCJ25ALZRQZQ4BKHnv0HFHtd3liiAIUg QFGHZqZIJ5q6kl9hN9cK5vab+s+MDNe2C35MhDq9gOUbgnAIVBMO5VGgwljhPcOY/gid 7VgV9PQr5mAymnHToCyzVDch33p1dU5lO/uasAzlvvoJ3G1HWDuShMB4bvuAy2BybeDk unVA== X-Gm-Message-State: AOAM532iE0gGrQXzy3QOW4xX0TB6mAT5rVT9G3fBR3YlR4/7Lu3jY6YP 3QhbvaWOlp7E5XbDmqK5VpDDOw== X-Received: by 2002:a63:af06:0:b0:378:3582:a49f with SMTP id w6-20020a63af06000000b003783582a49fmr12324720pge.125.1650330366826; Mon, 18 Apr 2022 18:06:06 -0700 (PDT) Received: from localhost.localdomain ([2400:4050:c3e1:100:5858:d3a6:5cad:ceeb]) by smtp.gmail.com with ESMTPSA id k137-20020a633d8f000000b0039800918b00sm14043756pga.77.2022.04.18.18.06.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Apr 2022 18:06:06 -0700 (PDT) From: AKASHI Takahiro To: xypron.glpk@gmx.de, sjg@chromium.org, ilias.apalodimas@linaro.org Cc: masami.hiramatsu@linaro.org, u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH v5 12/12] efi_loader: disk: use udevice instead of blk_desc Date: Tue, 19 Apr 2022 10:05:17 +0900 Message-Id: <20220419010517.47175-13-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220419010517.47175-1-takahiro.akashi@linaro.org> References: <20220419010517.47175-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 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.5 at phobos.denx.de X-Virus-Status: Clean In most of all cases, we can avoid using blk_desc which is expected to be private to udevice(UCLASS_BLK), that is, the data should not be manipulated outside the device driver unless really needed. Now efi_disk's internally use dev_read/write() interfaces if CONFIG_PARTITIONS is enabled. Signed-off-by: AKASHI Takahiro Reviewed-by: Simon Glass --- lib/efi_loader/efi_disk.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 34bb662e9cc0..8fb5b2363c45 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -36,7 +36,7 @@ const efi_guid_t efi_system_partition_guid = PARTITION_SYSTEM_GUID; * @part: partition * @volume: simple file system protocol of the partition * @offset: offset into disk for simple partition - * @desc: internal block device descriptor + * @dev: associated DM device */ struct efi_disk_obj { struct efi_object header; @@ -48,7 +48,7 @@ struct efi_disk_obj { unsigned int part; struct efi_simple_file_system_protocol *volume; lbaint_t offset; - struct blk_desc *desc; + struct udevice *dev; /* TODO: move it to efi_object */ }; /** @@ -83,14 +83,12 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, void *buffer, enum efi_disk_direction direction) { struct efi_disk_obj *diskobj; - struct blk_desc *desc; int blksz; int blocks; unsigned long n; diskobj = container_of(this, struct efi_disk_obj, ops); - desc = (struct blk_desc *) diskobj->desc; - blksz = desc->blksz; + blksz = diskobj->media.block_size; blocks = buffer_size / blksz; lba += diskobj->offset; @@ -101,10 +99,21 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, if (buffer_size & (blksz - 1)) return EFI_BAD_BUFFER_SIZE; +#if CONFIG_IS_ENABLED(PARTITIONS) + if (direction == EFI_DISK_READ) + n = dev_read(diskobj->dev, lba, blocks, buffer); + else + n = dev_write(diskobj->dev, lba, blocks, buffer); +#else + /* dev is always a block device (UCLASS_BLK) */ + struct blk_desc *desc; + + desc = dev_get_uclass_plat(diskobj->dev); if (direction == EFI_DISK_READ) n = blk_dread(desc, lba, blocks, buffer); else n = blk_dwrite(desc, lba, blocks, buffer); +#endif /* We don't do interrupts, so check for timers cooperatively */ efi_timer_check(); @@ -446,7 +455,6 @@ static efi_status_t efi_disk_add_dev( diskobj->ops = block_io_disk_template; diskobj->ifname = if_typename; diskobj->dev_index = dev_index; - diskobj->desc = desc; /* Fill in EFI IO Media info (for read/write callbacks) */ diskobj->media.removable_media = desc->removable; @@ -522,6 +530,7 @@ static int efi_disk_create_raw(struct udevice *dev) return -1; } + disk->dev = dev; if (dev_tag_set_ptr(dev, DM_TAG_EFI, &disk->header)) { efi_free_pool(disk->dp); efi_delete_handle(&disk->header); @@ -578,6 +587,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; if (dev_tag_set_ptr(dev, DM_TAG_EFI, &disk->header)) { efi_free_pool(disk->dp); efi_delete_handle(&disk->header);